From xen-changelog-bounces@lists.xenproject.org Thu Sep 01 09:00:07 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Sep 2022 09:00:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.396349.636458 (Exim 4.92) (envelope-from ) id 1oTg3P-0002rs-5S; Thu, 01 Sep 2022 09:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 396349.636458; Thu, 01 Sep 2022 09:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTg3P-0002rS-1F; Thu, 01 Sep 2022 09:00:03 +0000 Received: by outflank-mailman (input) for mailman id 396349; Thu, 01 Sep 2022 09:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTg3O-0002iy-A9 for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 09:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTg3O-00080y-7I for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 09:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oTg3O-0000F6-69 for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 09: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=obiJmaIbRoV2+X4KnNg0OOjbNl6/FjRTl8dFvIDrZE0=; b=Ts0XtsAfJF1qVkV8ZB0v3oE1zO xMbVJbExfgNCejvF1AmiH0pmGV2DtWR8+/vZhhfVPm31+BjWm3rx7U220eXHZ+Mgzk3N82/pLt833 REQlPzO9hfOGYrATLe+1BRXNTI+4rUcqSren1/xUcwPYc+9BqEJThjfD6zbOa08TqhBs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Support properly __ro_after_init on Arm Message-Id: Date: Thu, 01 Sep 2022 09:00:02 +0000 commit ace403022358b736755e3042e949540e775c65f1 Author: Julien Grall AuthorDate: Tue Aug 16 19:59:54 2022 +0100 Commit: Julien Grall CommitDate: Wed Aug 31 19:53:06 2022 +0100 xen/arm: Support properly __ro_after_init on Arm __ro_after_init was introduced recently to prevent modifying some variables after init. At the moment, on Arm, the variables will still be accessible because the region permission is not updated. Address that by moving the sections .data.ro_after_init out of .data and then map the region read-only once we finish to boot. Signed-off-by: Julien Grall Reviewed-by: Penny Zheng Reviewed-by: Bertrand Marquis Tested-by: Henry Wang --- xen/arch/arm/include/asm/setup.h | 2 ++ xen/arch/arm/setup.c | 14 ++++++++++++++ xen/arch/arm/xen.lds.S | 7 +++++++ 3 files changed, 23 insertions(+) diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 2bb01ecfa8..5815ccf8c5 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -137,6 +137,8 @@ u32 device_tree_get_u32(const void *fdt, int node, int map_range_to_domain(const struct dt_device_node *dev, u64 addr, u64 len, void *data); +extern const char __ro_after_init_start[], __ro_after_init_end[]; + #endif /* * Local variables: diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 500307edc0..6e0398f3f6 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -75,10 +75,24 @@ domid_t __read_mostly max_init_domid; static __used void init_done(void) { + int rc; + /* Must be done past setting system_state. */ unregister_init_virtual_region(); free_init_memory(); + + /* + * We have finished booting. Mark the section .data.ro_after_init + * read-only. + */ + rc = modify_xen_mappings((unsigned long)&__ro_after_init_start, + (unsigned long)&__ro_after_init_end, + PAGE_HYPERVISOR_RO); + if ( rc ) + panic("Unable to mark the .data.ro_after_init section read-only (rc = %d)\n", + rc); + startup_cpu_idle_loop(); } diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index 1e986e211f..92c2984052 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -83,6 +83,13 @@ SECTIONS _erodata = .; /* End of read-only data */ . = ALIGN(PAGE_SIZE); + .data.ro_after_init : { + __ro_after_init_start = .; + *(.data.ro_after_init) + . = ALIGN(PAGE_SIZE); + __ro_after_init_end = .; + } : text + .data.read_mostly : { /* Exception table */ __start___ex_table = .; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 01 23:00:07 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Sep 2022 23:00:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.397009.637431 (Exim 4.92) (envelope-from ) id 1oTtAJ-0004yS-Qx; Thu, 01 Sep 2022 23:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 397009.637431; Thu, 01 Sep 2022 23:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtAJ-0004yK-NR; Thu, 01 Sep 2022 23:00:03 +0000 Received: by outflank-mailman (input) for mailman id 397009; Thu, 01 Sep 2022 23:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtAI-0004s0-ET for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtAI-0006P1-DI for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oTtAI-0000Yg-CL for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23: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=ZiOQVGhJG8h/5pT9Dio8KFZtmANzqAF8IwpbM0w1fvY=; b=zbZuicom7yXOGc6IenpT1hOgXb yPTvcS7POW9m2lz3f3s9yBJk8vfYUzv7y4jFUPCEeFieAZGErl2aUaMP2JY7kPSqTE0EHbtlfWEeZ Veaa7YpUAmtGnYNOcP/1TcCmdN7wMAFFV81srefXsr2jpnnEGLHFdE3c3OM+4MibKblw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: head: Don't set x22 and update the documentation Message-Id: Date: Thu, 01 Sep 2022 23:00:02 +0000 commit 471721c341cb56487324410f501b7f012d313e0e Author: Julien Grall AuthorDate: Fri Aug 12 20:24:40 2022 +0100 Commit: Julien Grall CommitDate: Wed Aug 31 20:10:47 2022 +0100 xen/arm64: head: Don't set x22 and update the documentation Since commit 7e14a47e7c73 ("xen/arm64: head Rework and document launch()"), the boot code is setting x22 but not read it. So remove the two instructions setting x22 and update the documentation to show x22 has no specific purpose. Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis Reviewed-by: Wei Chen --- xen/arch/arm/arm64/head.S | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 1babcc65d7..26cc7705f5 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -71,7 +71,7 @@ * x19 - paddr(start) * x20 - phys offset * x21 - DTB address (boot cpu only) - * x22 - is_secondary_cpu + * x22 - * x23 - UART address * x24 - * x25 - @@ -305,8 +305,6 @@ real_start_efi: #endif PRINT("- Boot CPU booting -\r\n") - mov x22, #0 /* x22 := is_secondary_cpu */ - bl check_cpu_mode bl cpu_init bl create_page_tables @@ -345,8 +343,6 @@ GLOBAL(init_secondary) adr x19, start /* x19 := paddr (start) */ sub x20, x19, x0 /* x20 := phys-offset */ - mov x22, #1 /* x22 := is_secondary_cpu */ - mrs x0, mpidr_el1 ldr x13, =(~MPIDR_HWID_MASK) bic x24, x0, x13 /* Mask out flags to get CPU ID */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 01 23:00:13 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Sep 2022 23:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.397010.637435 (Exim 4.92) (envelope-from ) id 1oTtAT-0005VR-Rr; Thu, 01 Sep 2022 23:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 397010.637435; Thu, 01 Sep 2022 23: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 1oTtAT-0005VK-PB; Thu, 01 Sep 2022 23:00:13 +0000 Received: by outflank-mailman (input) for mailman id 397010; Thu, 01 Sep 2022 23:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtAS-0005VC-HS for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtAS-0006PT-GY for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oTtAS-0000aX-FV for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23: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=Xmt/SsQWhHVuoQyXUt26umpIf547c8iv0KJKJXBgC40=; b=ZB9VzWAHn1fEwdbqkurEkysFea PJzJ2iRO8J4wJbwwW/+LIo/ebvRQmMLmxGmSzVSe3b6jNk81/SkQImDe8/NDVePXjJI2l4puAlFCe mVqFVOQBVD4IlTzOUhffbizfFPwbr/W5llDo7gL3Xmhfpbqn8apSdpd4JdHkg44WI1/g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: head: Introduce get_table_slot() and use it Message-Id: Date: Thu, 01 Sep 2022 23:00:12 +0000 commit 0f94a5a7fb5fbf50979227b54f82577f8bb51b65 Author: Julien Grall AuthorDate: Fri Aug 12 20:24:41 2022 +0100 Commit: Julien Grall CommitDate: Wed Aug 31 20:16:04 2022 +0100 xen/arm64: head: Introduce get_table_slot() and use it There are a few places in the code that need to find the slot at a given page-table level. So create a new macro get_table_slot() for that. This will reduce the effort to figure out whether the code is doing the right thing. Take the opportunity to use 'ubfx'. The only benefits is reducing the number of instructions from 2 to 1. The new macro is used everywhere we need to compute the slot. This requires to tweak the parameter of create_table_entry() to pass a level rather than shift. Note, for slot 0 the code is currently skipping the masking part. While this is fine, it is safer to mask it as technically slot 0 only covers bit 48 - 39 bit (assuming 4KB page granularity). Take the opportunity to correct the comment when finding the second slot for the identity mapping (we are computing the second slot rather than first). Signed-off-by: Julien Grall Reviewed-by: Wei Chen Reviewed-by: Bertrand Marquis --- xen/arch/arm/arm64/head.S | 55 ++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 26cc7705f5..ad014716db 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -493,13 +493,24 @@ cpu_init: ret ENDPROC(cpu_init) +/* + * Macro to find the slot number at a given page-table level + * + * slot: slot computed + * virt: virtual address + * lvl: page-table level + */ +.macro get_table_slot, slot, virt, lvl + ubfx \slot, \virt, #XEN_PT_LEVEL_SHIFT(\lvl), #XEN_PT_LPAE_SHIFT +.endm + /* * Macro to create a page table entry in \ptbl to \tbl * * ptbl: table symbol where the entry will be created * tbl: table symbol to point to * virt: virtual address - * shift: #imm page table shift + * lvl: page-table level * tmp1: scratch register * tmp2: scratch register * tmp3: scratch register @@ -511,9 +522,8 @@ ENDPROC(cpu_init) * * Note that all parameters using registers should be distinct. */ -.macro create_table_entry, ptbl, tbl, virt, shift, tmp1, tmp2, tmp3 - lsr \tmp1, \virt, #\shift - and \tmp1, \tmp1, #XEN_PT_LPAE_ENTRY_MASK/* \tmp1 := slot in \tlb */ +.macro create_table_entry, ptbl, tbl, virt, lvl, tmp1, tmp2, tmp3 + get_table_slot \tmp1, \virt, \lvl /* \tmp1 := slot in \tlb */ load_paddr \tmp2, \tbl mov \tmp3, #PT_PT /* \tmp3 := right for linear PT */ @@ -544,8 +554,7 @@ ENDPROC(cpu_init) .macro create_mapping_entry, ptbl, virt, phys, tmp1, tmp2, tmp3, type=PT_MEM_L3 and \tmp3, \phys, #THIRD_MASK /* \tmp3 := PAGE_ALIGNED(phys) */ - lsr \tmp1, \virt, #THIRD_SHIFT - and \tmp1, \tmp1, #XEN_PT_LPAE_ENTRY_MASK/* \tmp1 := slot in \tlb */ + get_table_slot \tmp1, \virt, 3 /* \tmp1 := slot in \tlb */ mov \tmp2, #\type /* \tmp2 := right for section PT */ orr \tmp2, \tmp2, \tmp3 /* + PAGE_ALIGNED(phys) */ @@ -573,9 +582,9 @@ ENDPROC(cpu_init) create_page_tables: /* Prepare the page-tables for mapping Xen */ ldr x0, =XEN_VIRT_START - create_table_entry boot_pgtable, boot_first, x0, ZEROETH_SHIFT, x1, x2, x3 - create_table_entry boot_first, boot_second, x0, FIRST_SHIFT, x1, x2, x3 - create_table_entry boot_second, boot_third, x0, SECOND_SHIFT, x1, x2, x3 + create_table_entry boot_pgtable, boot_first, x0, 0, x1, x2, x3 + create_table_entry boot_first, boot_second, x0, 1, x1, x2, x3 + create_table_entry boot_second, boot_third, x0, 2, x1, x2, x3 /* Map Xen */ adr_l x4, boot_third @@ -612,10 +621,10 @@ create_page_tables: * XEN_ZEROETH_SLOT, then the 1:1 mapping will use its own set of * page-tables from the first level. */ - lsr x0, x19, #ZEROETH_SHIFT /* x0 := zeroeth slot */ + get_table_slot x0, x19, 0 /* x0 := zeroeth slot */ cmp x0, #XEN_ZEROETH_SLOT beq 1f - create_table_entry boot_pgtable, boot_first_id, x19, ZEROETH_SHIFT, x0, x1, x2 + create_table_entry boot_pgtable, boot_first_id, x19, 0, x0, x1, x2 b link_from_first_id 1: @@ -624,11 +633,10 @@ create_page_tables: * then the 1:1 mapping will use its own set of page-tables from * the second level. */ - lsr x0, x19, #FIRST_SHIFT - and x0, x0, #XEN_PT_LPAE_ENTRY_MASK /* x0 := first slot */ + get_table_slot x0, x19, 1 /* x0 := first slot */ cmp x0, #XEN_FIRST_SLOT beq 1f - create_table_entry boot_first, boot_second_id, x19, FIRST_SHIFT, x0, x1, x2 + create_table_entry boot_first, boot_second_id, x19, 1, x0, x1, x2 b link_from_second_id 1: @@ -638,17 +646,16 @@ create_page_tables: * third level. For slot XEN_SECOND_SLOT, Xen is not yet able to handle * it. */ - lsr x0, x19, #SECOND_SHIFT - and x0, x0, #XEN_PT_LPAE_ENTRY_MASK /* x0 := first slot */ + get_table_slot x0, x19, 2 /* x0 := second slot */ cmp x0, #XEN_SECOND_SLOT beq virtphys_clash - create_table_entry boot_second, boot_third_id, x19, SECOND_SHIFT, x0, x1, x2 + create_table_entry boot_second, boot_third_id, x19, 2, x0, x1, x2 b link_from_third_id link_from_first_id: - create_table_entry boot_first_id, boot_second_id, x19, FIRST_SHIFT, x0, x1, x2 + create_table_entry boot_first_id, boot_second_id, x19, 1, x0, x1, x2 link_from_second_id: - create_table_entry boot_second_id, boot_third_id, x19, SECOND_SHIFT, x0, x1, x2 + create_table_entry boot_second_id, boot_third_id, x19, 2, x0, x1, x2 link_from_third_id: create_mapping_entry boot_third_id, x19, x19, x0, x1, x2 ret @@ -705,7 +712,7 @@ remove_identity_mapping: * Find the zeroeth slot used. Remove the entry from zeroeth * table if the slot is not XEN_ZEROETH_SLOT. */ - lsr x1, x19, #ZEROETH_SHIFT /* x1 := zeroeth slot */ + get_table_slot x1, x19, 0 /* x1 := zeroeth slot */ cmp x1, #XEN_ZEROETH_SLOT beq 1f /* It is not in slot XEN_ZEROETH_SLOT, remove the entry. */ @@ -718,8 +725,7 @@ remove_identity_mapping: * Find the first slot used. Remove the entry for the first * table if the slot is not XEN_FIRST_SLOT. */ - lsr x1, x19, #FIRST_SHIFT - and x1, x1, #XEN_PT_LPAE_ENTRY_MASK /* x1 := first slot */ + get_table_slot x1, x19, 1 /* x1 := first slot */ cmp x1, #XEN_FIRST_SLOT beq 1f /* It is not in slot XEN_FIRST_SLOT, remove the entry. */ @@ -732,8 +738,7 @@ remove_identity_mapping: * Find the second slot used. Remove the entry for the first * table if the slot is not XEN_SECOND_SLOT. */ - lsr x1, x19, #SECOND_SHIFT - and x1, x1, #XEN_PT_LPAE_ENTRY_MASK /* x1 := first slot */ + get_table_slot x1, x19, 2 /* x1 := second slot */ cmp x1, #XEN_SECOND_SLOT beq identity_mapping_removed /* It is not in slot 1, remove the entry */ @@ -771,7 +776,7 @@ setup_fixmap: #endif /* Map fixmap into boot_second */ ldr x0, =FIXMAP_ADDR(0) - create_table_entry boot_second, xen_fixmap, x0, SECOND_SHIFT, x1, x2, x3 + create_table_entry boot_second, xen_fixmap, x0, 2, x1, x2, x3 /* Ensure any page table updates made above have occurred. */ dsb nshst -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 01 23:00:24 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Sep 2022 23:00:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.397011.637439 (Exim 4.92) (envelope-from ) id 1oTtAd-0005Y5-U5; Thu, 01 Sep 2022 23:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 397011.637439; Thu, 01 Sep 2022 23: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 1oTtAd-0005Xx-Qn; Thu, 01 Sep 2022 23:00:23 +0000 Received: by outflank-mailman (input) for mailman id 397011; Thu, 01 Sep 2022 23:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtAc-0005Xp-Kh for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtAc-0006Pk-Jw for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oTtAc-0000bO-Ir for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23: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=M80oklmm+2Nmig+FyA363gvfl3UuqJuo8MsAPtnd+vo=; b=GJ4WjejQEkREfQjbBIjLVVStE0 gfUn8JQtKbO7I+0jQTDMCLIRxL2LYS1zQAelM0Ka1XR780qardAsX61JZGbzB3pBKwiyKo3nl4+pa Y/izZdsTeLYVYJ1mPgQkIEJXjvXhxvgY41qcH5qEeH4D9wT46biA+V/bZDJeckXDzNos=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: head: Introduce get_table_slot() and use it Message-Id: Date: Thu, 01 Sep 2022 23:00:22 +0000 commit f93f7f70deca381e232968dc21da16522f28da6a Author: Julien Grall AuthorDate: Fri Aug 12 20:24:42 2022 +0100 Commit: Julien Grall CommitDate: Wed Aug 31 20:16:22 2022 +0100 xen/arm32: head: Introduce get_table_slot() and use it There are a few places in the code that need to find the slot at a given page-table level. So create a new macro get_table_slot() for that. This will reduce the effort to figure out whether the code is doing the right thing. The new macro is using 'ubfx' (or 'lsr' for the first level) rather than the existing sequence (mov_w, lsr, and) because it doesn't require a scratch register and reduce the number of instructions (4 -> 1). Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis Tested-by: Bertrand Marquis Reviewed-by: Wei Chen --- xen/arch/arm/arm32/head.S | 56 +++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 46d93bebba..50f6fa4eb3 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -358,13 +358,31 @@ cpu_init_done: mov pc, r5 /* Return address is in r5 */ ENDPROC(cpu_init) +/* + * Macro to find the slot number at a given page-table level + * + * slot: slot computed + * virt: virtual address + * lvl: page-table level + * + * Note that ubxf is unpredictable when the end bit is above 32-bit. So we + * can't use it for first level offset. + */ +.macro get_table_slot, slot, virt, lvl + .if \lvl == 1 + lsr \slot, \virt, #XEN_PT_LEVEL_SHIFT(\lvl) + .else + ubfx \slot, \virt, #XEN_PT_LEVEL_SHIFT(\lvl), #XEN_PT_LPAE_SHIFT + .endif +.endm + /* * Macro to create a page table entry in \ptbl to \tbl * * ptbl: table symbol where the entry will be created * tbl: table symbol to point to * virt: virtual address - * shift: #imm page table shift + * lvl: page-table level * mmu: Is the MMU turned on/off. If not specified it will be off * * Preserves \virt @@ -374,11 +392,9 @@ ENDPROC(cpu_init) * * Note that \virt should be in a register other than r1 - r4 */ -.macro create_table_entry, ptbl, tbl, virt, shift, mmu=0 - lsr r1, \virt, #\shift - mov_w r2, XEN_PT_LPAE_ENTRY_MASK - and r1, r1, r2 /* r1 := slot in \tlb */ - lsl r1, r1, #3 /* r1 := slot offset in \tlb */ +.macro create_table_entry, ptbl, tbl, virt, lvl, mmu=0 + get_table_slot r1, \virt, \lvl /* r1 := slot in \tlb */ + lsl r1, r1, #3 /* r1 := slot offset in \tlb */ load_paddr r4, \tbl @@ -448,8 +464,8 @@ ENDPROC(cpu_init) create_page_tables: /* Prepare the page-tables for mapping Xen */ ldr r0, =XEN_VIRT_START - create_table_entry boot_pgtable, boot_second, r0, FIRST_SHIFT - create_table_entry boot_second, boot_third, r0, SECOND_SHIFT + create_table_entry boot_pgtable, boot_second, r0, 1 + create_table_entry boot_second, boot_third, r0, 2 /* Setup boot_third: */ adr_l r4, boot_third, mmu=0 @@ -486,12 +502,10 @@ create_page_tables: * then the 1:1 mapping will use its own set of page-tables from * the second level. */ - lsr r1, r9, #FIRST_SHIFT - mov_w r0, XEN_PT_LPAE_ENTRY_MASK - and r1, r1, r0 /* r1 := first slot */ + get_table_slot r1, r9, 1 /* r1 := first slot */ cmp r1, #XEN_FIRST_SLOT beq 1f - create_table_entry boot_pgtable, boot_second_id, r9, FIRST_SHIFT + create_table_entry boot_pgtable, boot_second_id, r9, 1 b link_from_second_id 1: @@ -501,16 +515,14 @@ create_page_tables: * third level. For slot XEN_SECOND_SLOT, Xen is not yet able to handle * it. */ - lsr r1, r9, #SECOND_SHIFT - mov_w r0, XEN_PT_LPAE_ENTRY_MASK - and r1, r1, r0 /* r1 := second slot */ + get_table_slot r1, r9, 2 /* r1 := second slot */ cmp r1, #XEN_SECOND_SLOT beq virtphys_clash - create_table_entry boot_second, boot_third_id, r9, SECOND_SHIFT + create_table_entry boot_second, boot_third_id, r9, 2 b link_from_third_id link_from_second_id: - create_table_entry boot_second_id, boot_third_id, r9, SECOND_SHIFT + create_table_entry boot_second_id, boot_third_id, r9, 2 link_from_third_id: create_mapping_entry boot_third_id, r9, r9 mov pc, lr @@ -571,9 +583,7 @@ remove_identity_mapping: * Find the first slot used. Remove the entry for the first * table if the slot is not XEN_FIRST_SLOT. */ - lsr r1, r9, #FIRST_SHIFT - mov_w r0, XEN_PT_LPAE_ENTRY_MASK - and r1, r1, r0 /* r1 := first slot */ + get_table_slot r1, r9, 1 /* r1 := first slot */ cmp r1, #XEN_FIRST_SLOT beq 1f /* It is not in slot 0, remove the entry */ @@ -587,9 +597,7 @@ remove_identity_mapping: * Find the second slot used. Remove the entry for the first * table if the slot is not XEN_SECOND_SLOT. */ - lsr r1, r9, #SECOND_SHIFT - mov_w r0, XEN_PT_LPAE_ENTRY_MASK - and r1, r1, r0 /* r1 := second slot */ + get_table_slot r1, r9, 2 /* r1 := second slot */ cmp r1, #XEN_SECOND_SLOT beq identity_mapping_removed /* It is not in slot 1, remove the entry */ @@ -628,7 +636,7 @@ setup_fixmap: #endif /* Map fixmap into boot_second */ mov_w r0, FIXMAP_ADDR(0) - create_table_entry boot_second, xen_fixmap, r0, SECOND_SHIFT, mmu=1 + create_table_entry boot_second, xen_fixmap, r0, 2, mmu=1 /* Ensure any page table updates made above have occurred. */ dsb nshst -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 01 23:00:34 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Sep 2022 23:00:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.397012.637443 (Exim 4.92) (envelope-from ) id 1oTtAn-0005b7-Us; Thu, 01 Sep 2022 23:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 397012.637443; Thu, 01 Sep 2022 23: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 1oTtAn-0005az-SJ; Thu, 01 Sep 2022 23:00:33 +0000 Received: by outflank-mailman (input) for mailman id 397012; Thu, 01 Sep 2022 23:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtAm-0005al-NZ for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtAm-0006Pu-Mq for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oTtAm-0000cC-M2 for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23: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=m3md/tVM/nwZcVCoEhH09WW4feymsZuHQy7Q1XyYrKE=; b=jmVTS8lu3m3b/ZldpLcwogjx2S qihGVoVKGlDOSMs2kPTYGXgNAKVP/oMupuYNCoUfawR+Xy+Mdwu1xlFKg4FmRrUNQHIBmznmZ/6Bn nltOKQy7LLowZxWa6My2D7GUzPt2UULvGzCiwWEHXspsEM84wXab0BBP5korzgjvVrX0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: heap: Rework adr_l so it doesn't rely on where Xen is loaded Message-Id: Date: Thu, 01 Sep 2022 23:00:32 +0000 commit a571c1aab5a11a238eb190d20390435d49cdd50b Author: Julien Grall AuthorDate: Fri Aug 12 20:24:43 2022 +0100 Commit: Julien Grall CommitDate: Wed Aug 31 20:16:22 2022 +0100 xen/arm32: heap: Rework adr_l so it doesn't rely on where Xen is loaded At the moment, the macro addr_l needs to know whether the caller is running with the MMU on. This is fine today because there are only two possible cases: 1) MMU off 2) MMU on and linked to the virtual address This is still cumbersome to use for the developer as they need to know if the MMU is on. Thankfully, Linux developpers came up with a great way to allow adr_l to work within the range +/- 4GB of PC by emitting a PC-relative reference [1]. Re-use the same approach on Arm and drop the parameter 'mmu'. [1] 0b1674638a5c ("ARM: assembler: introduce adr_l, ldr_l and str_l macros") Signed-off-by: Julien Grall --- xen/arch/arm/arm32/head.S | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 50f6fa4eb3..27d02ac8d6 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -49,20 +49,16 @@ .endm /* - * There are no easy way to have a PC relative address within the range - * +/- 4GB of the PC. + * Pseudo-op for PC relative adr , where is + * within the range +/- 4GB of the PC. * - * This macro workaround it by asking the user to tell whether the MMU - * has been turned on or not. - * - * When the MMU is turned off, we need to apply the physical offset - * (r10) in order to find the associated physical address. + * @dst: destination register + * @sym: name of the symbol */ -.macro adr_l, dst, sym, mmu - ldr \dst, =\sym - .if \mmu == 0 - add \dst, \dst, r10 - .endif +.macro adr_l, dst, sym + mov_w \dst, \sym - .Lpc\@ + .set .Lpc\@, .+ 8 /* PC bias */ + add \dst, \dst, pc .endm .macro load_paddr rb, sym @@ -383,7 +379,6 @@ ENDPROC(cpu_init) * tbl: table symbol to point to * virt: virtual address * lvl: page-table level - * mmu: Is the MMU turned on/off. If not specified it will be off * * Preserves \virt * Clobbers r1 - r4 @@ -392,7 +387,7 @@ ENDPROC(cpu_init) * * Note that \virt should be in a register other than r1 - r4 */ -.macro create_table_entry, ptbl, tbl, virt, lvl, mmu=0 +.macro create_table_entry, ptbl, tbl, virt, lvl get_table_slot r1, \virt, \lvl /* r1 := slot in \tlb */ lsl r1, r1, #3 /* r1 := slot offset in \tlb */ @@ -402,7 +397,7 @@ ENDPROC(cpu_init) orr r2, r2, r4 /* + \tlb paddr */ mov r3, #0 - adr_l r4, \ptbl, \mmu + adr_l r4, \ptbl strd r2, r3, [r4, r1] .endm @@ -415,17 +410,14 @@ ENDPROC(cpu_init) * virt: virtual address * phys: physical address * type: mapping type. If not specified it will be normal memory (PT_MEM_L3) - * mmu: Is the MMU turned on/off. If not specified it will be off * * Preserves \virt, \phys * Clobbers r1 - r4 * - * * Also use r10 for the phys offset. - * * Note that \virt and \paddr should be in other registers than r1 - r4 * and be distinct. */ -.macro create_mapping_entry, ptbl, virt, phys, type=PT_MEM_L3, mmu=0 +.macro create_mapping_entry, ptbl, virt, phys, type=PT_MEM_L3 mov_w r2, XEN_PT_LPAE_ENTRY_MASK lsr r1, \virt, #THIRD_SHIFT and r1, r1, r2 /* r1 := slot in \tlb */ @@ -438,7 +430,7 @@ ENDPROC(cpu_init) orr r2, r2, r4 /* + PAGE_ALIGNED(phys) */ mov r3, #0 - adr_l r4, \ptbl, \mmu + adr_l r4, \ptbl strd r2, r3, [r4, r1] .endm @@ -468,7 +460,7 @@ create_page_tables: create_table_entry boot_second, boot_third, r0, 2 /* Setup boot_third: */ - adr_l r4, boot_third, mmu=0 + adr_l r4, boot_third lsr r2, r9, #THIRD_SHIFT /* Base address for 4K mapping */ lsl r2, r2, #THIRD_SHIFT @@ -632,11 +624,11 @@ setup_fixmap: #if defined(CONFIG_EARLY_PRINTK) /* Add UART to the fixmap table */ ldr r0, =EARLY_UART_VIRTUAL_ADDRESS - create_mapping_entry xen_fixmap, r0, r11, type=PT_DEV_L3, mmu=1 + create_mapping_entry xen_fixmap, r0, r11, type=PT_DEV_L3 #endif /* Map fixmap into boot_second */ mov_w r0, FIXMAP_ADDR(0) - create_table_entry boot_second, xen_fixmap, r0, 2, mmu=1 + create_table_entry boot_second, xen_fixmap, r0, 2 /* Ensure any page table updates made above have occurred. */ dsb nshst -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 01 23:00:44 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Sep 2022 23:00:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.397014.637447 (Exim 4.92) (envelope-from ) id 1oTtAy-0005e4-0U; Thu, 01 Sep 2022 23:00:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 397014.637447; Thu, 01 Sep 2022 23: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 1oTtAx-0005dv-Tl; Thu, 01 Sep 2022 23:00:43 +0000 Received: by outflank-mailman (input) for mailman id 397014; Thu, 01 Sep 2022 23:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtAw-0005dY-QO for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtAw-0006Q4-Pg for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oTtAw-0000d1-Ov for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23: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=T88MTlJrSYj+nJzefpVM5HYr4pZoufWDRAINT6zz1+Y=; b=PF0ZPf5rsQ9Wo4VbL/gMXP2qVM hRqTlARJ8waLLuh8ItHBNSl5CdMQvVs725EOLC+rP0yg9I5YExAxtpjDTMR8FT2QjvhQEHDrcfiEy +N6CppG96rkdQiKF5TaJ65Jzq/ZybIhGGqeXebIGt5fmJ6soyz/pSMA+/TmnsE6SxcCw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: head: Move earlyprintk messages to .rodata.str Message-Id: Date: Thu, 01 Sep 2022 23:00:42 +0000 commit 3babad2af858630b9196b89681a54d4360d39025 Author: Julien Grall AuthorDate: Fri Aug 12 20:24:44 2022 +0100 Commit: Julien Grall CommitDate: Wed Aug 31 20:16:22 2022 +0100 xen/arm32: head: Move earlyprintk messages to .rodata.str At the moment, the strings are in text right after each use because the instruction 'adr' has specific requirement on the location and the compiler will forbid cross section label. The macro 'adr_l' was recently reworked so the caller doesn't need to know whether the MMU is on. This makes it easier to use where instructions can be run in both context. This also means that the strings don't need to be part of .text anymore. So move them to .rodata.str. Signed-off-by: Julien Grall Reviewed-by: Jiamei Xie Reviewed-by: Bertrand Marquis Tested-by: Bertrand Marquis Reviewed-by: Wei Chen --- xen/arch/arm/arm32/head.S | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 27d02ac8d6..a558c2a687 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -93,13 +93,10 @@ */ #define PRINT(_s) \ mov r3, lr ;\ - adr r0, 98f ;\ + adr_l r0, 98f ;\ bl puts ;\ mov lr, r3 ;\ - b 99f ;\ -98: .asciz _s ;\ - .align 2 ;\ -99: + RODATA_STR(98, _s) /* * Macro to print the value of register \rb @@ -736,7 +733,7 @@ ENDPROC(puts) * Clobbers r0-r3 */ putn: - adr r1, hex + adr_l r1, hex mov r3, #8 1: early_uart_ready r11, r2 @@ -749,8 +746,7 @@ putn: mov pc, lr ENDPROC(putn) -hex: .ascii "0123456789abcdef" - .align 2 +RODATA_STR(hex, "0123456789abcdef") #else /* CONFIG_EARLY_PRINTK */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 01 23:00:54 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Sep 2022 23:00:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.397018.637461 (Exim 4.92) (envelope-from ) id 1oTtB8-0005z5-HH; Thu, 01 Sep 2022 23:00:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 397018.637461; Thu, 01 Sep 2022 23:00:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtB8-0005yt-E0; Thu, 01 Sep 2022 23:00:54 +0000 Received: by outflank-mailman (input) for mailman id 397018; Thu, 01 Sep 2022 23:00:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtB6-0005uf-TW for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtB6-0006QM-Sq for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oTtB6-0000dp-Rk for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:00:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JbXDnXeqVtjlvnWTFJvY4Ay1qlpqYcY9HxSI7r69P98=; b=h7Qe4vkgni9NtAIo2T81zoxBkZ HuEaVAYbxPZMv2l8c5xV/LEI5LW2Uxmu+J+pTTOyYUJfGT6QnMrLewVYEtW3SCKP41lLsnszQxiyz BNZTSDlc1nL4eqd5DlftMSAg6ia9mHIac6YGkEw9aqjAJrNzqHsfBsvPBPOysFIbHNeA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Tweak the dump page-table walk output Message-Id: Date: Thu, 01 Sep 2022 23:00:52 +0000 commit e1710891c72b513dea8e24a3e0d8969a91a4fa39 Author: Julien Grall AuthorDate: Fri Aug 12 20:24:45 2022 +0100 Commit: Julien Grall CommitDate: Wed Aug 31 20:16:22 2022 +0100 xen/arm: Tweak the dump page-table walk output Currently the output is looking like: (XEN) 1ST[0x1] = 0x000000004015ff7f (XEN) 2ND[0x1f] = 0x00500000bfe00f7d The content of the entries are not aligned making a bit trickier to read (I appreciate this is a matter of taste). Align the values by forcing the index to be always printed using 3 characters (enough to cover 512 in hexadecimal). New output: (XEN) 1ST[0x001] = 0x000000004015ff7f (XEN) 2ND[0x01f] = 0x00500000bfe00f7d Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis Reviewed-by: Henry Wang --- xen/arch/arm/mm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index b42cddb1b4..c81c706c8b 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -234,7 +234,7 @@ void dump_pt_walk(paddr_t ttbr, paddr_t addr, pte = mapping[offsets[level]]; - printk("%s[0x%x] = 0x%"PRIpaddr"\n", + printk("%s[0x%03x] = 0x%"PRIpaddr"\n", level_strs[level], offsets[level], pte.bits); if ( level == 3 || !pte.walk.valid || !pte.walk.table ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 01 23:01:03 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Sep 2022 23:01:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.397020.637465 (Exim 4.92) (envelope-from ) id 1oTtBH-00065Y-IV; Thu, 01 Sep 2022 23:01:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 397020.637465; Thu, 01 Sep 2022 23: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 1oTtBH-00065S-Fh; Thu, 01 Sep 2022 23:01:03 +0000 Received: by outflank-mailman (input) for mailman id 397020; Thu, 01 Sep 2022 23:01:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtBH-000658-0F for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:01:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oTtBG-0006Qm-Vn for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:01:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oTtBG-0000fN-Uu for xen-changelog@lists.xenproject.org; Thu, 01 Sep 2022 23:01:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pGhnddtXInABS2iN0U06NrS/KVT5/c4wAiUlA5jlxxE=; b=x+F+QbDr9ujB3tXr+HZwGxdPsH XwsaSLx4IAyLcZj6UTsGVXuvD7Ko8y8B8KyZyZgoDJcNRfvmtjCcpb4qGtUnpkZJxG3SjLCeUCRHO HSqedv/8OJuiTLL6Dmq5pk2VE0m7d/GeEMS1mGVGO6FtVDDfbDQXvNvs2OHeGjYBuPTw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: traps: Dump more information for hypervisor data abort Message-Id: Date: Thu, 01 Sep 2022 23:01:02 +0000 commit e997d055929665b12246e89eb092dc79c65de9a4 Author: Julien Grall AuthorDate: Fri Aug 12 20:24:48 2022 +0100 Commit: Julien Grall CommitDate: Wed Aug 31 20:16:22 2022 +0100 xen/arm32: traps: Dump more information for hypervisor data abort Unlike arm64, on arm32 there are no extra information dumped (e.g. page table walk) for hypervisor data abort. For data abort, the HSR will be set properly and so call do_trap_hyp_sync() instead of do_unexpected_trap() on arm32 to have the print the same information as arm64. Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis --- xen/arch/arm/arm32/traps.c | 2 +- xen/arch/arm/include/asm/traps.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/arm32/traps.c b/xen/arch/arm/arm32/traps.c index a4ce2b92d9..a2fc1c22cb 100644 --- a/xen/arch/arm/arm32/traps.c +++ b/xen/arch/arm/arm32/traps.c @@ -81,7 +81,7 @@ void do_trap_data_abort(struct cpu_user_regs *regs) if ( VABORT_GEN_BY_GUEST(regs) ) do_trap_guest_serror(regs); else - do_unexpected_trap("Data Abort", regs); + do_trap_hyp_sync(regs); } void finalize_instr_emulation(const struct instr_details *instr) diff --git a/xen/arch/arm/include/asm/traps.h b/xen/arch/arm/include/asm/traps.h index 08bc0b484c..883dae368e 100644 --- a/xen/arch/arm/include/asm/traps.h +++ b/xen/arch/arm/include/asm/traps.h @@ -73,6 +73,7 @@ int do_bug_frame(const struct cpu_user_regs *regs, vaddr_t pc); void noreturn do_unexpected_trap(const char *msg, const struct cpu_user_regs *regs); +void do_trap_hyp_sync(struct cpu_user_regs *regs); /* Functions for pending virtual abort checking window. */ void abort_guest_exit_start(void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 05 10:44:11 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Sep 2022 10:44:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.398719.639640 (Exim 4.92) (envelope-from ) id 1oV9aH-0000vF-Ku; Mon, 05 Sep 2022 10:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 398719.639640; Mon, 05 Sep 2022 10:44:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oV9aH-0000v7-I9; Mon, 05 Sep 2022 10:44:05 +0000 Received: by outflank-mailman (input) for mailman id 398719; Mon, 05 Sep 2022 10:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oV9aH-0000v1-3f for xen-changelog@lists.xenproject.org; Mon, 05 Sep 2022 10:44:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oV9aG-0007iu-Rb for xen-changelog@lists.xenproject.org; Mon, 05 Sep 2022 10:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oV9aG-0000OG-QZ for xen-changelog@lists.xenproject.org; Mon, 05 Sep 2022 10:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4/El+3fTzfpm8WISFzl7FIWLwmsB6H6hBkW5Dy+/VjA=; b=EkSclVAx8yMKggsnNEu92OYY/f EtKPZ2Yl0SR1sPd15Hcfl5VCemyVbkneTF0QjVdgxW6FDC/SDYGMUTMRr+ABNwWYg/4SfWOEzts7k kx8NY2Mz5hSE4zQ2l4ycxgjrldSdLpZmynW1vtoXcSwTlrrixCOX8hQukpls+CY+1OMc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/sched: introduce cpupool_update_node_affinity() Message-Id: Date: Mon, 05 Sep 2022 10:44:04 +0000 commit a83fa1e2b96ace65b45dde6954d67012633a082b Author: Juergen Gross AuthorDate: Mon Sep 5 09:00:03 2022 +0200 Commit: Andrew Cooper CommitDate: Mon Sep 5 11:42:30 2022 +0100 xen/sched: introduce cpupool_update_node_affinity() For updating the node affinities of all domains in a cpupool add a new function cpupool_update_node_affinity(). In order to avoid multiple allocations of cpumasks carve out memory allocation and freeing from domain_update_node_affinity() into new helpers, which can be used by cpupool_update_node_affinity(). Modify domain_update_node_affinity() to take an additional parameter for passing the allocated memory in and to allocate and free the memory via the new helpers in case NULL was passed. This will help later to pre-allocate the cpumasks in order to avoid allocations in stop-machine context. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Acked-by: Andrew Cooper Tested-by: Andrew Cooper --- xen/common/sched/core.c | 54 +++++++++++++++++++++++++++++++--------------- xen/common/sched/cpupool.c | 39 ++++++++++++++++++--------------- xen/common/sched/private.h | 7 ++++++ xen/include/xen/sched.h | 9 +++++++- 4 files changed, 74 insertions(+), 35 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index ff1ddc7624..5f1a265889 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -1824,9 +1824,28 @@ int vcpu_affinity_domctl(struct domain *d, uint32_t cmd, return ret; } -void domain_update_node_affinity(struct domain *d) +bool alloc_affinity_masks(struct affinity_masks *affinity) { - cpumask_var_t dom_cpumask, dom_cpumask_soft; + if ( !alloc_cpumask_var(&affinity->hard) ) + return false; + if ( !alloc_cpumask_var(&affinity->soft) ) + { + free_cpumask_var(affinity->hard); + return false; + } + + return true; +} + +void free_affinity_masks(struct affinity_masks *affinity) +{ + free_cpumask_var(affinity->soft); + free_cpumask_var(affinity->hard); +} + +void domain_update_node_aff(struct domain *d, struct affinity_masks *affinity) +{ + struct affinity_masks masks; cpumask_t *dom_affinity; const cpumask_t *online; struct sched_unit *unit; @@ -1836,14 +1855,16 @@ void domain_update_node_affinity(struct domain *d) if ( !d->vcpu || !d->vcpu[0] ) return; - if ( !zalloc_cpumask_var(&dom_cpumask) ) - return; - if ( !zalloc_cpumask_var(&dom_cpumask_soft) ) + if ( !affinity ) { - free_cpumask_var(dom_cpumask); - return; + affinity = &masks; + if ( !alloc_affinity_masks(affinity) ) + return; } + cpumask_clear(affinity->hard); + cpumask_clear(affinity->soft); + online = cpupool_domain_master_cpumask(d); spin_lock(&d->node_affinity_lock); @@ -1864,22 +1885,21 @@ void domain_update_node_affinity(struct domain *d) */ for_each_sched_unit ( d, unit ) { - cpumask_or(dom_cpumask, dom_cpumask, unit->cpu_hard_affinity); - cpumask_or(dom_cpumask_soft, dom_cpumask_soft, - unit->cpu_soft_affinity); + cpumask_or(affinity->hard, affinity->hard, unit->cpu_hard_affinity); + cpumask_or(affinity->soft, affinity->soft, unit->cpu_soft_affinity); } /* Filter out non-online cpus */ - cpumask_and(dom_cpumask, dom_cpumask, online); - ASSERT(!cpumask_empty(dom_cpumask)); + cpumask_and(affinity->hard, affinity->hard, online); + ASSERT(!cpumask_empty(affinity->hard)); /* And compute the intersection between hard, online and soft */ - cpumask_and(dom_cpumask_soft, dom_cpumask_soft, dom_cpumask); + cpumask_and(affinity->soft, affinity->soft, affinity->hard); /* * If not empty, the intersection of hard, soft and online is the * narrowest set we want. If empty, we fall back to hard&online. */ - dom_affinity = cpumask_empty(dom_cpumask_soft) ? - dom_cpumask : dom_cpumask_soft; + dom_affinity = cpumask_empty(affinity->soft) ? affinity->hard + : affinity->soft; nodes_clear(d->node_affinity); for_each_cpu ( cpu, dom_affinity ) @@ -1888,8 +1908,8 @@ void domain_update_node_affinity(struct domain *d) spin_unlock(&d->node_affinity_lock); - free_cpumask_var(dom_cpumask_soft); - free_cpumask_var(dom_cpumask); + if ( affinity == &masks ) + free_affinity_masks(affinity); } typedef long ret_t; diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index 2afe54f54d..aac3a269b7 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -410,6 +410,25 @@ int cpupool_move_domain(struct domain *d, struct cpupool *c) return ret; } +/* Update affinities of all domains in a cpupool. */ +static void cpupool_update_node_affinity(const struct cpupool *c) +{ + struct affinity_masks masks; + struct domain *d; + + if ( !alloc_affinity_masks(&masks) ) + return; + + rcu_read_lock(&domlist_read_lock); + + for_each_domain_in_cpupool(d, c) + domain_update_node_aff(d, &masks); + + rcu_read_unlock(&domlist_read_lock); + + free_affinity_masks(&masks); +} + /* * assign a specific cpu to a cpupool * cpupool_lock must be held @@ -417,7 +436,6 @@ int cpupool_move_domain(struct domain *d, struct cpupool *c) static int cpupool_assign_cpu_locked(struct cpupool *c, unsigned int cpu) { int ret; - struct domain *d; const cpumask_t *cpus; cpus = sched_get_opt_cpumask(c->gran, cpu); @@ -442,12 +460,7 @@ static int cpupool_assign_cpu_locked(struct cpupool *c, unsigned int cpu) rcu_read_unlock(&sched_res_rculock); - rcu_read_lock(&domlist_read_lock); - for_each_domain_in_cpupool(d, c) - { - domain_update_node_affinity(d); - } - rcu_read_unlock(&domlist_read_lock); + cpupool_update_node_affinity(c); return 0; } @@ -456,18 +469,14 @@ static int cpupool_unassign_cpu_finish(struct cpupool *c) { int cpu = cpupool_moving_cpu; const cpumask_t *cpus; - struct domain *d; int ret; if ( c != cpupool_cpu_moving ) return -EADDRNOTAVAIL; - /* - * We need this for scanning the domain list, both in - * cpu_disable_scheduler(), and at the bottom of this function. - */ rcu_read_lock(&domlist_read_lock); ret = cpu_disable_scheduler(cpu); + rcu_read_unlock(&domlist_read_lock); rcu_read_lock(&sched_res_rculock); cpus = get_sched_res(cpu)->cpus; @@ -494,11 +503,7 @@ static int cpupool_unassign_cpu_finish(struct cpupool *c) } rcu_read_unlock(&sched_res_rculock); - for_each_domain_in_cpupool(d, c) - { - domain_update_node_affinity(d); - } - rcu_read_unlock(&domlist_read_lock); + cpupool_update_node_affinity(c); return ret; } diff --git a/xen/common/sched/private.h b/xen/common/sched/private.h index a870320146..2b04b01a0c 100644 --- a/xen/common/sched/private.h +++ b/xen/common/sched/private.h @@ -593,6 +593,13 @@ affinity_balance_cpumask(const struct sched_unit *unit, int step, cpumask_copy(mask, unit->cpu_hard_affinity); } +struct affinity_masks { + cpumask_var_t hard; + cpumask_var_t soft; +}; + +bool alloc_affinity_masks(struct affinity_masks *affinity); +void free_affinity_masks(struct affinity_masks *affinity); void sched_rm_cpu(unsigned int cpu); const cpumask_t *sched_get_opt_cpumask(enum sched_gran opt, unsigned int cpu); void schedule_dump(struct cpupool *c); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 1cf629e7ec..81f1fcba2a 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -666,8 +666,15 @@ static inline void get_knownalive_domain(struct domain *d) ASSERT(!(atomic_read(&d->refcnt) & DOMAIN_DESTROYED)); } +struct affinity_masks; + int domain_set_node_affinity(struct domain *d, const nodemask_t *affinity); -void domain_update_node_affinity(struct domain *d); +void domain_update_node_aff(struct domain *d, struct affinity_masks *affinity); + +static inline void domain_update_node_affinity(struct domain *d) +{ + domain_update_node_aff(d, NULL); +} /* * To be implemented by each architecture, sanity checking the configuration -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 05 10:44:15 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Sep 2022 10:44:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.398720.639644 (Exim 4.92) (envelope-from ) id 1oV9aR-0000x1-ME; Mon, 05 Sep 2022 10:44:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 398720.639644; Mon, 05 Sep 2022 10:44:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oV9aR-0000wt-Jg; Mon, 05 Sep 2022 10:44:15 +0000 Received: by outflank-mailman (input) for mailman id 398720; Mon, 05 Sep 2022 10:44:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oV9aQ-0000wn-Vc for xen-changelog@lists.xenproject.org; Mon, 05 Sep 2022 10:44:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oV9aQ-0007j0-Uq for xen-changelog@lists.xenproject.org; Mon, 05 Sep 2022 10:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oV9aQ-0000Oj-Tl for xen-changelog@lists.xenproject.org; Mon, 05 Sep 2022 10:44:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VWJN6438a33vfVQMwn02/p9oUPgAj/4SPzM1UfQfo1Q=; b=n79xD+rKdkqslo05LIbtoX9Fd6 90mxQrZaYrCQwc8+U2SpKSn2EhV4heivrZKmh9K0Zz5gipBbjqfEkN+pI0Pduv6W2tBxJAlAkR4XW hNhCY0ZTdM1O45VYh2Hzhu3ArL0Aepg47aVO3MvNTO9LqkV9Ep4BWVgPHQIDOlpscVFk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/sched: carve out memory allocation and freeing from schedule_cpu_rm() Message-Id: Date: Mon, 05 Sep 2022 10:44:14 +0000 commit d42be6f83480b3ada286dc18444331a816be88a3 Author: Juergen Gross AuthorDate: Mon Sep 5 09:00:04 2022 +0200 Commit: Andrew Cooper CommitDate: Mon Sep 5 11:42:30 2022 +0100 xen/sched: carve out memory allocation and freeing from schedule_cpu_rm() In order to prepare not allocating or freeing memory from schedule_cpu_rm(), move this functionality to dedicated functions. For now call those functions from schedule_cpu_rm(). No change of behavior expected. Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Reviewed-by: Andrew Cooper --- xen/common/sched/core.c | 143 +++++++++++++++++++++++++++------------------ xen/common/sched/private.h | 11 ++++ 2 files changed, 98 insertions(+), 56 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 5f1a265889..588826cdbd 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -3237,6 +3237,75 @@ out: return ret; } +/* + * Allocate all memory needed for free_cpu_rm_data(), as allocations cannot + * be made in stop_machine() context. + * + * Between alloc_cpu_rm_data() and the real cpu removal action the relevant + * contents of struct sched_resource can't change, as the cpu in question is + * locked against any other movement to or from cpupools, and the data copied + * by alloc_cpu_rm_data() is modified only in case the cpu in question is + * being moved from or to a cpupool. + */ +struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu) +{ + struct cpu_rm_data *data; + const struct sched_resource *sr; + unsigned int idx; + + rcu_read_lock(&sched_res_rculock); + + sr = get_sched_res(cpu); + data = xmalloc_flex_struct(struct cpu_rm_data, sr, sr->granularity - 1); + if ( !data ) + goto out; + + data->old_ops = sr->scheduler; + data->vpriv_old = idle_vcpu[cpu]->sched_unit->priv; + data->ppriv_old = sr->sched_priv; + + for ( idx = 0; idx < sr->granularity - 1; idx++ ) + { + data->sr[idx] = sched_alloc_res(); + if ( data->sr[idx] ) + { + data->sr[idx]->sched_unit_idle = sched_alloc_unit_mem(); + if ( !data->sr[idx]->sched_unit_idle ) + { + sched_res_free(&data->sr[idx]->rcu); + data->sr[idx] = NULL; + } + } + if ( !data->sr[idx] ) + { + while ( idx > 0 ) + sched_res_free(&data->sr[--idx]->rcu); + XFREE(data); + goto out; + } + + data->sr[idx]->curr = data->sr[idx]->sched_unit_idle; + data->sr[idx]->scheduler = &sched_idle_ops; + data->sr[idx]->granularity = 1; + + /* We want the lock not to change when replacing the resource. */ + data->sr[idx]->schedule_lock = sr->schedule_lock; + } + + out: + rcu_read_unlock(&sched_res_rculock); + + return data; +} + +void free_cpu_rm_data(struct cpu_rm_data *mem, unsigned int cpu) +{ + sched_free_udata(mem->old_ops, mem->vpriv_old); + sched_free_pdata(mem->old_ops, mem->ppriv_old, cpu); + + xfree(mem); +} + /* * Remove a pCPU from its cpupool. Its scheduler becomes &sched_idle_ops * (the idle scheduler). @@ -3245,53 +3314,23 @@ out: */ int schedule_cpu_rm(unsigned int cpu) { - void *ppriv_old, *vpriv_old; - struct sched_resource *sr, **sr_new = NULL; + struct sched_resource *sr; + struct cpu_rm_data *data; struct sched_unit *unit; - struct scheduler *old_ops; spinlock_t *old_lock; unsigned long flags; - int idx, ret = -ENOMEM; + int idx = 0; unsigned int cpu_iter; + data = alloc_cpu_rm_data(cpu); + if ( !data ) + return -ENOMEM; + rcu_read_lock(&sched_res_rculock); sr = get_sched_res(cpu); - old_ops = sr->scheduler; - - if ( sr->granularity > 1 ) - { - sr_new = xmalloc_array(struct sched_resource *, sr->granularity - 1); - if ( !sr_new ) - goto out; - for ( idx = 0; idx < sr->granularity - 1; idx++ ) - { - sr_new[idx] = sched_alloc_res(); - if ( sr_new[idx] ) - { - sr_new[idx]->sched_unit_idle = sched_alloc_unit_mem(); - if ( !sr_new[idx]->sched_unit_idle ) - { - sched_res_free(&sr_new[idx]->rcu); - sr_new[idx] = NULL; - } - } - if ( !sr_new[idx] ) - { - for ( idx--; idx >= 0; idx-- ) - sched_res_free(&sr_new[idx]->rcu); - goto out; - } - sr_new[idx]->curr = sr_new[idx]->sched_unit_idle; - sr_new[idx]->scheduler = &sched_idle_ops; - sr_new[idx]->granularity = 1; - /* We want the lock not to change when replacing the resource. */ - sr_new[idx]->schedule_lock = sr->schedule_lock; - } - } - - ret = 0; + ASSERT(sr->granularity); ASSERT(sr->cpupool != NULL); ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus)); ASSERT(!cpumask_test_cpu(cpu, sr->cpupool->cpu_valid)); @@ -3299,10 +3338,6 @@ int schedule_cpu_rm(unsigned int cpu) /* See comment in schedule_cpu_add() regarding lock switching. */ old_lock = pcpu_schedule_lock_irqsave(cpu, &flags); - vpriv_old = idle_vcpu[cpu]->sched_unit->priv; - ppriv_old = sr->sched_priv; - - idx = 0; for_each_cpu ( cpu_iter, sr->cpus ) { per_cpu(sched_res_idx, cpu_iter) = 0; @@ -3316,27 +3351,27 @@ int schedule_cpu_rm(unsigned int cpu) else { /* Initialize unit. */ - unit = sr_new[idx]->sched_unit_idle; - unit->res = sr_new[idx]; + unit = data->sr[idx]->sched_unit_idle; + unit->res = data->sr[idx]; unit->is_running = true; sched_unit_add_vcpu(unit, idle_vcpu[cpu_iter]); sched_domain_insert_unit(unit, idle_vcpu[cpu_iter]->domain); /* Adjust cpu masks of resources (old and new). */ cpumask_clear_cpu(cpu_iter, sr->cpus); - cpumask_set_cpu(cpu_iter, sr_new[idx]->cpus); + cpumask_set_cpu(cpu_iter, data->sr[idx]->cpus); cpumask_set_cpu(cpu_iter, &sched_res_mask); /* Init timer. */ - init_timer(&sr_new[idx]->s_timer, s_timer_fn, NULL, cpu_iter); + init_timer(&data->sr[idx]->s_timer, s_timer_fn, NULL, cpu_iter); /* Last resource initializations and insert resource pointer. */ - sr_new[idx]->master_cpu = cpu_iter; - set_sched_res(cpu_iter, sr_new[idx]); + data->sr[idx]->master_cpu = cpu_iter; + set_sched_res(cpu_iter, data->sr[idx]); /* Last action: set the new lock pointer. */ smp_mb(); - sr_new[idx]->schedule_lock = &sched_free_cpu_lock; + data->sr[idx]->schedule_lock = &sched_free_cpu_lock; idx++; } @@ -3352,16 +3387,12 @@ int schedule_cpu_rm(unsigned int cpu) /* _Not_ pcpu_schedule_unlock(): schedule_lock may have changed! */ spin_unlock_irqrestore(old_lock, flags); - sched_deinit_pdata(old_ops, ppriv_old, cpu); - - sched_free_udata(old_ops, vpriv_old); - sched_free_pdata(old_ops, ppriv_old, cpu); + sched_deinit_pdata(data->old_ops, data->ppriv_old, cpu); -out: rcu_read_unlock(&sched_res_rculock); - xfree(sr_new); + free_cpu_rm_data(data, cpu); - return ret; + return 0; } struct scheduler *scheduler_get_default(void) diff --git a/xen/common/sched/private.h b/xen/common/sched/private.h index 2b04b01a0c..e286849a13 100644 --- a/xen/common/sched/private.h +++ b/xen/common/sched/private.h @@ -600,6 +600,15 @@ struct affinity_masks { bool alloc_affinity_masks(struct affinity_masks *affinity); void free_affinity_masks(struct affinity_masks *affinity); + +/* Memory allocation related data for schedule_cpu_rm(). */ +struct cpu_rm_data { + const struct scheduler *old_ops; + void *ppriv_old; + void *vpriv_old; + struct sched_resource *sr[]; +}; + void sched_rm_cpu(unsigned int cpu); const cpumask_t *sched_get_opt_cpumask(enum sched_gran opt, unsigned int cpu); void schedule_dump(struct cpupool *c); @@ -608,6 +617,8 @@ struct scheduler *scheduler_alloc(unsigned int sched_id); void scheduler_free(struct scheduler *sched); int cpu_disable_scheduler(unsigned int cpu); int schedule_cpu_add(unsigned int cpu, struct cpupool *c); +struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu); +void free_cpu_rm_data(struct cpu_rm_data *mem, unsigned int cpu); int schedule_cpu_rm(unsigned int cpu); int sched_move_domain(struct domain *d, struct cpupool *c); struct cpupool *cpupool_get_by_id(unsigned int poolid); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 05 10:44:25 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Sep 2022 10:44:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.398721.639648 (Exim 4.92) (envelope-from ) id 1oV9ab-0000zc-No; Mon, 05 Sep 2022 10:44:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 398721.639648; Mon, 05 Sep 2022 10:44: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 1oV9ab-0000zU-LC; Mon, 05 Sep 2022 10:44:25 +0000 Received: by outflank-mailman (input) for mailman id 398721; Mon, 05 Sep 2022 10:44:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oV9ab-0000zK-2y for xen-changelog@lists.xenproject.org; Mon, 05 Sep 2022 10:44:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oV9ab-0007jK-28 for xen-changelog@lists.xenproject.org; Mon, 05 Sep 2022 10:44:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oV9ab-0000Qp-0r for xen-changelog@lists.xenproject.org; Mon, 05 Sep 2022 10:44:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PdEKmyec1pI4mM+2uMQaqktfGyaSnWTLI9QKQM9yc/M=; b=dFCc+mxmd2PKuiyfOybh1c5L5G 5PJoisWj9CFlk5l4N5CB4EISlapNv2iLIws/d21M3N/YKQctzlmeZxOja342rKlHR/TwkbfCYyPll /hV/Y0xIR2IRiTWKXyED0RM/JD9QvV7Tj24R0mKYuYZXmGEqVKFcOfeu6BTYqujSFvJk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/sched: fix cpu hotplug Message-Id: Date: Mon, 05 Sep 2022 10:44:25 +0000 commit d84473689611eed32fd90b27e614f28af767fa3f Author: Juergen Gross AuthorDate: Mon Sep 5 09:00:05 2022 +0200 Commit: Andrew Cooper CommitDate: Mon Sep 5 11:42:30 2022 +0100 xen/sched: fix cpu hotplug Cpu unplugging is calling schedule_cpu_rm() via stop_machine_run() with interrupts disabled, thus any memory allocation or freeing must be avoided. Since commit 5047cd1d5dea ("xen/common: Use enhanced ASSERT_ALLOC_CONTEXT in xmalloc()") this restriction is being enforced via an assertion, which will now fail. Fix this by allocating needed memory before entering stop_machine_run() and freeing any memory only after having finished stop_machine_run(). Fixes: 1ec410112cdd ("xen/sched: support differing granularity in schedule_cpu_[add/rm]()") Reported-by: Gao Ruifeng Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Acked-by: Andrew Cooper Tested-by: Andrew Cooper --- xen/common/sched/core.c | 25 +++++++++++++---- xen/common/sched/cpupool.c | 69 ++++++++++++++++++++++++++++++++++++---------- xen/common/sched/private.h | 5 ++-- 3 files changed, 77 insertions(+), 22 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 588826cdbd..83455fbde1 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -3247,7 +3247,7 @@ out: * by alloc_cpu_rm_data() is modified only in case the cpu in question is * being moved from or to a cpupool. */ -struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu) +struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu, bool aff_alloc) { struct cpu_rm_data *data; const struct sched_resource *sr; @@ -3260,6 +3260,17 @@ struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu) if ( !data ) goto out; + if ( aff_alloc ) + { + if ( !alloc_affinity_masks(&data->affinity) ) + { + XFREE(data); + goto out; + } + } + else + memset(&data->affinity, 0, sizeof(data->affinity)); + data->old_ops = sr->scheduler; data->vpriv_old = idle_vcpu[cpu]->sched_unit->priv; data->ppriv_old = sr->sched_priv; @@ -3280,6 +3291,7 @@ struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu) { while ( idx > 0 ) sched_res_free(&data->sr[--idx]->rcu); + free_affinity_masks(&data->affinity); XFREE(data); goto out; } @@ -3302,6 +3314,7 @@ void free_cpu_rm_data(struct cpu_rm_data *mem, unsigned int cpu) { sched_free_udata(mem->old_ops, mem->vpriv_old); sched_free_pdata(mem->old_ops, mem->ppriv_old, cpu); + free_affinity_masks(&mem->affinity); xfree(mem); } @@ -3312,17 +3325,18 @@ void free_cpu_rm_data(struct cpu_rm_data *mem, unsigned int cpu) * The cpu is already marked as "free" and not valid any longer for its * cpupool. */ -int schedule_cpu_rm(unsigned int cpu) +int schedule_cpu_rm(unsigned int cpu, struct cpu_rm_data *data) { struct sched_resource *sr; - struct cpu_rm_data *data; struct sched_unit *unit; spinlock_t *old_lock; unsigned long flags; int idx = 0; unsigned int cpu_iter; + bool free_data = !data; - data = alloc_cpu_rm_data(cpu); + if ( !data ) + data = alloc_cpu_rm_data(cpu, false); if ( !data ) return -ENOMEM; @@ -3390,7 +3404,8 @@ int schedule_cpu_rm(unsigned int cpu) sched_deinit_pdata(data->old_ops, data->ppriv_old, cpu); rcu_read_unlock(&sched_res_rculock); - free_cpu_rm_data(data, cpu); + if ( free_data ) + free_cpu_rm_data(data, cpu); return 0; } diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index aac3a269b7..b2c6f520c3 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -411,22 +411,28 @@ int cpupool_move_domain(struct domain *d, struct cpupool *c) } /* Update affinities of all domains in a cpupool. */ -static void cpupool_update_node_affinity(const struct cpupool *c) +static void cpupool_update_node_affinity(const struct cpupool *c, + struct affinity_masks *masks) { - struct affinity_masks masks; + struct affinity_masks local_masks; struct domain *d; - if ( !alloc_affinity_masks(&masks) ) - return; + if ( !masks ) + { + if ( !alloc_affinity_masks(&local_masks) ) + return; + masks = &local_masks; + } rcu_read_lock(&domlist_read_lock); for_each_domain_in_cpupool(d, c) - domain_update_node_aff(d, &masks); + domain_update_node_aff(d, masks); rcu_read_unlock(&domlist_read_lock); - free_affinity_masks(&masks); + if ( masks == &local_masks ) + free_affinity_masks(masks); } /* @@ -460,15 +466,17 @@ static int cpupool_assign_cpu_locked(struct cpupool *c, unsigned int cpu) rcu_read_unlock(&sched_res_rculock); - cpupool_update_node_affinity(c); + cpupool_update_node_affinity(c, NULL); return 0; } -static int cpupool_unassign_cpu_finish(struct cpupool *c) +static int cpupool_unassign_cpu_finish(struct cpupool *c, + struct cpu_rm_data *mem) { int cpu = cpupool_moving_cpu; const cpumask_t *cpus; + struct affinity_masks *masks = mem ? &mem->affinity : NULL; int ret; if ( c != cpupool_cpu_moving ) @@ -491,7 +499,7 @@ static int cpupool_unassign_cpu_finish(struct cpupool *c) */ if ( !ret ) { - ret = schedule_cpu_rm(cpu); + ret = schedule_cpu_rm(cpu, mem); if ( ret ) cpumask_andnot(&cpupool_free_cpus, &cpupool_free_cpus, cpus); else @@ -503,7 +511,7 @@ static int cpupool_unassign_cpu_finish(struct cpupool *c) } rcu_read_unlock(&sched_res_rculock); - cpupool_update_node_affinity(c); + cpupool_update_node_affinity(c, masks); return ret; } @@ -567,7 +575,7 @@ static long cf_check cpupool_unassign_cpu_helper(void *info) cpupool_cpu_moving->cpupool_id, cpupool_moving_cpu); spin_lock(&cpupool_lock); - ret = cpupool_unassign_cpu_finish(c); + ret = cpupool_unassign_cpu_finish(c, NULL); spin_unlock(&cpupool_lock); debugtrace_printk("cpupool_unassign_cpu ret=%ld\n", ret); @@ -714,7 +722,7 @@ static int cpupool_cpu_add(unsigned int cpu) * This function is called in stop_machine context, so we can be sure no * non-idle vcpu is active on the system. */ -static void cpupool_cpu_remove(unsigned int cpu) +static void cpupool_cpu_remove(unsigned int cpu, struct cpu_rm_data *mem) { int ret; @@ -722,7 +730,7 @@ static void cpupool_cpu_remove(unsigned int cpu) if ( !cpumask_test_cpu(cpu, &cpupool_free_cpus) ) { - ret = cpupool_unassign_cpu_finish(cpupool0); + ret = cpupool_unassign_cpu_finish(cpupool0, mem); BUG_ON(ret); } cpumask_clear_cpu(cpu, &cpupool_free_cpus); @@ -788,7 +796,7 @@ static void cpupool_cpu_remove_forced(unsigned int cpu) { ret = cpupool_unassign_cpu_start(c, master_cpu); BUG_ON(ret); - ret = cpupool_unassign_cpu_finish(c); + ret = cpupool_unassign_cpu_finish(c, NULL); BUG_ON(ret); } } @@ -1006,12 +1014,24 @@ void cf_check dump_runq(unsigned char key) static int cf_check cpu_callback( struct notifier_block *nfb, unsigned long action, void *hcpu) { + static struct cpu_rm_data *mem; + unsigned int cpu = (unsigned long)hcpu; int rc = 0; switch ( action ) { case CPU_DOWN_FAILED: + if ( system_state <= SYS_STATE_active ) + { + if ( mem ) + { + free_cpu_rm_data(mem, cpu); + mem = NULL; + } + rc = cpupool_cpu_add(cpu); + } + break; case CPU_ONLINE: if ( system_state <= SYS_STATE_active ) rc = cpupool_cpu_add(cpu); @@ -1019,12 +1039,31 @@ static int cf_check cpu_callback( case CPU_DOWN_PREPARE: /* Suspend/Resume don't change assignments of cpus to cpupools. */ if ( system_state <= SYS_STATE_active ) + { rc = cpupool_cpu_remove_prologue(cpu); + if ( !rc ) + { + ASSERT(!mem); + mem = alloc_cpu_rm_data(cpu, true); + rc = mem ? 0 : -ENOMEM; + } + } break; case CPU_DYING: /* Suspend/Resume don't change assignments of cpus to cpupools. */ if ( system_state <= SYS_STATE_active ) - cpupool_cpu_remove(cpu); + { + ASSERT(mem); + cpupool_cpu_remove(cpu, mem); + } + break; + case CPU_DEAD: + if ( system_state <= SYS_STATE_active ) + { + ASSERT(mem); + free_cpu_rm_data(mem, cpu); + mem = NULL; + } break; case CPU_RESUME_FAILED: cpupool_cpu_remove_forced(cpu); diff --git a/xen/common/sched/private.h b/xen/common/sched/private.h index e286849a13..0126a4bb9e 100644 --- a/xen/common/sched/private.h +++ b/xen/common/sched/private.h @@ -603,6 +603,7 @@ void free_affinity_masks(struct affinity_masks *affinity); /* Memory allocation related data for schedule_cpu_rm(). */ struct cpu_rm_data { + struct affinity_masks affinity; const struct scheduler *old_ops; void *ppriv_old; void *vpriv_old; @@ -617,9 +618,9 @@ struct scheduler *scheduler_alloc(unsigned int sched_id); void scheduler_free(struct scheduler *sched); int cpu_disable_scheduler(unsigned int cpu); int schedule_cpu_add(unsigned int cpu, struct cpupool *c); -struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu); +struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu, bool aff_alloc); void free_cpu_rm_data(struct cpu_rm_data *mem, unsigned int cpu); -int schedule_cpu_rm(unsigned int cpu); +int schedule_cpu_rm(unsigned int cpu, struct cpu_rm_data *mem); int sched_move_domain(struct domain *d, struct cpupool *c); struct cpupool *cpupool_get_by_id(unsigned int poolid); void cpupool_put(struct cpupool *pool); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 14:11:10 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 14:11:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399915.641327 (Exim 4.92) (envelope-from ) id 1oVZIA-0003fK-A5; Tue, 06 Sep 2022 14:11:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399915.641327; Tue, 06 Sep 2022 14:11:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVZIA-0003f8-7C; Tue, 06 Sep 2022 14:11:06 +0000 Received: by outflank-mailman (input) for mailman id 399915; Tue, 06 Sep 2022 14:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVZI8-0003eO-La for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 14:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVZI8-0004fP-Kj for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 14:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVZI8-0007M5-Jg for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 14:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xi0KeZPtC7CSUKlqIS7zIFcRibHnViNXnBiEVjHJdPs=; b=E/0587RPmisFb8Tf+M6qy6evcW FEWhTQhWAlYACmxmQERcoebWLUDGC8a/487DeV25YAzdvapzabU8XFJeL02LPfYZKU+yjfLwCZBeP ujs3meXUZoBieSrQvChCY/Bb+sv91WKU+hRS925zDDdatSrpnEU7FgxAc0M/yNl1ZiXw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xsm/flask: fix MISRA C 2012 Rule 20.7 violations Message-Id: Date: Tue, 06 Sep 2022 14:11:04 +0000 commit ad0838f4499820db613370feea354ac484544b11 Author: Xenia Ragiadakou AuthorDate: Tue Sep 6 16:02:28 2022 +0200 Commit: Jan Beulich CommitDate: Tue Sep 6 16:02:28 2022 +0200 xsm/flask: fix MISRA C 2012 Rule 20.7 violations In macros SIDTAB_HASH(), INIT_SIDTAB_LOCK(), SIDTAB_LOCK() and SIDTAB_UNLOCK(), add parentheses around the macro parameter to prevent against unintended expansions. Signed-off-by: Xenia Ragiadakou Reviewed-by: Stefano Stabellini Acked-by: Daniel P. Smith --- xen/xsm/flask/ss/sidtab.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/xsm/flask/ss/sidtab.c b/xen/xsm/flask/ss/sidtab.c index 74babfac9c..69fc3389b3 100644 --- a/xen/xsm/flask/ss/sidtab.c +++ b/xen/xsm/flask/ss/sidtab.c @@ -14,11 +14,11 @@ #include "security.h" #include "sidtab.h" -#define SIDTAB_HASH(sid) (sid & SIDTAB_HASH_MASK) +#define SIDTAB_HASH(sid) ((sid) & SIDTAB_HASH_MASK) -#define INIT_SIDTAB_LOCK(s) spin_lock_init(&s->lock) -#define SIDTAB_LOCK(s) spin_lock(&s->lock) -#define SIDTAB_UNLOCK(s) spin_unlock(&s->lock) +#define INIT_SIDTAB_LOCK(s) spin_lock_init(&(s)->lock) +#define SIDTAB_LOCK(s) spin_lock(&(s)->lock) +#define SIDTAB_UNLOCK(s) spin_unlock(&(s)->lock) int sidtab_init(struct sidtab *s) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 14:11:16 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 14:11:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399918.641331 (Exim 4.92) (envelope-from ) id 1oVZIK-0003mB-BP; Tue, 06 Sep 2022 14:11:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399918.641331; Tue, 06 Sep 2022 14:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVZIK-0003m4-8d; Tue, 06 Sep 2022 14:11:16 +0000 Received: by outflank-mailman (input) for mailman id 399918; Tue, 06 Sep 2022 14:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVZII-0003lb-PI for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 14:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVZII-0004fU-OY for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 14:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVZII-0007MW-Mt for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 14:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=66XoZVkH8KGY36/ztuSwzA+TF4EUuIvDLzK1tzo5ShI=; b=1B/TLT7oaC0lysjtOtKXhYZMPS SaLZ5hxAd6S5EAHJ6cpHs4vc6086la4q05IW7mu9faswQWUHelYHmhmdc+yEQZmwnrrtFkxG0e0Om lPSab7aFj7SBC5t+1wZZA87gSGLrAHN99+nQtb6MTdB0KlNQzyREh3RAJrWZSfyX46mQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/public: move XEN_ACPI_ in a new header Message-Id: Date: Tue, 06 Sep 2022 14:11:14 +0000 commit 48f35317c2e2707fc66a839690fe41e6f16180de Author: Bertrand Marquis AuthorDate: Tue Sep 6 16:04:34 2022 +0200 Commit: Jan Beulich CommitDate: Tue Sep 6 16:04:34 2022 +0200 x86/public: move XEN_ACPI_ in a new header When Xen is compiled for x86 on an arm machine, libacpi build is failing due to a wrong include path: - arch-x86/xen.h includes xen.h - xen.h includes arch-arm.h (as __i386__ and __x86_64__ are not defined but arm ones are). To solve this issue move XEN_ACPI_ definitions in a new header guest-acpi.h that can be included cleanly by mk_dsdt.c. Inside this header, only protect the definitions using ifdef __XEN_TOOLS__ as the defines are not used anywhere in the hypervisor and are not expected to be. Previous users needing any of the XEN_ACPI_ definitions will now need to include arch-x86/guest-acpi.h instead of arch-x86/xen.h Fixes: d6ac8e22c7c5 ("acpi/x86: define ACPI IO registers for PVH guests") Signed-off-by: Bertrand Marquis Reviewed-by: Jan Beulich Release-acked-by: Henry Wang --- tools/libacpi/mk_dsdt.c | 2 +- xen/include/public/arch-x86/guest-acpi.h | 50 ++++++++++++++++++++++++++++++++ xen/include/public/arch-x86/xen.h | 6 ---- 3 files changed, 51 insertions(+), 7 deletions(-) diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c index c5ba4c0b2f..1176da80ef 100644 --- a/tools/libacpi/mk_dsdt.c +++ b/tools/libacpi/mk_dsdt.c @@ -18,7 +18,7 @@ #include #include #if defined(CONFIG_X86) -#include +#include #include #elif defined(CONFIG_ARM_64) #include diff --git a/xen/include/public/arch-x86/guest-acpi.h b/xen/include/public/arch-x86/guest-acpi.h new file mode 100644 index 0000000000..3d79a31fd8 --- /dev/null +++ b/xen/include/public/arch-x86/guest-acpi.h @@ -0,0 +1,50 @@ +/****************************************************************************** + * arch-x86/guest-acpi.h + * + * Guest ACPI interface to x86 Xen. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef __XEN_PUBLIC_ARCH_X86_GUEST_ACPI_H__ +#define __XEN_PUBLIC_ARCH_X86_GUEST_ACPI_H__ + +#ifdef __XEN_TOOLS__ + +/* Location of online VCPU bitmap. */ +#define XEN_ACPI_CPU_MAP 0xaf00 +#define XEN_ACPI_CPU_MAP_LEN ((HVM_MAX_VCPUS + 7) / 8) + +/* GPE0 bit set during CPU hotplug */ +#define XEN_ACPI_GPE0_CPUHP_BIT 2 + +#endif /* __XEN_TOOLS__ */ + +#endif /* __XEN_PUBLIC_ARCH_X86_GUEST_ACPI_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index 58a1e87ee9..546dd4496a 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -325,12 +325,6 @@ struct xen_arch_domainconfig { /* Max XEN_X86_* constant. Used for ABI checking. */ #define XEN_X86_MISC_FLAGS_MAX XEN_X86_ASSISTED_X2APIC -/* Location of online VCPU bitmap. */ -#define XEN_ACPI_CPU_MAP 0xaf00 -#define XEN_ACPI_CPU_MAP_LEN ((HVM_MAX_VCPUS + 7) / 8) - -/* GPE0 bit set during CPU hotplug */ -#define XEN_ACPI_GPE0_CPUHP_BIT 2 #endif /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 15:22:10 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 15:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399947.641380 (Exim 4.92) (envelope-from ) id 1oVaOs-0004oH-GF; Tue, 06 Sep 2022 15:22:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399947.641380; Tue, 06 Sep 2022 15:22:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVaOs-0004o9-CW; Tue, 06 Sep 2022 15:22:06 +0000 Received: by outflank-mailman (input) for mailman id 399947; Tue, 06 Sep 2022 15:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVaOq-0004o3-Lo for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 15:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVaOq-0005tz-K3 for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 15:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVaOq-0002PT-J8 for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 15:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YrFbPnYoNuKlh+Ce6YqWzfjjV7O4z7PShyiIv3gpTn0=; b=L6U/QLW315CVbugqwQD3GPkhPR iDT33WdDvm+GWnkbkBCPpd2Na+JmS/JVHvieiBEIlVkJAcLOgwvOBzBovqFL5oFhK+GBm/ENrzpBm Kbb9WiNjl3YG5mYDWioinCi+fBBEPb2+teRevfAPlEfadmAFL/ZRvyublKI5LimYLKYI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: only filter build-*/ in gitignore Message-Id: Date: Tue, 06 Sep 2022 15:22:04 +0000 commit 0b5034946f03f63e2c59255ae2fd9c18c9a20ec1 Author: Bertrand Marquis AuthorDate: Tue Sep 6 17:21:57 2022 +0200 Commit: Jan Beulich CommitDate: Tue Sep 6 17:21:57 2022 +0200 automation: only filter build-*/ in gitignore ...because there are some script in automation corresponding to the build-* filter (build-test.sh and build-each-commit.sh) Signed-off-by: Bertrand Marquis Acked-by: Jan Beulich --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e3fe06cd13..27881c9764 100644 --- a/.gitignore +++ b/.gitignore @@ -38,13 +38,13 @@ dist stubdom/*.tar.gz autom4te.cache/ +build-*/ config.log config.status config.cache config/Toplevel.mk config/Paths.mk -build-* dist/* docs/tmp.* docs/html/ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 16:55:11 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 16:55:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399976.641427 (Exim 4.92) (envelope-from ) id 1oVbqs-0008R7-2q; Tue, 06 Sep 2022 16:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399976.641427; Tue, 06 Sep 2022 16:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbqr-0008Qz-VZ; Tue, 06 Sep 2022 16:55:05 +0000 Received: by outflank-mailman (input) for mailman id 399976; Tue, 06 Sep 2022 16:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbqr-0008Qt-Az for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbqr-000868-7K for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVbqr-0002zw-5K for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7KiCuT5PF0MiiIBajtnJBGXw9o7BB2c/XeYDH+mYePo=; b=lLVy3j6DQY0y1RyF1ZSN5l+/rX axXNs0TiPuk14ZIJiPv4ooLhS9zrLZg5oH549UMEOWYNPHOW3JRua6DJgLHkolFxoPgBhL2PesvPB 4qszc4s50BsLg8M84MaNTqaaypSzDODT1eIqNvf1dE5AGxQUvs4dUhpjvk2+axglp28Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Fix l1 stream table size in the error message Message-Id: Date: Tue, 06 Sep 2022 16:55:05 +0000 commit b0cec9d37f264017e83c11177abf2aa96a5260a1 Author: Zenghui Yu AuthorDate: Mon Aug 22 16:19:01 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:42:59 2022 +0100 xen/arm: smmuv3: Fix l1 stream table size in the error message Backport Linux commit dc898eb84b25. This is the clean backport without any changes. The actual size of level-1 stream table is l1size. This looks like an oversight on commit d2e88e7c081ef ("iommu/arm-smmu: Fix LOG2SIZE setting for 2-level stream tables") which forgot to update the @size in error message as well. As memory allocation failure is already bad enough, nothing worse would happen. But let's be careful. Signed-off-by: Zenghui Yu Link: https://lore.kernel.org/r/20200826141758.341-1-yuzenghui@huawei.com Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git dc898eb84b25 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index f2562acc38..340609264d 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -2348,7 +2348,7 @@ static int arm_smmu_init_strtab_2lvl(struct arm_smmu_device *smmu) if (!strtab) { dev_err(smmu->dev, "failed to allocate l1 stream table (%u bytes)\n", - size); + l1size); return -ENOMEM; } cfg->strtab = strtab; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 16:55:16 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 16:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399977.641431 (Exim 4.92) (envelope-from ) id 1oVbr2-0008TA-3r; Tue, 06 Sep 2022 16:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399977.641431; Tue, 06 Sep 2022 16:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbr2-0008T2-0x; Tue, 06 Sep 2022 16:55:16 +0000 Received: by outflank-mailman (input) for mailman id 399977; Tue, 06 Sep 2022 16:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbr1-0008Sr-Cx for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbr1-00086H-CC for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVbr1-00039i-BC for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=X/LjWKIAB7OntPUqIvV01LBD89EnHImAA0AgXsS6IX4=; b=JlJ6ePPK9cmNc1F8I6Rzt4P86X IdZpfbUvddFsX0PgDRBubH7IM415g7IaJ5V0XyP5sGczJyaVCTfQhziLBa12fcRI/SW/R1/ecLsbr pwrZFqr53npXzrcs664ysLdrJwshmHpjvHLCTro9ds6qxxNDccJ4SG6ZLlg3B50dL5HU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Fix endianness annotations Message-Id: Date: Tue, 06 Sep 2022 16:55:15 +0000 commit 1b11b5ab42a1592c914a772a43860fc03d74ed43 Author: Jean-Philippe Brucker AuthorDate: Mon Aug 22 16:27:29 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:03 2022 +0100 xen/arm: smmuv3: Fix endianness annotations Backport Linux commit 376cdf66f624. This is the clean backport without any changes. When building with C=1, sparse reports some issues regarding endianness annotations: arm-smmu-v3.c:221:26: warning: cast to restricted __le64 arm-smmu-v3.c:221:24: warning: incorrect type in assignment (different base types) arm-smmu-v3.c:221:24: expected restricted __le64 [usertype] arm-smmu-v3.c:221:24: got unsigned long long [usertype] arm-smmu-v3.c:229:20: warning: incorrect type in argument 1 (different base types) arm-smmu-v3.c:229:20: expected restricted __le64 [usertype] *[assigned] dst arm-smmu-v3.c:229:20: got unsigned long long [usertype] *ent arm-smmu-v3.c:229:25: warning: incorrect type in argument 2 (different base types) arm-smmu-v3.c:229:25: expected unsigned long long [usertype] *[assigned] src arm-smmu-v3.c:229:25: got restricted __le64 [usertype] * arm-smmu-v3.c:396:20: warning: incorrect type in argument 1 (different base types) arm-smmu-v3.c:396:20: expected restricted __le64 [usertype] *[assigned] dst arm-smmu-v3.c:396:20: got unsigned long long * arm-smmu-v3.c:396:25: warning: incorrect type in argument 2 (different base types) arm-smmu-v3.c:396:25: expected unsigned long long [usertype] *[assigned] src arm-smmu-v3.c:396:25: got restricted __le64 [usertype] * arm-smmu-v3.c:1349:32: warning: invalid assignment: |= arm-smmu-v3.c:1349:32: left side has type restricted __le64 arm-smmu-v3.c:1349:32: right side has type unsigned long arm-smmu-v3.c:1396:53: warning: incorrect type in argument 3 (different base types) arm-smmu-v3.c:1396:53: expected restricted __le64 [usertype] *dst arm-smmu-v3.c:1396:53: got unsigned long long [usertype] *strtab arm-smmu-v3.c:1424:39: warning: incorrect type in argument 1 (different base types) arm-smmu-v3.c:1424:39: expected unsigned long long [usertype] *[assigned] strtab arm-smmu-v3.c:1424:39: got restricted __le64 [usertype] *l2ptr While harmless, they are incorrect and could hide actual errors during development. Fix them. Signed-off-by: Jean-Philippe Brucker Reviewed-by: Robin Murphy Link: https://lore.kernel.org/r/20200918141856.629722-1-jean-philippe@linaro.org Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 376cdf66f624 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 340609264d..64d39bb4d3 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -1037,7 +1037,7 @@ static int queue_insert_raw(struct arm_smmu_queue *q, u64 *ent) return 0; } -static void queue_read(__le64 *dst, u64 *src, size_t n_dwords) +static void queue_read(u64 *dst, __le64 *src, size_t n_dwords) { int i; @@ -1436,7 +1436,7 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, arm_smmu_cmdq_issue_cmd(smmu, &prefetch_cmd); } -static void arm_smmu_init_bypass_stes(u64 *strtab, unsigned int nent) +static void arm_smmu_init_bypass_stes(__le64 *strtab, unsigned int nent) { unsigned int i; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 16:55:26 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 16:55:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399978.641435 (Exim 4.92) (envelope-from ) id 1oVbrC-0008W9-54; Tue, 06 Sep 2022 16:55:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399978.641435; Tue, 06 Sep 2022 16:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrC-0008W1-2T; Tue, 06 Sep 2022 16:55:26 +0000 Received: by outflank-mailman (input) for mailman id 399978; Tue, 06 Sep 2022 16:55:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrB-0008Vu-GB for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrB-00086l-FO for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVbrB-0003AS-EM for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OmHl1CShLWaO2YSi7pSYW/nXLQX2adoE0DNVOFBA1qg=; b=ms5MPoTRG0xIQqsuv9D7PA4028 lti00XE0ptWBFlvBN35zkYWyu+RKh4S/SAak1ORrLfo8FD9tFA/q6Ru1NjsiUHMEa+aZdlt9VMzaX knTSHg3WO68Sx9xoLYUA50c+jcjR8cbkoZETKHBhXxtzE9zYs6O/oCIlmPFps5gmWXwA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Ensure queue is read after updating prod pointer Message-Id: Date: Tue, 06 Sep 2022 16:55:25 +0000 commit 56995f06fe9f4f253377189f6fd3f5ddfe3ce881 Author: Zhou Wang AuthorDate: Mon Aug 22 16:52:31 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:07 2022 +0100 xen/arm: smmuv3: Ensure queue is read after updating prod pointer Backport Linux commit a76a37777f2c. Introduce _iomb() in the smmu-v3.c file with other Linux compatibility definitions. Reading the 'prod' MMIO register in order to determine whether or not there is valid data beyond 'cons' for a given queue does not provide sufficient dependency ordering, as the resulting access is address dependent only on 'cons' and can therefore be speculated ahead of time, potentially allowing stale data to be read by the CPU. Use readl() instead of readl_relaxed() when updating the shadow copy of the 'prod' pointer, so that all speculated memory reads from the corresponding queue can occur only from valid slots. Signed-off-by: Zhou Wang Link: https://lore.kernel.org/r/1601281922-117296-1-git-send-email-wangzhou1@hisilicon.com [will: Use readl() instead of explicit barrier. Update 'cons' side to match.] Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git a76a37777f2c Signed-off-by: Rahul Singh Reviewed-by: Bertrand Marquis --- xen/drivers/passthrough/arm/smmu-v3.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 64d39bb4d3..229b9a4b0d 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -107,6 +107,8 @@ typedef paddr_t dma_addr_t; typedef paddr_t phys_addr_t; typedef unsigned int gfp_t; +#define __iomb() dmb(osh) + #define platform_device device #define GFP_KERNEL 0 @@ -951,7 +953,7 @@ static void queue_sync_cons_out(struct arm_smmu_queue *q) * Ensure that all CPU accesses (reads and writes) to the queue * are complete before we update the cons pointer. */ - mb(); + __iomb(); writel_relaxed(q->llq.cons, q->cons_reg); } @@ -963,8 +965,15 @@ static void queue_inc_cons(struct arm_smmu_ll_queue *q) static int queue_sync_prod_in(struct arm_smmu_queue *q) { + u32 prod; int ret = 0; - u32 prod = readl_relaxed(q->prod_reg); + + /* + * We can't use the _relaxed() variant here, as we must prevent + * speculative reads of the queue before we have determined that + * prod has indeed moved. + */ + prod = readl(q->prod_reg); if (Q_OVF(prod) != Q_OVF(q->llq.prod)) ret = -EOVERFLOW; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 16:55:36 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 16:55:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399979.641439 (Exim 4.92) (envelope-from ) id 1oVbrM-00007T-7c; Tue, 06 Sep 2022 16:55:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399979.641439; Tue, 06 Sep 2022 16:55:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrM-00007L-3z; Tue, 06 Sep 2022 16:55:36 +0000 Received: by outflank-mailman (input) for mailman id 399979; Tue, 06 Sep 2022 16:55:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrL-00007C-JR for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrL-00086v-Ic for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVbrL-0003At-HW for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IcGiZbbFbIDbMDPs3A02T4qt3IaoVzUj65g56CAIIz8=; b=LMceHZLazdkwOaYi0yr5Qm8hnv Lr6waflQ61vKh8WjOxLvWybV26h6ySah671/ouEGlqVtrt94QnD51KbbjiA4QqNl/E4ssEMmrTMdb J5/bACK+ilxqLXjSh2awK5k/72qSpL3NqgWPijSpv88KxXceWiqELLLoInaAcJJptKpk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Move definitions to a header Message-Id: Date: Tue, 06 Sep 2022 16:55:35 +0000 commit 19f609249a185cdc43132e4496bcfd96e371f293 Author: Jean-Philippe Brucker AuthorDate: Tue Jan 11 12:33:43 2022 +0000 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:22 2022 +0100 xen/arm: smmuv3: Move definitions to a header Backport Linux commit e881e7839fba. Also, move Xen related struct definition to header to get it compiled. Allow sharing structure definitions with the upcoming SVA support for Arm SMMUv3, by moving them to a separate header. We could surgically extract only what is needed but keeping all definitions in one place looks nicer. Signed-off-by: Jean-Philippe Brucker Reviewed-by: Eric Auger Reviewed-by: Jonathan Cameron Link: https://lore.kernel.org/r/20200918101852.582559-8-jean-philippe@linaro.org Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e881e7839fba Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 665 +-------------------------------- xen/drivers/passthrough/arm/smmu-v3.h | 674 ++++++++++++++++++++++++++++++++++ 2 files changed, 675 insertions(+), 664 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 229b9a4b0d..ba24a26ad6 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -90,6 +90,7 @@ #include #include +#include "smmu-v3.h" #define ARM_SMMU_VTCR_SH_IS 3 #define ARM_SMMU_VTCR_RGN_WBWA 1 @@ -103,22 +104,12 @@ #define ARM_SMMU_VTCR_PS_52_BIT 0x6ULL /* Linux compatibility functions. */ -typedef paddr_t dma_addr_t; -typedef paddr_t phys_addr_t; -typedef unsigned int gfp_t; - #define __iomb() dmb(osh) #define platform_device device #define GFP_KERNEL 0 -/* Alias to Xen lock functions */ -#define mutex spinlock -#define mutex_init spin_lock_init -#define mutex_lock spin_lock -#define mutex_unlock spin_unlock - /* Device logger functions */ #define dev_name(dev) dt_node_full_name(dev->of_node) #define dev_dbg(dev, fmt, ...) \ @@ -159,12 +150,6 @@ typedef unsigned int gfp_t; #define readl_relaxed_poll_timeout(addr, val, cond, delay_us, timeout_us) \ readx_poll_timeout(readl_relaxed, addr, val, cond, delay_us, timeout_us) -#define FIELD_PREP(_mask, _val) \ - (((typeof(_mask))(_val) << (ffs64(_mask) - 1)) & (_mask)) - -#define FIELD_GET(_mask, _reg) \ - ((typeof(_mask))(((_reg) & (_mask)) >> (ffs64(_mask) - 1))) - /* * Helpers for DMA allocation. Just the function name is reused for * porting code, these allocation are not managed allocations @@ -197,27 +182,6 @@ static void *dmam_alloc_coherent(struct device *dev, size_t size, return vaddr; } - -/* Xen specific code. */ -struct iommu_domain { - /* Runtime SMMU configuration for this iommu_domain */ - atomic_t ref; - /* - * Used to link iommu_domain contexts for a same domain. - * There is at least one per-SMMU to used by the domain. - */ - struct list_head list; -}; - -/* Describes information required for a Xen domain */ -struct arm_smmu_xen_domain { - spinlock_t lock; - - /* List of iommu domains associated to this domain */ - struct list_head contexts; -}; - - /* Keep a list of devices associated with this driver */ static DEFINE_SPINLOCK(arm_smmu_devices_lock); static LIST_HEAD(arm_smmu_devices); @@ -261,635 +225,8 @@ static int platform_get_irq_byname_optional(struct device *dev, } /* Start of Linux SMMUv3 code */ -/* MMIO registers */ -#define ARM_SMMU_IDR0 0x0 -#define IDR0_ST_LVL GENMASK(28, 27) -#define IDR0_ST_LVL_2LVL 1 -#define IDR0_STALL_MODEL GENMASK(25, 24) -#define IDR0_STALL_MODEL_STALL 0 -#define IDR0_STALL_MODEL_FORCE 2 -#define IDR0_TTENDIAN GENMASK(22, 21) -#define IDR0_TTENDIAN_MIXED 0 -#define IDR0_TTENDIAN_LE 2 -#define IDR0_TTENDIAN_BE 3 -#define IDR0_CD2L (1 << 19) -#define IDR0_VMID16 (1 << 18) -#define IDR0_PRI (1 << 16) -#define IDR0_SEV (1 << 14) -#define IDR0_MSI (1 << 13) -#define IDR0_ASID16 (1 << 12) -#define IDR0_ATS (1 << 10) -#define IDR0_HYP (1 << 9) -#define IDR0_COHACC (1 << 4) -#define IDR0_TTF GENMASK(3, 2) -#define IDR0_TTF_AARCH64 2 -#define IDR0_TTF_AARCH32_64 3 -#define IDR0_S1P (1 << 1) -#define IDR0_S2P (1 << 0) - -#define ARM_SMMU_IDR1 0x4 -#define IDR1_TABLES_PRESET (1 << 30) -#define IDR1_QUEUES_PRESET (1 << 29) -#define IDR1_REL (1 << 28) -#define IDR1_CMDQS GENMASK(25, 21) -#define IDR1_EVTQS GENMASK(20, 16) -#define IDR1_PRIQS GENMASK(15, 11) -#define IDR1_SSIDSIZE GENMASK(10, 6) -#define IDR1_SIDSIZE GENMASK(5, 0) - -#define ARM_SMMU_IDR5 0x14 -#define IDR5_STALL_MAX GENMASK(31, 16) -#define IDR5_GRAN64K (1 << 6) -#define IDR5_GRAN16K (1 << 5) -#define IDR5_GRAN4K (1 << 4) -#define IDR5_OAS GENMASK(2, 0) -#define IDR5_OAS_32_BIT 0 -#define IDR5_OAS_36_BIT 1 -#define IDR5_OAS_40_BIT 2 -#define IDR5_OAS_42_BIT 3 -#define IDR5_OAS_44_BIT 4 -#define IDR5_OAS_48_BIT 5 -#define IDR5_OAS_52_BIT 6 -#define IDR5_VAX GENMASK(11, 10) -#define IDR5_VAX_52_BIT 1 - -#define ARM_SMMU_CR0 0x20 -#define CR0_ATSCHK (1 << 4) -#define CR0_CMDQEN (1 << 3) -#define CR0_EVTQEN (1 << 2) -#define CR0_PRIQEN (1 << 1) -#define CR0_SMMUEN (1 << 0) - -#define ARM_SMMU_CR0ACK 0x24 - -#define ARM_SMMU_CR1 0x28 -#define CR1_TABLE_SH GENMASK(11, 10) -#define CR1_TABLE_OC GENMASK(9, 8) -#define CR1_TABLE_IC GENMASK(7, 6) -#define CR1_QUEUE_SH GENMASK(5, 4) -#define CR1_QUEUE_OC GENMASK(3, 2) -#define CR1_QUEUE_IC GENMASK(1, 0) -/* CR1 cacheability fields don't quite follow the usual TCR-style encoding */ -#define CR1_CACHE_NC 0 -#define CR1_CACHE_WB 1 -#define CR1_CACHE_WT 2 - -#define ARM_SMMU_CR2 0x2c -#define CR2_PTM (1 << 2) -#define CR2_RECINVSID (1 << 1) -#define CR2_E2H (1 << 0) - -#define ARM_SMMU_GBPA 0x44 -#define GBPA_UPDATE (1U << 31) -#define GBPA_ABORT (1 << 20) - -#define ARM_SMMU_IRQ_CTRL 0x50 -#define IRQ_CTRL_EVTQ_IRQEN (1 << 2) -#define IRQ_CTRL_PRIQ_IRQEN (1 << 1) -#define IRQ_CTRL_GERROR_IRQEN (1 << 0) - -#define ARM_SMMU_IRQ_CTRLACK 0x54 - -#define ARM_SMMU_GERROR 0x60 -#define GERROR_SFM_ERR (1 << 8) -#define GERROR_MSI_GERROR_ABT_ERR (1 << 7) -#define GERROR_MSI_PRIQ_ABT_ERR (1 << 6) -#define GERROR_MSI_EVTQ_ABT_ERR (1 << 5) -#define GERROR_MSI_CMDQ_ABT_ERR (1 << 4) -#define GERROR_PRIQ_ABT_ERR (1 << 3) -#define GERROR_EVTQ_ABT_ERR (1 << 2) -#define GERROR_CMDQ_ERR (1 << 0) -#define GERROR_ERR_MASK 0xfd - -#define ARM_SMMU_GERRORN 0x64 - -#define ARM_SMMU_GERROR_IRQ_CFG0 0x68 -#define ARM_SMMU_GERROR_IRQ_CFG1 0x70 -#define ARM_SMMU_GERROR_IRQ_CFG2 0x74 - -#define ARM_SMMU_STRTAB_BASE 0x80 -#define STRTAB_BASE_RA (1UL << 62) -#define STRTAB_BASE_ADDR_MASK GENMASK_ULL(51, 6) - -#define ARM_SMMU_STRTAB_BASE_CFG 0x88 -#define STRTAB_BASE_CFG_FMT GENMASK(17, 16) -#define STRTAB_BASE_CFG_FMT_LINEAR 0 -#define STRTAB_BASE_CFG_FMT_2LVL 1 -#define STRTAB_BASE_CFG_SPLIT GENMASK(10, 6) -#define STRTAB_BASE_CFG_LOG2SIZE GENMASK(5, 0) - -#define ARM_SMMU_CMDQ_BASE 0x90 -#define ARM_SMMU_CMDQ_PROD 0x98 -#define ARM_SMMU_CMDQ_CONS 0x9c - -#define ARM_SMMU_EVTQ_BASE 0xa0 -#define ARM_SMMU_EVTQ_PROD 0x100a8 -#define ARM_SMMU_EVTQ_CONS 0x100ac -#define ARM_SMMU_EVTQ_IRQ_CFG0 0xb0 -#define ARM_SMMU_EVTQ_IRQ_CFG1 0xb8 -#define ARM_SMMU_EVTQ_IRQ_CFG2 0xbc - -#define ARM_SMMU_PRIQ_BASE 0xc0 -#define ARM_SMMU_PRIQ_PROD 0x100c8 -#define ARM_SMMU_PRIQ_CONS 0x100cc -#define ARM_SMMU_PRIQ_IRQ_CFG0 0xd0 -#define ARM_SMMU_PRIQ_IRQ_CFG1 0xd8 -#define ARM_SMMU_PRIQ_IRQ_CFG2 0xdc - -#define ARM_SMMU_REG_SZ 0xe00 - -/* Common MSI config fields */ -#define MSI_CFG0_ADDR_MASK GENMASK_ULL(51, 2) -#define MSI_CFG2_SH GENMASK(5, 4) -#define MSI_CFG2_MEMATTR GENMASK(3, 0) - -/* Common memory attribute values */ -#define ARM_SMMU_SH_NSH 0 -#define ARM_SMMU_SH_OSH 2 -#define ARM_SMMU_SH_ISH 3 -#define ARM_SMMU_MEMATTR_DEVICE_nGnRE 0x1 -#define ARM_SMMU_MEMATTR_OIWB 0xf - -#define Q_IDX(llq, p) ((p) & ((1 << (llq)->max_n_shift) - 1)) -#define Q_WRP(llq, p) ((p) & (1 << (llq)->max_n_shift)) -#define Q_OVERFLOW_FLAG (1U << 31) -#define Q_OVF(p) ((p) & Q_OVERFLOW_FLAG) -#define Q_ENT(q, p) ((q)->base + \ - Q_IDX(&((q)->llq), p) * \ - (q)->ent_dwords) - -#define Q_BASE_RWA (1UL << 62) -#define Q_BASE_ADDR_MASK GENMASK_ULL(51, 5) -#define Q_BASE_LOG2SIZE GENMASK(4, 0) - -/* Ensure DMA allocations are naturally aligned */ -#ifdef CONFIG_CMA_ALIGNMENT -#define Q_MAX_SZ_SHIFT (PAGE_SHIFT + CONFIG_CMA_ALIGNMENT) -#else -#define Q_MAX_SZ_SHIFT (PAGE_SHIFT + MAX_ORDER - 1) -#endif - -/* - * Stream table. - * - * Linear: Enough to cover 1 << IDR1.SIDSIZE entries - * 2lvl: 128k L1 entries, - * 256 lazy entries per table (each table covers a PCI bus) - */ -#define STRTAB_L1_SZ_SHIFT 20 -#define STRTAB_SPLIT 8 - -#define STRTAB_L1_DESC_DWORDS 1 -#define STRTAB_L1_DESC_SPAN GENMASK_ULL(4, 0) -#define STRTAB_L1_DESC_L2PTR_MASK GENMASK_ULL(51, 6) - -#define STRTAB_STE_DWORDS 8 -#define STRTAB_STE_0_V (1UL << 0) -#define STRTAB_STE_0_CFG GENMASK_ULL(3, 1) -#define STRTAB_STE_0_CFG_ABORT 0 -#define STRTAB_STE_0_CFG_BYPASS 4 -#define STRTAB_STE_0_CFG_S1_TRANS 5 -#define STRTAB_STE_0_CFG_S2_TRANS 6 - -#define STRTAB_STE_0_S1FMT GENMASK_ULL(5, 4) -#define STRTAB_STE_0_S1FMT_LINEAR 0 -#define STRTAB_STE_0_S1FMT_64K_L2 2 -#define STRTAB_STE_0_S1CTXPTR_MASK GENMASK_ULL(51, 6) -#define STRTAB_STE_0_S1CDMAX GENMASK_ULL(63, 59) - -#define STRTAB_STE_1_S1DSS GENMASK_ULL(1, 0) -#define STRTAB_STE_1_S1DSS_TERMINATE 0x0 -#define STRTAB_STE_1_S1DSS_BYPASS 0x1 -#define STRTAB_STE_1_S1DSS_SSID0 0x2 - -#define STRTAB_STE_1_S1C_CACHE_NC 0UL -#define STRTAB_STE_1_S1C_CACHE_WBRA 1UL -#define STRTAB_STE_1_S1C_CACHE_WT 2UL -#define STRTAB_STE_1_S1C_CACHE_WB 3UL -#define STRTAB_STE_1_S1CIR GENMASK_ULL(3, 2) -#define STRTAB_STE_1_S1COR GENMASK_ULL(5, 4) -#define STRTAB_STE_1_S1CSH GENMASK_ULL(7, 6) - -#define STRTAB_STE_1_S1STALLD (1UL << 27) - -#define STRTAB_STE_1_EATS GENMASK_ULL(29, 28) -#define STRTAB_STE_1_EATS_ABT 0UL -#define STRTAB_STE_1_EATS_TRANS 1UL -#define STRTAB_STE_1_EATS_S1CHK 2UL - -#define STRTAB_STE_1_STRW GENMASK_ULL(31, 30) -#define STRTAB_STE_1_STRW_NSEL1 0UL -#define STRTAB_STE_1_STRW_EL2 2UL - -#define STRTAB_STE_1_SHCFG GENMASK_ULL(45, 44) -#define STRTAB_STE_1_SHCFG_INCOMING 1UL - -#define STRTAB_STE_2_S2VMID GENMASK_ULL(15, 0) -#define STRTAB_STE_2_VTCR GENMASK_ULL(50, 32) -#define STRTAB_STE_2_VTCR_S2T0SZ GENMASK_ULL(5, 0) -#define STRTAB_STE_2_VTCR_S2SL0 GENMASK_ULL(7, 6) -#define STRTAB_STE_2_VTCR_S2IR0 GENMASK_ULL(9, 8) -#define STRTAB_STE_2_VTCR_S2OR0 GENMASK_ULL(11, 10) -#define STRTAB_STE_2_VTCR_S2SH0 GENMASK_ULL(13, 12) -#define STRTAB_STE_2_VTCR_S2TG GENMASK_ULL(15, 14) -#define STRTAB_STE_2_VTCR_S2PS GENMASK_ULL(18, 16) -#define STRTAB_STE_2_S2AA64 (1UL << 51) -#define STRTAB_STE_2_S2ENDI (1UL << 52) -#define STRTAB_STE_2_S2PTW (1UL << 54) -#define STRTAB_STE_2_S2R (1UL << 58) - -#define STRTAB_STE_3_S2TTB_MASK GENMASK_ULL(51, 4) - -/* - * Context descriptors. - * - * Linear: when less than 1024 SSIDs are supported - * 2lvl: at most 1024 L1 entries, - * 1024 lazy entries per table. - */ -#define CTXDESC_SPLIT 10 -#define CTXDESC_L2_ENTRIES (1 << CTXDESC_SPLIT) - -#define CTXDESC_L1_DESC_DWORDS 1 -#define CTXDESC_L1_DESC_V (1UL << 0) -#define CTXDESC_L1_DESC_L2PTR_MASK GENMASK_ULL(51, 12) - -#define CTXDESC_CD_DWORDS 8 -#define CTXDESC_CD_0_TCR_T0SZ GENMASK_ULL(5, 0) -#define CTXDESC_CD_0_TCR_TG0 GENMASK_ULL(7, 6) -#define CTXDESC_CD_0_TCR_IRGN0 GENMASK_ULL(9, 8) -#define CTXDESC_CD_0_TCR_ORGN0 GENMASK_ULL(11, 10) -#define CTXDESC_CD_0_TCR_SH0 GENMASK_ULL(13, 12) -#define CTXDESC_CD_0_TCR_EPD0 (1ULL << 14) -#define CTXDESC_CD_0_TCR_EPD1 (1ULL << 30) - -#define CTXDESC_CD_0_ENDI (1UL << 15) -#define CTXDESC_CD_0_V (1UL << 31) - -#define CTXDESC_CD_0_TCR_IPS GENMASK_ULL(34, 32) -#define CTXDESC_CD_0_TCR_TBI0 (1ULL << 38) - -#define CTXDESC_CD_0_AA64 (1UL << 41) -#define CTXDESC_CD_0_S (1UL << 44) -#define CTXDESC_CD_0_R (1UL << 45) -#define CTXDESC_CD_0_A (1UL << 46) -#define CTXDESC_CD_0_ASET (1UL << 47) -#define CTXDESC_CD_0_ASID GENMASK_ULL(63, 48) - -#define CTXDESC_CD_1_TTB0_MASK GENMASK_ULL(51, 4) - -/* - * When the SMMU only supports linear context descriptor tables, pick a - * reasonable size limit (64kB). - */ -#define CTXDESC_LINEAR_CDMAX ilog2(SZ_64K / (CTXDESC_CD_DWORDS << 3)) - -/* Command queue */ -#define CMDQ_ENT_SZ_SHIFT 4 -#define CMDQ_ENT_DWORDS ((1 << CMDQ_ENT_SZ_SHIFT) >> 3) -#define CMDQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - CMDQ_ENT_SZ_SHIFT) - -#define CMDQ_CONS_ERR GENMASK(30, 24) -#define CMDQ_ERR_CERROR_NONE_IDX 0 -#define CMDQ_ERR_CERROR_ILL_IDX 1 -#define CMDQ_ERR_CERROR_ABT_IDX 2 -#define CMDQ_ERR_CERROR_ATC_INV_IDX 3 - -#define CMDQ_0_OP GENMASK_ULL(7, 0) -#define CMDQ_0_SSV (1UL << 11) - -#define CMDQ_PREFETCH_0_SID GENMASK_ULL(63, 32) -#define CMDQ_PREFETCH_1_SIZE GENMASK_ULL(4, 0) -#define CMDQ_PREFETCH_1_ADDR_MASK GENMASK_ULL(63, 12) - -#define CMDQ_CFGI_0_SSID GENMASK_ULL(31, 12) -#define CMDQ_CFGI_0_SID GENMASK_ULL(63, 32) -#define CMDQ_CFGI_1_LEAF (1UL << 0) -#define CMDQ_CFGI_1_RANGE GENMASK_ULL(4, 0) - -#define CMDQ_TLBI_0_VMID GENMASK_ULL(47, 32) -#define CMDQ_TLBI_0_ASID GENMASK_ULL(63, 48) -#define CMDQ_TLBI_1_LEAF (1UL << 0) -#define CMDQ_TLBI_1_VA_MASK GENMASK_ULL(63, 12) -#define CMDQ_TLBI_1_IPA_MASK GENMASK_ULL(51, 12) - -#define CMDQ_ATC_0_SSID GENMASK_ULL(31, 12) -#define CMDQ_ATC_0_SID GENMASK_ULL(63, 32) -#define CMDQ_ATC_0_GLOBAL (1UL << 9) -#define CMDQ_ATC_1_SIZE GENMASK_ULL(5, 0) -#define CMDQ_ATC_1_ADDR_MASK GENMASK_ULL(63, 12) - -#define CMDQ_PRI_0_SSID GENMASK_ULL(31, 12) -#define CMDQ_PRI_0_SID GENMASK_ULL(63, 32) -#define CMDQ_PRI_1_GRPID GENMASK_ULL(8, 0) -#define CMDQ_PRI_1_RESP GENMASK_ULL(13, 12) - -#define CMDQ_SYNC_0_CS GENMASK_ULL(13, 12) -#define CMDQ_SYNC_0_CS_NONE 0 -#define CMDQ_SYNC_0_CS_IRQ 1 -#define CMDQ_SYNC_0_CS_SEV 2 -#define CMDQ_SYNC_0_MSH GENMASK_ULL(23, 22) -#define CMDQ_SYNC_0_MSIATTR GENMASK_ULL(27, 24) -#define CMDQ_SYNC_0_MSIDATA GENMASK_ULL(63, 32) -#define CMDQ_SYNC_1_MSIADDR_MASK GENMASK_ULL(51, 2) - -/* Event queue */ -#define EVTQ_ENT_SZ_SHIFT 5 -#define EVTQ_ENT_DWORDS ((1 << EVTQ_ENT_SZ_SHIFT) >> 3) -#define EVTQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - EVTQ_ENT_SZ_SHIFT) - -#define EVTQ_0_ID GENMASK_ULL(7, 0) - -/* PRI queue */ -#define PRIQ_ENT_SZ_SHIFT 4 -#define PRIQ_ENT_DWORDS ((1 << PRIQ_ENT_SZ_SHIFT) >> 3) -#define PRIQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - PRIQ_ENT_SZ_SHIFT) - -#define PRIQ_0_SID GENMASK_ULL(31, 0) -#define PRIQ_0_SSID GENMASK_ULL(51, 32) -#define PRIQ_0_PERM_PRIV (1UL << 58) -#define PRIQ_0_PERM_EXEC (1UL << 59) -#define PRIQ_0_PERM_READ (1UL << 60) -#define PRIQ_0_PERM_WRITE (1UL << 61) -#define PRIQ_0_PRG_LAST (1UL << 62) -#define PRIQ_0_SSID_V (1UL << 63) - -#define PRIQ_1_PRG_IDX GENMASK_ULL(8, 0) -#define PRIQ_1_ADDR_MASK GENMASK_ULL(63, 12) - -/* High-level queue structures */ -#define ARM_SMMU_POLL_TIMEOUT_US 100 -#define ARM_SMMU_CMDQ_SYNC_TIMEOUT_US 1000000 /* 1s! */ -#define ARM_SMMU_CMDQ_SYNC_SPIN_COUNT 10 - static bool disable_bypass = 1; -enum pri_resp { - PRI_RESP_DENY = 0, - PRI_RESP_FAIL = 1, - PRI_RESP_SUCC = 2, -}; - -#ifdef CONFIG_MSI -enum arm_smmu_msi_index { - EVTQ_MSI_INDEX, - GERROR_MSI_INDEX, - PRIQ_MSI_INDEX, - ARM_SMMU_MAX_MSIS, -}; - -static phys_addr_t arm_smmu_msi_cfg[ARM_SMMU_MAX_MSIS][3] = { - [EVTQ_MSI_INDEX] = { - ARM_SMMU_EVTQ_IRQ_CFG0, - ARM_SMMU_EVTQ_IRQ_CFG1, - ARM_SMMU_EVTQ_IRQ_CFG2, - }, - [GERROR_MSI_INDEX] = { - ARM_SMMU_GERROR_IRQ_CFG0, - ARM_SMMU_GERROR_IRQ_CFG1, - ARM_SMMU_GERROR_IRQ_CFG2, - }, - [PRIQ_MSI_INDEX] = { - ARM_SMMU_PRIQ_IRQ_CFG0, - ARM_SMMU_PRIQ_IRQ_CFG1, - ARM_SMMU_PRIQ_IRQ_CFG2, - }, -}; -#endif /* CONFIG_MSI */ - -struct arm_smmu_cmdq_ent { - /* Common fields */ - u8 opcode; - bool substream_valid; - - /* Command-specific fields */ - union { - #define CMDQ_OP_PREFETCH_CFG 0x1 - struct { - u32 sid; - u8 size; - u64 addr; - } prefetch; - - #define CMDQ_OP_CFGI_STE 0x3 - #define CMDQ_OP_CFGI_ALL 0x4 - struct { - u32 sid; - union { - bool leaf; - u8 span; - }; - } cfgi; - - #define CMDQ_OP_TLBI_EL2_ALL 0x20 - #define CMDQ_OP_TLBI_S12_VMALL 0x28 - #define CMDQ_OP_TLBI_S2_IPA 0x2a - #define CMDQ_OP_TLBI_NSNH_ALL 0x30 - struct { - u16 asid; - u16 vmid; - bool leaf; - u64 addr; - } tlbi; - - #define CMDQ_OP_ATC_INV 0x40 - #define ATC_INV_SIZE_ALL 52 - struct { - u32 sid; - u32 ssid; - u64 addr; - u8 size; - bool global; - } atc; - - #define CMDQ_OP_PRI_RESP 0x41 - struct { - u32 sid; - u32 ssid; - u16 grpid; - enum pri_resp resp; - } pri; - - #define CMDQ_OP_CMD_SYNC 0x46 - struct { - u32 msidata; - u64 msiaddr; - } sync; - }; -}; - -struct arm_smmu_ll_queue { - u32 prod; - u32 cons; - u32 max_n_shift; -}; - -struct arm_smmu_queue { - struct arm_smmu_ll_queue llq; - int irq; /* Wired interrupt */ - - __le64 *base; - dma_addr_t base_dma; - u64 q_base; - - size_t ent_dwords; - - u32 __iomem *prod_reg; - u32 __iomem *cons_reg; -}; - -struct arm_smmu_cmdq { - struct arm_smmu_queue q; - spinlock_t lock; -}; - -struct arm_smmu_evtq { - struct arm_smmu_queue q; - u32 max_stalls; -}; - -struct arm_smmu_priq { - struct arm_smmu_queue q; -}; - -/* High-level stream table and context descriptor structures */ -struct arm_smmu_strtab_l1_desc { - u8 span; - - __le64 *l2ptr; - dma_addr_t l2ptr_dma; -}; - -struct arm_smmu_s2_cfg { - u16 vmid; - u64 vttbr; - u64 vtcr; -}; - -struct arm_smmu_strtab_cfg { - __le64 *strtab; - dma_addr_t strtab_dma; - struct arm_smmu_strtab_l1_desc *l1_desc; - unsigned int num_l1_ents; - - u64 strtab_base; - u32 strtab_base_cfg; -}; - -struct arm_lpae_s2_cfg { - u64 vttbr; - struct { - u32 ps:3; - u32 tg:2; - u32 sh:2; - u32 orgn:2; - u32 irgn:2; - u32 sl:2; - u32 tsz:6; - } vtcr; -}; - -/* An SMMUv3 instance */ -struct arm_smmu_device { - struct device *dev; - void __iomem *base; - void __iomem *page1; - -#define ARM_SMMU_FEAT_2_LVL_STRTAB (1 << 0) -#define ARM_SMMU_FEAT_2_LVL_CDTAB (1 << 1) -#define ARM_SMMU_FEAT_TT_LE (1 << 2) -#define ARM_SMMU_FEAT_TT_BE (1 << 3) -#define ARM_SMMU_FEAT_PRI (1 << 4) -#define ARM_SMMU_FEAT_ATS (1 << 5) -#define ARM_SMMU_FEAT_SEV (1 << 6) -#define ARM_SMMU_FEAT_MSI (1 << 7) -#define ARM_SMMU_FEAT_COHERENCY (1 << 8) -#define ARM_SMMU_FEAT_TRANS_S1 (1 << 9) -#define ARM_SMMU_FEAT_TRANS_S2 (1 << 10) -#define ARM_SMMU_FEAT_STALLS (1 << 11) -#define ARM_SMMU_FEAT_HYP (1 << 12) -#define ARM_SMMU_FEAT_STALL_FORCE (1 << 13) -#define ARM_SMMU_FEAT_VAX (1 << 14) - u32 features; - -#define ARM_SMMU_OPT_SKIP_PREFETCH (1 << 0) -#define ARM_SMMU_OPT_PAGE0_REGS_ONLY (1 << 1) - u32 options; - - struct arm_smmu_cmdq cmdq; - struct arm_smmu_evtq evtq; - struct arm_smmu_priq priq; - - int gerr_irq; - int combined_irq; - u32 sync_nr; - u8 prev_cmd_opcode; - - unsigned long ias; /* IPA */ - unsigned long oas; /* PA */ - unsigned long pgsize_bitmap; - -#define ARM_SMMU_MAX_VMIDS (1 << 16) - unsigned int vmid_bits; - DECLARE_BITMAP(vmid_map, ARM_SMMU_MAX_VMIDS); - - unsigned int sid_bits; - - struct arm_smmu_strtab_cfg strtab_cfg; - - /* Hi16xx adds an extra 32 bits of goodness to its MSI payload */ - union { - u32 sync_count; - u64 padding; - }; - - /* Need to keep a list of SMMU devices */ - struct list_head devices; - - /* Tasklets for handling evts/faults and pci page request IRQs*/ - struct tasklet evtq_irq_tasklet; - struct tasklet priq_irq_tasklet; - struct tasklet combined_irq_tasklet; -}; - -/* SMMU private data for each master */ -struct arm_smmu_master { - struct arm_smmu_device *smmu; - struct device *dev; - struct arm_smmu_domain *domain; - struct list_head domain_head; - u32 *sids; - unsigned int num_sids; - bool ats_enabled; -}; - -/* SMMU private data for an IOMMU domain */ -enum arm_smmu_domain_stage { - ARM_SMMU_DOMAIN_S1 = 0, - ARM_SMMU_DOMAIN_S2, - ARM_SMMU_DOMAIN_NESTED, - ARM_SMMU_DOMAIN_BYPASS, -}; - -struct arm_smmu_domain { - struct arm_smmu_device *smmu; - struct mutex init_mutex; /* Protects smmu pointer */ - - bool non_strict; - atomic_t nr_ats_masters; - - enum arm_smmu_domain_stage stage; - struct arm_smmu_s2_cfg s2_cfg; - - /* Xen domain associated with this SMMU domain */ - struct domain *d; - - struct iommu_domain domain; - - struct list_head devices; - spinlock_t devices_lock; -}; - struct arm_smmu_option_prop { u32 opt; const char *prop; diff --git a/xen/drivers/passthrough/arm/smmu-v3.h b/xen/drivers/passthrough/arm/smmu-v3.h new file mode 100644 index 0000000000..c45d2f16c4 --- /dev/null +++ b/xen/drivers/passthrough/arm/smmu-v3.h @@ -0,0 +1,674 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * IOMMU API for ARM architected SMMUv3 implementations. + * + * Copyright (C) 2022 ARM Limited + */ + +#ifndef _ARM_SMMU_V3_H +#define _ARM_SMMU_V3_H + +/* MMIO registers */ +#define ARM_SMMU_IDR0 0x0 +#define IDR0_ST_LVL GENMASK(28, 27) +#define IDR0_ST_LVL_2LVL 1 +#define IDR0_STALL_MODEL GENMASK(25, 24) +#define IDR0_STALL_MODEL_STALL 0 +#define IDR0_STALL_MODEL_FORCE 2 +#define IDR0_TTENDIAN GENMASK(22, 21) +#define IDR0_TTENDIAN_MIXED 0 +#define IDR0_TTENDIAN_LE 2 +#define IDR0_TTENDIAN_BE 3 +#define IDR0_CD2L (1 << 19) +#define IDR0_VMID16 (1 << 18) +#define IDR0_PRI (1 << 16) +#define IDR0_SEV (1 << 14) +#define IDR0_MSI (1 << 13) +#define IDR0_ASID16 (1 << 12) +#define IDR0_ATS (1 << 10) +#define IDR0_HYP (1 << 9) +#define IDR0_COHACC (1 << 4) +#define IDR0_TTF GENMASK(3, 2) +#define IDR0_TTF_AARCH64 2 +#define IDR0_TTF_AARCH32_64 3 +#define IDR0_S1P (1 << 1) +#define IDR0_S2P (1 << 0) + +#define ARM_SMMU_IDR1 0x4 +#define IDR1_TABLES_PRESET (1 << 30) +#define IDR1_QUEUES_PRESET (1 << 29) +#define IDR1_REL (1 << 28) +#define IDR1_CMDQS GENMASK(25, 21) +#define IDR1_EVTQS GENMASK(20, 16) +#define IDR1_PRIQS GENMASK(15, 11) +#define IDR1_SSIDSIZE GENMASK(10, 6) +#define IDR1_SIDSIZE GENMASK(5, 0) + +#define ARM_SMMU_IDR5 0x14 +#define IDR5_STALL_MAX GENMASK(31, 16) +#define IDR5_GRAN64K (1 << 6) +#define IDR5_GRAN16K (1 << 5) +#define IDR5_GRAN4K (1 << 4) +#define IDR5_OAS GENMASK(2, 0) +#define IDR5_OAS_32_BIT 0 +#define IDR5_OAS_36_BIT 1 +#define IDR5_OAS_40_BIT 2 +#define IDR5_OAS_42_BIT 3 +#define IDR5_OAS_44_BIT 4 +#define IDR5_OAS_48_BIT 5 +#define IDR5_OAS_52_BIT 6 +#define IDR5_VAX GENMASK(11, 10) +#define IDR5_VAX_52_BIT 1 + +#define ARM_SMMU_CR0 0x20 +#define CR0_ATSCHK (1 << 4) +#define CR0_CMDQEN (1 << 3) +#define CR0_EVTQEN (1 << 2) +#define CR0_PRIQEN (1 << 1) +#define CR0_SMMUEN (1 << 0) + +#define ARM_SMMU_CR0ACK 0x24 + +#define ARM_SMMU_CR1 0x28 +#define CR1_TABLE_SH GENMASK(11, 10) +#define CR1_TABLE_OC GENMASK(9, 8) +#define CR1_TABLE_IC GENMASK(7, 6) +#define CR1_QUEUE_SH GENMASK(5, 4) +#define CR1_QUEUE_OC GENMASK(3, 2) +#define CR1_QUEUE_IC GENMASK(1, 0) +/* CR1 cacheability fields don't quite follow the usual TCR-style encoding */ +#define CR1_CACHE_NC 0 +#define CR1_CACHE_WB 1 +#define CR1_CACHE_WT 2 + +#define ARM_SMMU_CR2 0x2c +#define CR2_PTM (1 << 2) +#define CR2_RECINVSID (1 << 1) +#define CR2_E2H (1 << 0) + +#define ARM_SMMU_GBPA 0x44 +#define GBPA_UPDATE (1 << 31) +#define GBPA_ABORT (1 << 20) + +#define ARM_SMMU_IRQ_CTRL 0x50 +#define IRQ_CTRL_EVTQ_IRQEN (1 << 2) +#define IRQ_CTRL_PRIQ_IRQEN (1 << 1) +#define IRQ_CTRL_GERROR_IRQEN (1 << 0) + +#define ARM_SMMU_IRQ_CTRLACK 0x54 + +#define ARM_SMMU_GERROR 0x60 +#define GERROR_SFM_ERR (1 << 8) +#define GERROR_MSI_GERROR_ABT_ERR (1 << 7) +#define GERROR_MSI_PRIQ_ABT_ERR (1 << 6) +#define GERROR_MSI_EVTQ_ABT_ERR (1 << 5) +#define GERROR_MSI_CMDQ_ABT_ERR (1 << 4) +#define GERROR_PRIQ_ABT_ERR (1 << 3) +#define GERROR_EVTQ_ABT_ERR (1 << 2) +#define GERROR_CMDQ_ERR (1 << 0) +#define GERROR_ERR_MASK 0xfd + +#define ARM_SMMU_GERRORN 0x64 + +#define ARM_SMMU_GERROR_IRQ_CFG0 0x68 +#define ARM_SMMU_GERROR_IRQ_CFG1 0x70 +#define ARM_SMMU_GERROR_IRQ_CFG2 0x74 + +#define ARM_SMMU_STRTAB_BASE 0x80 +#define STRTAB_BASE_RA (1UL << 62) +#define STRTAB_BASE_ADDR_MASK GENMASK_ULL(51, 6) + +#define ARM_SMMU_STRTAB_BASE_CFG 0x88 +#define STRTAB_BASE_CFG_FMT GENMASK(17, 16) +#define STRTAB_BASE_CFG_FMT_LINEAR 0 +#define STRTAB_BASE_CFG_FMT_2LVL 1 +#define STRTAB_BASE_CFG_SPLIT GENMASK(10, 6) +#define STRTAB_BASE_CFG_LOG2SIZE GENMASK(5, 0) + +#define ARM_SMMU_CMDQ_BASE 0x90 +#define ARM_SMMU_CMDQ_PROD 0x98 +#define ARM_SMMU_CMDQ_CONS 0x9c + +#define ARM_SMMU_EVTQ_BASE 0xa0 +#define ARM_SMMU_EVTQ_PROD 0x100a8 +#define ARM_SMMU_EVTQ_CONS 0x100ac +#define ARM_SMMU_EVTQ_IRQ_CFG0 0xb0 +#define ARM_SMMU_EVTQ_IRQ_CFG1 0xb8 +#define ARM_SMMU_EVTQ_IRQ_CFG2 0xbc + +#define ARM_SMMU_PRIQ_BASE 0xc0 +#define ARM_SMMU_PRIQ_PROD 0x100c8 +#define ARM_SMMU_PRIQ_CONS 0x100cc +#define ARM_SMMU_PRIQ_IRQ_CFG0 0xd0 +#define ARM_SMMU_PRIQ_IRQ_CFG1 0xd8 +#define ARM_SMMU_PRIQ_IRQ_CFG2 0xdc + +#define ARM_SMMU_REG_SZ 0xe00 + +/* Common MSI config fields */ +#define MSI_CFG0_ADDR_MASK GENMASK_ULL(51, 2) +#define MSI_CFG2_SH GENMASK(5, 4) +#define MSI_CFG2_MEMATTR GENMASK(3, 0) + +/* Common memory attribute values */ +#define ARM_SMMU_SH_NSH 0 +#define ARM_SMMU_SH_OSH 2 +#define ARM_SMMU_SH_ISH 3 +#define ARM_SMMU_MEMATTR_DEVICE_nGnRE 0x1 +#define ARM_SMMU_MEMATTR_OIWB 0xf + +#define Q_IDX(llq, p) ((p) & ((1 << (llq)->max_n_shift) - 1)) +#define Q_WRP(llq, p) ((p) & (1 << (llq)->max_n_shift)) +#define Q_OVERFLOW_FLAG (1 << 31) +#define Q_OVF(p) ((p) & Q_OVERFLOW_FLAG) +#define Q_ENT(q, p) ((q)->base + \ + Q_IDX(&((q)->llq), p) * \ + (q)->ent_dwords) + +#define Q_BASE_RWA (1UL << 62) +#define Q_BASE_ADDR_MASK GENMASK_ULL(51, 5) +#define Q_BASE_LOG2SIZE GENMASK(4, 0) + +/* Ensure DMA allocations are naturally aligned */ +#ifdef CONFIG_CMA_ALIGNMENT +#define Q_MAX_SZ_SHIFT (PAGE_SHIFT + CONFIG_CMA_ALIGNMENT) +#else +#define Q_MAX_SZ_SHIFT (PAGE_SHIFT + MAX_ORDER - 1) +#endif + +/* + * Stream table. + * + * Linear: Enough to cover 1 << IDR1.SIDSIZE entries + * 2lvl: 128k L1 entries, + * 256 lazy entries per table (each table covers a PCI bus) + */ +#define STRTAB_L1_SZ_SHIFT 20 +#define STRTAB_SPLIT 8 + +#define STRTAB_L1_DESC_DWORDS 1 +#define STRTAB_L1_DESC_SPAN GENMASK_ULL(4, 0) +#define STRTAB_L1_DESC_L2PTR_MASK GENMASK_ULL(51, 6) + +#define STRTAB_STE_DWORDS 8 +#define STRTAB_STE_0_V (1UL << 0) +#define STRTAB_STE_0_CFG GENMASK_ULL(3, 1) +#define STRTAB_STE_0_CFG_ABORT 0 +#define STRTAB_STE_0_CFG_BYPASS 4 +#define STRTAB_STE_0_CFG_S1_TRANS 5 +#define STRTAB_STE_0_CFG_S2_TRANS 6 + +#define STRTAB_STE_0_S1FMT GENMASK_ULL(5, 4) +#define STRTAB_STE_0_S1FMT_LINEAR 0 +#define STRTAB_STE_0_S1FMT_64K_L2 2 +#define STRTAB_STE_0_S1CTXPTR_MASK GENMASK_ULL(51, 6) +#define STRTAB_STE_0_S1CDMAX GENMASK_ULL(63, 59) + +#define STRTAB_STE_1_S1DSS GENMASK_ULL(1, 0) +#define STRTAB_STE_1_S1DSS_TERMINATE 0x0 +#define STRTAB_STE_1_S1DSS_BYPASS 0x1 +#define STRTAB_STE_1_S1DSS_SSID0 0x2 + +#define STRTAB_STE_1_S1C_CACHE_NC 0UL +#define STRTAB_STE_1_S1C_CACHE_WBRA 1UL +#define STRTAB_STE_1_S1C_CACHE_WT 2UL +#define STRTAB_STE_1_S1C_CACHE_WB 3UL +#define STRTAB_STE_1_S1CIR GENMASK_ULL(3, 2) +#define STRTAB_STE_1_S1COR GENMASK_ULL(5, 4) +#define STRTAB_STE_1_S1CSH GENMASK_ULL(7, 6) + +#define STRTAB_STE_1_S1STALLD (1UL << 27) + +#define STRTAB_STE_1_EATS GENMASK_ULL(29, 28) +#define STRTAB_STE_1_EATS_ABT 0UL +#define STRTAB_STE_1_EATS_TRANS 1UL +#define STRTAB_STE_1_EATS_S1CHK 2UL + +#define STRTAB_STE_1_STRW GENMASK_ULL(31, 30) +#define STRTAB_STE_1_STRW_NSEL1 0UL +#define STRTAB_STE_1_STRW_EL2 2UL + +#define STRTAB_STE_1_SHCFG GENMASK_ULL(45, 44) +#define STRTAB_STE_1_SHCFG_INCOMING 1UL + +#define STRTAB_STE_2_S2VMID GENMASK_ULL(15, 0) +#define STRTAB_STE_2_VTCR GENMASK_ULL(50, 32) +#define STRTAB_STE_2_VTCR_S2T0SZ GENMASK_ULL(5, 0) +#define STRTAB_STE_2_VTCR_S2SL0 GENMASK_ULL(7, 6) +#define STRTAB_STE_2_VTCR_S2IR0 GENMASK_ULL(9, 8) +#define STRTAB_STE_2_VTCR_S2OR0 GENMASK_ULL(11, 10) +#define STRTAB_STE_2_VTCR_S2SH0 GENMASK_ULL(13, 12) +#define STRTAB_STE_2_VTCR_S2TG GENMASK_ULL(15, 14) +#define STRTAB_STE_2_VTCR_S2PS GENMASK_ULL(18, 16) +#define STRTAB_STE_2_S2AA64 (1UL << 51) +#define STRTAB_STE_2_S2ENDI (1UL << 52) +#define STRTAB_STE_2_S2PTW (1UL << 54) +#define STRTAB_STE_2_S2R (1UL << 58) + +#define STRTAB_STE_3_S2TTB_MASK GENMASK_ULL(51, 4) + +/* + * Context descriptors. + * + * Linear: when less than 1024 SSIDs are supported + * 2lvl: at most 1024 L1 entries, + * 1024 lazy entries per table. + */ +#define CTXDESC_SPLIT 10 +#define CTXDESC_L2_ENTRIES (1 << CTXDESC_SPLIT) + +#define CTXDESC_L1_DESC_DWORDS 1 +#define CTXDESC_L1_DESC_V (1UL << 0) +#define CTXDESC_L1_DESC_L2PTR_MASK GENMASK_ULL(51, 12) + +#define CTXDESC_CD_DWORDS 8 +#define CTXDESC_CD_0_TCR_T0SZ GENMASK_ULL(5, 0) +#define CTXDESC_CD_0_TCR_TG0 GENMASK_ULL(7, 6) +#define CTXDESC_CD_0_TCR_IRGN0 GENMASK_ULL(9, 8) +#define CTXDESC_CD_0_TCR_ORGN0 GENMASK_ULL(11, 10) +#define CTXDESC_CD_0_TCR_SH0 GENMASK_ULL(13, 12) +#define CTXDESC_CD_0_TCR_EPD0 (1ULL << 14) +#define CTXDESC_CD_0_TCR_EPD1 (1ULL << 30) + +#define CTXDESC_CD_0_ENDI (1UL << 15) +#define CTXDESC_CD_0_V (1UL << 31) + +#define CTXDESC_CD_0_TCR_IPS GENMASK_ULL(34, 32) +#define CTXDESC_CD_0_TCR_TBI0 (1ULL << 38) + +#define CTXDESC_CD_0_AA64 (1UL << 41) +#define CTXDESC_CD_0_S (1UL << 44) +#define CTXDESC_CD_0_R (1UL << 45) +#define CTXDESC_CD_0_A (1UL << 46) +#define CTXDESC_CD_0_ASET (1UL << 47) +#define CTXDESC_CD_0_ASID GENMASK_ULL(63, 48) + +#define CTXDESC_CD_1_TTB0_MASK GENMASK_ULL(51, 4) + +/* + * When the SMMU only supports linear context descriptor tables, pick a + * reasonable size limit (64kB). + */ +#define CTXDESC_LINEAR_CDMAX ilog2(SZ_64K / (CTXDESC_CD_DWORDS << 3)) + +/* Command queue */ +#define CMDQ_ENT_SZ_SHIFT 4 +#define CMDQ_ENT_DWORDS ((1 << CMDQ_ENT_SZ_SHIFT) >> 3) +#define CMDQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - CMDQ_ENT_SZ_SHIFT) + +#define CMDQ_CONS_ERR GENMASK(30, 24) +#define CMDQ_ERR_CERROR_NONE_IDX 0 +#define CMDQ_ERR_CERROR_ILL_IDX 1 +#define CMDQ_ERR_CERROR_ABT_IDX 2 +#define CMDQ_ERR_CERROR_ATC_INV_IDX 3 + +#define CMDQ_0_OP GENMASK_ULL(7, 0) +#define CMDQ_0_SSV (1UL << 11) + +#define CMDQ_PREFETCH_0_SID GENMASK_ULL(63, 32) +#define CMDQ_PREFETCH_1_SIZE GENMASK_ULL(4, 0) +#define CMDQ_PREFETCH_1_ADDR_MASK GENMASK_ULL(63, 12) + +#define CMDQ_CFGI_0_SSID GENMASK_ULL(31, 12) +#define CMDQ_CFGI_0_SID GENMASK_ULL(63, 32) +#define CMDQ_CFGI_1_LEAF (1UL << 0) +#define CMDQ_CFGI_1_RANGE GENMASK_ULL(4, 0) + +#define CMDQ_TLBI_0_VMID GENMASK_ULL(47, 32) +#define CMDQ_TLBI_0_ASID GENMASK_ULL(63, 48) +#define CMDQ_TLBI_1_LEAF (1UL << 0) +#define CMDQ_TLBI_1_VA_MASK GENMASK_ULL(63, 12) +#define CMDQ_TLBI_1_IPA_MASK GENMASK_ULL(51, 12) + +#define CMDQ_ATC_0_SSID GENMASK_ULL(31, 12) +#define CMDQ_ATC_0_SID GENMASK_ULL(63, 32) +#define CMDQ_ATC_0_GLOBAL (1UL << 9) +#define CMDQ_ATC_1_SIZE GENMASK_ULL(5, 0) +#define CMDQ_ATC_1_ADDR_MASK GENMASK_ULL(63, 12) + +#define CMDQ_PRI_0_SSID GENMASK_ULL(31, 12) +#define CMDQ_PRI_0_SID GENMASK_ULL(63, 32) +#define CMDQ_PRI_1_GRPID GENMASK_ULL(8, 0) +#define CMDQ_PRI_1_RESP GENMASK_ULL(13, 12) + +#define CMDQ_SYNC_0_CS GENMASK_ULL(13, 12) +#define CMDQ_SYNC_0_CS_NONE 0 +#define CMDQ_SYNC_0_CS_IRQ 1 +#define CMDQ_SYNC_0_CS_SEV 2 +#define CMDQ_SYNC_0_MSH GENMASK_ULL(23, 22) +#define CMDQ_SYNC_0_MSIATTR GENMASK_ULL(27, 24) +#define CMDQ_SYNC_0_MSIDATA GENMASK_ULL(63, 32) +#define CMDQ_SYNC_1_MSIADDR_MASK GENMASK_ULL(51, 2) + +/* Event queue */ +#define EVTQ_ENT_SZ_SHIFT 5 +#define EVTQ_ENT_DWORDS ((1 << EVTQ_ENT_SZ_SHIFT) >> 3) +#define EVTQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - EVTQ_ENT_SZ_SHIFT) + +#define EVTQ_0_ID GENMASK_ULL(7, 0) + +/* PRI queue */ +#define PRIQ_ENT_SZ_SHIFT 4 +#define PRIQ_ENT_DWORDS ((1 << PRIQ_ENT_SZ_SHIFT) >> 3) +#define PRIQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - PRIQ_ENT_SZ_SHIFT) + +#define PRIQ_0_SID GENMASK_ULL(31, 0) +#define PRIQ_0_SSID GENMASK_ULL(51, 32) +#define PRIQ_0_PERM_PRIV (1UL << 58) +#define PRIQ_0_PERM_EXEC (1UL << 59) +#define PRIQ_0_PERM_READ (1UL << 60) +#define PRIQ_0_PERM_WRITE (1UL << 61) +#define PRIQ_0_PRG_LAST (1UL << 62) +#define PRIQ_0_SSID_V (1UL << 63) + +#define PRIQ_1_PRG_IDX GENMASK_ULL(8, 0) +#define PRIQ_1_ADDR_MASK GENMASK_ULL(63, 12) + +/* High-level queue structures */ +#define ARM_SMMU_POLL_TIMEOUT_US 100 +#define ARM_SMMU_CMDQ_SYNC_TIMEOUT_US 1000000 /* 1s! */ +#define ARM_SMMU_CMDQ_SYNC_SPIN_COUNT 10 + +#define FIELD_PREP(_mask, _val) \ + (((typeof(_mask))(_val) << (ffs64(_mask) - 1)) & (_mask)) + +#define FIELD_GET(_mask, _reg) \ + ((typeof(_mask))(((_reg) & (_mask)) >> (ffs64(_mask) - 1))) + +/* Linux compatibility functions. */ +typedef paddr_t dma_addr_t; +typedef paddr_t phys_addr_t; +typedef unsigned int gfp_t; + +/* Alias to Xen lock functions */ +#define mutex spinlock +#define mutex_init spin_lock_init +#define mutex_lock spin_lock +#define mutex_unlock spin_unlock + +/* SMMU private data for an IOMMU domain */ +enum arm_smmu_domain_stage { + ARM_SMMU_DOMAIN_S1 = 0, + ARM_SMMU_DOMAIN_S2, + ARM_SMMU_DOMAIN_NESTED, + ARM_SMMU_DOMAIN_BYPASS, +}; + +/* Xen specific code. */ +struct iommu_domain { + /* Runtime SMMU configuration for this iommu_domain */ + atomic_t ref; + /* + * Used to link iommu_domain contexts for a same domain. + * There is at least one per-SMMU to used by the domain. + */ + struct list_head list; +}; + +/* Describes information required for a Xen domain */ +struct arm_smmu_xen_domain { + spinlock_t lock; + + /* List of iommu domains associated to this domain */ + struct list_head contexts; +}; + +enum pri_resp { + PRI_RESP_DENY = 0, + PRI_RESP_FAIL = 1, + PRI_RESP_SUCC = 2, +}; + +#ifdef CONFIG_MSI +enum arm_smmu_msi_index { + EVTQ_MSI_INDEX, + GERROR_MSI_INDEX, + PRIQ_MSI_INDEX, + ARM_SMMU_MAX_MSIS, +}; + +static phys_addr_t arm_smmu_msi_cfg[ARM_SMMU_MAX_MSIS][3] = { + [EVTQ_MSI_INDEX] = { + ARM_SMMU_EVTQ_IRQ_CFG0, + ARM_SMMU_EVTQ_IRQ_CFG1, + ARM_SMMU_EVTQ_IRQ_CFG2, + }, + [GERROR_MSI_INDEX] = { + ARM_SMMU_GERROR_IRQ_CFG0, + ARM_SMMU_GERROR_IRQ_CFG1, + ARM_SMMU_GERROR_IRQ_CFG2, + }, + [PRIQ_MSI_INDEX] = { + ARM_SMMU_PRIQ_IRQ_CFG0, + ARM_SMMU_PRIQ_IRQ_CFG1, + ARM_SMMU_PRIQ_IRQ_CFG2, + }, +}; +#endif /* CONFIG_MSI */ + +struct arm_smmu_cmdq_ent { + /* Common fields */ + u8 opcode; + bool substream_valid; + + /* Command-specific fields */ + union { + #define CMDQ_OP_PREFETCH_CFG 0x1 + struct { + u32 sid; + u8 size; + u64 addr; + } prefetch; + + #define CMDQ_OP_CFGI_STE 0x3 + #define CMDQ_OP_CFGI_ALL 0x4 + struct { + u32 sid; + union { + bool leaf; + u8 span; + }; + } cfgi; + + #define CMDQ_OP_TLBI_EL2_ALL 0x20 + #define CMDQ_OP_TLBI_S12_VMALL 0x28 + #define CMDQ_OP_TLBI_S2_IPA 0x2a + #define CMDQ_OP_TLBI_NSNH_ALL 0x30 + struct { + u16 asid; + u16 vmid; + bool leaf; + u64 addr; + } tlbi; + + #define CMDQ_OP_ATC_INV 0x40 + #define ATC_INV_SIZE_ALL 52 + struct { + u32 sid; + u32 ssid; + u64 addr; + u8 size; + bool global; + } atc; + + #define CMDQ_OP_PRI_RESP 0x41 + struct { + u32 sid; + u32 ssid; + u16 grpid; + enum pri_resp resp; + } pri; + + #define CMDQ_OP_CMD_SYNC 0x46 + struct { + u32 msidata; + u64 msiaddr; + } sync; + }; +}; + +struct arm_smmu_ll_queue { + u32 prod; + u32 cons; + u32 max_n_shift; +}; + +struct arm_smmu_queue { + struct arm_smmu_ll_queue llq; + int irq; /* Wired interrupt */ + + __le64 *base; + dma_addr_t base_dma; + u64 q_base; + + size_t ent_dwords; + + u32 __iomem *prod_reg; + u32 __iomem *cons_reg; +}; + +struct arm_smmu_cmdq { + struct arm_smmu_queue q; + spinlock_t lock; +}; + +struct arm_smmu_evtq { + struct arm_smmu_queue q; + u32 max_stalls; +}; + +struct arm_smmu_priq { + struct arm_smmu_queue q; +}; + +/* High-level stream table and context descriptor structures */ +struct arm_smmu_strtab_l1_desc { + u8 span; + + __le64 *l2ptr; + dma_addr_t l2ptr_dma; +}; + +struct arm_smmu_s2_cfg { + u16 vmid; + u64 vttbr; + u64 vtcr; +}; + +struct arm_smmu_strtab_cfg { + __le64 *strtab; + dma_addr_t strtab_dma; + struct arm_smmu_strtab_l1_desc *l1_desc; + unsigned int num_l1_ents; + + u64 strtab_base; + u32 strtab_base_cfg; +}; + +struct arm_lpae_s2_cfg { + u64 vttbr; + struct { + u32 ps:3; + u32 tg:2; + u32 sh:2; + u32 orgn:2; + u32 irgn:2; + u32 sl:2; + u32 tsz:6; + } vtcr; +}; + +/* An SMMUv3 instance */ +struct arm_smmu_device { + struct device *dev; + void __iomem *base; + void __iomem *page1; + +#define ARM_SMMU_FEAT_2_LVL_STRTAB (1 << 0) +#define ARM_SMMU_FEAT_2_LVL_CDTAB (1 << 1) +#define ARM_SMMU_FEAT_TT_LE (1 << 2) +#define ARM_SMMU_FEAT_TT_BE (1 << 3) +#define ARM_SMMU_FEAT_PRI (1 << 4) +#define ARM_SMMU_FEAT_ATS (1 << 5) +#define ARM_SMMU_FEAT_SEV (1 << 6) +#define ARM_SMMU_FEAT_MSI (1 << 7) +#define ARM_SMMU_FEAT_COHERENCY (1 << 8) +#define ARM_SMMU_FEAT_TRANS_S1 (1 << 9) +#define ARM_SMMU_FEAT_TRANS_S2 (1 << 10) +#define ARM_SMMU_FEAT_STALLS (1 << 11) +#define ARM_SMMU_FEAT_HYP (1 << 12) +#define ARM_SMMU_FEAT_STALL_FORCE (1 << 13) +#define ARM_SMMU_FEAT_VAX (1 << 14) + u32 features; + +#define ARM_SMMU_OPT_SKIP_PREFETCH (1 << 0) +#define ARM_SMMU_OPT_PAGE0_REGS_ONLY (1 << 1) + u32 options; + + struct arm_smmu_cmdq cmdq; + struct arm_smmu_evtq evtq; + struct arm_smmu_priq priq; + + int gerr_irq; + int combined_irq; + u32 sync_nr; + u8 prev_cmd_opcode; + + unsigned long ias; /* IPA */ + unsigned long oas; /* PA */ + unsigned long pgsize_bitmap; + +#define ARM_SMMU_MAX_VMIDS (1 << 16) + unsigned int vmid_bits; + DECLARE_BITMAP(vmid_map, ARM_SMMU_MAX_VMIDS); + + unsigned int sid_bits; + + struct arm_smmu_strtab_cfg strtab_cfg; + + /* Hi16xx adds an extra 32 bits of goodness to its MSI payload */ + union { + u32 sync_count; + u64 padding; + }; + + /* Need to keep a list of SMMU devices */ + struct list_head devices; + + /* Tasklets for handling evts/faults and pci page request IRQs*/ + struct tasklet evtq_irq_tasklet; + struct tasklet priq_irq_tasklet; + struct tasklet combined_irq_tasklet; +}; + +/* SMMU private data for each master */ +struct arm_smmu_master { + struct arm_smmu_device *smmu; + struct device *dev; + struct arm_smmu_domain *domain; + struct list_head domain_head; + u32 *sids; + unsigned int num_sids; + bool ats_enabled; +}; + +struct arm_smmu_domain { + struct arm_smmu_device *smmu; + struct mutex init_mutex; /* Protects smmu pointer */ + + bool non_strict; + atomic_t nr_ats_masters; + + enum arm_smmu_domain_stage stage; + struct arm_smmu_s2_cfg s2_cfg; + + /* Xen domain associated with this SMMU domain */ + struct domain *d; + + struct iommu_domain domain; + + struct list_head devices; + spinlock_t devices_lock; +}; + +#endif /* _ARM_SMMU_V3_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 16:55:47 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 16:55:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399980.641443 (Exim 4.92) (envelope-from ) id 1oVbrX-0000Ac-AZ; Tue, 06 Sep 2022 16:55:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399980.641443; Tue, 06 Sep 2022 16:55:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrX-0000AU-7Z; Tue, 06 Sep 2022 16:55:47 +0000 Received: by outflank-mailman (input) for mailman id 399980; Tue, 06 Sep 2022 16:55:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrV-0000AK-N4 for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrV-000878-Lu for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVbrV-0003BL-Kq for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=j4BML4BXTECHqAUkOogf7h6M+bP6EA+R0nEmxJRChKY=; b=P+0ekId1xKT5+95V4YEg1CDvjC gjgPdAX+XU/xH+hnkTqsR/idshw9ngbQHgHjG9FmFFmOc1qG+CYEnRIgqDbQ+eoQsj6dFDfJASyL8 DnW8w3+iZzgeCvrMpm4UIsFD4NXCXctobaQwKknqiPo1XtmT+Ypuvhlx7NOirKXR2zvY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Remove the page 1 fixup Message-Id: Date: Tue, 06 Sep 2022 16:55:45 +0000 commit ae4ee09eb3e4b220b2aa6c5ff41b2819090355d6 Author: Robin Murphy AuthorDate: Tue Jan 11 17:10:51 2022 +0000 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:25 2022 +0100 xen/arm: smmuv3: Remove the page 1 fixup Backport Linux commit 86d2d9214880. This is the clean backport without any changes. Since we now keep track of page 1 via a separate pointer that already encapsulates aliasing to page 0 as necessary, we can remove the clunky fixup routine and simply use the relevant bases directly. The current architecture spec (IHI0070D.a) defines SMMU_{EVENTQ,PRIQ}_{PROD,CONS} as offsets relative to page 1, so the cleanup represents a little bit of convergence as well as just lines of code saved. Signed-off-by: Robin Murphy Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 86d2d9214880 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 42 +++++++++++++---------------------- xen/drivers/passthrough/arm/smmu-v3.h | 8 +++---- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index ba24a26ad6..15bb4d7e19 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -238,15 +238,6 @@ static struct arm_smmu_option_prop arm_smmu_options[] = { { 0, NULL}, }; -static inline void __iomem *arm_smmu_page1_fixup(unsigned long offset, - struct arm_smmu_device *smmu) -{ - if (offset > SZ_64K) - return smmu->page1 + offset - SZ_64K; - - return smmu->base + offset; -} - static struct arm_smmu_domain *to_smmu_domain(struct iommu_domain *dom) { return container_of(dom, struct arm_smmu_domain, domain); @@ -1581,6 +1572,7 @@ static int arm_smmu_dt_xlate(struct device *dev, /* Probing and initialisation functions */ static int arm_smmu_init_one_queue(struct arm_smmu_device *smmu, struct arm_smmu_queue *q, + void __iomem *page, unsigned long prod_off, unsigned long cons_off, size_t dwords, const char *name) @@ -1609,8 +1601,8 @@ static int arm_smmu_init_one_queue(struct arm_smmu_device *smmu, 1 << q->llq.max_n_shift, name); } - q->prod_reg = arm_smmu_page1_fixup(prod_off, smmu); - q->cons_reg = arm_smmu_page1_fixup(cons_off, smmu); + q->prod_reg = page + prod_off; + q->cons_reg = page + cons_off; q->ent_dwords = dwords; q->q_base = Q_BASE_RWA; @@ -1627,16 +1619,16 @@ static int arm_smmu_init_queues(struct arm_smmu_device *smmu) /* cmdq */ spin_lock_init(&smmu->cmdq.lock); - ret = arm_smmu_init_one_queue(smmu, &smmu->cmdq.q, ARM_SMMU_CMDQ_PROD, - ARM_SMMU_CMDQ_CONS, CMDQ_ENT_DWORDS, - "cmdq"); + ret = arm_smmu_init_one_queue(smmu, &smmu->cmdq.q, smmu->base, + ARM_SMMU_CMDQ_PROD, ARM_SMMU_CMDQ_CONS, + CMDQ_ENT_DWORDS, "cmdq"); if (ret) return ret; /* evtq */ - ret = arm_smmu_init_one_queue(smmu, &smmu->evtq.q, ARM_SMMU_EVTQ_PROD, - ARM_SMMU_EVTQ_CONS, EVTQ_ENT_DWORDS, - "evtq"); + ret = arm_smmu_init_one_queue(smmu, &smmu->evtq.q, smmu->page1, + ARM_SMMU_EVTQ_PROD, ARM_SMMU_EVTQ_CONS, + EVTQ_ENT_DWORDS, "evtq"); if (ret) return ret; @@ -1644,9 +1636,9 @@ static int arm_smmu_init_queues(struct arm_smmu_device *smmu) if (!(smmu->features & ARM_SMMU_FEAT_PRI)) return 0; - return arm_smmu_init_one_queue(smmu, &smmu->priq.q, ARM_SMMU_PRIQ_PROD, - ARM_SMMU_PRIQ_CONS, PRIQ_ENT_DWORDS, - "priq"); + return arm_smmu_init_one_queue(smmu, &smmu->priq.q, smmu->page1, + ARM_SMMU_PRIQ_PROD, ARM_SMMU_PRIQ_CONS, + PRIQ_ENT_DWORDS, "priq"); } static int arm_smmu_init_l1_strtab(struct arm_smmu_device *smmu) @@ -2090,10 +2082,8 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu) /* Event queue */ writeq_relaxed(smmu->evtq.q.q_base, smmu->base + ARM_SMMU_EVTQ_BASE); - writel_relaxed(smmu->evtq.q.llq.prod, - arm_smmu_page1_fixup(ARM_SMMU_EVTQ_PROD, smmu)); - writel_relaxed(smmu->evtq.q.llq.cons, - arm_smmu_page1_fixup(ARM_SMMU_EVTQ_CONS, smmu)); + writel_relaxed(smmu->evtq.q.llq.prod, smmu->page1 + ARM_SMMU_EVTQ_PROD); + writel_relaxed(smmu->evtq.q.llq.cons, smmu->page1 + ARM_SMMU_EVTQ_CONS); enables |= CR0_EVTQEN; ret = arm_smmu_write_reg_sync(smmu, enables, ARM_SMMU_CR0, @@ -2108,9 +2098,9 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu) writeq_relaxed(smmu->priq.q.q_base, smmu->base + ARM_SMMU_PRIQ_BASE); writel_relaxed(smmu->priq.q.llq.prod, - arm_smmu_page1_fixup(ARM_SMMU_PRIQ_PROD, smmu)); + smmu->page1 + ARM_SMMU_PRIQ_PROD); writel_relaxed(smmu->priq.q.llq.cons, - arm_smmu_page1_fixup(ARM_SMMU_PRIQ_CONS, smmu)); + smmu->page1 + ARM_SMMU_PRIQ_CONS); enables |= CR0_PRIQEN; ret = arm_smmu_write_reg_sync(smmu, enables, ARM_SMMU_CR0, diff --git a/xen/drivers/passthrough/arm/smmu-v3.h b/xen/drivers/passthrough/arm/smmu-v3.h index c45d2f16c4..0742bc393f 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.h +++ b/xen/drivers/passthrough/arm/smmu-v3.h @@ -130,15 +130,15 @@ #define ARM_SMMU_CMDQ_CONS 0x9c #define ARM_SMMU_EVTQ_BASE 0xa0 -#define ARM_SMMU_EVTQ_PROD 0x100a8 -#define ARM_SMMU_EVTQ_CONS 0x100ac +#define ARM_SMMU_EVTQ_PROD 0xa8 +#define ARM_SMMU_EVTQ_CONS 0xac #define ARM_SMMU_EVTQ_IRQ_CFG0 0xb0 #define ARM_SMMU_EVTQ_IRQ_CFG1 0xb8 #define ARM_SMMU_EVTQ_IRQ_CFG2 0xbc #define ARM_SMMU_PRIQ_BASE 0xc0 -#define ARM_SMMU_PRIQ_PROD 0x100c8 -#define ARM_SMMU_PRIQ_CONS 0x100cc +#define ARM_SMMU_PRIQ_PROD 0xc8 +#define ARM_SMMU_PRIQ_CONS 0xcc #define ARM_SMMU_PRIQ_IRQ_CFG0 0xd0 #define ARM_SMMU_PRIQ_IRQ_CFG1 0xd8 #define ARM_SMMU_PRIQ_IRQ_CFG2 0xdc -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 16:55:57 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 16:55:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399981.641446 (Exim 4.92) (envelope-from ) id 1oVbrh-0000EA-Bz; Tue, 06 Sep 2022 16:55:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399981.641446; Tue, 06 Sep 2022 16:55:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrh-0000E2-9E; Tue, 06 Sep 2022 16:55:57 +0000 Received: by outflank-mailman (input) for mailman id 399981; Tue, 06 Sep 2022 16:55:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrf-0000Di-Pw for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrf-00087L-P3 for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVbrf-0003Bk-O2 for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:55:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fqx+PqjS6yFb1IOBAHXAOjFF7O1U6qs5+FlBFgUHfb0=; b=ZHVi1SbEk7tCVwDlfE2zVYq/n5 2TwHWwtD3YPVk1agacALlOYBivz0aZkhwkwblMfaUw3oT6ZRiqbWd5bJPZ0m0xNo0QSJ1N9RmfsCK fqu1+XqZ/2c9jU9moyE29JrVLUlV2HaoM2nzXoV6QSxVe7MtWJBeqrykK2Zz/osVSMMo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Remove the unused fields for PREFETCH_CONFIG command Message-Id: Date: Tue, 06 Sep 2022 16:55:55 +0000 commit f9f03811be0599ea5d1bf917aeed384b641f4457 Author: Zenghui Yu AuthorDate: Tue Aug 23 15:05:36 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:27 2022 +0100 xen/arm: smmuv3: Remove the unused fields for PREFETCH_CONFIG command Backport Linux commit e0bb4b735404. This is the clean backport without any changes. Per SMMUv3 spec, there is no Size and Addr field in the PREFETCH_CONFIG command and they're not used by the driver. Remove them. We can add them back if we're going to use PREFETCH_ADDR in the future. Signed-off-by: Zenghui Yu Link: https://lore.kernel.org/r/20210407084448.1838-1-yuzenghui@huawei.com Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e0bb4b735404 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 2 -- xen/drivers/passthrough/arm/smmu-v3.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 15bb4d7e19..28fcb01757 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -405,8 +405,6 @@ static int arm_smmu_cmdq_build_cmd(u64 *cmd, struct arm_smmu_cmdq_ent *ent) break; case CMDQ_OP_PREFETCH_CFG: cmd[0] |= FIELD_PREP(CMDQ_PREFETCH_0_SID, ent->prefetch.sid); - cmd[1] |= FIELD_PREP(CMDQ_PREFETCH_1_SIZE, ent->prefetch.size); - cmd[1] |= ent->prefetch.addr & CMDQ_PREFETCH_1_ADDR_MASK; break; case CMDQ_OP_CFGI_STE: cmd[0] |= FIELD_PREP(CMDQ_CFGI_0_SID, ent->cfgi.sid); diff --git a/xen/drivers/passthrough/arm/smmu-v3.h b/xen/drivers/passthrough/arm/smmu-v3.h index 0742bc393f..b381ad3738 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.h +++ b/xen/drivers/passthrough/arm/smmu-v3.h @@ -456,8 +456,6 @@ struct arm_smmu_cmdq_ent { #define CMDQ_OP_PREFETCH_CFG 0x1 struct { u32 sid; - u8 size; - u64 addr; } prefetch; #define CMDQ_OP_CFGI_STE 0x3 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 16:56:07 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 16:56:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399982.641451 (Exim 4.92) (envelope-from ) id 1oVbrr-0000HC-DZ; Tue, 06 Sep 2022 16:56:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399982.641451; Tue, 06 Sep 2022 16:56: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 1oVbrr-0000H5-Am; Tue, 06 Sep 2022 16:56:07 +0000 Received: by outflank-mailman (input) for mailman id 399982; Tue, 06 Sep 2022 16:56:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrp-0000Gv-Sr for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:56:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrp-000896-SA for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:56:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVbrp-0003CO-RE for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:56: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=7DTDiGXjwImWFd3bzDfhaNubWqzW42kOQGUpkdxAIfU=; b=x3+6qkeN2rb0dgyQx35/3d4kGj hjBDH5RIxmBojKB99zoWPMnohUPiYyqF1ZD4+xkkBf9Jnz4FauhiPmAARueNTDPeAE4n8eD+mifpA H4151eWqnT8TS2ZU2GNJyxPp1gKlbpFBuEoCCBt4IDtiVXZb47rPcht+BYePPvF5brzc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Change *array into *const array Message-Id: Date: Tue, 06 Sep 2022 16:56:05 +0000 commit 6717b8e6a945ef7efb87e9d625dcf71ad0ef81ba Author: Bixuan Cui AuthorDate: Tue Aug 23 15:11:04 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:29 2022 +0100 xen/arm: smmuv3: Change *array into *const array Backport Linux commit d56d5162e317. This is the clean backport without any changes. Fix checkpatch warning in arm-smmu-v3.c: static const char * array should probably be static const char * const Signed-off-by: Bixuan Cui Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git d56d5162e317 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 28fcb01757..c53d4c96a4 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -470,7 +470,7 @@ static int arm_smmu_cmdq_build_cmd(u64 *cmd, struct arm_smmu_cmdq_ent *ent) static void arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu) { - static const char *cerror_str[] = { + static const char * const cerror_str[] = { [CMDQ_ERR_CERROR_NONE_IDX] = "No error", [CMDQ_ERR_CERROR_ILL_IDX] = "Illegal command", [CMDQ_ERR_CERROR_ABT_IDX] = "Abort on command fetch", -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 16:56:17 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 16:56:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399983.641454 (Exim 4.92) (envelope-from ) id 1oVbs1-0000KK-Ew; Tue, 06 Sep 2022 16:56:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399983.641454; Tue, 06 Sep 2022 16:56:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbs1-0000KC-CL; Tue, 06 Sep 2022 16:56:17 +0000 Received: by outflank-mailman (input) for mailman id 399983; Tue, 06 Sep 2022 16:56:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrz-0000K1-Vt for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:56:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbrz-00089D-V8 for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:56:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVbrz-0003Cp-UK for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:56: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=XqV8yn0aRH+FodMJTO1x+7G31t/opDqY311aRX6gfLE=; b=dVTyZTubs2+DH3IsKFKXdhl/ec gzUZtAXAqbaTiMXhzoH/3/ZQ/uhkKqPR/1/NaM64vaX3m3EgoPmMfeSvvBDWNUpdBSxN9+aYlIGai mJf2wDUTql/VNJ73zDEhqeObDDsk3kVBO5ZLZcrEQVtFlBDhr1fw2inlmbxji+GWZcqM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Remove unnecessary oom message Message-Id: Date: Tue, 06 Sep 2022 16:56:15 +0000 commit 96a0f2a264c6afb128cff4c6845225f8e3776ed7 Author: Zhen Lei AuthorDate: Tue Aug 23 15:30:38 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:31 2022 +0100 xen/arm: smmuv3: Remove unnecessary oom message Backport Linux commit affa909571b0. This is the clean backport without any changes. Fixes scripts/checkpatch.pl warning: WARNING: Possible unnecessary 'out of memory' message Remove it can help us save a bit of memory. Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210609125438.14369-1-thunder.leizhen@huawei.com Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git affa909571b0 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index c53d4c96a4..c47e7dea04 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -1647,10 +1647,8 @@ static int arm_smmu_init_l1_strtab(struct arm_smmu_device *smmu) void *strtab = smmu->strtab_cfg.strtab; cfg->l1_desc = _xzalloc(size, sizeof(void *)); - if (!cfg->l1_desc) { - dev_err(smmu->dev, "failed to allocate l1 stream table desc\n"); + if (!cfg->l1_desc) return -ENOMEM; - } for (i = 0; i < cfg->num_l1_ents; ++i) { arm_smmu_write_strtab_l1_desc(strtab, &cfg->l1_desc[i]); @@ -2435,10 +2433,8 @@ static int arm_smmu_device_probe(struct platform_device *pdev) struct arm_smmu_device *smmu; smmu = xzalloc(struct arm_smmu_device); - if (!smmu) { - dev_err(pdev, "failed to allocate arm_smmu_device\n"); + if (!smmu) return -ENOMEM; - } smmu->dev = pdev; if (pdev->of_node) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 16:56:27 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 16:56:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399984.641459 (Exim 4.92) (envelope-from ) id 1oVbsB-0000Mv-GT; Tue, 06 Sep 2022 16:56:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399984.641459; Tue, 06 Sep 2022 16:56:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbsB-0000Mn-Dm; Tue, 06 Sep 2022 16:56:27 +0000 Received: by outflank-mailman (input) for mailman id 399984; Tue, 06 Sep 2022 16:56:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbsA-0000MW-2d for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:56:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbsA-00089e-1t for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:56:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVbsA-0003DM-13 for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:56:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QZKKigedh7Je3UCj4m4//kY98BG0dgtBbMP4HteeTZw=; b=WF3TUzjtBrUB0Qk2zgK7p1xlrV cGo0dyHmzjwyjQZKDwFg8CekQVGShsvuIoF//BHMCApLFU6c8sxI8j3FyntUiq3Un0SXW07sD+7K7 nAbH4NbneCMRETOxgBwpVEM1yCB4I+tTSCWgixUIP7twT6g7zoHmY/ROv6v7E/plXjYg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Fix fall-through warning for Clang Message-Id: Date: Tue, 06 Sep 2022 16:56:26 +0000 commit eabda52f217124ed48bdd34ac008f98a5cb1feb9 Author: Gustavo A. R. Silva AuthorDate: Tue Aug 23 15:34:08 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:33 2022 +0100 xen/arm: smmuv3: Fix fall-through warning for Clang Backport Linux commit 5a1ab5c0299a. This is the clean backport without any changes. Fix the following fallthrough warning (arm64-randconfig with Clang): drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c:382:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough] Reported-by: kernel test robot Link: https://lore.kernel.org/lkml/60edca25.k00ut905IFBjPyt5%25lkp@intel.com/ Signed-off-by: Gustavo A. R. Silva Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 5a1ab5c0299a Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index c47e7dea04..b8ca4b0a24 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -492,6 +492,7 @@ static void arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu) switch (idx) { case CMDQ_ERR_CERROR_ABT_IDX: dev_err(smmu->dev, "retrying command fetch\n"); + return; case CMDQ_ERR_CERROR_NONE_IDX: return; case CMDQ_ERR_CERROR_ATC_INV_IDX: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 16:56:37 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 16:56:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.399985.641463 (Exim 4.92) (envelope-from ) id 1oVbsL-0000Q2-IE; Tue, 06 Sep 2022 16:56:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 399985.641463; Tue, 06 Sep 2022 16:56:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbsL-0000Pu-FD; Tue, 06 Sep 2022 16:56:37 +0000 Received: by outflank-mailman (input) for mailman id 399985; Tue, 06 Sep 2022 16:56:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbsK-0000Pj-5O for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:56:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVbsK-00089i-4j for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:56:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVbsK-0003Dn-40 for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 16:56:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6UpgLYVKO25Z9ayJGyL0P0KKGuBwgfnEqJXf9dE3pZU=; b=oJb1RiqhRBO8/wbDksRVJ1TngI 1aO8INPleJnm82cyiltDJ9oMGGU/Q0mz6ZBc9mepnDn/XLTsAETA44OW28JwWQauuWnqeRHmKhpCU rTACwtFkH7DPSdGzkyPsV52ygVoMCakC0rTmpfosg0Lso66d4GqhleBTn/XKo+r6EhMk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Avoid open coded arithmetic in memory allocation Message-Id: Date: Tue, 06 Sep 2022 16:56:36 +0000 commit 654f406d510a71e588b481a11434ed955d008be8 Author: Christophe JAILLET AuthorDate: Tue Aug 23 15:44:18 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:35 2022 +0100 xen/arm: smmuv3: Avoid open coded arithmetic in memory allocation Backport Linux commit 98b64741d611. This is the clean backport without any changes kmalloc_array()/kcalloc() should be used to avoid potential overflow when a multiplication is needed to compute the size of the requested memory. So turn a devm_kzalloc()+explicit size computation into an equivalent devm_kcalloc(). Signed-off-by: Christophe JAILLET Acked-by: Robin Murphy Link: https://lore.kernel.org/r/3f7b9b202c6b6f5edc234ab7af5f208fbf8bc944.1644274051.git.christophe.jaillet@wanadoo.fr Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 98b64741d611 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index b8ca4b0a24..9c9f463009 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -1644,10 +1644,10 @@ static int arm_smmu_init_l1_strtab(struct arm_smmu_device *smmu) { unsigned int i; struct arm_smmu_strtab_cfg *cfg = &smmu->strtab_cfg; - size_t size = sizeof(*cfg->l1_desc) * cfg->num_l1_ents; void *strtab = smmu->strtab_cfg.strtab; - cfg->l1_desc = _xzalloc(size, sizeof(void *)); + cfg->l1_desc = _xzalloc_array(sizeof(*cfg->l1_desc), sizeof(void *), + cfg->num_l1_ents); if (!cfg->l1_desc) return -ENOMEM; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 17:11:07 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 17:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.400008.641512 (Exim 4.92) (envelope-from ) id 1oVc6L-0004jz-Fr; Tue, 06 Sep 2022 17:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 400008.641512; Tue, 06 Sep 2022 17:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6L-0004jp-Ce; Tue, 06 Sep 2022 17:11:05 +0000 Received: by outflank-mailman (input) for mailman id 400008; Tue, 06 Sep 2022 17:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6K-0004jj-SN for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6K-0008S1-RT for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVc6K-0004DA-Po for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hXCfj8F6tYZDGCyLk14zVcaw/agL+bsjTzSuOg7OOUo=; b=dNKfJ/WV3z5genZKquLtn25xUm L9FsEsT4yJfTcI8FBYztg0VDsCDSAcGYSS6a9XXziaQofuMbBy1olIDN7oCkvvl5ZaSvB6GI4fk/3 1LDqdOuP1phdxrWHzViw7ic6fYbbhoJD472oe9ZFKoFmuhxHN815NvC0Xlawjo7cAxs4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: do not free reserved memory into heap Message-Id: Date: Tue, 06 Sep 2022 17:11:04 +0000 commit d58b6aef96968facad5867513fdca262c68d48a4 Author: Penny Zheng AuthorDate: Tue Sep 6 15:39:14 2022 +0800 Commit: Julien Grall CommitDate: Tue Sep 6 17:53:34 2022 +0100 xen: do not free reserved memory into heap Pages used as guest RAM for static domain, shall be reserved to this domain only. So in case reserved pages being used for other purpose, users shall not free them back to heap, even when last ref gets dropped. This commit introduces a new helper free_domstatic_page to free static page in runtime, and free_staticmem_pages will be called by it in runtime, so let's drop the __init flag. Wrapper #ifdef CONFIG_STATIC_MEMORY around function declaration( free_staticmem_pages, free_domstatic_page, etc) is kinds of redundant, so we decide to remove it here. Signed-off-by: Penny Zheng Reviewed-by: Jan Beulich Reviewed-by: Julien Grall --- xen/arch/arm/include/asm/mm.h | 6 +++++- xen/arch/arm/mm.c | 5 ++++- xen/common/page_alloc.c | 40 +++++++++++++++++++++++++++++++++++++--- xen/include/xen/mm.h | 3 +-- 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index da25251cda..749fbefa0c 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -121,9 +121,13 @@ struct page_info /* Page is Xen heap? */ #define _PGC_xen_heap PG_shift(2) #define PGC_xen_heap PG_mask(1, 2) - /* Page is static memory */ +#ifdef CONFIG_STATIC_MEMORY +/* Page is static memory */ #define _PGC_static PG_shift(3) #define PGC_static PG_mask(1, 3) +#else +#define PGC_static 0 +#endif /* ... */ /* Page is broken? */ #define _PGC_broken PG_shift(7) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index c81c706c8b..7f5b317d3e 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1496,7 +1496,10 @@ void put_page(struct page_info *page) if ( unlikely((nx & PGC_count_mask) == 0) ) { - free_domheap_page(page); + if ( unlikely(nx & PGC_static) ) + free_domstatic_page(page); + else + free_domheap_page(page); } } diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index bfd4150be7..0c50dee4c5 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2694,12 +2694,14 @@ struct domain *get_pg_owner(domid_t domid) #ifdef CONFIG_STATIC_MEMORY /* Equivalent of free_heap_pages to free nr_mfns pages of static memory. */ -void __init free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, - bool need_scrub) +void free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, + bool need_scrub) { mfn_t mfn = page_to_mfn(pg); unsigned long i; + spin_lock(&heap_lock); + for ( i = 0; i < nr_mfns; i++ ) { mark_page_free(&pg[i], mfn_add(mfn, i)); @@ -2710,9 +2712,41 @@ void __init free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, scrub_one_page(pg); } - /* In case initializing page of static memory, mark it PGC_static. */ pg[i].count_info |= PGC_static; } + + spin_unlock(&heap_lock); +} + +void free_domstatic_page(struct page_info *page) +{ + struct domain *d = page_get_owner(page); + bool drop_dom_ref; + + if ( unlikely(!d) ) + { + printk(XENLOG_G_ERR + "The about-to-free static page %"PRI_mfn" must be owned by a domain\n", + mfn_x(page_to_mfn(page))); + ASSERT_UNREACHABLE(); + return; + } + + ASSERT_ALLOC_CONTEXT(); + + /* NB. May recursively lock from relinquish_memory(). */ + spin_lock_recursive(&d->page_alloc_lock); + + arch_free_heap_page(d, page); + + drop_dom_ref = !domain_adjust_tot_pages(d, -1); + + spin_unlock_recursive(&d->page_alloc_lock); + + free_staticmem_pages(page, 1, scrub_debug); + + if ( drop_dom_ref ) + put_domain(d); } /* diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 35b065146f..deadf4b2a1 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -85,13 +85,12 @@ bool scrub_free_pages(void); } while ( false ) #define FREE_XENHEAP_PAGE(p) FREE_XENHEAP_PAGES(p, 0) -#ifdef CONFIG_STATIC_MEMORY /* These functions are for static memory */ void free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, bool need_scrub); +void free_domstatic_page(struct page_info *page); int acquire_domstatic_pages(struct domain *d, mfn_t smfn, unsigned int nr_mfns, unsigned int memflags); -#endif /* Map machine page range in Xen virtual address space. */ int map_pages_to_xen( -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 17:11:17 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 17:11:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.400009.641515 (Exim 4.92) (envelope-from ) id 1oVc6W-0004n8-Ic; Tue, 06 Sep 2022 17:11:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 400009.641515; Tue, 06 Sep 2022 17:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6W-0004n0-FX; Tue, 06 Sep 2022 17:11:16 +0000 Received: by outflank-mailman (input) for mailman id 400009; Tue, 06 Sep 2022 17:11:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6U-0004mh-VZ for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6U-0008SC-Up for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVc6U-0004DZ-To for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=05dHb8RHVS3ZByqAfuaTcjeUmwfF2I2aPctQkQIp1/w=; b=1JFTtrg4QpEZhQBDcNtM5D2vB+ fSROYXU1z0UJK37bWNCsjIaJsNMRLpUalmbrtbGXa05LTpfRh/182TuiZisTWEGHguSi4F9jm1/+4 8tRu9fxw9j05GXgOxfgTx9HTB+znJ3cawevaDSzvGwoZMwkTTkckybcLLBNsL9aV84Lc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: introduce CDF_staticmem Message-Id: Date: Tue, 06 Sep 2022 17:11:14 +0000 commit 5ebd3da7c95d1320e3005105d0163652d3f271b5 Author: Penny Zheng AuthorDate: Tue Sep 6 15:39:15 2022 +0800 Commit: Julien Grall CommitDate: Tue Sep 6 17:53:35 2022 +0100 xen/arm: introduce CDF_staticmem In order to have an easy and quick way to find out whether this domain memory is statically configured, this commit introduces a new flag CDF_staticmem and a new helper is_domain_using_staticmem() to tell. Signed-off-by: Penny Zheng Acked-by: Julien Grall Acked-by: Jan Beulich --- xen/arch/arm/domain_build.c | 5 ++++- xen/include/xen/domain.h | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 3fd1186b53..b76a84e8f5 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -3287,9 +3287,12 @@ void __init create_domUs(void) if ( !dt_device_is_compatible(node, "xen,domain") ) continue; + if ( dt_find_property(node, "xen,static-mem", NULL) ) + flags |= CDF_staticmem; + if ( dt_property_read_bool(node, "direct-map") ) { - if ( !IS_ENABLED(CONFIG_STATIC_MEMORY) || !dt_find_property(node, "xen,static-mem", NULL) ) + if ( !(flags & CDF_staticmem) ) panic("direct-map is not valid for domain %s without static allocation.\n", dt_node_name(node)); diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 628b14b086..2c8116afba 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -35,6 +35,14 @@ void arch_get_domain_info(const struct domain *d, /* Should domain memory be directly mapped? */ #define CDF_directmap (1U << 1) #endif +/* Is domain memory on static allocation? */ +#ifdef CONFIG_STATIC_MEMORY +#define CDF_staticmem (1U << 2) +#else +#define CDF_staticmem 0 +#endif + +#define is_domain_using_staticmem(d) ((d)->cdf & CDF_staticmem) /* * Arch-specifics. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 17:11:26 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 17:11:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.400010.641519 (Exim 4.92) (envelope-from ) id 1oVc6g-0004py-Jt; Tue, 06 Sep 2022 17:11:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 400010.641519; Tue, 06 Sep 2022 17:11:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6g-0004po-H4; Tue, 06 Sep 2022 17:11:26 +0000 Received: by outflank-mailman (input) for mailman id 400010; Tue, 06 Sep 2022 17:11:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6f-0004pZ-3S for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6f-0008Sg-2g for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVc6f-0004E6-0v for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3u8ZJVrbGcm5XT1dSA2zYDnnRfcTbBSoVakd52VmAbY=; b=pNW/wvufpPWMLC++IPahCSwFdY RXjQ5Oecu7uECv92ofMZMqSLJgOReCX4t6Z05+TKTkr6iTsinMh+dq6RffwBpmMPS2oO4PRJzJjDD UVuU1MGQrM96hrG2NTIhdWD5NhTTuEF19Hv0pSjj3lp9JdimEZCflV8/pctAEw+t+O7U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: unpopulate memory when domain is static Message-Id: Date: Tue, 06 Sep 2022 17:11:25 +0000 commit b01721f0779d56a60b9db26a09b79b469f260d8a Author: Penny Zheng AuthorDate: Tue Sep 6 15:39:16 2022 +0800 Commit: Julien Grall CommitDate: Tue Sep 6 17:53:35 2022 +0100 xen: unpopulate memory when domain is static Today when a domain unpopulates the memory on runtime, they will always hand the memory back to the heap allocator. And it will be a problem if domain is static. Pages as guest RAM for static domain shall be reserved to only this domain and not be used for any other purposes, so they shall never go back to heap allocator. This commit puts reserved page on the new list resv_page_list after it has been freed. Signed-off-by: Penny Zheng Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/common/domain.c | 4 ++++ xen/common/page_alloc.c | 7 +++++-- xen/include/xen/sched.h | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 7062393e37..c23f449451 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -604,6 +604,10 @@ struct domain *domain_create(domid_t domid, INIT_PAGE_LIST_HEAD(&d->page_list); INIT_PAGE_LIST_HEAD(&d->extra_page_list); INIT_PAGE_LIST_HEAD(&d->xenpage_list); +#ifdef CONFIG_STATIC_MEMORY + INIT_PAGE_LIST_HEAD(&d->resv_page_list); +#endif + spin_lock_init(&d->node_affinity_lock); d->node_affinity = NODE_MASK_ALL; diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 0c50dee4c5..26a2fad4e3 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2741,10 +2741,13 @@ void free_domstatic_page(struct page_info *page) drop_dom_ref = !domain_adjust_tot_pages(d, -1); - spin_unlock_recursive(&d->page_alloc_lock); - free_staticmem_pages(page, 1, scrub_debug); + /* Add page on the resv_page_list *after* it has been freed. */ + page_list_add_tail(page, &d->resv_page_list); + + spin_unlock_recursive(&d->page_alloc_lock); + if ( drop_dom_ref ) put_domain(d); } diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 81f1fcba2a..557b3229f6 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -381,6 +381,9 @@ struct domain struct page_list_head page_list; /* linked list */ struct page_list_head extra_page_list; /* linked list (size extra_pages) */ struct page_list_head xenpage_list; /* linked list (size xenheap_pages) */ +#ifdef CONFIG_STATIC_MEMORY + struct page_list_head resv_page_list; /* linked list */ +#endif /* * This field should only be directly accessed by domain_adjust_tot_pages() -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 17:11:36 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 17:11:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.400011.641523 (Exim 4.92) (envelope-from ) id 1oVc6q-0004sn-Li; Tue, 06 Sep 2022 17:11:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 400011.641523; Tue, 06 Sep 2022 17:11: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 1oVc6q-0004sf-Id; Tue, 06 Sep 2022 17:11:36 +0000 Received: by outflank-mailman (input) for mailman id 400011; Tue, 06 Sep 2022 17:11:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6p-0004sP-71 for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6p-0008Sq-6E for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVc6p-0004EV-4s for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11: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=rBIV4QbOFrx58b44wbHWI/ECrYSJ0Z/47CtCKJKwNWQ=; b=Kljz3KgVq/zPuFVgpzng+g3GQp xj5hGmMxa4N9HAdp0isfqr+y2xpRXMa576XpbbkcKylPZWvSMV4v0l/5kb/cyv2JPUx8PXGcUzc6F FPxCvvHhC9m/iZZVZXDQKkYMaMSc339ESfjDWoSemxiIQLpi2JBK8p4PZeEBnXvWzmJI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: introduce prepare_staticmem_pages Message-Id: Date: Tue, 06 Sep 2022 17:11:35 +0000 commit 508d2d297f7a99ed3c839a21d786f7e2a1284510 Author: Penny Zheng AuthorDate: Tue Sep 6 15:39:17 2022 +0800 Commit: Julien Grall CommitDate: Tue Sep 6 17:53:35 2022 +0100 xen: introduce prepare_staticmem_pages Later, we want to use acquire_domstatic_pages() for populating memory for static domain on runtime, however, there are a lot of pointless work (checking mfn_valid(), scrubbing the free part, cleaning the cache...) considering we know the page is valid and belong to the guest. This commit splits acquire_staticmem_pages() in two parts, and introduces prepare_staticmem_pages to bypass all "pointless work". Signed-off-by: Penny Zheng Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/common/page_alloc.c | 61 +++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 26a2fad4e3..adcc16e4f6 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2752,26 +2752,13 @@ void free_domstatic_page(struct page_info *page) put_domain(d); } -/* - * Acquire nr_mfns contiguous reserved pages, starting at #smfn, of - * static memory. - * This function needs to be reworked if used outside of boot. - */ -static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, - unsigned long nr_mfns, - unsigned int memflags) +static bool __init prepare_staticmem_pages(struct page_info *pg, + unsigned long nr_mfns, + unsigned int memflags) { bool need_tlbflush = false; uint32_t tlbflush_timestamp = 0; unsigned long i; - struct page_info *pg; - - ASSERT(nr_mfns); - for ( i = 0; i < nr_mfns; i++ ) - if ( !mfn_valid(mfn_add(smfn, i)) ) - return NULL; - - pg = mfn_to_page(smfn); spin_lock(&heap_lock); @@ -2782,7 +2769,7 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, { printk(XENLOG_ERR "pg[%lu] Static MFN %"PRI_mfn" c=%#lx t=%#x\n", - i, mfn_x(smfn) + i, + i, mfn_x(page_to_mfn(pg)) + i, pg[i].count_info, pg[i].tlbflush_timestamp); goto out_err; } @@ -2806,6 +2793,38 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, if ( need_tlbflush ) filtered_flush_tlb_mask(tlbflush_timestamp); + return true; + + out_err: + while ( i-- ) + pg[i].count_info = PGC_static | PGC_state_free; + + spin_unlock(&heap_lock); + + return false; +} + +/* + * Acquire nr_mfns contiguous reserved pages, starting at #smfn, of + * static memory. + * This function needs to be reworked if used outside of boot. + */ +static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, + unsigned long nr_mfns, + unsigned int memflags) +{ + unsigned long i; + struct page_info *pg; + + ASSERT(nr_mfns); + for ( i = 0; i < nr_mfns; i++ ) + if ( !mfn_valid(mfn_add(smfn, i)) ) + return NULL; + + pg = mfn_to_page(smfn); + if ( !prepare_staticmem_pages(pg, nr_mfns, memflags) ) + return NULL; + /* * Ensure cache and RAM are consistent for platforms where the guest * can control its own visibility of/through the cache. @@ -2814,14 +2833,6 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, flush_page_to_ram(mfn_x(smfn) + i, !(memflags & MEMF_no_icache_flush)); return pg; - - out_err: - while ( i-- ) - pg[i].count_info = PGC_static | PGC_state_free; - - spin_unlock(&heap_lock); - - return NULL; } /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 17:11:46 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 17:11:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.400012.641528 (Exim 4.92) (envelope-from ) id 1oVc70-0004vN-NW; Tue, 06 Sep 2022 17:11:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 400012.641528; Tue, 06 Sep 2022 17:11: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 1oVc70-0004vF-KE; Tue, 06 Sep 2022 17:11:46 +0000 Received: by outflank-mailman (input) for mailman id 400012; Tue, 06 Sep 2022 17:11:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6z-0004v3-Ar for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc6z-0008Su-AB for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVc6z-0004Eu-8c for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11: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=rFUqxSNGf4n6xg3lS8Ci0sF+1UH/+Rlef59ZJhZzyQU=; b=oPB7+ZiMa6ll6N7zqz6u/DNtPL jxx63IT/QIX2G8cJNccpUU2HAfl/qMcN1ZK4p4UVWvR+9rqYi+S7xDc4itYLzbLjRBwb4ZQzIvOgz S/FJPLeqgfbRW0KpaPYGbNpRw4zPrfFTNff8W/4UVTwqcdZ6rVMwbC6jgWzMZHQEs1NM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: rename free_staticmem_pages to unprepare_staticmem_pages Message-Id: Date: Tue, 06 Sep 2022 17:11:45 +0000 commit 142578a5061ad2ce4fe789c1524e2eb5cb102b0e Author: Penny Zheng AuthorDate: Tue Sep 6 15:39:18 2022 +0800 Commit: Julien Grall CommitDate: Tue Sep 6 17:53:35 2022 +0100 xen: rename free_staticmem_pages to unprepare_staticmem_pages The name of free_staticmem_pages is inappropriate, considering it is the opposite of function prepare_staticmem_pages. Rename free_staticmem_pages to unprepare_staticmem_pages. Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- xen/arch/arm/setup.c | 3 ++- xen/common/page_alloc.c | 13 ++++++++----- xen/include/xen/mm.h | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 6e0398f3f6..7814fe323d 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -653,7 +653,8 @@ static void __init init_staticmem_pages(void) if ( mfn_x(bank_end) <= mfn_x(bank_start) ) return; - free_staticmem_pages(mfn_to_page(bank_start), bank_pages, false); + unprepare_staticmem_pages(mfn_to_page(bank_start), + bank_pages, false); } } #endif diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index adcc16e4f6..18d34d1b69 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2693,9 +2693,12 @@ struct domain *get_pg_owner(domid_t domid) } #ifdef CONFIG_STATIC_MEMORY -/* Equivalent of free_heap_pages to free nr_mfns pages of static memory. */ -void free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, - bool need_scrub) +/* + * It is the opposite of prepare_staticmem_pages, and it aims to unprepare + * nr_mfns pages of static memory. + */ +void unprepare_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, + bool need_scrub) { mfn_t mfn = page_to_mfn(pg); unsigned long i; @@ -2741,7 +2744,7 @@ void free_domstatic_page(struct page_info *page) drop_dom_ref = !domain_adjust_tot_pages(d, -1); - free_staticmem_pages(page, 1, scrub_debug); + unprepare_staticmem_pages(page, 1, scrub_debug); /* Add page on the resv_page_list *after* it has been freed. */ page_list_add_tail(page, &d->resv_page_list); @@ -2862,7 +2865,7 @@ int __init acquire_domstatic_pages(struct domain *d, mfn_t smfn, if ( assign_pages(pg, nr_mfns, d, memflags) ) { - free_staticmem_pages(pg, nr_mfns, memflags & MEMF_no_scrub); + unprepare_staticmem_pages(pg, nr_mfns, memflags & MEMF_no_scrub); return -EINVAL; } diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index deadf4b2a1..93db3c4418 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -86,8 +86,8 @@ bool scrub_free_pages(void); #define FREE_XENHEAP_PAGE(p) FREE_XENHEAP_PAGES(p, 0) /* These functions are for static memory */ -void free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, - bool need_scrub); +void unprepare_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, + bool need_scrub); void free_domstatic_page(struct page_info *page); int acquire_domstatic_pages(struct domain *d, mfn_t smfn, unsigned int nr_mfns, unsigned int memflags); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 06 17:11:56 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Sep 2022 17:11:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.400013.641531 (Exim 4.92) (envelope-from ) id 1oVc7A-0004yY-OU; Tue, 06 Sep 2022 17:11:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 400013.641531; Tue, 06 Sep 2022 17:11: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 1oVc7A-0004yP-Lk; Tue, 06 Sep 2022 17:11:56 +0000 Received: by outflank-mailman (input) for mailman id 400013; Tue, 06 Sep 2022 17:11:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc79-0004yA-Dx for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVc79-0008T1-DG for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVc79-0004FN-CU for xen-changelog@lists.xenproject.org; Tue, 06 Sep 2022 17:11:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=b4Z9ts9QbI5HMYqLLM+DNdsTuhSZVoQcHTj8HoCC9A4=; b=q5GDkg566Pm/3kQ0+hDjnRmGna EFLuSfPLlplBjo0Ev5gvrFg/RSj0cQ/9Nzq4mQzXQZO60tGaKm+yKZ1rstJn9O8+asBFQEfY6xw25 qVcEN+QUP4BE1v4IXHEdlzsXNHmcQsgg7U2evfT3P5dov+agOxmhTFX6px3tELp6KZ+I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: retrieve reserved pages on populate_physmap Message-Id: Date: Tue, 06 Sep 2022 17:11:55 +0000 commit 172015009a6acc20357a2698800e13058ba1d3db Author: Penny Zheng AuthorDate: Tue Sep 6 15:39:19 2022 +0800 Commit: Julien Grall CommitDate: Tue Sep 6 18:03:07 2022 +0100 xen: retrieve reserved pages on populate_physmap When a static domain populates memory through populate_physmap at runtime, it shall retrieve reserved pages from resv_page_list to make sure that domain's RAM is still restricted in statically configured memory regions. This commit also introduces a new helper acquire_reserved_page to make it work. Signed-off-by: Penny Zheng Reviewed-by: Julien Grall --- xen/common/memory.c | 23 +++++++++++++++ xen/common/page_alloc.c | 74 +++++++++++++++++++++++++++++++++++++++---------- xen/include/xen/mm.h | 1 + 3 files changed, 84 insertions(+), 14 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index bc89442ba5..ae8163a738 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -245,6 +245,29 @@ static void populate_physmap(struct memop_args *a) mfn = _mfn(gpfn); } + else if ( is_domain_using_staticmem(d) ) + { + /* + * No easy way to guarantee the retrieved pages are contiguous, + * so forbid non-zero-order requests here. + */ + if ( a->extent_order != 0 ) + { + gdprintk(XENLOG_WARNING, + "Cannot allocate static order-%u pages for %pd\n", + a->extent_order, d); + goto out; + } + + mfn = acquire_reserved_page(d, a->memflags); + if ( mfn_eq(mfn, INVALID_MFN) ) + { + gdprintk(XENLOG_WARNING, + "%pd: failed to retrieve a reserved page\n", + d); + goto out; + } + } else { page = alloc_domheap_pages(d, a->extent_order, a->memflags); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 18d34d1b69..62afb07bc6 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2755,9 +2755,8 @@ void free_domstatic_page(struct page_info *page) put_domain(d); } -static bool __init prepare_staticmem_pages(struct page_info *pg, - unsigned long nr_mfns, - unsigned int memflags) +static bool prepare_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, + unsigned int memflags) { bool need_tlbflush = false; uint32_t tlbflush_timestamp = 0; @@ -2838,6 +2837,25 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, return pg; } +static int assign_domstatic_pages(struct domain *d, struct page_info *pg, + unsigned int nr_mfns, unsigned int memflags) +{ + if ( !d || (memflags & (MEMF_no_owner | MEMF_no_refcount)) ) + { + /* + * Respective handling omitted here because right now + * acquired static memory is only for domain's RAM. + */ + ASSERT_UNREACHABLE(); + return -EINVAL; + } + + if ( assign_pages(pg, nr_mfns, d, memflags) ) + return -EINVAL; + + return 0; +} + /* * Acquire nr_mfns contiguous pages, starting at #smfn, of static memory, * then assign them to one specific domain #d. @@ -2853,17 +2871,7 @@ int __init acquire_domstatic_pages(struct domain *d, mfn_t smfn, if ( !pg ) return -ENOENT; - if ( !d || (memflags & (MEMF_no_owner | MEMF_no_refcount)) ) - { - /* - * Respective handling omitted here because right now - * acquired static memory is only for guest RAM. - */ - ASSERT_UNREACHABLE(); - return -EINVAL; - } - - if ( assign_pages(pg, nr_mfns, d, memflags) ) + if ( assign_domstatic_pages(d, pg, nr_mfns, memflags) ) { unprepare_staticmem_pages(pg, nr_mfns, memflags & MEMF_no_scrub); return -EINVAL; @@ -2871,6 +2879,44 @@ int __init acquire_domstatic_pages(struct domain *d, mfn_t smfn, return 0; } + +/* + * Acquire a page from reserved page list(resv_page_list), when populating + * memory for static domain on runtime. + */ +mfn_t acquire_reserved_page(struct domain *d, unsigned int memflags) +{ + struct page_info *page; + + ASSERT_ALLOC_CONTEXT(); + + /* Acquire a page from reserved page list(resv_page_list). */ + spin_lock(&d->page_alloc_lock); + page = page_list_remove_head(&d->resv_page_list); + spin_unlock(&d->page_alloc_lock); + if ( unlikely(!page) ) + return INVALID_MFN; + + if ( !prepare_staticmem_pages(page, 1, memflags) ) + goto fail; + + if ( assign_domstatic_pages(d, page, 1, memflags) ) + goto fail_assign; + + return page_to_mfn(page); + + fail_assign: + /* + * The page was never accessible by the domain. So scrubbing can be + * skipped + */ + unprepare_staticmem_pages(page, 1, false); + fail: + spin_lock(&d->page_alloc_lock); + page_list_add_tail(page, &d->resv_page_list); + spin_unlock(&d->page_alloc_lock); + return INVALID_MFN; +} #endif /* diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 93db3c4418..a925028ab3 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -198,6 +198,7 @@ struct npfec { #else #define MAX_ORDER 20 /* 2^20 contiguous pages */ #endif +mfn_t acquire_reserved_page(struct domain *d, unsigned int memflags); /* Private domain structs for DOMID_XEN, DOMID_IO, etc. */ extern struct domain *dom_xen, *dom_io; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:33:08 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401162.642880 (Exim 4.92) (envelope-from ) id 1oVsMh-0005G4-JP; Wed, 07 Sep 2022 10:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401162.642880; Wed, 07 Sep 2022 10: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 1oVsMh-0005Fv-GZ; Wed, 07 Sep 2022 10:33:03 +0000 Received: by outflank-mailman (input) for mailman id 401162; Wed, 07 Sep 2022 10:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsMf-0005Fp-KM for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsMf-0002rT-JR for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsMf-0002iI-Ia for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10: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=ZfaDoesXdaokd8ktL6PE2Iiev3LVDPb1NZR2ogehGJg=; b=JjxPEVEA2b80nFo16Q7sHcKnEu 8aZG+Rje8YklvD32Rw1IelhrAecd/Er776G8hoY+ntvM5tp2C9lylmOxdQAZCwIkk0cMdUlRsLma6 d8PpHyxN6I5XL3KYJliyixLPiEvtH8Gi86LTVACpa7QEKShaXuHwDq/FFJ6h7u5i9O2Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sched: introduce cpupool_update_node_affinity() Message-Id: Date: Wed, 07 Sep 2022 10:33:01 +0000 commit a83fa1e2b96ace65b45dde6954d67012633a082b Author: Juergen Gross AuthorDate: Mon Sep 5 09:00:03 2022 +0200 Commit: Andrew Cooper CommitDate: Mon Sep 5 11:42:30 2022 +0100 xen/sched: introduce cpupool_update_node_affinity() For updating the node affinities of all domains in a cpupool add a new function cpupool_update_node_affinity(). In order to avoid multiple allocations of cpumasks carve out memory allocation and freeing from domain_update_node_affinity() into new helpers, which can be used by cpupool_update_node_affinity(). Modify domain_update_node_affinity() to take an additional parameter for passing the allocated memory in and to allocate and free the memory via the new helpers in case NULL was passed. This will help later to pre-allocate the cpumasks in order to avoid allocations in stop-machine context. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Acked-by: Andrew Cooper Tested-by: Andrew Cooper --- xen/common/sched/core.c | 54 +++++++++++++++++++++++++++++++--------------- xen/common/sched/cpupool.c | 39 ++++++++++++++++++--------------- xen/common/sched/private.h | 7 ++++++ xen/include/xen/sched.h | 9 +++++++- 4 files changed, 74 insertions(+), 35 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index ff1ddc7624..5f1a265889 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -1824,9 +1824,28 @@ int vcpu_affinity_domctl(struct domain *d, uint32_t cmd, return ret; } -void domain_update_node_affinity(struct domain *d) +bool alloc_affinity_masks(struct affinity_masks *affinity) { - cpumask_var_t dom_cpumask, dom_cpumask_soft; + if ( !alloc_cpumask_var(&affinity->hard) ) + return false; + if ( !alloc_cpumask_var(&affinity->soft) ) + { + free_cpumask_var(affinity->hard); + return false; + } + + return true; +} + +void free_affinity_masks(struct affinity_masks *affinity) +{ + free_cpumask_var(affinity->soft); + free_cpumask_var(affinity->hard); +} + +void domain_update_node_aff(struct domain *d, struct affinity_masks *affinity) +{ + struct affinity_masks masks; cpumask_t *dom_affinity; const cpumask_t *online; struct sched_unit *unit; @@ -1836,14 +1855,16 @@ void domain_update_node_affinity(struct domain *d) if ( !d->vcpu || !d->vcpu[0] ) return; - if ( !zalloc_cpumask_var(&dom_cpumask) ) - return; - if ( !zalloc_cpumask_var(&dom_cpumask_soft) ) + if ( !affinity ) { - free_cpumask_var(dom_cpumask); - return; + affinity = &masks; + if ( !alloc_affinity_masks(affinity) ) + return; } + cpumask_clear(affinity->hard); + cpumask_clear(affinity->soft); + online = cpupool_domain_master_cpumask(d); spin_lock(&d->node_affinity_lock); @@ -1864,22 +1885,21 @@ void domain_update_node_affinity(struct domain *d) */ for_each_sched_unit ( d, unit ) { - cpumask_or(dom_cpumask, dom_cpumask, unit->cpu_hard_affinity); - cpumask_or(dom_cpumask_soft, dom_cpumask_soft, - unit->cpu_soft_affinity); + cpumask_or(affinity->hard, affinity->hard, unit->cpu_hard_affinity); + cpumask_or(affinity->soft, affinity->soft, unit->cpu_soft_affinity); } /* Filter out non-online cpus */ - cpumask_and(dom_cpumask, dom_cpumask, online); - ASSERT(!cpumask_empty(dom_cpumask)); + cpumask_and(affinity->hard, affinity->hard, online); + ASSERT(!cpumask_empty(affinity->hard)); /* And compute the intersection between hard, online and soft */ - cpumask_and(dom_cpumask_soft, dom_cpumask_soft, dom_cpumask); + cpumask_and(affinity->soft, affinity->soft, affinity->hard); /* * If not empty, the intersection of hard, soft and online is the * narrowest set we want. If empty, we fall back to hard&online. */ - dom_affinity = cpumask_empty(dom_cpumask_soft) ? - dom_cpumask : dom_cpumask_soft; + dom_affinity = cpumask_empty(affinity->soft) ? affinity->hard + : affinity->soft; nodes_clear(d->node_affinity); for_each_cpu ( cpu, dom_affinity ) @@ -1888,8 +1908,8 @@ void domain_update_node_affinity(struct domain *d) spin_unlock(&d->node_affinity_lock); - free_cpumask_var(dom_cpumask_soft); - free_cpumask_var(dom_cpumask); + if ( affinity == &masks ) + free_affinity_masks(affinity); } typedef long ret_t; diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index 2afe54f54d..aac3a269b7 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -410,6 +410,25 @@ int cpupool_move_domain(struct domain *d, struct cpupool *c) return ret; } +/* Update affinities of all domains in a cpupool. */ +static void cpupool_update_node_affinity(const struct cpupool *c) +{ + struct affinity_masks masks; + struct domain *d; + + if ( !alloc_affinity_masks(&masks) ) + return; + + rcu_read_lock(&domlist_read_lock); + + for_each_domain_in_cpupool(d, c) + domain_update_node_aff(d, &masks); + + rcu_read_unlock(&domlist_read_lock); + + free_affinity_masks(&masks); +} + /* * assign a specific cpu to a cpupool * cpupool_lock must be held @@ -417,7 +436,6 @@ int cpupool_move_domain(struct domain *d, struct cpupool *c) static int cpupool_assign_cpu_locked(struct cpupool *c, unsigned int cpu) { int ret; - struct domain *d; const cpumask_t *cpus; cpus = sched_get_opt_cpumask(c->gran, cpu); @@ -442,12 +460,7 @@ static int cpupool_assign_cpu_locked(struct cpupool *c, unsigned int cpu) rcu_read_unlock(&sched_res_rculock); - rcu_read_lock(&domlist_read_lock); - for_each_domain_in_cpupool(d, c) - { - domain_update_node_affinity(d); - } - rcu_read_unlock(&domlist_read_lock); + cpupool_update_node_affinity(c); return 0; } @@ -456,18 +469,14 @@ static int cpupool_unassign_cpu_finish(struct cpupool *c) { int cpu = cpupool_moving_cpu; const cpumask_t *cpus; - struct domain *d; int ret; if ( c != cpupool_cpu_moving ) return -EADDRNOTAVAIL; - /* - * We need this for scanning the domain list, both in - * cpu_disable_scheduler(), and at the bottom of this function. - */ rcu_read_lock(&domlist_read_lock); ret = cpu_disable_scheduler(cpu); + rcu_read_unlock(&domlist_read_lock); rcu_read_lock(&sched_res_rculock); cpus = get_sched_res(cpu)->cpus; @@ -494,11 +503,7 @@ static int cpupool_unassign_cpu_finish(struct cpupool *c) } rcu_read_unlock(&sched_res_rculock); - for_each_domain_in_cpupool(d, c) - { - domain_update_node_affinity(d); - } - rcu_read_unlock(&domlist_read_lock); + cpupool_update_node_affinity(c); return ret; } diff --git a/xen/common/sched/private.h b/xen/common/sched/private.h index a870320146..2b04b01a0c 100644 --- a/xen/common/sched/private.h +++ b/xen/common/sched/private.h @@ -593,6 +593,13 @@ affinity_balance_cpumask(const struct sched_unit *unit, int step, cpumask_copy(mask, unit->cpu_hard_affinity); } +struct affinity_masks { + cpumask_var_t hard; + cpumask_var_t soft; +}; + +bool alloc_affinity_masks(struct affinity_masks *affinity); +void free_affinity_masks(struct affinity_masks *affinity); void sched_rm_cpu(unsigned int cpu); const cpumask_t *sched_get_opt_cpumask(enum sched_gran opt, unsigned int cpu); void schedule_dump(struct cpupool *c); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 1cf629e7ec..81f1fcba2a 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -666,8 +666,15 @@ static inline void get_knownalive_domain(struct domain *d) ASSERT(!(atomic_read(&d->refcnt) & DOMAIN_DESTROYED)); } +struct affinity_masks; + int domain_set_node_affinity(struct domain *d, const nodemask_t *affinity); -void domain_update_node_affinity(struct domain *d); +void domain_update_node_aff(struct domain *d, struct affinity_masks *affinity); + +static inline void domain_update_node_affinity(struct domain *d) +{ + domain_update_node_aff(d, NULL); +} /* * To be implemented by each architecture, sanity checking the configuration -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:33:13 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401163.642886 (Exim 4.92) (envelope-from ) id 1oVsMr-0005KV-Mb; Wed, 07 Sep 2022 10:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401163.642886; Wed, 07 Sep 2022 10:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsMr-0005KM-JY; Wed, 07 Sep 2022 10:33:13 +0000 Received: by outflank-mailman (input) for mailman id 401163; Wed, 07 Sep 2022 10:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsMp-0005K8-Nm for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsMp-0002rX-My for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsMp-0002ij-Lp for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10: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=ih5TZiXb9t7yaqUrXF+1Bo3jGibtC6QUKXjm+xB7ZHw=; b=u1EbTk09g2xAs2buVokMUQ+GaL Ph9ZfOHFYrsO+/ft5YXkAiX+V+LjkfuVQT2s/6bUDs8lHEwrROTMpW07Zyke7mG4y4JMh1TWyE5Ip W4vk1QDvUYjY3ZqvKFbr4RJoBSVT6qqE9HCyrq7Jl5A6jZSKzztjBWn0sG+toetRLiq8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sched: carve out memory allocation and freeing from schedule_cpu_rm() Message-Id: Date: Wed, 07 Sep 2022 10:33:11 +0000 commit d42be6f83480b3ada286dc18444331a816be88a3 Author: Juergen Gross AuthorDate: Mon Sep 5 09:00:04 2022 +0200 Commit: Andrew Cooper CommitDate: Mon Sep 5 11:42:30 2022 +0100 xen/sched: carve out memory allocation and freeing from schedule_cpu_rm() In order to prepare not allocating or freeing memory from schedule_cpu_rm(), move this functionality to dedicated functions. For now call those functions from schedule_cpu_rm(). No change of behavior expected. Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Reviewed-by: Andrew Cooper --- xen/common/sched/core.c | 143 +++++++++++++++++++++++++++------------------ xen/common/sched/private.h | 11 ++++ 2 files changed, 98 insertions(+), 56 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 5f1a265889..588826cdbd 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -3237,6 +3237,75 @@ out: return ret; } +/* + * Allocate all memory needed for free_cpu_rm_data(), as allocations cannot + * be made in stop_machine() context. + * + * Between alloc_cpu_rm_data() and the real cpu removal action the relevant + * contents of struct sched_resource can't change, as the cpu in question is + * locked against any other movement to or from cpupools, and the data copied + * by alloc_cpu_rm_data() is modified only in case the cpu in question is + * being moved from or to a cpupool. + */ +struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu) +{ + struct cpu_rm_data *data; + const struct sched_resource *sr; + unsigned int idx; + + rcu_read_lock(&sched_res_rculock); + + sr = get_sched_res(cpu); + data = xmalloc_flex_struct(struct cpu_rm_data, sr, sr->granularity - 1); + if ( !data ) + goto out; + + data->old_ops = sr->scheduler; + data->vpriv_old = idle_vcpu[cpu]->sched_unit->priv; + data->ppriv_old = sr->sched_priv; + + for ( idx = 0; idx < sr->granularity - 1; idx++ ) + { + data->sr[idx] = sched_alloc_res(); + if ( data->sr[idx] ) + { + data->sr[idx]->sched_unit_idle = sched_alloc_unit_mem(); + if ( !data->sr[idx]->sched_unit_idle ) + { + sched_res_free(&data->sr[idx]->rcu); + data->sr[idx] = NULL; + } + } + if ( !data->sr[idx] ) + { + while ( idx > 0 ) + sched_res_free(&data->sr[--idx]->rcu); + XFREE(data); + goto out; + } + + data->sr[idx]->curr = data->sr[idx]->sched_unit_idle; + data->sr[idx]->scheduler = &sched_idle_ops; + data->sr[idx]->granularity = 1; + + /* We want the lock not to change when replacing the resource. */ + data->sr[idx]->schedule_lock = sr->schedule_lock; + } + + out: + rcu_read_unlock(&sched_res_rculock); + + return data; +} + +void free_cpu_rm_data(struct cpu_rm_data *mem, unsigned int cpu) +{ + sched_free_udata(mem->old_ops, mem->vpriv_old); + sched_free_pdata(mem->old_ops, mem->ppriv_old, cpu); + + xfree(mem); +} + /* * Remove a pCPU from its cpupool. Its scheduler becomes &sched_idle_ops * (the idle scheduler). @@ -3245,53 +3314,23 @@ out: */ int schedule_cpu_rm(unsigned int cpu) { - void *ppriv_old, *vpriv_old; - struct sched_resource *sr, **sr_new = NULL; + struct sched_resource *sr; + struct cpu_rm_data *data; struct sched_unit *unit; - struct scheduler *old_ops; spinlock_t *old_lock; unsigned long flags; - int idx, ret = -ENOMEM; + int idx = 0; unsigned int cpu_iter; + data = alloc_cpu_rm_data(cpu); + if ( !data ) + return -ENOMEM; + rcu_read_lock(&sched_res_rculock); sr = get_sched_res(cpu); - old_ops = sr->scheduler; - - if ( sr->granularity > 1 ) - { - sr_new = xmalloc_array(struct sched_resource *, sr->granularity - 1); - if ( !sr_new ) - goto out; - for ( idx = 0; idx < sr->granularity - 1; idx++ ) - { - sr_new[idx] = sched_alloc_res(); - if ( sr_new[idx] ) - { - sr_new[idx]->sched_unit_idle = sched_alloc_unit_mem(); - if ( !sr_new[idx]->sched_unit_idle ) - { - sched_res_free(&sr_new[idx]->rcu); - sr_new[idx] = NULL; - } - } - if ( !sr_new[idx] ) - { - for ( idx--; idx >= 0; idx-- ) - sched_res_free(&sr_new[idx]->rcu); - goto out; - } - sr_new[idx]->curr = sr_new[idx]->sched_unit_idle; - sr_new[idx]->scheduler = &sched_idle_ops; - sr_new[idx]->granularity = 1; - /* We want the lock not to change when replacing the resource. */ - sr_new[idx]->schedule_lock = sr->schedule_lock; - } - } - - ret = 0; + ASSERT(sr->granularity); ASSERT(sr->cpupool != NULL); ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus)); ASSERT(!cpumask_test_cpu(cpu, sr->cpupool->cpu_valid)); @@ -3299,10 +3338,6 @@ int schedule_cpu_rm(unsigned int cpu) /* See comment in schedule_cpu_add() regarding lock switching. */ old_lock = pcpu_schedule_lock_irqsave(cpu, &flags); - vpriv_old = idle_vcpu[cpu]->sched_unit->priv; - ppriv_old = sr->sched_priv; - - idx = 0; for_each_cpu ( cpu_iter, sr->cpus ) { per_cpu(sched_res_idx, cpu_iter) = 0; @@ -3316,27 +3351,27 @@ int schedule_cpu_rm(unsigned int cpu) else { /* Initialize unit. */ - unit = sr_new[idx]->sched_unit_idle; - unit->res = sr_new[idx]; + unit = data->sr[idx]->sched_unit_idle; + unit->res = data->sr[idx]; unit->is_running = true; sched_unit_add_vcpu(unit, idle_vcpu[cpu_iter]); sched_domain_insert_unit(unit, idle_vcpu[cpu_iter]->domain); /* Adjust cpu masks of resources (old and new). */ cpumask_clear_cpu(cpu_iter, sr->cpus); - cpumask_set_cpu(cpu_iter, sr_new[idx]->cpus); + cpumask_set_cpu(cpu_iter, data->sr[idx]->cpus); cpumask_set_cpu(cpu_iter, &sched_res_mask); /* Init timer. */ - init_timer(&sr_new[idx]->s_timer, s_timer_fn, NULL, cpu_iter); + init_timer(&data->sr[idx]->s_timer, s_timer_fn, NULL, cpu_iter); /* Last resource initializations and insert resource pointer. */ - sr_new[idx]->master_cpu = cpu_iter; - set_sched_res(cpu_iter, sr_new[idx]); + data->sr[idx]->master_cpu = cpu_iter; + set_sched_res(cpu_iter, data->sr[idx]); /* Last action: set the new lock pointer. */ smp_mb(); - sr_new[idx]->schedule_lock = &sched_free_cpu_lock; + data->sr[idx]->schedule_lock = &sched_free_cpu_lock; idx++; } @@ -3352,16 +3387,12 @@ int schedule_cpu_rm(unsigned int cpu) /* _Not_ pcpu_schedule_unlock(): schedule_lock may have changed! */ spin_unlock_irqrestore(old_lock, flags); - sched_deinit_pdata(old_ops, ppriv_old, cpu); - - sched_free_udata(old_ops, vpriv_old); - sched_free_pdata(old_ops, ppriv_old, cpu); + sched_deinit_pdata(data->old_ops, data->ppriv_old, cpu); -out: rcu_read_unlock(&sched_res_rculock); - xfree(sr_new); + free_cpu_rm_data(data, cpu); - return ret; + return 0; } struct scheduler *scheduler_get_default(void) diff --git a/xen/common/sched/private.h b/xen/common/sched/private.h index 2b04b01a0c..e286849a13 100644 --- a/xen/common/sched/private.h +++ b/xen/common/sched/private.h @@ -600,6 +600,15 @@ struct affinity_masks { bool alloc_affinity_masks(struct affinity_masks *affinity); void free_affinity_masks(struct affinity_masks *affinity); + +/* Memory allocation related data for schedule_cpu_rm(). */ +struct cpu_rm_data { + const struct scheduler *old_ops; + void *ppriv_old; + void *vpriv_old; + struct sched_resource *sr[]; +}; + void sched_rm_cpu(unsigned int cpu); const cpumask_t *sched_get_opt_cpumask(enum sched_gran opt, unsigned int cpu); void schedule_dump(struct cpupool *c); @@ -608,6 +617,8 @@ struct scheduler *scheduler_alloc(unsigned int sched_id); void scheduler_free(struct scheduler *sched); int cpu_disable_scheduler(unsigned int cpu); int schedule_cpu_add(unsigned int cpu, struct cpupool *c); +struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu); +void free_cpu_rm_data(struct cpu_rm_data *mem, unsigned int cpu); int schedule_cpu_rm(unsigned int cpu); int sched_move_domain(struct domain *d, struct cpupool *c); struct cpupool *cpupool_get_by_id(unsigned int poolid); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:33:23 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401164.642889 (Exim 4.92) (envelope-from ) id 1oVsN1-0005N9-Nz; Wed, 07 Sep 2022 10:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401164.642889; Wed, 07 Sep 2022 10: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 1oVsN1-0005N1-L4; Wed, 07 Sep 2022 10:33:23 +0000 Received: by outflank-mailman (input) for mailman id 401164; Wed, 07 Sep 2022 10:33:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsMz-0005Me-Ql for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsMz-0002rv-Px for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsMz-0002jJ-PF for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10: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=U14oIfCeXPkX97dwYBTmzl7EXjHy2xE65Ua1+6Trb7w=; b=VEPF2vO+bOGLxAuVe4JausZafG HnLHBKVnV7Wdku0WzANQiZHohlV/El5reiuFMMHsmMvJXV4kTJH+zYtqksDlAWRAf8j0RYCtQOP9R xAyCJMnqNyX+P1eUoePrH4MU1B3F2aPszXtQzIghz4+Wjgt3yw6unsMTNS/KsV4GnFwg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sched: fix cpu hotplug Message-Id: Date: Wed, 07 Sep 2022 10:33:21 +0000 commit d84473689611eed32fd90b27e614f28af767fa3f Author: Juergen Gross AuthorDate: Mon Sep 5 09:00:05 2022 +0200 Commit: Andrew Cooper CommitDate: Mon Sep 5 11:42:30 2022 +0100 xen/sched: fix cpu hotplug Cpu unplugging is calling schedule_cpu_rm() via stop_machine_run() with interrupts disabled, thus any memory allocation or freeing must be avoided. Since commit 5047cd1d5dea ("xen/common: Use enhanced ASSERT_ALLOC_CONTEXT in xmalloc()") this restriction is being enforced via an assertion, which will now fail. Fix this by allocating needed memory before entering stop_machine_run() and freeing any memory only after having finished stop_machine_run(). Fixes: 1ec410112cdd ("xen/sched: support differing granularity in schedule_cpu_[add/rm]()") Reported-by: Gao Ruifeng Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Acked-by: Andrew Cooper Tested-by: Andrew Cooper --- xen/common/sched/core.c | 25 +++++++++++++---- xen/common/sched/cpupool.c | 69 ++++++++++++++++++++++++++++++++++++---------- xen/common/sched/private.h | 5 ++-- 3 files changed, 77 insertions(+), 22 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 588826cdbd..83455fbde1 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -3247,7 +3247,7 @@ out: * by alloc_cpu_rm_data() is modified only in case the cpu in question is * being moved from or to a cpupool. */ -struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu) +struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu, bool aff_alloc) { struct cpu_rm_data *data; const struct sched_resource *sr; @@ -3260,6 +3260,17 @@ struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu) if ( !data ) goto out; + if ( aff_alloc ) + { + if ( !alloc_affinity_masks(&data->affinity) ) + { + XFREE(data); + goto out; + } + } + else + memset(&data->affinity, 0, sizeof(data->affinity)); + data->old_ops = sr->scheduler; data->vpriv_old = idle_vcpu[cpu]->sched_unit->priv; data->ppriv_old = sr->sched_priv; @@ -3280,6 +3291,7 @@ struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu) { while ( idx > 0 ) sched_res_free(&data->sr[--idx]->rcu); + free_affinity_masks(&data->affinity); XFREE(data); goto out; } @@ -3302,6 +3314,7 @@ void free_cpu_rm_data(struct cpu_rm_data *mem, unsigned int cpu) { sched_free_udata(mem->old_ops, mem->vpriv_old); sched_free_pdata(mem->old_ops, mem->ppriv_old, cpu); + free_affinity_masks(&mem->affinity); xfree(mem); } @@ -3312,17 +3325,18 @@ void free_cpu_rm_data(struct cpu_rm_data *mem, unsigned int cpu) * The cpu is already marked as "free" and not valid any longer for its * cpupool. */ -int schedule_cpu_rm(unsigned int cpu) +int schedule_cpu_rm(unsigned int cpu, struct cpu_rm_data *data) { struct sched_resource *sr; - struct cpu_rm_data *data; struct sched_unit *unit; spinlock_t *old_lock; unsigned long flags; int idx = 0; unsigned int cpu_iter; + bool free_data = !data; - data = alloc_cpu_rm_data(cpu); + if ( !data ) + data = alloc_cpu_rm_data(cpu, false); if ( !data ) return -ENOMEM; @@ -3390,7 +3404,8 @@ int schedule_cpu_rm(unsigned int cpu) sched_deinit_pdata(data->old_ops, data->ppriv_old, cpu); rcu_read_unlock(&sched_res_rculock); - free_cpu_rm_data(data, cpu); + if ( free_data ) + free_cpu_rm_data(data, cpu); return 0; } diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index aac3a269b7..b2c6f520c3 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -411,22 +411,28 @@ int cpupool_move_domain(struct domain *d, struct cpupool *c) } /* Update affinities of all domains in a cpupool. */ -static void cpupool_update_node_affinity(const struct cpupool *c) +static void cpupool_update_node_affinity(const struct cpupool *c, + struct affinity_masks *masks) { - struct affinity_masks masks; + struct affinity_masks local_masks; struct domain *d; - if ( !alloc_affinity_masks(&masks) ) - return; + if ( !masks ) + { + if ( !alloc_affinity_masks(&local_masks) ) + return; + masks = &local_masks; + } rcu_read_lock(&domlist_read_lock); for_each_domain_in_cpupool(d, c) - domain_update_node_aff(d, &masks); + domain_update_node_aff(d, masks); rcu_read_unlock(&domlist_read_lock); - free_affinity_masks(&masks); + if ( masks == &local_masks ) + free_affinity_masks(masks); } /* @@ -460,15 +466,17 @@ static int cpupool_assign_cpu_locked(struct cpupool *c, unsigned int cpu) rcu_read_unlock(&sched_res_rculock); - cpupool_update_node_affinity(c); + cpupool_update_node_affinity(c, NULL); return 0; } -static int cpupool_unassign_cpu_finish(struct cpupool *c) +static int cpupool_unassign_cpu_finish(struct cpupool *c, + struct cpu_rm_data *mem) { int cpu = cpupool_moving_cpu; const cpumask_t *cpus; + struct affinity_masks *masks = mem ? &mem->affinity : NULL; int ret; if ( c != cpupool_cpu_moving ) @@ -491,7 +499,7 @@ static int cpupool_unassign_cpu_finish(struct cpupool *c) */ if ( !ret ) { - ret = schedule_cpu_rm(cpu); + ret = schedule_cpu_rm(cpu, mem); if ( ret ) cpumask_andnot(&cpupool_free_cpus, &cpupool_free_cpus, cpus); else @@ -503,7 +511,7 @@ static int cpupool_unassign_cpu_finish(struct cpupool *c) } rcu_read_unlock(&sched_res_rculock); - cpupool_update_node_affinity(c); + cpupool_update_node_affinity(c, masks); return ret; } @@ -567,7 +575,7 @@ static long cf_check cpupool_unassign_cpu_helper(void *info) cpupool_cpu_moving->cpupool_id, cpupool_moving_cpu); spin_lock(&cpupool_lock); - ret = cpupool_unassign_cpu_finish(c); + ret = cpupool_unassign_cpu_finish(c, NULL); spin_unlock(&cpupool_lock); debugtrace_printk("cpupool_unassign_cpu ret=%ld\n", ret); @@ -714,7 +722,7 @@ static int cpupool_cpu_add(unsigned int cpu) * This function is called in stop_machine context, so we can be sure no * non-idle vcpu is active on the system. */ -static void cpupool_cpu_remove(unsigned int cpu) +static void cpupool_cpu_remove(unsigned int cpu, struct cpu_rm_data *mem) { int ret; @@ -722,7 +730,7 @@ static void cpupool_cpu_remove(unsigned int cpu) if ( !cpumask_test_cpu(cpu, &cpupool_free_cpus) ) { - ret = cpupool_unassign_cpu_finish(cpupool0); + ret = cpupool_unassign_cpu_finish(cpupool0, mem); BUG_ON(ret); } cpumask_clear_cpu(cpu, &cpupool_free_cpus); @@ -788,7 +796,7 @@ static void cpupool_cpu_remove_forced(unsigned int cpu) { ret = cpupool_unassign_cpu_start(c, master_cpu); BUG_ON(ret); - ret = cpupool_unassign_cpu_finish(c); + ret = cpupool_unassign_cpu_finish(c, NULL); BUG_ON(ret); } } @@ -1006,12 +1014,24 @@ void cf_check dump_runq(unsigned char key) static int cf_check cpu_callback( struct notifier_block *nfb, unsigned long action, void *hcpu) { + static struct cpu_rm_data *mem; + unsigned int cpu = (unsigned long)hcpu; int rc = 0; switch ( action ) { case CPU_DOWN_FAILED: + if ( system_state <= SYS_STATE_active ) + { + if ( mem ) + { + free_cpu_rm_data(mem, cpu); + mem = NULL; + } + rc = cpupool_cpu_add(cpu); + } + break; case CPU_ONLINE: if ( system_state <= SYS_STATE_active ) rc = cpupool_cpu_add(cpu); @@ -1019,12 +1039,31 @@ static int cf_check cpu_callback( case CPU_DOWN_PREPARE: /* Suspend/Resume don't change assignments of cpus to cpupools. */ if ( system_state <= SYS_STATE_active ) + { rc = cpupool_cpu_remove_prologue(cpu); + if ( !rc ) + { + ASSERT(!mem); + mem = alloc_cpu_rm_data(cpu, true); + rc = mem ? 0 : -ENOMEM; + } + } break; case CPU_DYING: /* Suspend/Resume don't change assignments of cpus to cpupools. */ if ( system_state <= SYS_STATE_active ) - cpupool_cpu_remove(cpu); + { + ASSERT(mem); + cpupool_cpu_remove(cpu, mem); + } + break; + case CPU_DEAD: + if ( system_state <= SYS_STATE_active ) + { + ASSERT(mem); + free_cpu_rm_data(mem, cpu); + mem = NULL; + } break; case CPU_RESUME_FAILED: cpupool_cpu_remove_forced(cpu); diff --git a/xen/common/sched/private.h b/xen/common/sched/private.h index e286849a13..0126a4bb9e 100644 --- a/xen/common/sched/private.h +++ b/xen/common/sched/private.h @@ -603,6 +603,7 @@ void free_affinity_masks(struct affinity_masks *affinity); /* Memory allocation related data for schedule_cpu_rm(). */ struct cpu_rm_data { + struct affinity_masks affinity; const struct scheduler *old_ops; void *ppriv_old; void *vpriv_old; @@ -617,9 +618,9 @@ struct scheduler *scheduler_alloc(unsigned int sched_id); void scheduler_free(struct scheduler *sched); int cpu_disable_scheduler(unsigned int cpu); int schedule_cpu_add(unsigned int cpu, struct cpupool *c); -struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu); +struct cpu_rm_data *alloc_cpu_rm_data(unsigned int cpu, bool aff_alloc); void free_cpu_rm_data(struct cpu_rm_data *mem, unsigned int cpu); -int schedule_cpu_rm(unsigned int cpu); +int schedule_cpu_rm(unsigned int cpu, struct cpu_rm_data *mem); int sched_move_domain(struct domain *d, struct cpupool *c); struct cpupool *cpupool_get_by_id(unsigned int poolid); void cpupool_put(struct cpupool *pool); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:33:33 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401166.642894 (Exim 4.92) (envelope-from ) id 1oVsNB-0005QM-Pj; Wed, 07 Sep 2022 10:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401166.642894; Wed, 07 Sep 2022 10: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 1oVsNB-0005QA-MZ; Wed, 07 Sep 2022 10:33:33 +0000 Received: by outflank-mailman (input) for mailman id 401166; Wed, 07 Sep 2022 10:33:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsN9-0005Pn-TV for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsN9-0002sQ-Sq for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsN9-0002jm-S6 for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10: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=ahWqR3OR0vgIxEpW+iIDM/BvIn7QYO6vt1hnBjmsoaA=; b=kZU5+KZzUoUcB2zekjCFliS8o0 BhF6UivVtaHzJwoDVTBYIgZod4hoPrbKEBQa5xdlXX8AkbrB9GlDDi/a11quh8zqIK/mBWxrQoSb0 5zVtwAZkj4DLjM+hbnqIqMwODKkW7/ifXCyTMbg+30zylxnckoDtv7bmwKpRn4I2NtzA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm/flask: fix MISRA C 2012 Rule 20.7 violations Message-Id: Date: Wed, 07 Sep 2022 10:33:31 +0000 commit ad0838f4499820db613370feea354ac484544b11 Author: Xenia Ragiadakou AuthorDate: Tue Sep 6 16:02:28 2022 +0200 Commit: Jan Beulich CommitDate: Tue Sep 6 16:02:28 2022 +0200 xsm/flask: fix MISRA C 2012 Rule 20.7 violations In macros SIDTAB_HASH(), INIT_SIDTAB_LOCK(), SIDTAB_LOCK() and SIDTAB_UNLOCK(), add parentheses around the macro parameter to prevent against unintended expansions. Signed-off-by: Xenia Ragiadakou Reviewed-by: Stefano Stabellini Acked-by: Daniel P. Smith --- xen/xsm/flask/ss/sidtab.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/xsm/flask/ss/sidtab.c b/xen/xsm/flask/ss/sidtab.c index 74babfac9c..69fc3389b3 100644 --- a/xen/xsm/flask/ss/sidtab.c +++ b/xen/xsm/flask/ss/sidtab.c @@ -14,11 +14,11 @@ #include "security.h" #include "sidtab.h" -#define SIDTAB_HASH(sid) (sid & SIDTAB_HASH_MASK) +#define SIDTAB_HASH(sid) ((sid) & SIDTAB_HASH_MASK) -#define INIT_SIDTAB_LOCK(s) spin_lock_init(&s->lock) -#define SIDTAB_LOCK(s) spin_lock(&s->lock) -#define SIDTAB_UNLOCK(s) spin_unlock(&s->lock) +#define INIT_SIDTAB_LOCK(s) spin_lock_init(&(s)->lock) +#define SIDTAB_LOCK(s) spin_lock(&(s)->lock) +#define SIDTAB_UNLOCK(s) spin_unlock(&(s)->lock) int sidtab_init(struct sidtab *s) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:33:43 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401167.642897 (Exim 4.92) (envelope-from ) id 1oVsNL-0005TI-RH; Wed, 07 Sep 2022 10:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401167.642897; Wed, 07 Sep 2022 10: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 1oVsNL-0005T9-O4; Wed, 07 Sep 2022 10:33:43 +0000 Received: by outflank-mailman (input) for mailman id 401167; Wed, 07 Sep 2022 10:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsNK-0005Sy-0Y for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsNJ-0002sa-W1 for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:41 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsNJ-0002kB-V4 for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10: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=cK0ARWXf0VbLWVOWtjoOwu5lCcskMBa1LZeSnfy5N7M=; b=OiGOY5AEjHCBL6auLSdpr8Ov9W +3c/IpzSzTtqrSD18hvevAfN2jibtTSthhUyfGWH+I8gmZqqcL6QVi2cm1dU7whxu1Gn+FLjpzEOB xvhvc18exbr8dZbi68WYfAC7483SPgWxRD9pta8kk8+QcjgZJ7bXkNqGP8avN3oL2NfI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/public: move XEN_ACPI_ in a new header Message-Id: Date: Wed, 07 Sep 2022 10:33:41 +0000 commit 48f35317c2e2707fc66a839690fe41e6f16180de Author: Bertrand Marquis AuthorDate: Tue Sep 6 16:04:34 2022 +0200 Commit: Jan Beulich CommitDate: Tue Sep 6 16:04:34 2022 +0200 x86/public: move XEN_ACPI_ in a new header When Xen is compiled for x86 on an arm machine, libacpi build is failing due to a wrong include path: - arch-x86/xen.h includes xen.h - xen.h includes arch-arm.h (as __i386__ and __x86_64__ are not defined but arm ones are). To solve this issue move XEN_ACPI_ definitions in a new header guest-acpi.h that can be included cleanly by mk_dsdt.c. Inside this header, only protect the definitions using ifdef __XEN_TOOLS__ as the defines are not used anywhere in the hypervisor and are not expected to be. Previous users needing any of the XEN_ACPI_ definitions will now need to include arch-x86/guest-acpi.h instead of arch-x86/xen.h Fixes: d6ac8e22c7c5 ("acpi/x86: define ACPI IO registers for PVH guests") Signed-off-by: Bertrand Marquis Reviewed-by: Jan Beulich Release-acked-by: Henry Wang --- tools/libacpi/mk_dsdt.c | 2 +- xen/include/public/arch-x86/guest-acpi.h | 50 ++++++++++++++++++++++++++++++++ xen/include/public/arch-x86/xen.h | 6 ---- 3 files changed, 51 insertions(+), 7 deletions(-) diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c index c5ba4c0b2f..1176da80ef 100644 --- a/tools/libacpi/mk_dsdt.c +++ b/tools/libacpi/mk_dsdt.c @@ -18,7 +18,7 @@ #include #include #if defined(CONFIG_X86) -#include +#include #include #elif defined(CONFIG_ARM_64) #include diff --git a/xen/include/public/arch-x86/guest-acpi.h b/xen/include/public/arch-x86/guest-acpi.h new file mode 100644 index 0000000000..3d79a31fd8 --- /dev/null +++ b/xen/include/public/arch-x86/guest-acpi.h @@ -0,0 +1,50 @@ +/****************************************************************************** + * arch-x86/guest-acpi.h + * + * Guest ACPI interface to x86 Xen. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef __XEN_PUBLIC_ARCH_X86_GUEST_ACPI_H__ +#define __XEN_PUBLIC_ARCH_X86_GUEST_ACPI_H__ + +#ifdef __XEN_TOOLS__ + +/* Location of online VCPU bitmap. */ +#define XEN_ACPI_CPU_MAP 0xaf00 +#define XEN_ACPI_CPU_MAP_LEN ((HVM_MAX_VCPUS + 7) / 8) + +/* GPE0 bit set during CPU hotplug */ +#define XEN_ACPI_GPE0_CPUHP_BIT 2 + +#endif /* __XEN_TOOLS__ */ + +#endif /* __XEN_PUBLIC_ARCH_X86_GUEST_ACPI_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index 58a1e87ee9..546dd4496a 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -325,12 +325,6 @@ struct xen_arch_domainconfig { /* Max XEN_X86_* constant. Used for ABI checking. */ #define XEN_X86_MISC_FLAGS_MAX XEN_X86_ASSISTED_X2APIC -/* Location of online VCPU bitmap. */ -#define XEN_ACPI_CPU_MAP 0xaf00 -#define XEN_ACPI_CPU_MAP_LEN ((HVM_MAX_VCPUS + 7) / 8) - -/* GPE0 bit set during CPU hotplug */ -#define XEN_ACPI_GPE0_CPUHP_BIT 2 #endif /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:33:52 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:33:52 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401168.642901 (Exim 4.92) (envelope-from ) id 1oVsNU-0005WV-Tr; Wed, 07 Sep 2022 10:33:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401168.642901; Wed, 07 Sep 2022 10:33:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsNU-0005WN-RA; Wed, 07 Sep 2022 10:33:52 +0000 Received: by outflank-mailman (input) for mailman id 401168; Wed, 07 Sep 2022 10:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsNU-0005WB-3B for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsNU-0002sn-2X for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsNU-0002ka-1q for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:33:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wQfPj8uXQqESMnaTc1iMWv6NscudiyxKwW3w4Lvavsg=; b=NykwTjxql79tzbLpGiU6xECGqo 1mH2i9y152iVbLtCQlFAERcZmdS3YJLvMet7KZjs/DyDQrU7MnubVAjKklSB2ztn8jvlP8J1wjx62 ZorfiLw+tj7sID/R731Zub7CymTBbqvTvEAO6C1RbgqVRvwcLUiuT3BZFd4AxjffMSRQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: only filter build-*/ in gitignore Message-Id: Date: Wed, 07 Sep 2022 10:33:52 +0000 commit 0b5034946f03f63e2c59255ae2fd9c18c9a20ec1 Author: Bertrand Marquis AuthorDate: Tue Sep 6 17:21:57 2022 +0200 Commit: Jan Beulich CommitDate: Tue Sep 6 17:21:57 2022 +0200 automation: only filter build-*/ in gitignore ...because there are some script in automation corresponding to the build-* filter (build-test.sh and build-each-commit.sh) Signed-off-by: Bertrand Marquis Acked-by: Jan Beulich --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e3fe06cd13..27881c9764 100644 --- a/.gitignore +++ b/.gitignore @@ -38,13 +38,13 @@ dist stubdom/*.tar.gz autom4te.cache/ +build-*/ config.log config.status config.cache config/Toplevel.mk config/Paths.mk -build-* dist/* docs/tmp.* docs/html/ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:34:03 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:34:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401169.642905 (Exim 4.92) (envelope-from ) id 1oVsNe-0005ZP-VS; Wed, 07 Sep 2022 10:34:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401169.642905; Wed, 07 Sep 2022 10:34: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 1oVsNe-0005ZH-Sh; Wed, 07 Sep 2022 10:34:02 +0000 Received: by outflank-mailman (input) for mailman id 401169; Wed, 07 Sep 2022 10:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsNe-0005ZB-6K for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsNe-0002tE-5Y for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsNe-0002lI-4k for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34: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=+ioudWbRTKhLpDisfwP0sW1yZresaagZdy+1UJkeIKQ=; b=fMOUSkYsZMbwyeBRe4YjXP+XKd n1G16US9Skpv4BiWFH60Pbte6TS3Id1H8E3pNYjI7JN7jSMttx3BTKvFuVOz7eTtcz5ldgSo36JsR HAXZ4UHDDuV2hDTbMTugy00m4pniUnLzxdoSb9KZSrYqx+ObIOiwGpFr3lZZHCIf7roM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smmuv3: Fix l1 stream table size in the error message Message-Id: Date: Wed, 07 Sep 2022 10:34:02 +0000 commit b0cec9d37f264017e83c11177abf2aa96a5260a1 Author: Zenghui Yu AuthorDate: Mon Aug 22 16:19:01 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:42:59 2022 +0100 xen/arm: smmuv3: Fix l1 stream table size in the error message Backport Linux commit dc898eb84b25. This is the clean backport without any changes. The actual size of level-1 stream table is l1size. This looks like an oversight on commit d2e88e7c081ef ("iommu/arm-smmu: Fix LOG2SIZE setting for 2-level stream tables") which forgot to update the @size in error message as well. As memory allocation failure is already bad enough, nothing worse would happen. But let's be careful. Signed-off-by: Zenghui Yu Link: https://lore.kernel.org/r/20200826141758.341-1-yuzenghui@huawei.com Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git dc898eb84b25 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index f2562acc38..340609264d 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -2348,7 +2348,7 @@ static int arm_smmu_init_strtab_2lvl(struct arm_smmu_device *smmu) if (!strtab) { dev_err(smmu->dev, "failed to allocate l1 stream table (%u bytes)\n", - size); + l1size); return -ENOMEM; } cfg->strtab = strtab; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:34:13 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:34:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401170.642909 (Exim 4.92) (envelope-from ) id 1oVsNp-0005cW-0m; Wed, 07 Sep 2022 10:34:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401170.642909; Wed, 07 Sep 2022 10:34: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 1oVsNo-0005cO-UM; Wed, 07 Sep 2022 10:34:12 +0000 Received: by outflank-mailman (input) for mailman id 401170; Wed, 07 Sep 2022 10:34:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsNo-0005cI-9Z for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsNo-0002tS-8s for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsNo-0002ll-7w for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34: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=teCENNwlGlAFVFaSbgqBODA4Y2j2o8589ZpocLB/ahg=; b=I228ojp4Df+IORzI9Yq676nflN eUCCkgjJyKpGdZNIHnVN0xF5PA0hPlOywMXj4F6JdrypAzyuUqPuDuC6spjP8gcb0c5itj2O8rSph 4Mb25yESD79ebSnesJ89+he5ne77NRJorDXJ7pT5V1uXQEnfRKltCa/g5rJqsZisQ2kw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smmuv3: Fix endianness annotations Message-Id: Date: Wed, 07 Sep 2022 10:34:12 +0000 commit 1b11b5ab42a1592c914a772a43860fc03d74ed43 Author: Jean-Philippe Brucker AuthorDate: Mon Aug 22 16:27:29 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:03 2022 +0100 xen/arm: smmuv3: Fix endianness annotations Backport Linux commit 376cdf66f624. This is the clean backport without any changes. When building with C=1, sparse reports some issues regarding endianness annotations: arm-smmu-v3.c:221:26: warning: cast to restricted __le64 arm-smmu-v3.c:221:24: warning: incorrect type in assignment (different base types) arm-smmu-v3.c:221:24: expected restricted __le64 [usertype] arm-smmu-v3.c:221:24: got unsigned long long [usertype] arm-smmu-v3.c:229:20: warning: incorrect type in argument 1 (different base types) arm-smmu-v3.c:229:20: expected restricted __le64 [usertype] *[assigned] dst arm-smmu-v3.c:229:20: got unsigned long long [usertype] *ent arm-smmu-v3.c:229:25: warning: incorrect type in argument 2 (different base types) arm-smmu-v3.c:229:25: expected unsigned long long [usertype] *[assigned] src arm-smmu-v3.c:229:25: got restricted __le64 [usertype] * arm-smmu-v3.c:396:20: warning: incorrect type in argument 1 (different base types) arm-smmu-v3.c:396:20: expected restricted __le64 [usertype] *[assigned] dst arm-smmu-v3.c:396:20: got unsigned long long * arm-smmu-v3.c:396:25: warning: incorrect type in argument 2 (different base types) arm-smmu-v3.c:396:25: expected unsigned long long [usertype] *[assigned] src arm-smmu-v3.c:396:25: got restricted __le64 [usertype] * arm-smmu-v3.c:1349:32: warning: invalid assignment: |= arm-smmu-v3.c:1349:32: left side has type restricted __le64 arm-smmu-v3.c:1349:32: right side has type unsigned long arm-smmu-v3.c:1396:53: warning: incorrect type in argument 3 (different base types) arm-smmu-v3.c:1396:53: expected restricted __le64 [usertype] *dst arm-smmu-v3.c:1396:53: got unsigned long long [usertype] *strtab arm-smmu-v3.c:1424:39: warning: incorrect type in argument 1 (different base types) arm-smmu-v3.c:1424:39: expected unsigned long long [usertype] *[assigned] strtab arm-smmu-v3.c:1424:39: got restricted __le64 [usertype] *l2ptr While harmless, they are incorrect and could hide actual errors during development. Fix them. Signed-off-by: Jean-Philippe Brucker Reviewed-by: Robin Murphy Link: https://lore.kernel.org/r/20200918141856.629722-1-jean-philippe@linaro.org Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 376cdf66f624 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 340609264d..64d39bb4d3 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -1037,7 +1037,7 @@ static int queue_insert_raw(struct arm_smmu_queue *q, u64 *ent) return 0; } -static void queue_read(__le64 *dst, u64 *src, size_t n_dwords) +static void queue_read(u64 *dst, __le64 *src, size_t n_dwords) { int i; @@ -1436,7 +1436,7 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, arm_smmu_cmdq_issue_cmd(smmu, &prefetch_cmd); } -static void arm_smmu_init_bypass_stes(u64 *strtab, unsigned int nent) +static void arm_smmu_init_bypass_stes(__le64 *strtab, unsigned int nent) { unsigned int i; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:34:23 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:34:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401171.642913 (Exim 4.92) (envelope-from ) id 1oVsNz-0005f7-2R; Wed, 07 Sep 2022 10:34:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401171.642913; Wed, 07 Sep 2022 10:34: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 1oVsNy-0005ez-Vt; Wed, 07 Sep 2022 10:34:22 +0000 Received: by outflank-mailman (input) for mailman id 401171; Wed, 07 Sep 2022 10:34:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsNy-0005er-DO for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsNy-0002tj-CW for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsNy-0002o8-B6 for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34: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=Ch3F0DhWb8fwd7IGOVCEXXQ/RM5p1Ul99oWP2bHbTfk=; b=kAnMtr+Vsf38KDoQiGhHt4likY W0lpQqdyC68FWYCmfNKIcY4gFpvrdzNXdI5/B4JHXLizbLuwPtjk5bAU5KTV48kMgUDtiEJkMHnBv xVPLhMo4n1U8rSked8jLmsgflkbTKn1lhUYIS/hMx/M/qTo8v7i/+/TqYoxEwDZWhZTY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smmuv3: Ensure queue is read after updating prod pointer Message-Id: Date: Wed, 07 Sep 2022 10:34:22 +0000 commit 56995f06fe9f4f253377189f6fd3f5ddfe3ce881 Author: Zhou Wang AuthorDate: Mon Aug 22 16:52:31 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:07 2022 +0100 xen/arm: smmuv3: Ensure queue is read after updating prod pointer Backport Linux commit a76a37777f2c. Introduce _iomb() in the smmu-v3.c file with other Linux compatibility definitions. Reading the 'prod' MMIO register in order to determine whether or not there is valid data beyond 'cons' for a given queue does not provide sufficient dependency ordering, as the resulting access is address dependent only on 'cons' and can therefore be speculated ahead of time, potentially allowing stale data to be read by the CPU. Use readl() instead of readl_relaxed() when updating the shadow copy of the 'prod' pointer, so that all speculated memory reads from the corresponding queue can occur only from valid slots. Signed-off-by: Zhou Wang Link: https://lore.kernel.org/r/1601281922-117296-1-git-send-email-wangzhou1@hisilicon.com [will: Use readl() instead of explicit barrier. Update 'cons' side to match.] Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git a76a37777f2c Signed-off-by: Rahul Singh Reviewed-by: Bertrand Marquis --- xen/drivers/passthrough/arm/smmu-v3.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 64d39bb4d3..229b9a4b0d 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -107,6 +107,8 @@ typedef paddr_t dma_addr_t; typedef paddr_t phys_addr_t; typedef unsigned int gfp_t; +#define __iomb() dmb(osh) + #define platform_device device #define GFP_KERNEL 0 @@ -951,7 +953,7 @@ static void queue_sync_cons_out(struct arm_smmu_queue *q) * Ensure that all CPU accesses (reads and writes) to the queue * are complete before we update the cons pointer. */ - mb(); + __iomb(); writel_relaxed(q->llq.cons, q->cons_reg); } @@ -963,8 +965,15 @@ static void queue_inc_cons(struct arm_smmu_ll_queue *q) static int queue_sync_prod_in(struct arm_smmu_queue *q) { + u32 prod; int ret = 0; - u32 prod = readl_relaxed(q->prod_reg); + + /* + * We can't use the _relaxed() variant here, as we must prevent + * speculative reads of the queue before we have determined that + * prod has indeed moved. + */ + prod = readl(q->prod_reg); if (Q_OVF(prod) != Q_OVF(q->llq.prod)) ret = -EOVERFLOW; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:34:33 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:34:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401172.642918 (Exim 4.92) (envelope-from ) id 1oVsO9-0005i4-5I; Wed, 07 Sep 2022 10:34:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401172.642918; Wed, 07 Sep 2022 10:34: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 1oVsO9-0005hw-1E; Wed, 07 Sep 2022 10:34:33 +0000 Received: by outflank-mailman (input) for mailman id 401172; Wed, 07 Sep 2022 10:34:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsO8-0005hj-GE for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsO8-0002u9-FS for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsO8-0002ow-Ej for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34: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=DPfxtB+rHvcm1xwreXBH+3Utgp57bFdccECu1xyBt1U=; b=YQG+LgdFMK0nTwhY/R/we08Iw4 gjx43ydLIOpzTD3rzJeTqTMCfB9mKI4oV8Elnln1pamLlvbyujvj6Ra9Kk7my2RbNngIbYRXcP7PF t8UFhZyvr7PdWOiZ8Qg6sl69NwaBXQz1v7uDhN4km40O2znSGSg0QYLzTEqmbsV2nrtU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smmuv3: Move definitions to a header Message-Id: Date: Wed, 07 Sep 2022 10:34:32 +0000 commit 19f609249a185cdc43132e4496bcfd96e371f293 Author: Jean-Philippe Brucker AuthorDate: Tue Jan 11 12:33:43 2022 +0000 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:22 2022 +0100 xen/arm: smmuv3: Move definitions to a header Backport Linux commit e881e7839fba. Also, move Xen related struct definition to header to get it compiled. Allow sharing structure definitions with the upcoming SVA support for Arm SMMUv3, by moving them to a separate header. We could surgically extract only what is needed but keeping all definitions in one place looks nicer. Signed-off-by: Jean-Philippe Brucker Reviewed-by: Eric Auger Reviewed-by: Jonathan Cameron Link: https://lore.kernel.org/r/20200918101852.582559-8-jean-philippe@linaro.org Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e881e7839fba Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 665 +-------------------------------- xen/drivers/passthrough/arm/smmu-v3.h | 674 ++++++++++++++++++++++++++++++++++ 2 files changed, 675 insertions(+), 664 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 229b9a4b0d..ba24a26ad6 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -90,6 +90,7 @@ #include #include +#include "smmu-v3.h" #define ARM_SMMU_VTCR_SH_IS 3 #define ARM_SMMU_VTCR_RGN_WBWA 1 @@ -103,22 +104,12 @@ #define ARM_SMMU_VTCR_PS_52_BIT 0x6ULL /* Linux compatibility functions. */ -typedef paddr_t dma_addr_t; -typedef paddr_t phys_addr_t; -typedef unsigned int gfp_t; - #define __iomb() dmb(osh) #define platform_device device #define GFP_KERNEL 0 -/* Alias to Xen lock functions */ -#define mutex spinlock -#define mutex_init spin_lock_init -#define mutex_lock spin_lock -#define mutex_unlock spin_unlock - /* Device logger functions */ #define dev_name(dev) dt_node_full_name(dev->of_node) #define dev_dbg(dev, fmt, ...) \ @@ -159,12 +150,6 @@ typedef unsigned int gfp_t; #define readl_relaxed_poll_timeout(addr, val, cond, delay_us, timeout_us) \ readx_poll_timeout(readl_relaxed, addr, val, cond, delay_us, timeout_us) -#define FIELD_PREP(_mask, _val) \ - (((typeof(_mask))(_val) << (ffs64(_mask) - 1)) & (_mask)) - -#define FIELD_GET(_mask, _reg) \ - ((typeof(_mask))(((_reg) & (_mask)) >> (ffs64(_mask) - 1))) - /* * Helpers for DMA allocation. Just the function name is reused for * porting code, these allocation are not managed allocations @@ -197,27 +182,6 @@ static void *dmam_alloc_coherent(struct device *dev, size_t size, return vaddr; } - -/* Xen specific code. */ -struct iommu_domain { - /* Runtime SMMU configuration for this iommu_domain */ - atomic_t ref; - /* - * Used to link iommu_domain contexts for a same domain. - * There is at least one per-SMMU to used by the domain. - */ - struct list_head list; -}; - -/* Describes information required for a Xen domain */ -struct arm_smmu_xen_domain { - spinlock_t lock; - - /* List of iommu domains associated to this domain */ - struct list_head contexts; -}; - - /* Keep a list of devices associated with this driver */ static DEFINE_SPINLOCK(arm_smmu_devices_lock); static LIST_HEAD(arm_smmu_devices); @@ -261,635 +225,8 @@ static int platform_get_irq_byname_optional(struct device *dev, } /* Start of Linux SMMUv3 code */ -/* MMIO registers */ -#define ARM_SMMU_IDR0 0x0 -#define IDR0_ST_LVL GENMASK(28, 27) -#define IDR0_ST_LVL_2LVL 1 -#define IDR0_STALL_MODEL GENMASK(25, 24) -#define IDR0_STALL_MODEL_STALL 0 -#define IDR0_STALL_MODEL_FORCE 2 -#define IDR0_TTENDIAN GENMASK(22, 21) -#define IDR0_TTENDIAN_MIXED 0 -#define IDR0_TTENDIAN_LE 2 -#define IDR0_TTENDIAN_BE 3 -#define IDR0_CD2L (1 << 19) -#define IDR0_VMID16 (1 << 18) -#define IDR0_PRI (1 << 16) -#define IDR0_SEV (1 << 14) -#define IDR0_MSI (1 << 13) -#define IDR0_ASID16 (1 << 12) -#define IDR0_ATS (1 << 10) -#define IDR0_HYP (1 << 9) -#define IDR0_COHACC (1 << 4) -#define IDR0_TTF GENMASK(3, 2) -#define IDR0_TTF_AARCH64 2 -#define IDR0_TTF_AARCH32_64 3 -#define IDR0_S1P (1 << 1) -#define IDR0_S2P (1 << 0) - -#define ARM_SMMU_IDR1 0x4 -#define IDR1_TABLES_PRESET (1 << 30) -#define IDR1_QUEUES_PRESET (1 << 29) -#define IDR1_REL (1 << 28) -#define IDR1_CMDQS GENMASK(25, 21) -#define IDR1_EVTQS GENMASK(20, 16) -#define IDR1_PRIQS GENMASK(15, 11) -#define IDR1_SSIDSIZE GENMASK(10, 6) -#define IDR1_SIDSIZE GENMASK(5, 0) - -#define ARM_SMMU_IDR5 0x14 -#define IDR5_STALL_MAX GENMASK(31, 16) -#define IDR5_GRAN64K (1 << 6) -#define IDR5_GRAN16K (1 << 5) -#define IDR5_GRAN4K (1 << 4) -#define IDR5_OAS GENMASK(2, 0) -#define IDR5_OAS_32_BIT 0 -#define IDR5_OAS_36_BIT 1 -#define IDR5_OAS_40_BIT 2 -#define IDR5_OAS_42_BIT 3 -#define IDR5_OAS_44_BIT 4 -#define IDR5_OAS_48_BIT 5 -#define IDR5_OAS_52_BIT 6 -#define IDR5_VAX GENMASK(11, 10) -#define IDR5_VAX_52_BIT 1 - -#define ARM_SMMU_CR0 0x20 -#define CR0_ATSCHK (1 << 4) -#define CR0_CMDQEN (1 << 3) -#define CR0_EVTQEN (1 << 2) -#define CR0_PRIQEN (1 << 1) -#define CR0_SMMUEN (1 << 0) - -#define ARM_SMMU_CR0ACK 0x24 - -#define ARM_SMMU_CR1 0x28 -#define CR1_TABLE_SH GENMASK(11, 10) -#define CR1_TABLE_OC GENMASK(9, 8) -#define CR1_TABLE_IC GENMASK(7, 6) -#define CR1_QUEUE_SH GENMASK(5, 4) -#define CR1_QUEUE_OC GENMASK(3, 2) -#define CR1_QUEUE_IC GENMASK(1, 0) -/* CR1 cacheability fields don't quite follow the usual TCR-style encoding */ -#define CR1_CACHE_NC 0 -#define CR1_CACHE_WB 1 -#define CR1_CACHE_WT 2 - -#define ARM_SMMU_CR2 0x2c -#define CR2_PTM (1 << 2) -#define CR2_RECINVSID (1 << 1) -#define CR2_E2H (1 << 0) - -#define ARM_SMMU_GBPA 0x44 -#define GBPA_UPDATE (1U << 31) -#define GBPA_ABORT (1 << 20) - -#define ARM_SMMU_IRQ_CTRL 0x50 -#define IRQ_CTRL_EVTQ_IRQEN (1 << 2) -#define IRQ_CTRL_PRIQ_IRQEN (1 << 1) -#define IRQ_CTRL_GERROR_IRQEN (1 << 0) - -#define ARM_SMMU_IRQ_CTRLACK 0x54 - -#define ARM_SMMU_GERROR 0x60 -#define GERROR_SFM_ERR (1 << 8) -#define GERROR_MSI_GERROR_ABT_ERR (1 << 7) -#define GERROR_MSI_PRIQ_ABT_ERR (1 << 6) -#define GERROR_MSI_EVTQ_ABT_ERR (1 << 5) -#define GERROR_MSI_CMDQ_ABT_ERR (1 << 4) -#define GERROR_PRIQ_ABT_ERR (1 << 3) -#define GERROR_EVTQ_ABT_ERR (1 << 2) -#define GERROR_CMDQ_ERR (1 << 0) -#define GERROR_ERR_MASK 0xfd - -#define ARM_SMMU_GERRORN 0x64 - -#define ARM_SMMU_GERROR_IRQ_CFG0 0x68 -#define ARM_SMMU_GERROR_IRQ_CFG1 0x70 -#define ARM_SMMU_GERROR_IRQ_CFG2 0x74 - -#define ARM_SMMU_STRTAB_BASE 0x80 -#define STRTAB_BASE_RA (1UL << 62) -#define STRTAB_BASE_ADDR_MASK GENMASK_ULL(51, 6) - -#define ARM_SMMU_STRTAB_BASE_CFG 0x88 -#define STRTAB_BASE_CFG_FMT GENMASK(17, 16) -#define STRTAB_BASE_CFG_FMT_LINEAR 0 -#define STRTAB_BASE_CFG_FMT_2LVL 1 -#define STRTAB_BASE_CFG_SPLIT GENMASK(10, 6) -#define STRTAB_BASE_CFG_LOG2SIZE GENMASK(5, 0) - -#define ARM_SMMU_CMDQ_BASE 0x90 -#define ARM_SMMU_CMDQ_PROD 0x98 -#define ARM_SMMU_CMDQ_CONS 0x9c - -#define ARM_SMMU_EVTQ_BASE 0xa0 -#define ARM_SMMU_EVTQ_PROD 0x100a8 -#define ARM_SMMU_EVTQ_CONS 0x100ac -#define ARM_SMMU_EVTQ_IRQ_CFG0 0xb0 -#define ARM_SMMU_EVTQ_IRQ_CFG1 0xb8 -#define ARM_SMMU_EVTQ_IRQ_CFG2 0xbc - -#define ARM_SMMU_PRIQ_BASE 0xc0 -#define ARM_SMMU_PRIQ_PROD 0x100c8 -#define ARM_SMMU_PRIQ_CONS 0x100cc -#define ARM_SMMU_PRIQ_IRQ_CFG0 0xd0 -#define ARM_SMMU_PRIQ_IRQ_CFG1 0xd8 -#define ARM_SMMU_PRIQ_IRQ_CFG2 0xdc - -#define ARM_SMMU_REG_SZ 0xe00 - -/* Common MSI config fields */ -#define MSI_CFG0_ADDR_MASK GENMASK_ULL(51, 2) -#define MSI_CFG2_SH GENMASK(5, 4) -#define MSI_CFG2_MEMATTR GENMASK(3, 0) - -/* Common memory attribute values */ -#define ARM_SMMU_SH_NSH 0 -#define ARM_SMMU_SH_OSH 2 -#define ARM_SMMU_SH_ISH 3 -#define ARM_SMMU_MEMATTR_DEVICE_nGnRE 0x1 -#define ARM_SMMU_MEMATTR_OIWB 0xf - -#define Q_IDX(llq, p) ((p) & ((1 << (llq)->max_n_shift) - 1)) -#define Q_WRP(llq, p) ((p) & (1 << (llq)->max_n_shift)) -#define Q_OVERFLOW_FLAG (1U << 31) -#define Q_OVF(p) ((p) & Q_OVERFLOW_FLAG) -#define Q_ENT(q, p) ((q)->base + \ - Q_IDX(&((q)->llq), p) * \ - (q)->ent_dwords) - -#define Q_BASE_RWA (1UL << 62) -#define Q_BASE_ADDR_MASK GENMASK_ULL(51, 5) -#define Q_BASE_LOG2SIZE GENMASK(4, 0) - -/* Ensure DMA allocations are naturally aligned */ -#ifdef CONFIG_CMA_ALIGNMENT -#define Q_MAX_SZ_SHIFT (PAGE_SHIFT + CONFIG_CMA_ALIGNMENT) -#else -#define Q_MAX_SZ_SHIFT (PAGE_SHIFT + MAX_ORDER - 1) -#endif - -/* - * Stream table. - * - * Linear: Enough to cover 1 << IDR1.SIDSIZE entries - * 2lvl: 128k L1 entries, - * 256 lazy entries per table (each table covers a PCI bus) - */ -#define STRTAB_L1_SZ_SHIFT 20 -#define STRTAB_SPLIT 8 - -#define STRTAB_L1_DESC_DWORDS 1 -#define STRTAB_L1_DESC_SPAN GENMASK_ULL(4, 0) -#define STRTAB_L1_DESC_L2PTR_MASK GENMASK_ULL(51, 6) - -#define STRTAB_STE_DWORDS 8 -#define STRTAB_STE_0_V (1UL << 0) -#define STRTAB_STE_0_CFG GENMASK_ULL(3, 1) -#define STRTAB_STE_0_CFG_ABORT 0 -#define STRTAB_STE_0_CFG_BYPASS 4 -#define STRTAB_STE_0_CFG_S1_TRANS 5 -#define STRTAB_STE_0_CFG_S2_TRANS 6 - -#define STRTAB_STE_0_S1FMT GENMASK_ULL(5, 4) -#define STRTAB_STE_0_S1FMT_LINEAR 0 -#define STRTAB_STE_0_S1FMT_64K_L2 2 -#define STRTAB_STE_0_S1CTXPTR_MASK GENMASK_ULL(51, 6) -#define STRTAB_STE_0_S1CDMAX GENMASK_ULL(63, 59) - -#define STRTAB_STE_1_S1DSS GENMASK_ULL(1, 0) -#define STRTAB_STE_1_S1DSS_TERMINATE 0x0 -#define STRTAB_STE_1_S1DSS_BYPASS 0x1 -#define STRTAB_STE_1_S1DSS_SSID0 0x2 - -#define STRTAB_STE_1_S1C_CACHE_NC 0UL -#define STRTAB_STE_1_S1C_CACHE_WBRA 1UL -#define STRTAB_STE_1_S1C_CACHE_WT 2UL -#define STRTAB_STE_1_S1C_CACHE_WB 3UL -#define STRTAB_STE_1_S1CIR GENMASK_ULL(3, 2) -#define STRTAB_STE_1_S1COR GENMASK_ULL(5, 4) -#define STRTAB_STE_1_S1CSH GENMASK_ULL(7, 6) - -#define STRTAB_STE_1_S1STALLD (1UL << 27) - -#define STRTAB_STE_1_EATS GENMASK_ULL(29, 28) -#define STRTAB_STE_1_EATS_ABT 0UL -#define STRTAB_STE_1_EATS_TRANS 1UL -#define STRTAB_STE_1_EATS_S1CHK 2UL - -#define STRTAB_STE_1_STRW GENMASK_ULL(31, 30) -#define STRTAB_STE_1_STRW_NSEL1 0UL -#define STRTAB_STE_1_STRW_EL2 2UL - -#define STRTAB_STE_1_SHCFG GENMASK_ULL(45, 44) -#define STRTAB_STE_1_SHCFG_INCOMING 1UL - -#define STRTAB_STE_2_S2VMID GENMASK_ULL(15, 0) -#define STRTAB_STE_2_VTCR GENMASK_ULL(50, 32) -#define STRTAB_STE_2_VTCR_S2T0SZ GENMASK_ULL(5, 0) -#define STRTAB_STE_2_VTCR_S2SL0 GENMASK_ULL(7, 6) -#define STRTAB_STE_2_VTCR_S2IR0 GENMASK_ULL(9, 8) -#define STRTAB_STE_2_VTCR_S2OR0 GENMASK_ULL(11, 10) -#define STRTAB_STE_2_VTCR_S2SH0 GENMASK_ULL(13, 12) -#define STRTAB_STE_2_VTCR_S2TG GENMASK_ULL(15, 14) -#define STRTAB_STE_2_VTCR_S2PS GENMASK_ULL(18, 16) -#define STRTAB_STE_2_S2AA64 (1UL << 51) -#define STRTAB_STE_2_S2ENDI (1UL << 52) -#define STRTAB_STE_2_S2PTW (1UL << 54) -#define STRTAB_STE_2_S2R (1UL << 58) - -#define STRTAB_STE_3_S2TTB_MASK GENMASK_ULL(51, 4) - -/* - * Context descriptors. - * - * Linear: when less than 1024 SSIDs are supported - * 2lvl: at most 1024 L1 entries, - * 1024 lazy entries per table. - */ -#define CTXDESC_SPLIT 10 -#define CTXDESC_L2_ENTRIES (1 << CTXDESC_SPLIT) - -#define CTXDESC_L1_DESC_DWORDS 1 -#define CTXDESC_L1_DESC_V (1UL << 0) -#define CTXDESC_L1_DESC_L2PTR_MASK GENMASK_ULL(51, 12) - -#define CTXDESC_CD_DWORDS 8 -#define CTXDESC_CD_0_TCR_T0SZ GENMASK_ULL(5, 0) -#define CTXDESC_CD_0_TCR_TG0 GENMASK_ULL(7, 6) -#define CTXDESC_CD_0_TCR_IRGN0 GENMASK_ULL(9, 8) -#define CTXDESC_CD_0_TCR_ORGN0 GENMASK_ULL(11, 10) -#define CTXDESC_CD_0_TCR_SH0 GENMASK_ULL(13, 12) -#define CTXDESC_CD_0_TCR_EPD0 (1ULL << 14) -#define CTXDESC_CD_0_TCR_EPD1 (1ULL << 30) - -#define CTXDESC_CD_0_ENDI (1UL << 15) -#define CTXDESC_CD_0_V (1UL << 31) - -#define CTXDESC_CD_0_TCR_IPS GENMASK_ULL(34, 32) -#define CTXDESC_CD_0_TCR_TBI0 (1ULL << 38) - -#define CTXDESC_CD_0_AA64 (1UL << 41) -#define CTXDESC_CD_0_S (1UL << 44) -#define CTXDESC_CD_0_R (1UL << 45) -#define CTXDESC_CD_0_A (1UL << 46) -#define CTXDESC_CD_0_ASET (1UL << 47) -#define CTXDESC_CD_0_ASID GENMASK_ULL(63, 48) - -#define CTXDESC_CD_1_TTB0_MASK GENMASK_ULL(51, 4) - -/* - * When the SMMU only supports linear context descriptor tables, pick a - * reasonable size limit (64kB). - */ -#define CTXDESC_LINEAR_CDMAX ilog2(SZ_64K / (CTXDESC_CD_DWORDS << 3)) - -/* Command queue */ -#define CMDQ_ENT_SZ_SHIFT 4 -#define CMDQ_ENT_DWORDS ((1 << CMDQ_ENT_SZ_SHIFT) >> 3) -#define CMDQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - CMDQ_ENT_SZ_SHIFT) - -#define CMDQ_CONS_ERR GENMASK(30, 24) -#define CMDQ_ERR_CERROR_NONE_IDX 0 -#define CMDQ_ERR_CERROR_ILL_IDX 1 -#define CMDQ_ERR_CERROR_ABT_IDX 2 -#define CMDQ_ERR_CERROR_ATC_INV_IDX 3 - -#define CMDQ_0_OP GENMASK_ULL(7, 0) -#define CMDQ_0_SSV (1UL << 11) - -#define CMDQ_PREFETCH_0_SID GENMASK_ULL(63, 32) -#define CMDQ_PREFETCH_1_SIZE GENMASK_ULL(4, 0) -#define CMDQ_PREFETCH_1_ADDR_MASK GENMASK_ULL(63, 12) - -#define CMDQ_CFGI_0_SSID GENMASK_ULL(31, 12) -#define CMDQ_CFGI_0_SID GENMASK_ULL(63, 32) -#define CMDQ_CFGI_1_LEAF (1UL << 0) -#define CMDQ_CFGI_1_RANGE GENMASK_ULL(4, 0) - -#define CMDQ_TLBI_0_VMID GENMASK_ULL(47, 32) -#define CMDQ_TLBI_0_ASID GENMASK_ULL(63, 48) -#define CMDQ_TLBI_1_LEAF (1UL << 0) -#define CMDQ_TLBI_1_VA_MASK GENMASK_ULL(63, 12) -#define CMDQ_TLBI_1_IPA_MASK GENMASK_ULL(51, 12) - -#define CMDQ_ATC_0_SSID GENMASK_ULL(31, 12) -#define CMDQ_ATC_0_SID GENMASK_ULL(63, 32) -#define CMDQ_ATC_0_GLOBAL (1UL << 9) -#define CMDQ_ATC_1_SIZE GENMASK_ULL(5, 0) -#define CMDQ_ATC_1_ADDR_MASK GENMASK_ULL(63, 12) - -#define CMDQ_PRI_0_SSID GENMASK_ULL(31, 12) -#define CMDQ_PRI_0_SID GENMASK_ULL(63, 32) -#define CMDQ_PRI_1_GRPID GENMASK_ULL(8, 0) -#define CMDQ_PRI_1_RESP GENMASK_ULL(13, 12) - -#define CMDQ_SYNC_0_CS GENMASK_ULL(13, 12) -#define CMDQ_SYNC_0_CS_NONE 0 -#define CMDQ_SYNC_0_CS_IRQ 1 -#define CMDQ_SYNC_0_CS_SEV 2 -#define CMDQ_SYNC_0_MSH GENMASK_ULL(23, 22) -#define CMDQ_SYNC_0_MSIATTR GENMASK_ULL(27, 24) -#define CMDQ_SYNC_0_MSIDATA GENMASK_ULL(63, 32) -#define CMDQ_SYNC_1_MSIADDR_MASK GENMASK_ULL(51, 2) - -/* Event queue */ -#define EVTQ_ENT_SZ_SHIFT 5 -#define EVTQ_ENT_DWORDS ((1 << EVTQ_ENT_SZ_SHIFT) >> 3) -#define EVTQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - EVTQ_ENT_SZ_SHIFT) - -#define EVTQ_0_ID GENMASK_ULL(7, 0) - -/* PRI queue */ -#define PRIQ_ENT_SZ_SHIFT 4 -#define PRIQ_ENT_DWORDS ((1 << PRIQ_ENT_SZ_SHIFT) >> 3) -#define PRIQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - PRIQ_ENT_SZ_SHIFT) - -#define PRIQ_0_SID GENMASK_ULL(31, 0) -#define PRIQ_0_SSID GENMASK_ULL(51, 32) -#define PRIQ_0_PERM_PRIV (1UL << 58) -#define PRIQ_0_PERM_EXEC (1UL << 59) -#define PRIQ_0_PERM_READ (1UL << 60) -#define PRIQ_0_PERM_WRITE (1UL << 61) -#define PRIQ_0_PRG_LAST (1UL << 62) -#define PRIQ_0_SSID_V (1UL << 63) - -#define PRIQ_1_PRG_IDX GENMASK_ULL(8, 0) -#define PRIQ_1_ADDR_MASK GENMASK_ULL(63, 12) - -/* High-level queue structures */ -#define ARM_SMMU_POLL_TIMEOUT_US 100 -#define ARM_SMMU_CMDQ_SYNC_TIMEOUT_US 1000000 /* 1s! */ -#define ARM_SMMU_CMDQ_SYNC_SPIN_COUNT 10 - static bool disable_bypass = 1; -enum pri_resp { - PRI_RESP_DENY = 0, - PRI_RESP_FAIL = 1, - PRI_RESP_SUCC = 2, -}; - -#ifdef CONFIG_MSI -enum arm_smmu_msi_index { - EVTQ_MSI_INDEX, - GERROR_MSI_INDEX, - PRIQ_MSI_INDEX, - ARM_SMMU_MAX_MSIS, -}; - -static phys_addr_t arm_smmu_msi_cfg[ARM_SMMU_MAX_MSIS][3] = { - [EVTQ_MSI_INDEX] = { - ARM_SMMU_EVTQ_IRQ_CFG0, - ARM_SMMU_EVTQ_IRQ_CFG1, - ARM_SMMU_EVTQ_IRQ_CFG2, - }, - [GERROR_MSI_INDEX] = { - ARM_SMMU_GERROR_IRQ_CFG0, - ARM_SMMU_GERROR_IRQ_CFG1, - ARM_SMMU_GERROR_IRQ_CFG2, - }, - [PRIQ_MSI_INDEX] = { - ARM_SMMU_PRIQ_IRQ_CFG0, - ARM_SMMU_PRIQ_IRQ_CFG1, - ARM_SMMU_PRIQ_IRQ_CFG2, - }, -}; -#endif /* CONFIG_MSI */ - -struct arm_smmu_cmdq_ent { - /* Common fields */ - u8 opcode; - bool substream_valid; - - /* Command-specific fields */ - union { - #define CMDQ_OP_PREFETCH_CFG 0x1 - struct { - u32 sid; - u8 size; - u64 addr; - } prefetch; - - #define CMDQ_OP_CFGI_STE 0x3 - #define CMDQ_OP_CFGI_ALL 0x4 - struct { - u32 sid; - union { - bool leaf; - u8 span; - }; - } cfgi; - - #define CMDQ_OP_TLBI_EL2_ALL 0x20 - #define CMDQ_OP_TLBI_S12_VMALL 0x28 - #define CMDQ_OP_TLBI_S2_IPA 0x2a - #define CMDQ_OP_TLBI_NSNH_ALL 0x30 - struct { - u16 asid; - u16 vmid; - bool leaf; - u64 addr; - } tlbi; - - #define CMDQ_OP_ATC_INV 0x40 - #define ATC_INV_SIZE_ALL 52 - struct { - u32 sid; - u32 ssid; - u64 addr; - u8 size; - bool global; - } atc; - - #define CMDQ_OP_PRI_RESP 0x41 - struct { - u32 sid; - u32 ssid; - u16 grpid; - enum pri_resp resp; - } pri; - - #define CMDQ_OP_CMD_SYNC 0x46 - struct { - u32 msidata; - u64 msiaddr; - } sync; - }; -}; - -struct arm_smmu_ll_queue { - u32 prod; - u32 cons; - u32 max_n_shift; -}; - -struct arm_smmu_queue { - struct arm_smmu_ll_queue llq; - int irq; /* Wired interrupt */ - - __le64 *base; - dma_addr_t base_dma; - u64 q_base; - - size_t ent_dwords; - - u32 __iomem *prod_reg; - u32 __iomem *cons_reg; -}; - -struct arm_smmu_cmdq { - struct arm_smmu_queue q; - spinlock_t lock; -}; - -struct arm_smmu_evtq { - struct arm_smmu_queue q; - u32 max_stalls; -}; - -struct arm_smmu_priq { - struct arm_smmu_queue q; -}; - -/* High-level stream table and context descriptor structures */ -struct arm_smmu_strtab_l1_desc { - u8 span; - - __le64 *l2ptr; - dma_addr_t l2ptr_dma; -}; - -struct arm_smmu_s2_cfg { - u16 vmid; - u64 vttbr; - u64 vtcr; -}; - -struct arm_smmu_strtab_cfg { - __le64 *strtab; - dma_addr_t strtab_dma; - struct arm_smmu_strtab_l1_desc *l1_desc; - unsigned int num_l1_ents; - - u64 strtab_base; - u32 strtab_base_cfg; -}; - -struct arm_lpae_s2_cfg { - u64 vttbr; - struct { - u32 ps:3; - u32 tg:2; - u32 sh:2; - u32 orgn:2; - u32 irgn:2; - u32 sl:2; - u32 tsz:6; - } vtcr; -}; - -/* An SMMUv3 instance */ -struct arm_smmu_device { - struct device *dev; - void __iomem *base; - void __iomem *page1; - -#define ARM_SMMU_FEAT_2_LVL_STRTAB (1 << 0) -#define ARM_SMMU_FEAT_2_LVL_CDTAB (1 << 1) -#define ARM_SMMU_FEAT_TT_LE (1 << 2) -#define ARM_SMMU_FEAT_TT_BE (1 << 3) -#define ARM_SMMU_FEAT_PRI (1 << 4) -#define ARM_SMMU_FEAT_ATS (1 << 5) -#define ARM_SMMU_FEAT_SEV (1 << 6) -#define ARM_SMMU_FEAT_MSI (1 << 7) -#define ARM_SMMU_FEAT_COHERENCY (1 << 8) -#define ARM_SMMU_FEAT_TRANS_S1 (1 << 9) -#define ARM_SMMU_FEAT_TRANS_S2 (1 << 10) -#define ARM_SMMU_FEAT_STALLS (1 << 11) -#define ARM_SMMU_FEAT_HYP (1 << 12) -#define ARM_SMMU_FEAT_STALL_FORCE (1 << 13) -#define ARM_SMMU_FEAT_VAX (1 << 14) - u32 features; - -#define ARM_SMMU_OPT_SKIP_PREFETCH (1 << 0) -#define ARM_SMMU_OPT_PAGE0_REGS_ONLY (1 << 1) - u32 options; - - struct arm_smmu_cmdq cmdq; - struct arm_smmu_evtq evtq; - struct arm_smmu_priq priq; - - int gerr_irq; - int combined_irq; - u32 sync_nr; - u8 prev_cmd_opcode; - - unsigned long ias; /* IPA */ - unsigned long oas; /* PA */ - unsigned long pgsize_bitmap; - -#define ARM_SMMU_MAX_VMIDS (1 << 16) - unsigned int vmid_bits; - DECLARE_BITMAP(vmid_map, ARM_SMMU_MAX_VMIDS); - - unsigned int sid_bits; - - struct arm_smmu_strtab_cfg strtab_cfg; - - /* Hi16xx adds an extra 32 bits of goodness to its MSI payload */ - union { - u32 sync_count; - u64 padding; - }; - - /* Need to keep a list of SMMU devices */ - struct list_head devices; - - /* Tasklets for handling evts/faults and pci page request IRQs*/ - struct tasklet evtq_irq_tasklet; - struct tasklet priq_irq_tasklet; - struct tasklet combined_irq_tasklet; -}; - -/* SMMU private data for each master */ -struct arm_smmu_master { - struct arm_smmu_device *smmu; - struct device *dev; - struct arm_smmu_domain *domain; - struct list_head domain_head; - u32 *sids; - unsigned int num_sids; - bool ats_enabled; -}; - -/* SMMU private data for an IOMMU domain */ -enum arm_smmu_domain_stage { - ARM_SMMU_DOMAIN_S1 = 0, - ARM_SMMU_DOMAIN_S2, - ARM_SMMU_DOMAIN_NESTED, - ARM_SMMU_DOMAIN_BYPASS, -}; - -struct arm_smmu_domain { - struct arm_smmu_device *smmu; - struct mutex init_mutex; /* Protects smmu pointer */ - - bool non_strict; - atomic_t nr_ats_masters; - - enum arm_smmu_domain_stage stage; - struct arm_smmu_s2_cfg s2_cfg; - - /* Xen domain associated with this SMMU domain */ - struct domain *d; - - struct iommu_domain domain; - - struct list_head devices; - spinlock_t devices_lock; -}; - struct arm_smmu_option_prop { u32 opt; const char *prop; diff --git a/xen/drivers/passthrough/arm/smmu-v3.h b/xen/drivers/passthrough/arm/smmu-v3.h new file mode 100644 index 0000000000..c45d2f16c4 --- /dev/null +++ b/xen/drivers/passthrough/arm/smmu-v3.h @@ -0,0 +1,674 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * IOMMU API for ARM architected SMMUv3 implementations. + * + * Copyright (C) 2022 ARM Limited + */ + +#ifndef _ARM_SMMU_V3_H +#define _ARM_SMMU_V3_H + +/* MMIO registers */ +#define ARM_SMMU_IDR0 0x0 +#define IDR0_ST_LVL GENMASK(28, 27) +#define IDR0_ST_LVL_2LVL 1 +#define IDR0_STALL_MODEL GENMASK(25, 24) +#define IDR0_STALL_MODEL_STALL 0 +#define IDR0_STALL_MODEL_FORCE 2 +#define IDR0_TTENDIAN GENMASK(22, 21) +#define IDR0_TTENDIAN_MIXED 0 +#define IDR0_TTENDIAN_LE 2 +#define IDR0_TTENDIAN_BE 3 +#define IDR0_CD2L (1 << 19) +#define IDR0_VMID16 (1 << 18) +#define IDR0_PRI (1 << 16) +#define IDR0_SEV (1 << 14) +#define IDR0_MSI (1 << 13) +#define IDR0_ASID16 (1 << 12) +#define IDR0_ATS (1 << 10) +#define IDR0_HYP (1 << 9) +#define IDR0_COHACC (1 << 4) +#define IDR0_TTF GENMASK(3, 2) +#define IDR0_TTF_AARCH64 2 +#define IDR0_TTF_AARCH32_64 3 +#define IDR0_S1P (1 << 1) +#define IDR0_S2P (1 << 0) + +#define ARM_SMMU_IDR1 0x4 +#define IDR1_TABLES_PRESET (1 << 30) +#define IDR1_QUEUES_PRESET (1 << 29) +#define IDR1_REL (1 << 28) +#define IDR1_CMDQS GENMASK(25, 21) +#define IDR1_EVTQS GENMASK(20, 16) +#define IDR1_PRIQS GENMASK(15, 11) +#define IDR1_SSIDSIZE GENMASK(10, 6) +#define IDR1_SIDSIZE GENMASK(5, 0) + +#define ARM_SMMU_IDR5 0x14 +#define IDR5_STALL_MAX GENMASK(31, 16) +#define IDR5_GRAN64K (1 << 6) +#define IDR5_GRAN16K (1 << 5) +#define IDR5_GRAN4K (1 << 4) +#define IDR5_OAS GENMASK(2, 0) +#define IDR5_OAS_32_BIT 0 +#define IDR5_OAS_36_BIT 1 +#define IDR5_OAS_40_BIT 2 +#define IDR5_OAS_42_BIT 3 +#define IDR5_OAS_44_BIT 4 +#define IDR5_OAS_48_BIT 5 +#define IDR5_OAS_52_BIT 6 +#define IDR5_VAX GENMASK(11, 10) +#define IDR5_VAX_52_BIT 1 + +#define ARM_SMMU_CR0 0x20 +#define CR0_ATSCHK (1 << 4) +#define CR0_CMDQEN (1 << 3) +#define CR0_EVTQEN (1 << 2) +#define CR0_PRIQEN (1 << 1) +#define CR0_SMMUEN (1 << 0) + +#define ARM_SMMU_CR0ACK 0x24 + +#define ARM_SMMU_CR1 0x28 +#define CR1_TABLE_SH GENMASK(11, 10) +#define CR1_TABLE_OC GENMASK(9, 8) +#define CR1_TABLE_IC GENMASK(7, 6) +#define CR1_QUEUE_SH GENMASK(5, 4) +#define CR1_QUEUE_OC GENMASK(3, 2) +#define CR1_QUEUE_IC GENMASK(1, 0) +/* CR1 cacheability fields don't quite follow the usual TCR-style encoding */ +#define CR1_CACHE_NC 0 +#define CR1_CACHE_WB 1 +#define CR1_CACHE_WT 2 + +#define ARM_SMMU_CR2 0x2c +#define CR2_PTM (1 << 2) +#define CR2_RECINVSID (1 << 1) +#define CR2_E2H (1 << 0) + +#define ARM_SMMU_GBPA 0x44 +#define GBPA_UPDATE (1 << 31) +#define GBPA_ABORT (1 << 20) + +#define ARM_SMMU_IRQ_CTRL 0x50 +#define IRQ_CTRL_EVTQ_IRQEN (1 << 2) +#define IRQ_CTRL_PRIQ_IRQEN (1 << 1) +#define IRQ_CTRL_GERROR_IRQEN (1 << 0) + +#define ARM_SMMU_IRQ_CTRLACK 0x54 + +#define ARM_SMMU_GERROR 0x60 +#define GERROR_SFM_ERR (1 << 8) +#define GERROR_MSI_GERROR_ABT_ERR (1 << 7) +#define GERROR_MSI_PRIQ_ABT_ERR (1 << 6) +#define GERROR_MSI_EVTQ_ABT_ERR (1 << 5) +#define GERROR_MSI_CMDQ_ABT_ERR (1 << 4) +#define GERROR_PRIQ_ABT_ERR (1 << 3) +#define GERROR_EVTQ_ABT_ERR (1 << 2) +#define GERROR_CMDQ_ERR (1 << 0) +#define GERROR_ERR_MASK 0xfd + +#define ARM_SMMU_GERRORN 0x64 + +#define ARM_SMMU_GERROR_IRQ_CFG0 0x68 +#define ARM_SMMU_GERROR_IRQ_CFG1 0x70 +#define ARM_SMMU_GERROR_IRQ_CFG2 0x74 + +#define ARM_SMMU_STRTAB_BASE 0x80 +#define STRTAB_BASE_RA (1UL << 62) +#define STRTAB_BASE_ADDR_MASK GENMASK_ULL(51, 6) + +#define ARM_SMMU_STRTAB_BASE_CFG 0x88 +#define STRTAB_BASE_CFG_FMT GENMASK(17, 16) +#define STRTAB_BASE_CFG_FMT_LINEAR 0 +#define STRTAB_BASE_CFG_FMT_2LVL 1 +#define STRTAB_BASE_CFG_SPLIT GENMASK(10, 6) +#define STRTAB_BASE_CFG_LOG2SIZE GENMASK(5, 0) + +#define ARM_SMMU_CMDQ_BASE 0x90 +#define ARM_SMMU_CMDQ_PROD 0x98 +#define ARM_SMMU_CMDQ_CONS 0x9c + +#define ARM_SMMU_EVTQ_BASE 0xa0 +#define ARM_SMMU_EVTQ_PROD 0x100a8 +#define ARM_SMMU_EVTQ_CONS 0x100ac +#define ARM_SMMU_EVTQ_IRQ_CFG0 0xb0 +#define ARM_SMMU_EVTQ_IRQ_CFG1 0xb8 +#define ARM_SMMU_EVTQ_IRQ_CFG2 0xbc + +#define ARM_SMMU_PRIQ_BASE 0xc0 +#define ARM_SMMU_PRIQ_PROD 0x100c8 +#define ARM_SMMU_PRIQ_CONS 0x100cc +#define ARM_SMMU_PRIQ_IRQ_CFG0 0xd0 +#define ARM_SMMU_PRIQ_IRQ_CFG1 0xd8 +#define ARM_SMMU_PRIQ_IRQ_CFG2 0xdc + +#define ARM_SMMU_REG_SZ 0xe00 + +/* Common MSI config fields */ +#define MSI_CFG0_ADDR_MASK GENMASK_ULL(51, 2) +#define MSI_CFG2_SH GENMASK(5, 4) +#define MSI_CFG2_MEMATTR GENMASK(3, 0) + +/* Common memory attribute values */ +#define ARM_SMMU_SH_NSH 0 +#define ARM_SMMU_SH_OSH 2 +#define ARM_SMMU_SH_ISH 3 +#define ARM_SMMU_MEMATTR_DEVICE_nGnRE 0x1 +#define ARM_SMMU_MEMATTR_OIWB 0xf + +#define Q_IDX(llq, p) ((p) & ((1 << (llq)->max_n_shift) - 1)) +#define Q_WRP(llq, p) ((p) & (1 << (llq)->max_n_shift)) +#define Q_OVERFLOW_FLAG (1 << 31) +#define Q_OVF(p) ((p) & Q_OVERFLOW_FLAG) +#define Q_ENT(q, p) ((q)->base + \ + Q_IDX(&((q)->llq), p) * \ + (q)->ent_dwords) + +#define Q_BASE_RWA (1UL << 62) +#define Q_BASE_ADDR_MASK GENMASK_ULL(51, 5) +#define Q_BASE_LOG2SIZE GENMASK(4, 0) + +/* Ensure DMA allocations are naturally aligned */ +#ifdef CONFIG_CMA_ALIGNMENT +#define Q_MAX_SZ_SHIFT (PAGE_SHIFT + CONFIG_CMA_ALIGNMENT) +#else +#define Q_MAX_SZ_SHIFT (PAGE_SHIFT + MAX_ORDER - 1) +#endif + +/* + * Stream table. + * + * Linear: Enough to cover 1 << IDR1.SIDSIZE entries + * 2lvl: 128k L1 entries, + * 256 lazy entries per table (each table covers a PCI bus) + */ +#define STRTAB_L1_SZ_SHIFT 20 +#define STRTAB_SPLIT 8 + +#define STRTAB_L1_DESC_DWORDS 1 +#define STRTAB_L1_DESC_SPAN GENMASK_ULL(4, 0) +#define STRTAB_L1_DESC_L2PTR_MASK GENMASK_ULL(51, 6) + +#define STRTAB_STE_DWORDS 8 +#define STRTAB_STE_0_V (1UL << 0) +#define STRTAB_STE_0_CFG GENMASK_ULL(3, 1) +#define STRTAB_STE_0_CFG_ABORT 0 +#define STRTAB_STE_0_CFG_BYPASS 4 +#define STRTAB_STE_0_CFG_S1_TRANS 5 +#define STRTAB_STE_0_CFG_S2_TRANS 6 + +#define STRTAB_STE_0_S1FMT GENMASK_ULL(5, 4) +#define STRTAB_STE_0_S1FMT_LINEAR 0 +#define STRTAB_STE_0_S1FMT_64K_L2 2 +#define STRTAB_STE_0_S1CTXPTR_MASK GENMASK_ULL(51, 6) +#define STRTAB_STE_0_S1CDMAX GENMASK_ULL(63, 59) + +#define STRTAB_STE_1_S1DSS GENMASK_ULL(1, 0) +#define STRTAB_STE_1_S1DSS_TERMINATE 0x0 +#define STRTAB_STE_1_S1DSS_BYPASS 0x1 +#define STRTAB_STE_1_S1DSS_SSID0 0x2 + +#define STRTAB_STE_1_S1C_CACHE_NC 0UL +#define STRTAB_STE_1_S1C_CACHE_WBRA 1UL +#define STRTAB_STE_1_S1C_CACHE_WT 2UL +#define STRTAB_STE_1_S1C_CACHE_WB 3UL +#define STRTAB_STE_1_S1CIR GENMASK_ULL(3, 2) +#define STRTAB_STE_1_S1COR GENMASK_ULL(5, 4) +#define STRTAB_STE_1_S1CSH GENMASK_ULL(7, 6) + +#define STRTAB_STE_1_S1STALLD (1UL << 27) + +#define STRTAB_STE_1_EATS GENMASK_ULL(29, 28) +#define STRTAB_STE_1_EATS_ABT 0UL +#define STRTAB_STE_1_EATS_TRANS 1UL +#define STRTAB_STE_1_EATS_S1CHK 2UL + +#define STRTAB_STE_1_STRW GENMASK_ULL(31, 30) +#define STRTAB_STE_1_STRW_NSEL1 0UL +#define STRTAB_STE_1_STRW_EL2 2UL + +#define STRTAB_STE_1_SHCFG GENMASK_ULL(45, 44) +#define STRTAB_STE_1_SHCFG_INCOMING 1UL + +#define STRTAB_STE_2_S2VMID GENMASK_ULL(15, 0) +#define STRTAB_STE_2_VTCR GENMASK_ULL(50, 32) +#define STRTAB_STE_2_VTCR_S2T0SZ GENMASK_ULL(5, 0) +#define STRTAB_STE_2_VTCR_S2SL0 GENMASK_ULL(7, 6) +#define STRTAB_STE_2_VTCR_S2IR0 GENMASK_ULL(9, 8) +#define STRTAB_STE_2_VTCR_S2OR0 GENMASK_ULL(11, 10) +#define STRTAB_STE_2_VTCR_S2SH0 GENMASK_ULL(13, 12) +#define STRTAB_STE_2_VTCR_S2TG GENMASK_ULL(15, 14) +#define STRTAB_STE_2_VTCR_S2PS GENMASK_ULL(18, 16) +#define STRTAB_STE_2_S2AA64 (1UL << 51) +#define STRTAB_STE_2_S2ENDI (1UL << 52) +#define STRTAB_STE_2_S2PTW (1UL << 54) +#define STRTAB_STE_2_S2R (1UL << 58) + +#define STRTAB_STE_3_S2TTB_MASK GENMASK_ULL(51, 4) + +/* + * Context descriptors. + * + * Linear: when less than 1024 SSIDs are supported + * 2lvl: at most 1024 L1 entries, + * 1024 lazy entries per table. + */ +#define CTXDESC_SPLIT 10 +#define CTXDESC_L2_ENTRIES (1 << CTXDESC_SPLIT) + +#define CTXDESC_L1_DESC_DWORDS 1 +#define CTXDESC_L1_DESC_V (1UL << 0) +#define CTXDESC_L1_DESC_L2PTR_MASK GENMASK_ULL(51, 12) + +#define CTXDESC_CD_DWORDS 8 +#define CTXDESC_CD_0_TCR_T0SZ GENMASK_ULL(5, 0) +#define CTXDESC_CD_0_TCR_TG0 GENMASK_ULL(7, 6) +#define CTXDESC_CD_0_TCR_IRGN0 GENMASK_ULL(9, 8) +#define CTXDESC_CD_0_TCR_ORGN0 GENMASK_ULL(11, 10) +#define CTXDESC_CD_0_TCR_SH0 GENMASK_ULL(13, 12) +#define CTXDESC_CD_0_TCR_EPD0 (1ULL << 14) +#define CTXDESC_CD_0_TCR_EPD1 (1ULL << 30) + +#define CTXDESC_CD_0_ENDI (1UL << 15) +#define CTXDESC_CD_0_V (1UL << 31) + +#define CTXDESC_CD_0_TCR_IPS GENMASK_ULL(34, 32) +#define CTXDESC_CD_0_TCR_TBI0 (1ULL << 38) + +#define CTXDESC_CD_0_AA64 (1UL << 41) +#define CTXDESC_CD_0_S (1UL << 44) +#define CTXDESC_CD_0_R (1UL << 45) +#define CTXDESC_CD_0_A (1UL << 46) +#define CTXDESC_CD_0_ASET (1UL << 47) +#define CTXDESC_CD_0_ASID GENMASK_ULL(63, 48) + +#define CTXDESC_CD_1_TTB0_MASK GENMASK_ULL(51, 4) + +/* + * When the SMMU only supports linear context descriptor tables, pick a + * reasonable size limit (64kB). + */ +#define CTXDESC_LINEAR_CDMAX ilog2(SZ_64K / (CTXDESC_CD_DWORDS << 3)) + +/* Command queue */ +#define CMDQ_ENT_SZ_SHIFT 4 +#define CMDQ_ENT_DWORDS ((1 << CMDQ_ENT_SZ_SHIFT) >> 3) +#define CMDQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - CMDQ_ENT_SZ_SHIFT) + +#define CMDQ_CONS_ERR GENMASK(30, 24) +#define CMDQ_ERR_CERROR_NONE_IDX 0 +#define CMDQ_ERR_CERROR_ILL_IDX 1 +#define CMDQ_ERR_CERROR_ABT_IDX 2 +#define CMDQ_ERR_CERROR_ATC_INV_IDX 3 + +#define CMDQ_0_OP GENMASK_ULL(7, 0) +#define CMDQ_0_SSV (1UL << 11) + +#define CMDQ_PREFETCH_0_SID GENMASK_ULL(63, 32) +#define CMDQ_PREFETCH_1_SIZE GENMASK_ULL(4, 0) +#define CMDQ_PREFETCH_1_ADDR_MASK GENMASK_ULL(63, 12) + +#define CMDQ_CFGI_0_SSID GENMASK_ULL(31, 12) +#define CMDQ_CFGI_0_SID GENMASK_ULL(63, 32) +#define CMDQ_CFGI_1_LEAF (1UL << 0) +#define CMDQ_CFGI_1_RANGE GENMASK_ULL(4, 0) + +#define CMDQ_TLBI_0_VMID GENMASK_ULL(47, 32) +#define CMDQ_TLBI_0_ASID GENMASK_ULL(63, 48) +#define CMDQ_TLBI_1_LEAF (1UL << 0) +#define CMDQ_TLBI_1_VA_MASK GENMASK_ULL(63, 12) +#define CMDQ_TLBI_1_IPA_MASK GENMASK_ULL(51, 12) + +#define CMDQ_ATC_0_SSID GENMASK_ULL(31, 12) +#define CMDQ_ATC_0_SID GENMASK_ULL(63, 32) +#define CMDQ_ATC_0_GLOBAL (1UL << 9) +#define CMDQ_ATC_1_SIZE GENMASK_ULL(5, 0) +#define CMDQ_ATC_1_ADDR_MASK GENMASK_ULL(63, 12) + +#define CMDQ_PRI_0_SSID GENMASK_ULL(31, 12) +#define CMDQ_PRI_0_SID GENMASK_ULL(63, 32) +#define CMDQ_PRI_1_GRPID GENMASK_ULL(8, 0) +#define CMDQ_PRI_1_RESP GENMASK_ULL(13, 12) + +#define CMDQ_SYNC_0_CS GENMASK_ULL(13, 12) +#define CMDQ_SYNC_0_CS_NONE 0 +#define CMDQ_SYNC_0_CS_IRQ 1 +#define CMDQ_SYNC_0_CS_SEV 2 +#define CMDQ_SYNC_0_MSH GENMASK_ULL(23, 22) +#define CMDQ_SYNC_0_MSIATTR GENMASK_ULL(27, 24) +#define CMDQ_SYNC_0_MSIDATA GENMASK_ULL(63, 32) +#define CMDQ_SYNC_1_MSIADDR_MASK GENMASK_ULL(51, 2) + +/* Event queue */ +#define EVTQ_ENT_SZ_SHIFT 5 +#define EVTQ_ENT_DWORDS ((1 << EVTQ_ENT_SZ_SHIFT) >> 3) +#define EVTQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - EVTQ_ENT_SZ_SHIFT) + +#define EVTQ_0_ID GENMASK_ULL(7, 0) + +/* PRI queue */ +#define PRIQ_ENT_SZ_SHIFT 4 +#define PRIQ_ENT_DWORDS ((1 << PRIQ_ENT_SZ_SHIFT) >> 3) +#define PRIQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - PRIQ_ENT_SZ_SHIFT) + +#define PRIQ_0_SID GENMASK_ULL(31, 0) +#define PRIQ_0_SSID GENMASK_ULL(51, 32) +#define PRIQ_0_PERM_PRIV (1UL << 58) +#define PRIQ_0_PERM_EXEC (1UL << 59) +#define PRIQ_0_PERM_READ (1UL << 60) +#define PRIQ_0_PERM_WRITE (1UL << 61) +#define PRIQ_0_PRG_LAST (1UL << 62) +#define PRIQ_0_SSID_V (1UL << 63) + +#define PRIQ_1_PRG_IDX GENMASK_ULL(8, 0) +#define PRIQ_1_ADDR_MASK GENMASK_ULL(63, 12) + +/* High-level queue structures */ +#define ARM_SMMU_POLL_TIMEOUT_US 100 +#define ARM_SMMU_CMDQ_SYNC_TIMEOUT_US 1000000 /* 1s! */ +#define ARM_SMMU_CMDQ_SYNC_SPIN_COUNT 10 + +#define FIELD_PREP(_mask, _val) \ + (((typeof(_mask))(_val) << (ffs64(_mask) - 1)) & (_mask)) + +#define FIELD_GET(_mask, _reg) \ + ((typeof(_mask))(((_reg) & (_mask)) >> (ffs64(_mask) - 1))) + +/* Linux compatibility functions. */ +typedef paddr_t dma_addr_t; +typedef paddr_t phys_addr_t; +typedef unsigned int gfp_t; + +/* Alias to Xen lock functions */ +#define mutex spinlock +#define mutex_init spin_lock_init +#define mutex_lock spin_lock +#define mutex_unlock spin_unlock + +/* SMMU private data for an IOMMU domain */ +enum arm_smmu_domain_stage { + ARM_SMMU_DOMAIN_S1 = 0, + ARM_SMMU_DOMAIN_S2, + ARM_SMMU_DOMAIN_NESTED, + ARM_SMMU_DOMAIN_BYPASS, +}; + +/* Xen specific code. */ +struct iommu_domain { + /* Runtime SMMU configuration for this iommu_domain */ + atomic_t ref; + /* + * Used to link iommu_domain contexts for a same domain. + * There is at least one per-SMMU to used by the domain. + */ + struct list_head list; +}; + +/* Describes information required for a Xen domain */ +struct arm_smmu_xen_domain { + spinlock_t lock; + + /* List of iommu domains associated to this domain */ + struct list_head contexts; +}; + +enum pri_resp { + PRI_RESP_DENY = 0, + PRI_RESP_FAIL = 1, + PRI_RESP_SUCC = 2, +}; + +#ifdef CONFIG_MSI +enum arm_smmu_msi_index { + EVTQ_MSI_INDEX, + GERROR_MSI_INDEX, + PRIQ_MSI_INDEX, + ARM_SMMU_MAX_MSIS, +}; + +static phys_addr_t arm_smmu_msi_cfg[ARM_SMMU_MAX_MSIS][3] = { + [EVTQ_MSI_INDEX] = { + ARM_SMMU_EVTQ_IRQ_CFG0, + ARM_SMMU_EVTQ_IRQ_CFG1, + ARM_SMMU_EVTQ_IRQ_CFG2, + }, + [GERROR_MSI_INDEX] = { + ARM_SMMU_GERROR_IRQ_CFG0, + ARM_SMMU_GERROR_IRQ_CFG1, + ARM_SMMU_GERROR_IRQ_CFG2, + }, + [PRIQ_MSI_INDEX] = { + ARM_SMMU_PRIQ_IRQ_CFG0, + ARM_SMMU_PRIQ_IRQ_CFG1, + ARM_SMMU_PRIQ_IRQ_CFG2, + }, +}; +#endif /* CONFIG_MSI */ + +struct arm_smmu_cmdq_ent { + /* Common fields */ + u8 opcode; + bool substream_valid; + + /* Command-specific fields */ + union { + #define CMDQ_OP_PREFETCH_CFG 0x1 + struct { + u32 sid; + u8 size; + u64 addr; + } prefetch; + + #define CMDQ_OP_CFGI_STE 0x3 + #define CMDQ_OP_CFGI_ALL 0x4 + struct { + u32 sid; + union { + bool leaf; + u8 span; + }; + } cfgi; + + #define CMDQ_OP_TLBI_EL2_ALL 0x20 + #define CMDQ_OP_TLBI_S12_VMALL 0x28 + #define CMDQ_OP_TLBI_S2_IPA 0x2a + #define CMDQ_OP_TLBI_NSNH_ALL 0x30 + struct { + u16 asid; + u16 vmid; + bool leaf; + u64 addr; + } tlbi; + + #define CMDQ_OP_ATC_INV 0x40 + #define ATC_INV_SIZE_ALL 52 + struct { + u32 sid; + u32 ssid; + u64 addr; + u8 size; + bool global; + } atc; + + #define CMDQ_OP_PRI_RESP 0x41 + struct { + u32 sid; + u32 ssid; + u16 grpid; + enum pri_resp resp; + } pri; + + #define CMDQ_OP_CMD_SYNC 0x46 + struct { + u32 msidata; + u64 msiaddr; + } sync; + }; +}; + +struct arm_smmu_ll_queue { + u32 prod; + u32 cons; + u32 max_n_shift; +}; + +struct arm_smmu_queue { + struct arm_smmu_ll_queue llq; + int irq; /* Wired interrupt */ + + __le64 *base; + dma_addr_t base_dma; + u64 q_base; + + size_t ent_dwords; + + u32 __iomem *prod_reg; + u32 __iomem *cons_reg; +}; + +struct arm_smmu_cmdq { + struct arm_smmu_queue q; + spinlock_t lock; +}; + +struct arm_smmu_evtq { + struct arm_smmu_queue q; + u32 max_stalls; +}; + +struct arm_smmu_priq { + struct arm_smmu_queue q; +}; + +/* High-level stream table and context descriptor structures */ +struct arm_smmu_strtab_l1_desc { + u8 span; + + __le64 *l2ptr; + dma_addr_t l2ptr_dma; +}; + +struct arm_smmu_s2_cfg { + u16 vmid; + u64 vttbr; + u64 vtcr; +}; + +struct arm_smmu_strtab_cfg { + __le64 *strtab; + dma_addr_t strtab_dma; + struct arm_smmu_strtab_l1_desc *l1_desc; + unsigned int num_l1_ents; + + u64 strtab_base; + u32 strtab_base_cfg; +}; + +struct arm_lpae_s2_cfg { + u64 vttbr; + struct { + u32 ps:3; + u32 tg:2; + u32 sh:2; + u32 orgn:2; + u32 irgn:2; + u32 sl:2; + u32 tsz:6; + } vtcr; +}; + +/* An SMMUv3 instance */ +struct arm_smmu_device { + struct device *dev; + void __iomem *base; + void __iomem *page1; + +#define ARM_SMMU_FEAT_2_LVL_STRTAB (1 << 0) +#define ARM_SMMU_FEAT_2_LVL_CDTAB (1 << 1) +#define ARM_SMMU_FEAT_TT_LE (1 << 2) +#define ARM_SMMU_FEAT_TT_BE (1 << 3) +#define ARM_SMMU_FEAT_PRI (1 << 4) +#define ARM_SMMU_FEAT_ATS (1 << 5) +#define ARM_SMMU_FEAT_SEV (1 << 6) +#define ARM_SMMU_FEAT_MSI (1 << 7) +#define ARM_SMMU_FEAT_COHERENCY (1 << 8) +#define ARM_SMMU_FEAT_TRANS_S1 (1 << 9) +#define ARM_SMMU_FEAT_TRANS_S2 (1 << 10) +#define ARM_SMMU_FEAT_STALLS (1 << 11) +#define ARM_SMMU_FEAT_HYP (1 << 12) +#define ARM_SMMU_FEAT_STALL_FORCE (1 << 13) +#define ARM_SMMU_FEAT_VAX (1 << 14) + u32 features; + +#define ARM_SMMU_OPT_SKIP_PREFETCH (1 << 0) +#define ARM_SMMU_OPT_PAGE0_REGS_ONLY (1 << 1) + u32 options; + + struct arm_smmu_cmdq cmdq; + struct arm_smmu_evtq evtq; + struct arm_smmu_priq priq; + + int gerr_irq; + int combined_irq; + u32 sync_nr; + u8 prev_cmd_opcode; + + unsigned long ias; /* IPA */ + unsigned long oas; /* PA */ + unsigned long pgsize_bitmap; + +#define ARM_SMMU_MAX_VMIDS (1 << 16) + unsigned int vmid_bits; + DECLARE_BITMAP(vmid_map, ARM_SMMU_MAX_VMIDS); + + unsigned int sid_bits; + + struct arm_smmu_strtab_cfg strtab_cfg; + + /* Hi16xx adds an extra 32 bits of goodness to its MSI payload */ + union { + u32 sync_count; + u64 padding; + }; + + /* Need to keep a list of SMMU devices */ + struct list_head devices; + + /* Tasklets for handling evts/faults and pci page request IRQs*/ + struct tasklet evtq_irq_tasklet; + struct tasklet priq_irq_tasklet; + struct tasklet combined_irq_tasklet; +}; + +/* SMMU private data for each master */ +struct arm_smmu_master { + struct arm_smmu_device *smmu; + struct device *dev; + struct arm_smmu_domain *domain; + struct list_head domain_head; + u32 *sids; + unsigned int num_sids; + bool ats_enabled; +}; + +struct arm_smmu_domain { + struct arm_smmu_device *smmu; + struct mutex init_mutex; /* Protects smmu pointer */ + + bool non_strict; + atomic_t nr_ats_masters; + + enum arm_smmu_domain_stage stage; + struct arm_smmu_s2_cfg s2_cfg; + + /* Xen domain associated with this SMMU domain */ + struct domain *d; + + struct iommu_domain domain; + + struct list_head devices; + spinlock_t devices_lock; +}; + +#endif /* _ARM_SMMU_V3_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:34:43 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:34:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401173.642920 (Exim 4.92) (envelope-from ) id 1oVsOJ-0005l7-7M; Wed, 07 Sep 2022 10:34:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401173.642920; Wed, 07 Sep 2022 10:34: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 1oVsOJ-0005kz-4Y; Wed, 07 Sep 2022 10:34:43 +0000 Received: by outflank-mailman (input) for mailman id 401173; Wed, 07 Sep 2022 10:34:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsOI-0005km-JG for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsOI-0002uJ-IW for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsOI-0002qD-Hg for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34: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=28j3I9WCdZa1MRfCM7xX/hljYfxCnhrTVKPLyo51ap0=; b=xKTDgAdE23gGWclrSrY58t4FKX XGk/MyN4h0P5EjY0iJmOSEyh5S1n5R6A1PpkrM27X+ydwjTch9+6KKS1bJHP6BeXZgIiuKccW1gBH O/GDdh2fbGK6jQzw4NVsiOPdagLINsS1ofV7Uuj4BSj+YWBziqK8+hRKflEqnqnWp0q4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smmuv3: Remove the page 1 fixup Message-Id: Date: Wed, 07 Sep 2022 10:34:42 +0000 commit ae4ee09eb3e4b220b2aa6c5ff41b2819090355d6 Author: Robin Murphy AuthorDate: Tue Jan 11 17:10:51 2022 +0000 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:25 2022 +0100 xen/arm: smmuv3: Remove the page 1 fixup Backport Linux commit 86d2d9214880. This is the clean backport without any changes. Since we now keep track of page 1 via a separate pointer that already encapsulates aliasing to page 0 as necessary, we can remove the clunky fixup routine and simply use the relevant bases directly. The current architecture spec (IHI0070D.a) defines SMMU_{EVENTQ,PRIQ}_{PROD,CONS} as offsets relative to page 1, so the cleanup represents a little bit of convergence as well as just lines of code saved. Signed-off-by: Robin Murphy Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 86d2d9214880 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 42 +++++++++++++---------------------- xen/drivers/passthrough/arm/smmu-v3.h | 8 +++---- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index ba24a26ad6..15bb4d7e19 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -238,15 +238,6 @@ static struct arm_smmu_option_prop arm_smmu_options[] = { { 0, NULL}, }; -static inline void __iomem *arm_smmu_page1_fixup(unsigned long offset, - struct arm_smmu_device *smmu) -{ - if (offset > SZ_64K) - return smmu->page1 + offset - SZ_64K; - - return smmu->base + offset; -} - static struct arm_smmu_domain *to_smmu_domain(struct iommu_domain *dom) { return container_of(dom, struct arm_smmu_domain, domain); @@ -1581,6 +1572,7 @@ static int arm_smmu_dt_xlate(struct device *dev, /* Probing and initialisation functions */ static int arm_smmu_init_one_queue(struct arm_smmu_device *smmu, struct arm_smmu_queue *q, + void __iomem *page, unsigned long prod_off, unsigned long cons_off, size_t dwords, const char *name) @@ -1609,8 +1601,8 @@ static int arm_smmu_init_one_queue(struct arm_smmu_device *smmu, 1 << q->llq.max_n_shift, name); } - q->prod_reg = arm_smmu_page1_fixup(prod_off, smmu); - q->cons_reg = arm_smmu_page1_fixup(cons_off, smmu); + q->prod_reg = page + prod_off; + q->cons_reg = page + cons_off; q->ent_dwords = dwords; q->q_base = Q_BASE_RWA; @@ -1627,16 +1619,16 @@ static int arm_smmu_init_queues(struct arm_smmu_device *smmu) /* cmdq */ spin_lock_init(&smmu->cmdq.lock); - ret = arm_smmu_init_one_queue(smmu, &smmu->cmdq.q, ARM_SMMU_CMDQ_PROD, - ARM_SMMU_CMDQ_CONS, CMDQ_ENT_DWORDS, - "cmdq"); + ret = arm_smmu_init_one_queue(smmu, &smmu->cmdq.q, smmu->base, + ARM_SMMU_CMDQ_PROD, ARM_SMMU_CMDQ_CONS, + CMDQ_ENT_DWORDS, "cmdq"); if (ret) return ret; /* evtq */ - ret = arm_smmu_init_one_queue(smmu, &smmu->evtq.q, ARM_SMMU_EVTQ_PROD, - ARM_SMMU_EVTQ_CONS, EVTQ_ENT_DWORDS, - "evtq"); + ret = arm_smmu_init_one_queue(smmu, &smmu->evtq.q, smmu->page1, + ARM_SMMU_EVTQ_PROD, ARM_SMMU_EVTQ_CONS, + EVTQ_ENT_DWORDS, "evtq"); if (ret) return ret; @@ -1644,9 +1636,9 @@ static int arm_smmu_init_queues(struct arm_smmu_device *smmu) if (!(smmu->features & ARM_SMMU_FEAT_PRI)) return 0; - return arm_smmu_init_one_queue(smmu, &smmu->priq.q, ARM_SMMU_PRIQ_PROD, - ARM_SMMU_PRIQ_CONS, PRIQ_ENT_DWORDS, - "priq"); + return arm_smmu_init_one_queue(smmu, &smmu->priq.q, smmu->page1, + ARM_SMMU_PRIQ_PROD, ARM_SMMU_PRIQ_CONS, + PRIQ_ENT_DWORDS, "priq"); } static int arm_smmu_init_l1_strtab(struct arm_smmu_device *smmu) @@ -2090,10 +2082,8 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu) /* Event queue */ writeq_relaxed(smmu->evtq.q.q_base, smmu->base + ARM_SMMU_EVTQ_BASE); - writel_relaxed(smmu->evtq.q.llq.prod, - arm_smmu_page1_fixup(ARM_SMMU_EVTQ_PROD, smmu)); - writel_relaxed(smmu->evtq.q.llq.cons, - arm_smmu_page1_fixup(ARM_SMMU_EVTQ_CONS, smmu)); + writel_relaxed(smmu->evtq.q.llq.prod, smmu->page1 + ARM_SMMU_EVTQ_PROD); + writel_relaxed(smmu->evtq.q.llq.cons, smmu->page1 + ARM_SMMU_EVTQ_CONS); enables |= CR0_EVTQEN; ret = arm_smmu_write_reg_sync(smmu, enables, ARM_SMMU_CR0, @@ -2108,9 +2098,9 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu) writeq_relaxed(smmu->priq.q.q_base, smmu->base + ARM_SMMU_PRIQ_BASE); writel_relaxed(smmu->priq.q.llq.prod, - arm_smmu_page1_fixup(ARM_SMMU_PRIQ_PROD, smmu)); + smmu->page1 + ARM_SMMU_PRIQ_PROD); writel_relaxed(smmu->priq.q.llq.cons, - arm_smmu_page1_fixup(ARM_SMMU_PRIQ_CONS, smmu)); + smmu->page1 + ARM_SMMU_PRIQ_CONS); enables |= CR0_PRIQEN; ret = arm_smmu_write_reg_sync(smmu, enables, ARM_SMMU_CR0, diff --git a/xen/drivers/passthrough/arm/smmu-v3.h b/xen/drivers/passthrough/arm/smmu-v3.h index c45d2f16c4..0742bc393f 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.h +++ b/xen/drivers/passthrough/arm/smmu-v3.h @@ -130,15 +130,15 @@ #define ARM_SMMU_CMDQ_CONS 0x9c #define ARM_SMMU_EVTQ_BASE 0xa0 -#define ARM_SMMU_EVTQ_PROD 0x100a8 -#define ARM_SMMU_EVTQ_CONS 0x100ac +#define ARM_SMMU_EVTQ_PROD 0xa8 +#define ARM_SMMU_EVTQ_CONS 0xac #define ARM_SMMU_EVTQ_IRQ_CFG0 0xb0 #define ARM_SMMU_EVTQ_IRQ_CFG1 0xb8 #define ARM_SMMU_EVTQ_IRQ_CFG2 0xbc #define ARM_SMMU_PRIQ_BASE 0xc0 -#define ARM_SMMU_PRIQ_PROD 0x100c8 -#define ARM_SMMU_PRIQ_CONS 0x100cc +#define ARM_SMMU_PRIQ_PROD 0xc8 +#define ARM_SMMU_PRIQ_CONS 0xcc #define ARM_SMMU_PRIQ_IRQ_CFG0 0xd0 #define ARM_SMMU_PRIQ_IRQ_CFG1 0xd8 #define ARM_SMMU_PRIQ_IRQ_CFG2 0xdc -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:34:53 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:34:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401177.642937 (Exim 4.92) (envelope-from ) id 1oVsOT-00066p-HK; Wed, 07 Sep 2022 10:34:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401177.642937; Wed, 07 Sep 2022 10:34: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 1oVsOT-00066g-Di; Wed, 07 Sep 2022 10:34:53 +0000 Received: by outflank-mailman (input) for mailman id 401177; Wed, 07 Sep 2022 10:34:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsOS-00066L-M8 for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsOS-0002ui-LU for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsOS-0002r1-Kj for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:34: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=/kJ2k+JWZOfxBo5tZNohqZM4ZfliJCqcmR0dEAjyL+A=; b=Y4cXRSW9z9Owi5hAH/E6sZRIFi WYZhrefxRTeyS1kLRFI9oLQeJbx0kMOwR3TtAWBUdqoXk0Nk6ZZ0WKckjGQJWEzTVGpaWFiBVWVOF nJpRReHVyHtywsVD9icRWrXpMXxWDi5YiH0qiCfEsEn3xLy5+1fkCJsVnFH8Ng5LlD8o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smmuv3: Remove the unused fields for PREFETCH_CONFIG command Message-Id: Date: Wed, 07 Sep 2022 10:34:52 +0000 commit f9f03811be0599ea5d1bf917aeed384b641f4457 Author: Zenghui Yu AuthorDate: Tue Aug 23 15:05:36 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:27 2022 +0100 xen/arm: smmuv3: Remove the unused fields for PREFETCH_CONFIG command Backport Linux commit e0bb4b735404. This is the clean backport without any changes. Per SMMUv3 spec, there is no Size and Addr field in the PREFETCH_CONFIG command and they're not used by the driver. Remove them. We can add them back if we're going to use PREFETCH_ADDR in the future. Signed-off-by: Zenghui Yu Link: https://lore.kernel.org/r/20210407084448.1838-1-yuzenghui@huawei.com Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e0bb4b735404 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 2 -- xen/drivers/passthrough/arm/smmu-v3.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 15bb4d7e19..28fcb01757 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -405,8 +405,6 @@ static int arm_smmu_cmdq_build_cmd(u64 *cmd, struct arm_smmu_cmdq_ent *ent) break; case CMDQ_OP_PREFETCH_CFG: cmd[0] |= FIELD_PREP(CMDQ_PREFETCH_0_SID, ent->prefetch.sid); - cmd[1] |= FIELD_PREP(CMDQ_PREFETCH_1_SIZE, ent->prefetch.size); - cmd[1] |= ent->prefetch.addr & CMDQ_PREFETCH_1_ADDR_MASK; break; case CMDQ_OP_CFGI_STE: cmd[0] |= FIELD_PREP(CMDQ_CFGI_0_SID, ent->cfgi.sid); diff --git a/xen/drivers/passthrough/arm/smmu-v3.h b/xen/drivers/passthrough/arm/smmu-v3.h index 0742bc393f..b381ad3738 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.h +++ b/xen/drivers/passthrough/arm/smmu-v3.h @@ -456,8 +456,6 @@ struct arm_smmu_cmdq_ent { #define CMDQ_OP_PREFETCH_CFG 0x1 struct { u32 sid; - u8 size; - u64 addr; } prefetch; #define CMDQ_OP_CFGI_STE 0x3 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:35:03 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:35:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401178.642940 (Exim 4.92) (envelope-from ) id 1oVsOd-0006HV-Ie; Wed, 07 Sep 2022 10:35:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401178.642940; Wed, 07 Sep 2022 10:35: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 1oVsOd-0006HK-FL; Wed, 07 Sep 2022 10:35:03 +0000 Received: by outflank-mailman (input) for mailman id 401178; Wed, 07 Sep 2022 10:35:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsOc-0006Fw-P4 for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsOc-0002we-OM for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsOc-0002s3-Ni for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35: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=UVqDECDNLsN//LdLNbCS494npKpFvCxBjKWQNxK4LBY=; b=wBpKOhWXdBQl4f8ewvUtuUjYpW f3iFe7frv+N4NplgVMmTnnkb6Tz9ytGcgUadIKpntJQZwv3O7+6SeMyGlvWm3Yic+tbETlAFfEry1 Gm/9/63v0nGlAylDhbLbZ3G16AkwpbAkZDTGGgxynRPvb4TAR6HfTYJXok7zU5WBzUgA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smmuv3: Change *array into *const array Message-Id: Date: Wed, 07 Sep 2022 10:35:02 +0000 commit 6717b8e6a945ef7efb87e9d625dcf71ad0ef81ba Author: Bixuan Cui AuthorDate: Tue Aug 23 15:11:04 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:29 2022 +0100 xen/arm: smmuv3: Change *array into *const array Backport Linux commit d56d5162e317. This is the clean backport without any changes. Fix checkpatch warning in arm-smmu-v3.c: static const char * array should probably be static const char * const Signed-off-by: Bixuan Cui Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git d56d5162e317 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 28fcb01757..c53d4c96a4 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -470,7 +470,7 @@ static int arm_smmu_cmdq_build_cmd(u64 *cmd, struct arm_smmu_cmdq_ent *ent) static void arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu) { - static const char *cerror_str[] = { + static const char * const cerror_str[] = { [CMDQ_ERR_CERROR_NONE_IDX] = "No error", [CMDQ_ERR_CERROR_ILL_IDX] = "Illegal command", [CMDQ_ERR_CERROR_ABT_IDX] = "Abort on command fetch", -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:35:13 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:35:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401181.642945 (Exim 4.92) (envelope-from ) id 1oVsOn-0006MD-Kh; Wed, 07 Sep 2022 10:35:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401181.642945; Wed, 07 Sep 2022 10:35: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 1oVsOn-0006M4-Gu; Wed, 07 Sep 2022 10:35:13 +0000 Received: by outflank-mailman (input) for mailman id 401181; Wed, 07 Sep 2022 10:35:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsOm-0006Ls-S0 for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsOm-0002wu-RM for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsOm-0002sw-Qa for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35: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=fvl0rJvkH9anbWyBLh81qhHikwc2S7jVAIektCKtMgE=; b=O8XSvKvO90mIOY+vbDQ75iU9kj P5tBJFehg7AJSpLO5gfYf++n+hvw4nbXQnYbMI2Tf07jUdxCgs8sQQYsqPqPZFnikWfJxyiDfLR5q wiiRNcu49CeolTI06K78hXQ9sIlakcAT8vgt0uCf5gxTPOyZJoCpvWZJ/LgCyx7XpYsU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smmuv3: Remove unnecessary oom message Message-Id: Date: Wed, 07 Sep 2022 10:35:12 +0000 commit 96a0f2a264c6afb128cff4c6845225f8e3776ed7 Author: Zhen Lei AuthorDate: Tue Aug 23 15:30:38 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:31 2022 +0100 xen/arm: smmuv3: Remove unnecessary oom message Backport Linux commit affa909571b0. This is the clean backport without any changes. Fixes scripts/checkpatch.pl warning: WARNING: Possible unnecessary 'out of memory' message Remove it can help us save a bit of memory. Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210609125438.14369-1-thunder.leizhen@huawei.com Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git affa909571b0 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index c53d4c96a4..c47e7dea04 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -1647,10 +1647,8 @@ static int arm_smmu_init_l1_strtab(struct arm_smmu_device *smmu) void *strtab = smmu->strtab_cfg.strtab; cfg->l1_desc = _xzalloc(size, sizeof(void *)); - if (!cfg->l1_desc) { - dev_err(smmu->dev, "failed to allocate l1 stream table desc\n"); + if (!cfg->l1_desc) return -ENOMEM; - } for (i = 0; i < cfg->num_l1_ents; ++i) { arm_smmu_write_strtab_l1_desc(strtab, &cfg->l1_desc[i]); @@ -2435,10 +2433,8 @@ static int arm_smmu_device_probe(struct platform_device *pdev) struct arm_smmu_device *smmu; smmu = xzalloc(struct arm_smmu_device); - if (!smmu) { - dev_err(pdev, "failed to allocate arm_smmu_device\n"); + if (!smmu) return -ENOMEM; - } smmu->dev = pdev; if (pdev->of_node) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:35:23 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:35:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401185.642947 (Exim 4.92) (envelope-from ) id 1oVsOx-0006SA-LF; Wed, 07 Sep 2022 10:35:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401185.642947; Wed, 07 Sep 2022 10:35: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 1oVsOx-0006S2-IW; Wed, 07 Sep 2022 10:35:23 +0000 Received: by outflank-mailman (input) for mailman id 401185; Wed, 07 Sep 2022 10:35:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsOw-0006Ru-VA for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsOw-0002x4-UN for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsOw-0002tk-TX for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35: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=NNWodFQB/PeKs2GiWikzu/cQjJ+NwbylLbv2MkBkxNE=; b=tJSLmE2RDr49h65sgMuyNxO3S9 2QK8QB+MSOI/NHsrUoH1ROQ7N/FEmDgNnjJsL+A5mLclc8+B1l/Q3i+0NHV0Va3b1cqbzWK368Jmf QvE/8+6qqTdrdey74CgzhBMnv6zPhGKlNFFnaHV3BlQjl908GfeAUe5Oe0nkArOFNDfE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smmuv3: Fix fall-through warning for Clang Message-Id: Date: Wed, 07 Sep 2022 10:35:22 +0000 commit eabda52f217124ed48bdd34ac008f98a5cb1feb9 Author: Gustavo A. R. Silva AuthorDate: Tue Aug 23 15:34:08 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:33 2022 +0100 xen/arm: smmuv3: Fix fall-through warning for Clang Backport Linux commit 5a1ab5c0299a. This is the clean backport without any changes. Fix the following fallthrough warning (arm64-randconfig with Clang): drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c:382:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough] Reported-by: kernel test robot Link: https://lore.kernel.org/lkml/60edca25.k00ut905IFBjPyt5%25lkp@intel.com/ Signed-off-by: Gustavo A. R. Silva Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 5a1ab5c0299a Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index c47e7dea04..b8ca4b0a24 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -492,6 +492,7 @@ static void arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu) switch (idx) { case CMDQ_ERR_CERROR_ABT_IDX: dev_err(smmu->dev, "retrying command fetch\n"); + return; case CMDQ_ERR_CERROR_NONE_IDX: return; case CMDQ_ERR_CERROR_ATC_INV_IDX: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:35:33 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:35:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401187.642952 (Exim 4.92) (envelope-from ) id 1oVsP7-0006WS-Mh; Wed, 07 Sep 2022 10:35:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401187.642952; Wed, 07 Sep 2022 10:35: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 1oVsP7-0006WK-Jz; Wed, 07 Sep 2022 10:35:33 +0000 Received: by outflank-mailman (input) for mailman id 401187; Wed, 07 Sep 2022 10:35:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsP7-0006WA-1n for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsP7-0002xR-19 for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsP7-0002uT-0L for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35: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=ga3RtyY07vfjEGd5mhoB6FI/ccShYaxnL7uWUdcoqr4=; b=AQ7B5Xnsjz6zryvKtZe3WccUtr pn27wET3p1OIunoH/UhhRr3MP/jR+DOH7Q1Kmq/+R7tkQgx0h8/jYWEy2xyCbKdHoABIZrHwyYE8A kVfQPWFyxX5luz6lnfYMtEm7mmBOgRyDxST5g1WeywmTn1f9VFQB8vMcI8cLiFU/hIBI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smmuv3: Avoid open coded arithmetic in memory allocation Message-Id: Date: Wed, 07 Sep 2022 10:35:33 +0000 commit 654f406d510a71e588b481a11434ed955d008be8 Author: Christophe JAILLET AuthorDate: Tue Aug 23 15:44:18 2022 +0100 Commit: Julien Grall CommitDate: Tue Sep 6 17:43:35 2022 +0100 xen/arm: smmuv3: Avoid open coded arithmetic in memory allocation Backport Linux commit 98b64741d611. This is the clean backport without any changes kmalloc_array()/kcalloc() should be used to avoid potential overflow when a multiplication is needed to compute the size of the requested memory. So turn a devm_kzalloc()+explicit size computation into an equivalent devm_kcalloc(). Signed-off-by: Christophe JAILLET Acked-by: Robin Murphy Link: https://lore.kernel.org/r/3f7b9b202c6b6f5edc234ab7af5f208fbf8bc944.1644274051.git.christophe.jaillet@wanadoo.fr Signed-off-by: Will Deacon Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 98b64741d611 Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index b8ca4b0a24..9c9f463009 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -1644,10 +1644,10 @@ static int arm_smmu_init_l1_strtab(struct arm_smmu_device *smmu) { unsigned int i; struct arm_smmu_strtab_cfg *cfg = &smmu->strtab_cfg; - size_t size = sizeof(*cfg->l1_desc) * cfg->num_l1_ents; void *strtab = smmu->strtab_cfg.strtab; - cfg->l1_desc = _xzalloc(size, sizeof(void *)); + cfg->l1_desc = _xzalloc_array(sizeof(*cfg->l1_desc), sizeof(void *), + cfg->num_l1_ents); if (!cfg->l1_desc) return -ENOMEM; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:35:44 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:35:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401188.642956 (Exim 4.92) (envelope-from ) id 1oVsPI-0006ZO-OU; Wed, 07 Sep 2022 10:35:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401188.642956; Wed, 07 Sep 2022 10:35: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 1oVsPI-0006ZG-LV; Wed, 07 Sep 2022 10:35:44 +0000 Received: by outflank-mailman (input) for mailman id 401188; Wed, 07 Sep 2022 10:35:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsPH-0006Z9-57 for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsPH-0002xb-4J for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsPH-0002vD-3V for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35: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=vOSBNfxfT5BQADyxha1Lm0yCrmL+Op0dG+F9bxMsfkM=; b=4d/EkcCe9bR6D8s+u0cK2HsPfw Vb2KZ0OGz5wj5W1n1PWT56BRPplrh/mmBESxFvle3WGlv9jwqMEwCel1idyspCneDORnKfE7EnGez JW/F/EoCPTTxJ6zK3HQ9ouqu3rFkn+PnXxKWFxABgFzTB/cSx8y9EAQS83FiRh6LbHHk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: do not free reserved memory into heap Message-Id: Date: Wed, 07 Sep 2022 10:35:43 +0000 commit d58b6aef96968facad5867513fdca262c68d48a4 Author: Penny Zheng AuthorDate: Tue Sep 6 15:39:14 2022 +0800 Commit: Julien Grall CommitDate: Tue Sep 6 17:53:34 2022 +0100 xen: do not free reserved memory into heap Pages used as guest RAM for static domain, shall be reserved to this domain only. So in case reserved pages being used for other purpose, users shall not free them back to heap, even when last ref gets dropped. This commit introduces a new helper free_domstatic_page to free static page in runtime, and free_staticmem_pages will be called by it in runtime, so let's drop the __init flag. Wrapper #ifdef CONFIG_STATIC_MEMORY around function declaration( free_staticmem_pages, free_domstatic_page, etc) is kinds of redundant, so we decide to remove it here. Signed-off-by: Penny Zheng Reviewed-by: Jan Beulich Reviewed-by: Julien Grall --- xen/arch/arm/include/asm/mm.h | 6 +++++- xen/arch/arm/mm.c | 5 ++++- xen/common/page_alloc.c | 40 +++++++++++++++++++++++++++++++++++++--- xen/include/xen/mm.h | 3 +-- 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index da25251cda..749fbefa0c 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -121,9 +121,13 @@ struct page_info /* Page is Xen heap? */ #define _PGC_xen_heap PG_shift(2) #define PGC_xen_heap PG_mask(1, 2) - /* Page is static memory */ +#ifdef CONFIG_STATIC_MEMORY +/* Page is static memory */ #define _PGC_static PG_shift(3) #define PGC_static PG_mask(1, 3) +#else +#define PGC_static 0 +#endif /* ... */ /* Page is broken? */ #define _PGC_broken PG_shift(7) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index c81c706c8b..7f5b317d3e 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1496,7 +1496,10 @@ void put_page(struct page_info *page) if ( unlikely((nx & PGC_count_mask) == 0) ) { - free_domheap_page(page); + if ( unlikely(nx & PGC_static) ) + free_domstatic_page(page); + else + free_domheap_page(page); } } diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index bfd4150be7..0c50dee4c5 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2694,12 +2694,14 @@ struct domain *get_pg_owner(domid_t domid) #ifdef CONFIG_STATIC_MEMORY /* Equivalent of free_heap_pages to free nr_mfns pages of static memory. */ -void __init free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, - bool need_scrub) +void free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, + bool need_scrub) { mfn_t mfn = page_to_mfn(pg); unsigned long i; + spin_lock(&heap_lock); + for ( i = 0; i < nr_mfns; i++ ) { mark_page_free(&pg[i], mfn_add(mfn, i)); @@ -2710,9 +2712,41 @@ void __init free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, scrub_one_page(pg); } - /* In case initializing page of static memory, mark it PGC_static. */ pg[i].count_info |= PGC_static; } + + spin_unlock(&heap_lock); +} + +void free_domstatic_page(struct page_info *page) +{ + struct domain *d = page_get_owner(page); + bool drop_dom_ref; + + if ( unlikely(!d) ) + { + printk(XENLOG_G_ERR + "The about-to-free static page %"PRI_mfn" must be owned by a domain\n", + mfn_x(page_to_mfn(page))); + ASSERT_UNREACHABLE(); + return; + } + + ASSERT_ALLOC_CONTEXT(); + + /* NB. May recursively lock from relinquish_memory(). */ + spin_lock_recursive(&d->page_alloc_lock); + + arch_free_heap_page(d, page); + + drop_dom_ref = !domain_adjust_tot_pages(d, -1); + + spin_unlock_recursive(&d->page_alloc_lock); + + free_staticmem_pages(page, 1, scrub_debug); + + if ( drop_dom_ref ) + put_domain(d); } /* diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 35b065146f..deadf4b2a1 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -85,13 +85,12 @@ bool scrub_free_pages(void); } while ( false ) #define FREE_XENHEAP_PAGE(p) FREE_XENHEAP_PAGES(p, 0) -#ifdef CONFIG_STATIC_MEMORY /* These functions are for static memory */ void free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, bool need_scrub); +void free_domstatic_page(struct page_info *page); int acquire_domstatic_pages(struct domain *d, mfn_t smfn, unsigned int nr_mfns, unsigned int memflags); -#endif /* Map machine page range in Xen virtual address space. */ int map_pages_to_xen( -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:35:55 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:35:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401189.642960 (Exim 4.92) (envelope-from ) id 1oVsPS-0006d5-R6; Wed, 07 Sep 2022 10:35:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401189.642960; Wed, 07 Sep 2022 10:35: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 1oVsPS-0006cx-OW; Wed, 07 Sep 2022 10:35:54 +0000 Received: by outflank-mailman (input) for mailman id 401189; Wed, 07 Sep 2022 10:35:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsPR-0006cZ-7q for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsPR-0002xr-78 for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsPR-0002wY-6V for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:35: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=46pZjaKoz/61MuYv3tww2nnmRKURjDhyJlXKF5opv24=; b=63iwRN/aEriKvSUW1q2WmyI0By 73M6z/BSnEHuPIMob50H7DNz3qIPx20QPGf0gmjzqxVScZaFJzYo4igSEbzZ0EXnPpEcdOKt6Vdfi 8HAu6vYy886cijb1NZeVTr32pImGRAKhpFNZk6M88th0ovzllHq+1Hpj9A0UNQ4ksrNY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: introduce CDF_staticmem Message-Id: Date: Wed, 07 Sep 2022 10:35:53 +0000 commit 5ebd3da7c95d1320e3005105d0163652d3f271b5 Author: Penny Zheng AuthorDate: Tue Sep 6 15:39:15 2022 +0800 Commit: Julien Grall CommitDate: Tue Sep 6 17:53:35 2022 +0100 xen/arm: introduce CDF_staticmem In order to have an easy and quick way to find out whether this domain memory is statically configured, this commit introduces a new flag CDF_staticmem and a new helper is_domain_using_staticmem() to tell. Signed-off-by: Penny Zheng Acked-by: Julien Grall Acked-by: Jan Beulich --- xen/arch/arm/domain_build.c | 5 ++++- xen/include/xen/domain.h | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 3fd1186b53..b76a84e8f5 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -3287,9 +3287,12 @@ void __init create_domUs(void) if ( !dt_device_is_compatible(node, "xen,domain") ) continue; + if ( dt_find_property(node, "xen,static-mem", NULL) ) + flags |= CDF_staticmem; + if ( dt_property_read_bool(node, "direct-map") ) { - if ( !IS_ENABLED(CONFIG_STATIC_MEMORY) || !dt_find_property(node, "xen,static-mem", NULL) ) + if ( !(flags & CDF_staticmem) ) panic("direct-map is not valid for domain %s without static allocation.\n", dt_node_name(node)); diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 628b14b086..2c8116afba 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -35,6 +35,14 @@ void arch_get_domain_info(const struct domain *d, /* Should domain memory be directly mapped? */ #define CDF_directmap (1U << 1) #endif +/* Is domain memory on static allocation? */ +#ifdef CONFIG_STATIC_MEMORY +#define CDF_staticmem (1U << 2) +#else +#define CDF_staticmem 0 +#endif + +#define is_domain_using_staticmem(d) ((d)->cdf & CDF_staticmem) /* * Arch-specifics. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:36:05 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:36:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401190.642965 (Exim 4.92) (envelope-from ) id 1oVsPc-0006fr-TM; Wed, 07 Sep 2022 10:36:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401190.642965; Wed, 07 Sep 2022 10:36: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 1oVsPc-0006fj-Q0; Wed, 07 Sep 2022 10:36:04 +0000 Received: by outflank-mailman (input) for mailman id 401190; Wed, 07 Sep 2022 10:36:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsPb-0006fZ-Dp for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:36:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsPb-0002yE-AD for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:36:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsPb-0002xY-9O for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:36: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=m4DMnOnlcUBDqEj6eVh5K1OuQmGxDOECZSmqbPkw4x4=; b=0nOFX5bmzTBTRybdRQ9WfpC/Gu j/j7JuqVoJ2RzCUQyjI5SJJQeAAHQb9VQLSmHoWBjfbKmyXPcynXguLIgiSPYNGwPC26qC4Gd+tPk X8CIBcDQrITB/abi7ur0rdoozhj0j2+2NHGb8mqGsjA6SC8ufarFzUnmISUaBhwhSI98=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: unpopulate memory when domain is static Message-Id: Date: Wed, 07 Sep 2022 10:36:03 +0000 commit b01721f0779d56a60b9db26a09b79b469f260d8a Author: Penny Zheng AuthorDate: Tue Sep 6 15:39:16 2022 +0800 Commit: Julien Grall CommitDate: Tue Sep 6 17:53:35 2022 +0100 xen: unpopulate memory when domain is static Today when a domain unpopulates the memory on runtime, they will always hand the memory back to the heap allocator. And it will be a problem if domain is static. Pages as guest RAM for static domain shall be reserved to only this domain and not be used for any other purposes, so they shall never go back to heap allocator. This commit puts reserved page on the new list resv_page_list after it has been freed. Signed-off-by: Penny Zheng Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/common/domain.c | 4 ++++ xen/common/page_alloc.c | 7 +++++-- xen/include/xen/sched.h | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 7062393e37..c23f449451 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -604,6 +604,10 @@ struct domain *domain_create(domid_t domid, INIT_PAGE_LIST_HEAD(&d->page_list); INIT_PAGE_LIST_HEAD(&d->extra_page_list); INIT_PAGE_LIST_HEAD(&d->xenpage_list); +#ifdef CONFIG_STATIC_MEMORY + INIT_PAGE_LIST_HEAD(&d->resv_page_list); +#endif + spin_lock_init(&d->node_affinity_lock); d->node_affinity = NODE_MASK_ALL; diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 0c50dee4c5..26a2fad4e3 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2741,10 +2741,13 @@ void free_domstatic_page(struct page_info *page) drop_dom_ref = !domain_adjust_tot_pages(d, -1); - spin_unlock_recursive(&d->page_alloc_lock); - free_staticmem_pages(page, 1, scrub_debug); + /* Add page on the resv_page_list *after* it has been freed. */ + page_list_add_tail(page, &d->resv_page_list); + + spin_unlock_recursive(&d->page_alloc_lock); + if ( drop_dom_ref ) put_domain(d); } diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 81f1fcba2a..557b3229f6 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -381,6 +381,9 @@ struct domain struct page_list_head page_list; /* linked list */ struct page_list_head extra_page_list; /* linked list (size extra_pages) */ struct page_list_head xenpage_list; /* linked list (size xenheap_pages) */ +#ifdef CONFIG_STATIC_MEMORY + struct page_list_head resv_page_list; /* linked list */ +#endif /* * This field should only be directly accessed by domain_adjust_tot_pages() -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:36:14 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:36:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401191.642968 (Exim 4.92) (envelope-from ) id 1oVsPm-0006jb-UM; Wed, 07 Sep 2022 10:36:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401191.642968; Wed, 07 Sep 2022 10:36: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 1oVsPm-0006jT-Ra; Wed, 07 Sep 2022 10:36:14 +0000 Received: by outflank-mailman (input) for mailman id 401191; Wed, 07 Sep 2022 10:36:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsPl-0006jE-Df for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:36:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsPl-0002yY-D0 for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:36:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsPl-0002yN-CO for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:36: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=GqN6BTwfVu47fJTkS9/g+aj0k8hRpY5WwE0cAMvy8f4=; b=vR9HWT1Qx1sLrxJYA+43goXHrw dJLF3Tilvyda7YnZTi71cWIiyPNYUfSqd5jIHlewKJDJUUk2qIZvFhEyL9G9mlNBX1OlYIEDe0WNH t0eD9ZJMbSVnTdbNP9Y4uSawvy9VhuV/qDonUUf3cOk1OmyqxnVvTlFbX7a7MsiuPqZA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: introduce prepare_staticmem_pages Message-Id: Date: Wed, 07 Sep 2022 10:36:13 +0000 commit 508d2d297f7a99ed3c839a21d786f7e2a1284510 Author: Penny Zheng AuthorDate: Tue Sep 6 15:39:17 2022 +0800 Commit: Julien Grall CommitDate: Tue Sep 6 17:53:35 2022 +0100 xen: introduce prepare_staticmem_pages Later, we want to use acquire_domstatic_pages() for populating memory for static domain on runtime, however, there are a lot of pointless work (checking mfn_valid(), scrubbing the free part, cleaning the cache...) considering we know the page is valid and belong to the guest. This commit splits acquire_staticmem_pages() in two parts, and introduces prepare_staticmem_pages to bypass all "pointless work". Signed-off-by: Penny Zheng Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/common/page_alloc.c | 61 +++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 26a2fad4e3..adcc16e4f6 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2752,26 +2752,13 @@ void free_domstatic_page(struct page_info *page) put_domain(d); } -/* - * Acquire nr_mfns contiguous reserved pages, starting at #smfn, of - * static memory. - * This function needs to be reworked if used outside of boot. - */ -static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, - unsigned long nr_mfns, - unsigned int memflags) +static bool __init prepare_staticmem_pages(struct page_info *pg, + unsigned long nr_mfns, + unsigned int memflags) { bool need_tlbflush = false; uint32_t tlbflush_timestamp = 0; unsigned long i; - struct page_info *pg; - - ASSERT(nr_mfns); - for ( i = 0; i < nr_mfns; i++ ) - if ( !mfn_valid(mfn_add(smfn, i)) ) - return NULL; - - pg = mfn_to_page(smfn); spin_lock(&heap_lock); @@ -2782,7 +2769,7 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, { printk(XENLOG_ERR "pg[%lu] Static MFN %"PRI_mfn" c=%#lx t=%#x\n", - i, mfn_x(smfn) + i, + i, mfn_x(page_to_mfn(pg)) + i, pg[i].count_info, pg[i].tlbflush_timestamp); goto out_err; } @@ -2806,6 +2793,38 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, if ( need_tlbflush ) filtered_flush_tlb_mask(tlbflush_timestamp); + return true; + + out_err: + while ( i-- ) + pg[i].count_info = PGC_static | PGC_state_free; + + spin_unlock(&heap_lock); + + return false; +} + +/* + * Acquire nr_mfns contiguous reserved pages, starting at #smfn, of + * static memory. + * This function needs to be reworked if used outside of boot. + */ +static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, + unsigned long nr_mfns, + unsigned int memflags) +{ + unsigned long i; + struct page_info *pg; + + ASSERT(nr_mfns); + for ( i = 0; i < nr_mfns; i++ ) + if ( !mfn_valid(mfn_add(smfn, i)) ) + return NULL; + + pg = mfn_to_page(smfn); + if ( !prepare_staticmem_pages(pg, nr_mfns, memflags) ) + return NULL; + /* * Ensure cache and RAM are consistent for platforms where the guest * can control its own visibility of/through the cache. @@ -2814,14 +2833,6 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, flush_page_to_ram(mfn_x(smfn) + i, !(memflags & MEMF_no_icache_flush)); return pg; - - out_err: - while ( i-- ) - pg[i].count_info = PGC_static | PGC_state_free; - - spin_unlock(&heap_lock); - - return NULL; } /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:36:25 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:36:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401192.642971 (Exim 4.92) (envelope-from ) id 1oVsPw-0006mm-Vy; Wed, 07 Sep 2022 10:36:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401192.642971; Wed, 07 Sep 2022 10:36: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 1oVsPw-0006me-T8; Wed, 07 Sep 2022 10:36:24 +0000 Received: by outflank-mailman (input) for mailman id 401192; Wed, 07 Sep 2022 10:36:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsPv-0006mN-Gb for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:36:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsPv-0002yq-Fu for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:36:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsPv-0002zF-FG for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:36: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=PpBNPhZIieyCSvFVdt6cp370HD2yFQCs429/9HeyACY=; b=DMEYSvgOjpOBOjNQb4B8caFwRG 4p3glqQ4GZhXl6JREQZATO0J7etLDicrwhK+u7JgLRsh8CjGuDkoctOo+hkZ8HlRsRkak3Kzf4Jcc ZqUsN77TvxB7Uxm6GsoKMw7xQVPaDVzrbkmC4QIpierKWzlGbIsryS7YRn8Clbydt6HA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: rename free_staticmem_pages to unprepare_staticmem_pages Message-Id: Date: Wed, 07 Sep 2022 10:36:23 +0000 commit 142578a5061ad2ce4fe789c1524e2eb5cb102b0e Author: Penny Zheng AuthorDate: Tue Sep 6 15:39:18 2022 +0800 Commit: Julien Grall CommitDate: Tue Sep 6 17:53:35 2022 +0100 xen: rename free_staticmem_pages to unprepare_staticmem_pages The name of free_staticmem_pages is inappropriate, considering it is the opposite of function prepare_staticmem_pages. Rename free_staticmem_pages to unprepare_staticmem_pages. Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- xen/arch/arm/setup.c | 3 ++- xen/common/page_alloc.c | 13 ++++++++----- xen/include/xen/mm.h | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 6e0398f3f6..7814fe323d 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -653,7 +653,8 @@ static void __init init_staticmem_pages(void) if ( mfn_x(bank_end) <= mfn_x(bank_start) ) return; - free_staticmem_pages(mfn_to_page(bank_start), bank_pages, false); + unprepare_staticmem_pages(mfn_to_page(bank_start), + bank_pages, false); } } #endif diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index adcc16e4f6..18d34d1b69 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2693,9 +2693,12 @@ struct domain *get_pg_owner(domid_t domid) } #ifdef CONFIG_STATIC_MEMORY -/* Equivalent of free_heap_pages to free nr_mfns pages of static memory. */ -void free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, - bool need_scrub) +/* + * It is the opposite of prepare_staticmem_pages, and it aims to unprepare + * nr_mfns pages of static memory. + */ +void unprepare_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, + bool need_scrub) { mfn_t mfn = page_to_mfn(pg); unsigned long i; @@ -2741,7 +2744,7 @@ void free_domstatic_page(struct page_info *page) drop_dom_ref = !domain_adjust_tot_pages(d, -1); - free_staticmem_pages(page, 1, scrub_debug); + unprepare_staticmem_pages(page, 1, scrub_debug); /* Add page on the resv_page_list *after* it has been freed. */ page_list_add_tail(page, &d->resv_page_list); @@ -2862,7 +2865,7 @@ int __init acquire_domstatic_pages(struct domain *d, mfn_t smfn, if ( assign_pages(pg, nr_mfns, d, memflags) ) { - free_staticmem_pages(pg, nr_mfns, memflags & MEMF_no_scrub); + unprepare_staticmem_pages(pg, nr_mfns, memflags & MEMF_no_scrub); return -EINVAL; } diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index deadf4b2a1..93db3c4418 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -86,8 +86,8 @@ bool scrub_free_pages(void); #define FREE_XENHEAP_PAGE(p) FREE_XENHEAP_PAGES(p, 0) /* These functions are for static memory */ -void free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, - bool need_scrub); +void unprepare_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, + bool need_scrub); void free_domstatic_page(struct page_info *page); int acquire_domstatic_pages(struct domain *d, mfn_t smfn, unsigned int nr_mfns, unsigned int memflags); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 07 10:36:35 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Sep 2022 10:36:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.401193.642975 (Exim 4.92) (envelope-from ) id 1oVsQ7-0006pT-14; Wed, 07 Sep 2022 10:36:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 401193.642975; Wed, 07 Sep 2022 10:36: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 1oVsQ6-0006pM-Un; Wed, 07 Sep 2022 10:36:34 +0000 Received: by outflank-mailman (input) for mailman id 401193; Wed, 07 Sep 2022 10:36:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsQ5-0006p9-Je for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:36:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oVsQ5-0002zG-Iu for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:36:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oVsQ5-0002zg-I9 for xen-changelog@lists.xenproject.org; Wed, 07 Sep 2022 10:36: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=FkqQpRf0f7Z2Ae4H7XVSFnM2+GxEudLrvLhWn+unfIE=; b=z6Rzx0w3IrmcYxI9XuzYRB0H82 haonv6pMMUHtbhgHD1V83B3DgNtoNlMVKfSrZihNwaZP600f8yGqggEt/vzBxrbj3K7MK4AG2wJv2 7OHFOkQaL8luKeFgw7iQy9ajYT7jwf9jJ2igCAh7h8F6D6YIHMIlZB4bRtpZNXnC7VCI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: retrieve reserved pages on populate_physmap Message-Id: Date: Wed, 07 Sep 2022 10:36:33 +0000 commit 172015009a6acc20357a2698800e13058ba1d3db Author: Penny Zheng AuthorDate: Tue Sep 6 15:39:19 2022 +0800 Commit: Julien Grall CommitDate: Tue Sep 6 18:03:07 2022 +0100 xen: retrieve reserved pages on populate_physmap When a static domain populates memory through populate_physmap at runtime, it shall retrieve reserved pages from resv_page_list to make sure that domain's RAM is still restricted in statically configured memory regions. This commit also introduces a new helper acquire_reserved_page to make it work. Signed-off-by: Penny Zheng Reviewed-by: Julien Grall --- xen/common/memory.c | 23 +++++++++++++++ xen/common/page_alloc.c | 74 +++++++++++++++++++++++++++++++++++++++---------- xen/include/xen/mm.h | 1 + 3 files changed, 84 insertions(+), 14 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index bc89442ba5..ae8163a738 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -245,6 +245,29 @@ static void populate_physmap(struct memop_args *a) mfn = _mfn(gpfn); } + else if ( is_domain_using_staticmem(d) ) + { + /* + * No easy way to guarantee the retrieved pages are contiguous, + * so forbid non-zero-order requests here. + */ + if ( a->extent_order != 0 ) + { + gdprintk(XENLOG_WARNING, + "Cannot allocate static order-%u pages for %pd\n", + a->extent_order, d); + goto out; + } + + mfn = acquire_reserved_page(d, a->memflags); + if ( mfn_eq(mfn, INVALID_MFN) ) + { + gdprintk(XENLOG_WARNING, + "%pd: failed to retrieve a reserved page\n", + d); + goto out; + } + } else { page = alloc_domheap_pages(d, a->extent_order, a->memflags); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 18d34d1b69..62afb07bc6 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2755,9 +2755,8 @@ void free_domstatic_page(struct page_info *page) put_domain(d); } -static bool __init prepare_staticmem_pages(struct page_info *pg, - unsigned long nr_mfns, - unsigned int memflags) +static bool prepare_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, + unsigned int memflags) { bool need_tlbflush = false; uint32_t tlbflush_timestamp = 0; @@ -2838,6 +2837,25 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, return pg; } +static int assign_domstatic_pages(struct domain *d, struct page_info *pg, + unsigned int nr_mfns, unsigned int memflags) +{ + if ( !d || (memflags & (MEMF_no_owner | MEMF_no_refcount)) ) + { + /* + * Respective handling omitted here because right now + * acquired static memory is only for domain's RAM. + */ + ASSERT_UNREACHABLE(); + return -EINVAL; + } + + if ( assign_pages(pg, nr_mfns, d, memflags) ) + return -EINVAL; + + return 0; +} + /* * Acquire nr_mfns contiguous pages, starting at #smfn, of static memory, * then assign them to one specific domain #d. @@ -2853,17 +2871,7 @@ int __init acquire_domstatic_pages(struct domain *d, mfn_t smfn, if ( !pg ) return -ENOENT; - if ( !d || (memflags & (MEMF_no_owner | MEMF_no_refcount)) ) - { - /* - * Respective handling omitted here because right now - * acquired static memory is only for guest RAM. - */ - ASSERT_UNREACHABLE(); - return -EINVAL; - } - - if ( assign_pages(pg, nr_mfns, d, memflags) ) + if ( assign_domstatic_pages(d, pg, nr_mfns, memflags) ) { unprepare_staticmem_pages(pg, nr_mfns, memflags & MEMF_no_scrub); return -EINVAL; @@ -2871,6 +2879,44 @@ int __init acquire_domstatic_pages(struct domain *d, mfn_t smfn, return 0; } + +/* + * Acquire a page from reserved page list(resv_page_list), when populating + * memory for static domain on runtime. + */ +mfn_t acquire_reserved_page(struct domain *d, unsigned int memflags) +{ + struct page_info *page; + + ASSERT_ALLOC_CONTEXT(); + + /* Acquire a page from reserved page list(resv_page_list). */ + spin_lock(&d->page_alloc_lock); + page = page_list_remove_head(&d->resv_page_list); + spin_unlock(&d->page_alloc_lock); + if ( unlikely(!page) ) + return INVALID_MFN; + + if ( !prepare_staticmem_pages(page, 1, memflags) ) + goto fail; + + if ( assign_domstatic_pages(d, page, 1, memflags) ) + goto fail_assign; + + return page_to_mfn(page); + + fail_assign: + /* + * The page was never accessible by the domain. So scrubbing can be + * skipped + */ + unprepare_staticmem_pages(page, 1, false); + fail: + spin_lock(&d->page_alloc_lock); + page_list_add_tail(page, &d->resv_page_list); + spin_unlock(&d->page_alloc_lock); + return INVALID_MFN; +} #endif /* diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 93db3c4418..a925028ab3 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -198,6 +198,7 @@ struct npfec { #else #define MAX_ORDER 20 /* 2^20 contiguous pages */ #endif +mfn_t acquire_reserved_page(struct domain *d, unsigned int memflags); /* Private domain structs for DOMID_XEN, DOMID_IO, etc. */ extern struct domain *dom_xen, *dom_io; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 07:33:10 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 07:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.402762.644623 (Exim 4.92) (envelope-from ) id 1oWC25-0003Ni-NO; Thu, 08 Sep 2022 07:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 402762.644623; Thu, 08 Sep 2022 07:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC25-0003Nb-Kh; Thu, 08 Sep 2022 07:33:05 +0000 Received: by outflank-mailman (input) for mailman id 402762; Thu, 08 Sep 2022 07:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC24-0003Jz-3h for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC24-0000tN-2w for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWC24-0001yl-1z for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MMBNnlYRCT+YDq+FdSbWd3lkF3I/0Fhdk5CKbnGDs8I=; b=AtUUm5ZWKNLcyUEUcJMvJPGXt3 +n3xxGL8d8klIE7X9ZMicVftnHZmeDwHA2VBAMScShYAPP6tYEsa5bZGHkQ/GrIVhxKfMv0+A/sUC m9RPyEI2/TyixI2LVx6L7rp4Rk/KB1RMmi5gfe4TvtI8W2Ldp9lhNFlahND3ACCU1kmg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Config.mk: correct PIE-related option(s) in EMBEDDED_EXTRA_CFLAGS Message-Id: Date: Thu, 08 Sep 2022 07:33:04 +0000 commit ecd6b9759919fa6335b0be1b5fc5cce29a30c4f1 Author: Jan Beulich AuthorDate: Thu Sep 8 09:25:26 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 8 09:25:26 2022 +0200 Config.mk: correct PIE-related option(s) in EMBEDDED_EXTRA_CFLAGS I haven't been able to find evidence of "-nopie" ever having been a supported compiler option. The correct spelling is "-no-pie". Furthermore like "-pie" this is an option which is solely passed to the linker. The compiler only recognizes "-fpie" / "-fPIE" / "-fno-pie", and it doesn't infer these options from "-pie" / "-no-pie". Add the compiler recognized form, but for the possible case of the variable also being used somewhere for linking keep the linker option as well (with corrected spelling). Signed-off-by: Jan Beulich Acked-by: Julien Grall --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index e56844d964..000e57e57b 100644 --- a/Config.mk +++ b/Config.mk @@ -188,7 +188,7 @@ endif APPEND_LDFLAGS += $(foreach i, $(APPEND_LIB), -L$(i)) APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i)) -EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all +EMBEDDED_EXTRA_CFLAGS := -fno-pie -no-pie -fno-stack-protector -fno-stack-protector-all EMBEDDED_EXTRA_CFLAGS += -fno-exceptions -fno-asynchronous-unwind-tables XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 07:33:15 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 07:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.402765.644628 (Exim 4.92) (envelope-from ) id 1oWC2F-0003TK-PS; Thu, 08 Sep 2022 07:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 402765.644628; Thu, 08 Sep 2022 07:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2F-0003TA-MM; Thu, 08 Sep 2022 07:33:15 +0000 Received: by outflank-mailman (input) for mailman id 402765; Thu, 08 Sep 2022 07:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2E-0003Sn-6w for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2E-0000tW-5y for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWC2E-0001zO-4z for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=O/331AThffPSlw1A3FJS3lfYas1Nrc07M0eq1ed9yi4=; b=GqperzF4NYlhr6Dvcv+p/iEJNN Tj5iCCMP1tw+zH1CeQ1j3rzD3QRKnmh2HFLzBCHB5cyAUe/cOFdJWxB1igucNCATp8yOsArOcP9+3 tMuCEf1yAB+6fw+XRzl8WtYDoS/z8Q0lXPlkiDpldptVJJzno5ObEcPGxRNXXOpBS5dY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: minor fix of the migration stream doc Message-Id: Date: Thu, 08 Sep 2022 07:33:14 +0000 commit ace1d2eff80d3d66c37ae765dae3e3cb5697e5a4 Author: Juergen Gross AuthorDate: Thu Sep 8 09:25:58 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 8 09:25:58 2022 +0200 tools/xenstore: minor fix of the migration stream doc Drop mentioning the non-existent read-only socket in the migration stream description document. The related record field was removed in commit 8868a0e3f674 ("docs: update the xenstore migration stream documentation). Signed-off-by: Juergen Gross Acked-by: Julien Grall --- docs/designs/xenstore-migration.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/designs/xenstore-migration.md b/docs/designs/xenstore-migration.md index b94af7fd7c..efa526f420 100644 --- a/docs/designs/xenstore-migration.md +++ b/docs/designs/xenstore-migration.md @@ -129,11 +129,9 @@ xenstored state that needs to be restored. | `evtchn-fd` | The file descriptor used to communicate with | | | the event channel driver | -xenstored will resume in the original process context. Hence `rw-socket-fd` and -`ro-socket-fd` simply specify the file descriptors of the sockets. Sockets -are not always used, however, and so -1 will be used to denote an unused -socket. - +xenstored will resume in the original process context. Hence `rw-socket-fd` +simply specifies the file descriptor of the socket. Sockets are not always +used, however, and so -1 will be used to denote an unused socket. \pagebreak -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 07:33:25 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 07:33:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.402769.644632 (Exim 4.92) (envelope-from ) id 1oWC2P-0003b5-Qt; Thu, 08 Sep 2022 07:33:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 402769.644632; Thu, 08 Sep 2022 07:33:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2P-0003ax-OA; Thu, 08 Sep 2022 07:33:25 +0000 Received: by outflank-mailman (input) for mailman id 402769; Thu, 08 Sep 2022 07:33:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2O-0003Yt-9n for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2O-0000u9-8y for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWC2O-000204-7x for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=I/5lyH3H43IFc14+et76jSTpeGlahiieeaATqkr9LlM=; b=hmQnTHLPgcgXjIzzY1aaT2SB7M IQM57e8QCOoRFGL4cgqJc82BKEqDba+BAy0PrUwyL35ffssK99a6AWXvnmR+9bSYtwUZbbL+Ox9+x bD4P3/cUK75Y66QI/IhTwGC65BXbaaSWCMiC4p2MYK4A9V6aeE2DxXA+qNmFCTE3USUY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add documentation for new set/get-quota commands Message-Id: Date: Thu, 08 Sep 2022 07:33:24 +0000 commit 4d4cf97d418fffec76b8adf0aac3f9da81e10260 Author: Juergen Gross AuthorDate: Thu Sep 8 09:27:59 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 8 09:27:59 2022 +0200 tools/xenstore: add documentation for new set/get-quota commands Add documentation for two new Xenstore wire commands SET_QUOTA and GET_QUOTA used to set or query the global Xenstore quota or those of a given domain. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- docs/misc/xenstore.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 054247c404..d49a07db21 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -337,6 +337,23 @@ SET_FEATURE || xenstored prevents the use of GET_FEATURE and SET_FEATURE other than by dom0. +GET_QUOTA [[|]|] | +SET_QUOTA [|]|| + Returns or sets a quota value for the domain being specified by + . Omitting will return or set the global quota + values, which are the default values for new domains. is + one of "nodes", "watches", "transactions", "node-size", + "permissions", or any other implementation defined value. For + GET_QUOTA it is possible to omit the parameter together + with the parameter, which will return a single string of + all supported values separated by blanks. is a + decimal number specifying the quota value, with "0" having the + special meaning of quota checks being disabled. The initial quota + settings for a domain are the global ones of Xenstore. + + xenstored prevents the use of GET_QUOTA and SET_QUOTA other + than by dom0. + ---------- Miscellaneous ---------- CONTROL |[|] -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 07:33:35 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 07:33:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.402773.644636 (Exim 4.92) (envelope-from ) id 1oWC2Z-0003ec-Sc; Thu, 08 Sep 2022 07:33:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 402773.644636; Thu, 08 Sep 2022 07:33:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2Z-0003eU-Pk; Thu, 08 Sep 2022 07:33:35 +0000 Received: by outflank-mailman (input) for mailman id 402773; Thu, 08 Sep 2022 07:33:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2Y-0003eB-D0 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2Y-0000uL-CE for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWC2Y-00020V-B9 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xEOufeqpJFU9WVVujgumjy0pafDZ/PWogaLzAMlOzMM=; b=VAcfm7+tNvfrVo9fSsVgwJupos hj5rGjs/+mz2W7ximZunpQ7o3PwMkUQbgeCK5XUhf3S7PxnTqBQtvJ4whlVSpeDRWq3cv1XWTqgX6 NHJg2dTDjQe9fvv1coyScNJI7WUu1grdSedcqlIUn+V0Cin9m0fi9KGEOr1kvASpSn+w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add documentation for extended watch command Message-Id: Date: Thu, 08 Sep 2022 07:33:34 +0000 commit 3a2feae17e0e43ab87565ab58334147fc8443915 Author: Juergen Gross AuthorDate: Thu Sep 8 09:28:30 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 8 09:28:30 2022 +0200 tools/xenstore: add documentation for extended watch command Add documentation for an extension of the WATCH command used to limit the scope of watched paths. Additionally it enables to receive more information in the events related to special watches (@introduceDomain or @releaseDomain). Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- docs/misc/xenstore-ring.txt | 1 + docs/misc/xenstore.txt | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/misc/xenstore-ring.txt b/docs/misc/xenstore-ring.txt index 2792d13530..dbc7335e24 100644 --- a/docs/misc/xenstore-ring.txt +++ b/docs/misc/xenstore-ring.txt @@ -69,6 +69,7 @@ Bit Description ----------------------------------------------------------------- 0 Ring reconnection (see the ring reconnection feature below) 1 Connection error indicator (see connection error feature below) +2 WATCH can take a third parameter limiting its scope The "Connection state" field is used to request a ring close and reconnect. The "Connection state" field only contains valid data if the server has diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index d49a07db21..4bc262fd5d 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -176,7 +176,7 @@ SET_PERMS ||+? ---------- Watches ---------- -WATCH ||? +WATCH ||[|]? Adds a watch. When a is modified (including path creation, removal, @@ -187,7 +187,11 @@ WATCH ||? matching watch results in a WATCH_EVENT message (see below). The event's path matches the watch's if it is an child - of . + of . This match can be limited by specifying (a + decimal value of 0 or larger): it denotes the directory levels + below to consider for a match ("0" would not match for + a child of , "1" would match only for a direct child, + etc.). can be a to watch or @. In the latter case may have any syntax but it matches @@ -198,7 +202,13 @@ WATCH ||? shutdown, and also on RELEASE and domain destruction events are sent to privileged callers or explicitly - via SET_PERMS enabled domains only. + via SET_PERMS enabled domains only. The semantics for a + specification of differ for generating + events: specifying "1" will report the related domid by using + @/ for the reported path. Other + values are not supported. + For @releaseDomain it is possible to watch only for a specific + domain by specifying @releaseDomain/ for the path. When a watch is first set up it is triggered once straight away, with equal to . Watches may be triggered -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 07:33:45 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 07:33:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.402774.644640 (Exim 4.92) (envelope-from ) id 1oWC2j-0003hP-UX; Thu, 08 Sep 2022 07:33:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 402774.644640; Thu, 08 Sep 2022 07:33: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 1oWC2j-0003hI-RR; Thu, 08 Sep 2022 07:33:45 +0000 Received: by outflank-mailman (input) for mailman id 402774; Thu, 08 Sep 2022 07:33:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2i-0003gv-GF for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2i-0000uo-FT for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWC2i-000211-Ea for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=96n/cxxu383P1/zp/8sGclUtOCDuiZ6R/TwQoyTYRz4=; b=qphASQ1TIJUUj2EWW8HUdXjKCZ 4DxD2gbGKiQhbN+tn0qCWjepMu0uBycMUEbOHJMPtEAoWLVB88hxiEUF0KgR4nWgT+5C/CTqMy801 EG/K2NlteDlqrRG6LQd0U+/tuzzgffYijERM5ZGv40uHlGGPJwaNB5r8+166kFXPuAZw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: add macro for version number string Message-Id: Date: Thu, 08 Sep 2022 07:33:44 +0000 commit f2bf0a45b005d7e296a7597922fcca1bab0e56f1 Author: Leo Yan AuthorDate: Thu Sep 8 09:28:58 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 8 09:28:58 2022 +0200 xen: add macro for version number string On Arm64 Linux kernel prints log for Xen version number: Xen XEN_VERSION.XEN_SUBVERSION support found The header file "xen/compile.h" is missed so that XEN_VERSION and XEN_SUBVERSION are not defined, __stringify() wrongly converts them as strings and concatenate to string "XEN_VERSION.XEN_SUBVERSION". This patch introduces a string macro XEN_VERSION_STRING, we can directly use it as version number string, as a result it drops to use of __stringify() to make the code more readable. The change has been tested on Ampere AVA Arm64 platform. Fixes: 5d797ee199b3 ("xen/arm: split domain_build.c") Suggested-by: Bertrand Marquis Signed-off-by: Leo Yan Reviewed-by: Bertrand Marquis Reviewed-by: Jan Beulich --- xen/arch/arm/acpi/domain_build.c | 3 ++- xen/arch/arm/domain_build.c | 2 +- xen/common/efi/boot.c | 4 ++-- xen/include/xen/compile.h.in | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/acpi/domain_build.c b/xen/arch/arm/acpi/domain_build.c index bbdc90f92c..ed824c0178 100644 --- a/xen/arch/arm/acpi/domain_build.c +++ b/xen/arch/arm/acpi/domain_build.c @@ -9,6 +9,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -91,7 +92,7 @@ static int __init acpi_make_hypervisor_node(const struct kernel_info *kinfo, struct membank tbl_add[]) { const char compat[] = - "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" + "xen,xen-" XEN_VERSION_STRING "\0" "xen,xen"; int res; /* Convenience alias */ diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index b76a84e8f5..0277790088 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1367,7 +1367,7 @@ static int __init make_hypervisor_node(struct domain *d, int addrcells, int sizecells) { const char compat[] = - "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" + "xen,xen-" XEN_VERSION_STRING "\0" "xen,xen"; __be32 *reg, *cells; gic_interrupt_t intr; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index a5b2d6ddb8..db0340c8e2 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1341,8 +1341,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_console_set_mode(); } - PrintStr(L"Xen " __stringify(XEN_VERSION) "." __stringify(XEN_SUBVERSION) - XEN_EXTRAVERSION " (c/s " XEN_CHANGESET ") EFI loader\r\n"); + PrintStr(L"Xen " XEN_VERSION_STRING XEN_EXTRAVERSION + " (c/s " XEN_CHANGESET ") EFI loader\r\n"); efi_arch_relocate_image(0); diff --git a/xen/include/xen/compile.h.in b/xen/include/xen/compile.h.in index 440ecb25c1..3151d1e7d1 100644 --- a/xen/include/xen/compile.h.in +++ b/xen/include/xen/compile.h.in @@ -7,6 +7,7 @@ #define XEN_VERSION @@version@@ #define XEN_SUBVERSION @@subversion@@ +#define XEN_VERSION_STRING "@@version@@.@@subversion@@" #define XEN_EXTRAVERSION "@@extraversion@@" #define XEN_CHANGESET "@@changeset@@" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 07:33:56 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 07:33:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.402775.644644 (Exim 4.92) (envelope-from ) id 1oWC2t-0003ko-Vm; Thu, 08 Sep 2022 07:33:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 402775.644644; Thu, 08 Sep 2022 07:33:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2t-0003kh-T9; Thu, 08 Sep 2022 07:33:55 +0000 Received: by outflank-mailman (input) for mailman id 402775; Thu, 08 Sep 2022 07:33:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2s-0003kR-J2 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWC2s-0000uz-IM for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWC2s-00021Y-HY for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 07:33:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=88dWLFD5NCvaPKKx5cqHZeTfewUbl3pZ0bHpKZHS0/M=; b=G3UJCF21OcaDxmEqP6izLwmt+o ouIesBjQ2G7kt0OneUEIelFtdgF72Hzuwt8AfxeVWuptuBFjc6V1M7cdnUB/Fgq7ie1ESjhf15thE QUgHhsVrA4Y71Hyybo89NLDm+MjLWSKIscNT80yRh1v25UnzV3hN5hwdsqOnXEY1D7nc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] .gitignore: add init-dom0less Message-Id: Date: Thu, 08 Sep 2022 07:33:54 +0000 commit 64e302157a87b246473a31fa104377a6d48eb046 Author: Viresh Kumar AuthorDate: Thu Sep 8 09:32:14 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 8 09:32:14 2022 +0200 .gitignore: add init-dom0less Add tools/helpers/init-dom0less to gitignore. Signed-off-by: Viresh Kumar Acked-by: Jan Beulich --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 27881c9764..af9bf749c4 100644 --- a/.gitignore +++ b/.gitignore @@ -169,6 +169,7 @@ tools/flask/utils/flask-loadpolicy tools/flask/utils/flask-setenforce tools/flask/utils/flask-set-bool tools/flask/utils/flask-label-pci +tools/helpers/init-dom0less tools/helpers/init-xenstore-domain tools/helpers/xen-init-dom0 tools/hotplug/common/hotplugpath.sh -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 11:33:11 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 11:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403178.645188 (Exim 4.92) (envelope-from ) id 1oWFmM-0007qe-BF; Thu, 08 Sep 2022 11:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403178.645188; Thu, 08 Sep 2022 11:33:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFmM-0007qW-8K; Thu, 08 Sep 2022 11:33:06 +0000 Received: by outflank-mailman (input) for mailman id 403178; Thu, 08 Sep 2022 11:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFmK-0007q8-Hy for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFmK-0006Bd-HG for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWFmK-0005Pt-GQ for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Pt3gEm8Wc7yoeLn/axdNI8uI0rIK2/UHjdXRGwc3swU=; b=erCmTWN/rGATZ9SsOM+CwR3GWM fVQ/cmZgeDAKoIl8JeLfUzco93zb91YqHmVKJw6fdv6F4xRHf/qI05Ty8z2/nH4An+4UGXMKJf5A3 ONqBoapoA2jQ0t+DdfgzJs4C8unJxKgdS7ALeGlHgquDY+grwjki1fL/yZGV6aUNU0+8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/evtchn: Make sure all buckets below d->valid_evtchns are allocated Message-Id: Date: Thu, 08 Sep 2022 11:33:04 +0000 commit 5d1cfe844e23cb1610ef07f60bc8076e058891d6 Author: Julien Grall AuthorDate: Wed Sep 7 17:27:32 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:58 2022 +0100 xen/evtchn: Make sure all buckets below d->valid_evtchns are allocated Since commit 01280dc19cf3 "evtchn: simplify port_is_valid()", the event channels code assumes that all the buckets below d->valid_evtchns are always allocated. This assumption hold in most of the situation because a guest is not allowed to chose the port. Instead, it will be the first free from port 0. When static event channel support will be added for dom0less domains user can request to allocate the evtchn port numbers that are scattered in nature. The existing implementation of evtchn_allocate_port() is not able to deal with such situation and will end up to override bucket or/and leave some bucket unallocated. The latter will result to a droplet crash if the event channel belongs to an unallocated bucket. This can be solved by making sure that all the buckets below d->valid_evtchns are allocated. There should be no impact for most of the situation but LM/LU as only one bucket would be allocated. For LM/LU, we may end up to allocate multiple buckets if ports in use are sparse. A potential alternative is to check that the bucket is valid in is_port_valid(). This should still possible to do it without taking per-domain lock but will result a couple more of memory access. Signed-off-by: Julien Grall Signed-off-by: Rahul Singh Reviewed-by: Michal Orzel Reviewed-by: Jan Beulich --- xen/common/event_channel.c | 55 +++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index c2c6f8c151..f81c229358 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -193,6 +193,15 @@ static struct evtchn *alloc_evtchn_bucket(struct domain *d, unsigned int port) return NULL; } +/* + * Allocate a given port and ensure all the buckets up to that ports + * have been allocated. + * + * The last part is important because the rest of the event channel code + * relies on all the buckets up to d->valid_evtchns to be valid. However, + * event channels may be sparsed when allocating the static evtchn port + * numbers that are scattered in nature. + */ int evtchn_allocate_port(struct domain *d, evtchn_port_t port) { if ( port > d->max_evtchn_port || port >= max_evtchns(d) ) @@ -207,30 +216,36 @@ int evtchn_allocate_port(struct domain *d, evtchn_port_t port) } else { - struct evtchn *chn; - struct evtchn **grp; + unsigned int alloc_port = read_atomic(&d->valid_evtchns); - if ( !group_from_port(d, port) ) + do { - grp = xzalloc_array(struct evtchn *, BUCKETS_PER_GROUP); - if ( !grp ) - return -ENOMEM; - group_from_port(d, port) = grp; - } + struct evtchn *chn; + struct evtchn **grp; - chn = alloc_evtchn_bucket(d, port); - if ( !chn ) - return -ENOMEM; - bucket_from_port(d, port) = chn; + if ( !group_from_port(d, alloc_port) ) + { + grp = xzalloc_array(struct evtchn *, BUCKETS_PER_GROUP); + if ( !grp ) + return -ENOMEM; + group_from_port(d, alloc_port) = grp; + } - /* - * d->valid_evtchns is used to check whether the bucket can be - * accessed without the per-domain lock. Therefore, - * d->valid_evtchns should be seen *after* the new bucket has - * been setup. - */ - smp_wmb(); - write_atomic(&d->valid_evtchns, d->valid_evtchns + EVTCHNS_PER_BUCKET); + chn = alloc_evtchn_bucket(d, alloc_port); + if ( !chn ) + return -ENOMEM; + bucket_from_port(d, alloc_port) = chn; + + /* + * d->valid_evtchns is used to check whether the bucket can be + * accessed without the per-domain lock. Therefore, + * d->valid_evtchns should be seen *after* the new bucket has + * been setup. + */ + smp_wmb(); + alloc_port += EVTCHNS_PER_BUCKET; + write_atomic(&d->valid_evtchns, alloc_port); + } while ( port >= alloc_port ); } write_atomic(&d->active_evtchns, d->active_evtchns + 1); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 11:33:15 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 11:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403181.645203 (Exim 4.92) (envelope-from ) id 1oWFmV-0008CF-Ml; Thu, 08 Sep 2022 11:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403181.645203; Thu, 08 Sep 2022 11:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFmV-0008C3-Jx; Thu, 08 Sep 2022 11:33:15 +0000 Received: by outflank-mailman (input) for mailman id 403181; Thu, 08 Sep 2022 11:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFmU-0008BC-Kz for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFmU-0006C0-KG for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWFmU-0005Qc-JM for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tK/xo58fS37yWqN/V1KA8LecTWwFO04g7D/xmkx16OU=; b=gXtVrBoEoPZVyqaUTzkTEcb3xy FE/kGPWQUe+1t22qnTSLAbxo9Dtj/+XazveReY2/jwUF1LuMsTDvhajdOAxakZYXP68hLbovmjZdR a/HX6ZlF8awXPylHM+mP3ATZEAilbmiwGI8aJjJTNtF9vBJ4iD+rEdfDuO5TEI3UdESs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/evtchn: Add an helper to reserve/allocate a port Message-Id: Date: Thu, 08 Sep 2022 11:33:14 +0000 commit 4e1eade78ef3f339ed671851abce398e80ba04ca Author: Stanislav Kinsburskii AuthorDate: Wed Sep 7 17:27:33 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:58 2022 +0100 xen/evtchn: Add an helper to reserve/allocate a port In a follow-up patch we will want to either reserve or allocate a port for various event channel helpers. A new wrapper is introduced to either reserve a given port or allocate a fresh one if zero. Take the opportunity to replace the open-coded version in evtchn_bind_virq(). Signed-off-by: Stanislav Kinsburskii Signed-off-by: Julien Grall Signed-off-by: Rahul Singh Acked-by: Jan Beulich --- xen/common/event_channel.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index f81c229358..565ab71881 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -305,6 +305,18 @@ void evtchn_free(struct domain *d, struct evtchn *chn) xsm_evtchn_close_post(chn); } +static int evtchn_get_port(struct domain *d, evtchn_port_t port) +{ + int rc; + + if ( port != 0 ) + rc = evtchn_allocate_port(d, port); + else + rc = get_free_port(d); + + return rc ?: port; +} + int evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) { struct evtchn *chn; @@ -462,19 +474,10 @@ int evtchn_bind_virq(evtchn_bind_virq_t *bind, evtchn_port_t port) if ( read_atomic(&v->virq_to_evtchn[virq]) ) ERROR_EXIT(-EEXIST); - if ( port != 0 ) - { - if ( (rc = evtchn_allocate_port(d, port)) != 0 ) - ERROR_EXIT(rc); - } - else - { - int alloc_port = get_free_port(d); - - if ( alloc_port < 0 ) - ERROR_EXIT(alloc_port); - port = alloc_port; - } + port = rc = evtchn_get_port(d, port); + if ( rc < 0 ) + ERROR_EXIT(rc); + rc = 0; chn = evtchn_from_port(d, port); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 11:33:25 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 11:33:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403182.645207 (Exim 4.92) (envelope-from ) id 1oWFmf-0008Lt-OZ; Thu, 08 Sep 2022 11:33:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403182.645207; Thu, 08 Sep 2022 11:33:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFmf-0008Lj-LP; Thu, 08 Sep 2022 11:33:25 +0000 Received: by outflank-mailman (input) for mailman id 403182; Thu, 08 Sep 2022 11:33:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFme-0008LO-P2 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFme-0006CS-OL for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWFme-0005R6-MM for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=39ltjRFLT8TwpWquMxNYXNXh1IcuHSsccJ/ipZEpDxI=; b=sApCE626mbcSI7s4Is6L50F/Rg p9Ki8/nXlYbeYf35ofYSUomrfAUdKr5wRqX8ropshPfGK2yjompCJXJFpeuUMsQL5wQX4R66MdLSh FHsbDvHL8QLILx2+zkDLatvQLtnAiU55QcNELUidS71nwtZSy48CCv84cLQjkQoiASAc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/evtchn: restrict the maximum number of evtchn supported for domUs Message-Id: Date: Thu, 08 Sep 2022 11:33:24 +0000 commit 0a8ef2fa450aa9673dd2e0d25bb16931aea2bf1e Author: Rahul Singh AuthorDate: Wed Sep 7 17:27:34 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:58 2022 +0100 xen/evtchn: restrict the maximum number of evtchn supported for domUs Restrict the maximum number of evtchn supported for domUs to avoid allocating a large amount of memory in Xen. Set the default value of max_evtchn_port to 1023. The value of 1023 should be sufficient for guests because on ARM we don't bind physical interrupts to event channels. The only use of the evtchn port is inter-domain communications. Another reason why we choose the value of 1023 is to follow the default behavior of libxl. Signed-off-by: Rahul Singh Reviewed-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 0277790088..f899766860 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -3277,7 +3277,13 @@ void __init create_domUs(void) struct xen_domctl_createdomain d_cfg = { .arch.gic_version = XEN_DOMCTL_CONFIG_GIC_NATIVE, .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, - .max_evtchn_port = -1, + /* + * The default of 1023 should be sufficient for guests because + * on ARM we don't bind physical interrupts to event channels. + * The only use of the evtchn port is inter-domain communications. + * 1023 is also the default value used in libxl. + */ + .max_evtchn_port = 1023, .max_grant_frames = -1, .max_maptrack_frames = -1, .grant_opts = XEN_DOMCTL_GRANT_version(opt_gnttab_max_version), -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 11:33:35 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 11:33:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403186.645212 (Exim 4.92) (envelope-from ) id 1oWFmp-0008Um-Q0; Thu, 08 Sep 2022 11:33:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403186.645212; Thu, 08 Sep 2022 11:33:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFmp-0008Uc-Mz; Thu, 08 Sep 2022 11:33:35 +0000 Received: by outflank-mailman (input) for mailman id 403186; Thu, 08 Sep 2022 11:33:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFmo-0008UU-S5 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFmo-0006Ck-RP for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWFmo-0005Rc-QY for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1lRi/+ldtiS8y+4NwH8Zja+CQacqc0maaKWbFQe0iSY=; b=5BObna4IC8GcjKndZKHg/YV+hS ixpAbXgUyNILD81znIMNz0o7oh73SbQVgJiMIf2KMXjPAUTIUtYhWvTr3d56+9W7L2Tuq6V6qqMml mCQnGm1OckYBMTWRyYELR7ayYh+dWhCekYl/ViLmLUsoSZ0/JACfMhIZBmDjFdBLVt+A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/evtchn: modify evtchn_alloc_unbound to allocate specified port Message-Id: Date: Thu, 08 Sep 2022 11:33:34 +0000 commit 5324b179e4658b270c33004038b34c7eaf197ce6 Author: Rahul Singh AuthorDate: Wed Sep 7 17:27:35 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:59 2022 +0100 xen/evtchn: modify evtchn_alloc_unbound to allocate specified port Currently evtchn_alloc_unbound() always allocates the next available port. Static event channel support for dom0less domains requires allocating a specified port. Modify the evtchn_alloc_unbound() to accept the port number as an argument and allocate the specified port if available. If the port number argument is zero, the next available port will be allocated. Signed-off-by: Rahul Singh Acked-by: Jan Beulich Reviewed-by: Julien Grall --- xen/arch/arm/domain_build.c | 2 +- xen/common/event_channel.c | 17 ++++++++++++----- xen/include/xen/event.h | 3 ++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f899766860..7192293068 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -3171,7 +3171,7 @@ static int __init alloc_xenstore_evtchn(struct domain *d) alloc.dom = d->domain_id; alloc.remote_dom = hardware_domain->domain_id; - rc = evtchn_alloc_unbound(&alloc); + rc = evtchn_alloc_unbound(&alloc, 0); if ( rc ) { printk("Failed allocating event channel for domain\n"); diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 565ab71881..f546e81758 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -317,11 +317,15 @@ static int evtchn_get_port(struct domain *d, evtchn_port_t port) return rc ?: port; } -int evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) +/* + * If port is zero get the next free port and allocate. If port is non-zero + * allocate the specified port. + */ +int evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc, evtchn_port_t port) { struct evtchn *chn; struct domain *d; - int port, rc; + int rc; domid_t dom = alloc->dom; d = rcu_lock_domain_by_any_id(dom); @@ -330,8 +334,11 @@ int evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) write_lock(&d->event_lock); - if ( (port = get_free_port(d)) < 0 ) - ERROR_EXIT_DOM(port, d); + port = rc = evtchn_get_port(d, port); + if ( rc < 0 ) + ERROR_EXIT(rc); + rc = 0; + chn = evtchn_from_port(d, port); rc = xsm_evtchn_unbound(XSM_TARGET, d, chn, alloc->remote_dom); @@ -1222,7 +1229,7 @@ long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct evtchn_alloc_unbound alloc_unbound; if ( copy_from_guest(&alloc_unbound, arg, 1) != 0 ) return -EFAULT; - rc = evtchn_alloc_unbound(&alloc_unbound); + rc = evtchn_alloc_unbound(&alloc_unbound, 0); if ( !rc && __copy_to_guest(arg, &alloc_unbound, 1) ) rc = -EFAULT; /* Cleaning up here would be a mess! */ break; diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index f3021fe304..f31963703f 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -72,7 +72,8 @@ void evtchn_free(struct domain *d, struct evtchn *chn); int evtchn_allocate_port(struct domain *d, unsigned int port); /* Allocate a new event channel */ -int __must_check evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc); +int __must_check evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc, + evtchn_port_t port); /* Unmask a local event-channel port. */ int evtchn_unmask(unsigned int port); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 11:33:45 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 11:33:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403187.645216 (Exim 4.92) (envelope-from ) id 1oWFmz-00006r-Rq; Thu, 08 Sep 2022 11:33:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403187.645216; Thu, 08 Sep 2022 11:33: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 1oWFmz-00006h-OT; Thu, 08 Sep 2022 11:33:45 +0000 Received: by outflank-mailman (input) for mailman id 403187; Thu, 08 Sep 2022 11:33:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFmy-00006T-Ur for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFmy-0006Cu-U7 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWFmy-0005SA-TS for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EaLdzvyk2CpY9m+PshzHPFCjND/XpcHyMQn5ZSp3Gm4=; b=TkSApY6KoK8pA1bncUtqz9wVlm ZBWM+F3cmNLV1J4sgXKE/QrcZiWlbzwngOjer67skFcPkeyiDiz8tY3J0ePCFLfkT8XPn5MCqgOTW AqWySClS4gsNi7G9ILsaz5gQPCHWsENIILT6dBch1bmHfAYSzV6yYBOLv9Jfx4+S8HTc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/evtchn: modify evtchn_bind_interdomain to support static evtchn Message-Id: Date: Thu, 08 Sep 2022 11:33:44 +0000 commit 7ba046a538cba2bc196d9d6d609594aa3b393f94 Author: Rahul Singh AuthorDate: Wed Sep 7 17:27:36 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:59 2022 +0100 xen/evtchn: modify evtchn_bind_interdomain to support static evtchn Static event channel support will be added for dom0less domains. Modify evtchn_bind_interdomain to support static evtchn. It is necessary to have access to the evtchn_bind_interdomain function to do that, so make evtchn_bind_interdomain global and also make it __must_check. Currently evtchn_bind_interdomain() always allocates the next available local port. Static event channel support for dom0less domains requires allocating a specified port. Modify the evtchn_bind_interdomain to accept the port number as an argument and allocate the specified port if available. If the port number argument is zero, the next available port will be allocated. Currently evtchn_bind_interdomain() finds the local domain from "current->domain" pointer. evtchn_bind_interdomain() will be called from the XEN to create static event channel during domain creation. "current" pointer is not valid at that time, therefore modify the evtchn_bind_interdomain() to pass domain as an argument. Signed-off-by: Rahul Singh Acked-by: Jan Beulich Reviewed-by: Julien Grall --- xen/common/event_channel.c | 20 ++++++++++++++------ xen/include/xen/event.h | 5 +++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index f546e81758..f5e0b12d15 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -381,11 +381,16 @@ static void double_evtchn_unlock(struct evtchn *lchn, struct evtchn *rchn) evtchn_write_unlock(rchn); } -static int evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) +/* + * If lport is zero get the next free port and allocate. If port is non-zero + * allocate the specified lport. + */ +int evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind, struct domain *ld, + evtchn_port_t lport) { struct evtchn *lchn, *rchn; - struct domain *ld = current->domain, *rd; - int lport, rc; + struct domain *rd; + int rc; evtchn_port_t rport = bind->remote_port; domid_t rdom = bind->remote_dom; @@ -405,8 +410,11 @@ static int evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) write_lock(&ld->event_lock); } - if ( (lport = get_free_port(ld)) < 0 ) - ERROR_EXIT(lport); + lport = rc = evtchn_get_port(ld, lport); + if ( rc < 0 ) + ERROR_EXIT(rc); + rc = 0; + lchn = evtchn_from_port(ld, lport); rchn = _evtchn_from_port(rd, rport); @@ -1239,7 +1247,7 @@ long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct evtchn_bind_interdomain bind_interdomain; if ( copy_from_guest(&bind_interdomain, arg, 1) != 0 ) return -EFAULT; - rc = evtchn_bind_interdomain(&bind_interdomain); + rc = evtchn_bind_interdomain(&bind_interdomain, current->domain, 0); if ( !rc && __copy_to_guest(arg, &bind_interdomain, 1) ) rc = -EFAULT; /* Cleaning up here would be a mess! */ break; diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index f31963703f..8eae9984a9 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -75,6 +75,11 @@ int evtchn_allocate_port(struct domain *d, unsigned int port); int __must_check evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc, evtchn_port_t port); +/* Bind an event channel port to interdomain */ +int __must_check evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind, + struct domain *ld, + evtchn_port_t port); + /* Unmask a local event-channel port. */ int evtchn_unmask(unsigned int port); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 11:33:55 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 11:33:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403189.645219 (Exim 4.92) (envelope-from ) id 1oWFn9-0000Bw-Sc; Thu, 08 Sep 2022 11:33:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403189.645219; Thu, 08 Sep 2022 11:33:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFn9-0000Bo-Q2; Thu, 08 Sep 2022 11:33:55 +0000 Received: by outflank-mailman (input) for mailman id 403189; Thu, 08 Sep 2022 11:33:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFn9-0000BZ-2n for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFn9-0006DO-24 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWFn9-0005Sb-03 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:33:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3mdZKjA1cekbAWa8s8t8WEtt1KP6XsJ4f4+jjgF3JUk=; b=nDy5wCbR7nueDz+fkeVNyP2p3l ItPBuX5Yu8Y2UHWTauDE/jZoS293rnuPm3rOVTqPig2FETryYjtndjePsortqSyBiTX+SWz/42kZ6 p+oYnbeuNJYF6I64Nq2iO4+qUG0nF3c7zklsWEdaiozwK4V4BIJGDVLNL8r5HDLVKFQk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: introduce new xen,enhanced property value Message-Id: Date: Thu, 08 Sep 2022 11:33:55 +0000 commit 4a6d155a840de41e59050e2dc06d86293112c0f3 Author: Rahul Singh AuthorDate: Wed Sep 7 17:27:37 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:59 2022 +0100 xen/arm: introduce new xen,enhanced property value Introduce a new "xen,enhanced" dom0less property value "no-xenstore" to disable xenstore interface for dom0less guests. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 4 ++++ xen/arch/arm/domain_build.c | 10 ++++++---- xen/arch/arm/include/asm/kernel.h | 23 +++++++++++++++++++++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 98253414b8..47567b3906 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -204,6 +204,10 @@ with the following properties: - "disabled" Xen PV interfaces are disabled. + - "no-xenstore" + All default Xen PV interfaces, including grant-table will be enabled but + xenstore will be disabled for the VM. + If the xen,enhanced property is present with no value, it defaults to "enabled". If the xen,enhanced property is not present, PV interfaces are disabled. diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 7192293068..e5aba9841f 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2891,7 +2891,7 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) goto err; } - if ( kinfo->dom0less_enhanced ) + if ( kinfo->dom0less_feature & DOM0LESS_ENHANCED_NO_XS ) { ret = make_hypervisor_node(d, kinfo, addrcells, sizecells); if ( ret ) @@ -3209,10 +3209,12 @@ static int __init construct_domU(struct domain *d, (rc == 0 && !strcmp(dom0less_enhanced, "enabled")) ) { if ( hardware_domain ) - kinfo.dom0less_enhanced = true; + kinfo.dom0less_feature = DOM0LESS_ENHANCED; else - panic("Tried to use xen,enhanced without dom0\n"); + panic("At the moment, Xenstore support requires dom0 to be present\n"); } + else if ( rc == 0 && !strcmp(dom0less_enhanced, "no-xenstore") ) + kinfo.dom0less_feature = DOM0LESS_ENHANCED_NO_XS; if ( vcpu_create(d, 0) == NULL ) return -ENOMEM; @@ -3252,7 +3254,7 @@ static int __init construct_domU(struct domain *d, if ( rc < 0 ) return rc; - if ( kinfo.dom0less_enhanced ) + if ( kinfo.dom0less_feature & DOM0LESS_XENSTORE ) { ASSERT(hardware_domain); rc = alloc_xenstore_evtchn(d); diff --git a/xen/arch/arm/include/asm/kernel.h b/xen/arch/arm/include/asm/kernel.h index c4dc039b54..f8bb85767b 100644 --- a/xen/arch/arm/include/asm/kernel.h +++ b/xen/arch/arm/include/asm/kernel.h @@ -9,6 +9,25 @@ #include #include +/* + * List of possible features for dom0less domUs + * + * DOM0LESS_ENHANCED_NO_XS: Notify the OS it is running on top of Xen. All the + * default features (excluding Xenstore) will be + * available. Note that an OS *must* not rely on the + * availability of Xen features if this is not set. + * DOM0LESS_XENSTORE: Xenstore will be enabled for the VM. This feature + * can't be enabled without the + * DOM0LESS_ENHANCED_NO_XS. + * DOM0LESS_ENHANCED: Notify the OS it is running on top of Xen. All the + * default features (including Xenstore) will be + * available. Note that an OS *must* not rely on the + * availability of Xen features if this is not set. + */ +#define DOM0LESS_ENHANCED_NO_XS BIT(0, U) +#define DOM0LESS_XENSTORE BIT(1, U) +#define DOM0LESS_ENHANCED (DOM0LESS_ENHANCED_NO_XS | DOM0LESS_XENSTORE) + struct kernel_info { #ifdef CONFIG_ARM_64 enum domain_type type; @@ -36,8 +55,8 @@ struct kernel_info { /* Enable pl011 emulation */ bool vpl011; - /* Enable PV drivers */ - bool dom0less_enhanced; + /* Enable/Disable PV drivers interfaces */ + uint16_t dom0less_feature; /* GIC phandle */ uint32_t phandle_gic; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 11:34:05 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 11:34:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403190.645223 (Exim 4.92) (envelope-from ) id 1oWFnJ-0000Ew-UT; Thu, 08 Sep 2022 11:34:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403190.645223; Thu, 08 Sep 2022 11:34:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnJ-0000Eo-RZ; Thu, 08 Sep 2022 11:34:05 +0000 Received: by outflank-mailman (input) for mailman id 403190; Thu, 08 Sep 2022 11:34:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnJ-0000Eg-6I for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnJ-0006Dl-5H for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWFnJ-0005TR-4S for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tsvF8ijafOSTdqEYGspcjiwHJ7O5hodKtT4+veSVbDU=; b=qlSbdojQB+mCdpyS5JnTo5/CV8 iAHDy16eA7QXJlULUEVMpR5heRXt5JxFi6cN0w+72bjNAJtikoKEKO25IDge6KyKLh0dll0HeYJkd 6CP0H1cYjeqjxH2S+pPDIkbQE0743H7gg4dlKyu0TgjCX8gAf5NrdP0/j3Cmv+NaqSB4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: introduce xen-evtchn dom0less property Message-Id: Date: Thu, 08 Sep 2022 11:34:05 +0000 commit 1fe16b3ed78a041e17a9625a073a6d4540fb1a20 Author: Rahul Singh AuthorDate: Wed Sep 7 17:27:38 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:59 2022 +0100 xen/arm: introduce xen-evtchn dom0less property Introduce a new sub-node under /chosen node to establish static event channel communication between domains on dom0less systems. An event channel will be created beforehand to allow the domains to send notifications to each other. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 98 +++++++++++++++++++++++ xen/arch/arm/domain_build.c | 147 ++++++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/setup.h | 1 + xen/arch/arm/setup.c | 2 + xen/include/xen/device_tree.h | 16 ++++ 5 files changed, 264 insertions(+) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 47567b3906..e03e5e9e4c 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -382,3 +382,101 @@ device-tree: This will reserve a 512MB region starting at the host physical address 0x30000000 to be exclusively used by DomU1. + +Static Event Channel +==================== +The event channel communication will be established statically between two +domains (dom0 and domU also). Event channel connection information between +domains will be passed to Xen via the device tree node. The event channel +will be created and established in Xen before the domain started. The domain +does not need to do any operation to establish a connection. Domain only +needs hypercall EVTCHNOP_send(local port) to send notifications to the +remote guest. + +There is no need to describe the static event channel info in the domU device +tree. Static event channels are only useful in fully static configurations, +and in those configurations, the domU device tree dynamically generated by Xen +is not needed. + +To enable the event-channel interface for domU guests include the +xen,enhanced = "no-xenstore" property in the domU Xen device tree node. + +Under the "xen,domain" compatible node for domU, there needs to be sub-nodes +with compatible "xen,evtchn" that describe the event channel connection +between two domUs. For dom0, there needs to be sub-nodes with compatible +"xen,evtchn" under the chosen node. + +The static event channel node has the following properties: + +- compatible + + "xen,evtchn" + +- xen,evtchn + + The property is tuples of two numbers + (local-evtchn link-to-foreign-evtchn) where: + + local-evtchn is an integer value that will be used to allocate local port + for a domain to send and receive event notifications to/from the remote + domain. Maximum supported value is 2^17 for FIFO ABI and 4096 for 2L ABI. + It is recommended to use low event channel IDs. + + link-to-foreign-evtchn is a single phandle to a remote evtchn to which + local-evtchn will be connected. + +Example +======= + +chosen { + + /* One sub-node per local event channel. This sub-node is for Dom0. */ + ec1: evtchn@1 { + compatible = "xen,evtchn-v1"; + /* local-evtchn link-to-foreign-evtchn */ + xen,evtchn = <0xa &ec2>; + }; + + domU1 { + compatible = "xen,domain"; + #address-cells = <0x2>; + #size-cells = <0x1>; + xen,enhanced = "no-xenstore"; + + /* One sub-node per local event channel */ + ec2: evtchn@2 { + compatible = "xen,evtchn-v1"; + /* local-evtchn link-to-foreign-evtchn */ + xen,evtchn = <0xa &ec1>; + }; + + ec3: evtchn@3 { + compatible = "xen,evtchn-v1"; + xen,evtchn = <0xb &ec5>; + }; + + ec4: evtchn@4 { + compatible = "xen,evtchn-v1"; + xen,evtchn = <0xc &ec6>; + }; + }; + + domU2 { + compatible = "xen,domain"; + #address-cells = <0x2>; + #size-cells = <0x1>; + xen,enhanced = "no-xenstore"; + + /* One sub-node per local event channel */ + ec5: evtchn@5 { + compatible = "xen,evtchn-v1"; + /* local-evtchn link-to-foreign-evtchn */ + xen,evtchn = <0xb &ec3>; + }; + + ec6: evtchn@6 { + compatible = "xen,evtchn-v1"; + xen,evtchn = <0xd &ec4>; + }; + }; +}; diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e5aba9841f..1d6b414c73 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -33,6 +33,8 @@ #include #include +#define STATIC_EVTCHN_NODE_SIZE_CELLS 2 + static unsigned int __initdata opt_dom0_max_vcpus; integer_param("dom0_max_vcpus", opt_dom0_max_vcpus); @@ -3052,6 +3054,150 @@ void __init evtchn_allocate(struct domain *d) d->arch.hvm.params[HVM_PARAM_CALLBACK_IRQ] = val; } +static int __init get_evtchn_dt_property(const struct dt_device_node *np, + uint32_t *port, uint32_t *phandle) +{ + const __be32 *prop = NULL; + uint32_t len; + + prop = dt_get_property(np, "xen,evtchn", &len); + if ( !prop ) + { + printk(XENLOG_ERR "xen,evtchn property should not be empty.\n"); + return -EINVAL; + } + + if ( !len || len < dt_cells_to_size(STATIC_EVTCHN_NODE_SIZE_CELLS) ) + { + printk(XENLOG_ERR "xen,evtchn property value is not valid.\n"); + return -EINVAL; + } + + *port = dt_next_cell(1, &prop); + *phandle = dt_next_cell(1, &prop); + + return 0; +} + +static int __init alloc_domain_evtchn(struct dt_device_node *node) +{ + int rc; + uint32_t domU1_port, domU2_port, remote_phandle; + struct dt_device_node *remote_node; + const struct dt_device_node *p1_node, *p2_node; + struct evtchn_alloc_unbound alloc_unbound; + struct evtchn_bind_interdomain bind_interdomain; + struct domain *d1 = NULL, *d2 = NULL; + + if ( !dt_device_is_compatible(node, "xen,evtchn-v1") ) + return 0; + + /* + * Event channel is already created while parsing the other side of + * evtchn node. + */ + if ( dt_device_static_evtchn_created(node) ) + return 0; + + rc = get_evtchn_dt_property(node, &domU1_port, &remote_phandle); + if ( rc ) + return rc; + + remote_node = dt_find_node_by_phandle(remote_phandle); + if ( !remote_node ) + { + printk(XENLOG_ERR + "evtchn: could not find remote evtchn phandle\n"); + return -EINVAL; + } + + rc = get_evtchn_dt_property(remote_node, &domU2_port, &remote_phandle); + if ( rc ) + return rc; + + if ( node->phandle != remote_phandle ) + { + printk(XENLOG_ERR "xen,evtchn property is not setup correctly.\n"); + return -EINVAL; + } + + p1_node = dt_get_parent(node); + if ( !p1_node ) + { + printk(XENLOG_ERR "evtchn: evtchn parent node is NULL\n" ); + return -EINVAL; + } + + p2_node = dt_get_parent(remote_node); + if ( !p2_node ) + { + printk(XENLOG_ERR "evtchn: remote parent node is NULL\n" ); + return -EINVAL; + } + + d1 = get_domain_by_id(p1_node->used_by); + d2 = get_domain_by_id(p2_node->used_by); + + if ( !d1 || !d2 ) + { + printk(XENLOG_ERR "evtchn: could not find domains\n" ); + return -EINVAL; + } + + alloc_unbound.dom = d1->domain_id; + alloc_unbound.remote_dom = d2->domain_id; + + rc = evtchn_alloc_unbound(&alloc_unbound, domU1_port); + if ( rc < 0 ) + { + printk(XENLOG_ERR + "evtchn_alloc_unbound() failure (Error %d) \n", rc); + return rc; + } + + bind_interdomain.remote_dom = d1->domain_id; + bind_interdomain.remote_port = domU1_port; + + rc = evtchn_bind_interdomain(&bind_interdomain, d2, domU2_port); + if ( rc < 0 ) + { + printk(XENLOG_ERR + "evtchn_bind_interdomain() failure (Error %d) \n", rc); + return rc; + } + + dt_device_set_static_evtchn_created(node); + dt_device_set_static_evtchn_created(remote_node); + + return 0; +} + +void __init alloc_static_evtchn(void) +{ + struct dt_device_node *node, *evtchn_node; + struct dt_device_node *chosen = dt_find_node_by_path("/chosen"); + + BUG_ON(chosen == NULL); + + if ( hardware_domain ) + dt_device_set_used_by(chosen, hardware_domain->domain_id); + + dt_for_each_child_node(chosen, node) + { + if ( hardware_domain ) + { + if ( alloc_domain_evtchn(node) != 0 ) + panic("Could not set up domains evtchn\n"); + } + + dt_for_each_child_node(node, evtchn_node) + { + if ( alloc_domain_evtchn(evtchn_node) != 0 ) + panic("Could not set up domains evtchn\n"); + } + } +} + static void __init find_gnttab_region(struct domain *d, struct kernel_info *kinfo) { @@ -3369,6 +3515,7 @@ void __init create_domUs(void) panic("Error creating domain %s\n", dt_node_name(node)); d->is_console = true; + dt_device_set_used_by(node, d->domain_id); if ( construct_domU(d, node) != 0 ) panic("Could not set up domain %s\n", dt_node_name(node)); diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 5815ccf8c5..5ee28b270f 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -106,6 +106,7 @@ int acpi_make_efi_nodes(void *fdt, struct membank tbl_add[]); void create_domUs(void); void create_dom0(void); +void alloc_static_evtchn(void); void discard_initial_modules(void); void fw_unreserved_regions(paddr_t s, paddr_t e, diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 7814fe323d..909013992e 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -1078,6 +1078,8 @@ void __init start_xen(unsigned long boot_phys_offset, if ( acpi_disabled ) create_domUs(); + alloc_static_evtchn(); + /* * This needs to be called **before** heap_init_late() so modules * will be scrubbed (unless suppressed). diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 430a1ef445..a28937d12a 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -92,6 +92,10 @@ struct dt_device_node { /* IOMMU specific fields */ bool is_protected; + + /* HACK: Remove this if there is a need of space */ + bool_t static_evtchn_created; + /* * The main purpose of this list is to link the structure in the list * of devices assigned to domain. @@ -317,6 +321,18 @@ static inline bool_t dt_property_name_is_equal(const struct dt_property *pp, return !dt_prop_cmp(pp->name, name); } +static inline void +dt_device_set_static_evtchn_created(struct dt_device_node *device) +{ + device->static_evtchn_created = true; +} + +static inline bool_t +dt_device_static_evtchn_created(const struct dt_device_node *device) +{ + return device->static_evtchn_created; +} + /** * dt_find_compatible_node - Find a node based on type and one of the * tokens in its "compatible" property -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 11:34:17 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 11:34:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403191.645227 (Exim 4.92) (envelope-from ) id 1oWFnV-0000JI-1u; Thu, 08 Sep 2022 11:34:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403191.645227; Thu, 08 Sep 2022 11:34:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnU-0000JA-VQ; Thu, 08 Sep 2022 11:34:16 +0000 Received: by outflank-mailman (input) for mailman id 403191; Thu, 08 Sep 2022 11:34:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnT-0000Ib-A6 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnT-0006Dx-9P for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWFnT-0005U2-7L for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=aMfZgybC1NrdyqMw2OBL8tV2qU1FI2cLNeqTlfIw3RA=; b=OOFSNYdhSu3ml5SCSwKQNYvSDW ZASDtFMiaxGE2iSRztqPE7iCEHpRfQS1D9ix85JqIR8TkGjPu0OKVXJkM7I88iWSYIbrr23Mwh9Ab mdUAcEcbICaz8S/RjqB1PVnCuWdlL/OQ0AYOSf4Fsz1vkeeHheovuRpFAixuDNohGq48=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: bootfdt: Make process_chosen_node() return int Message-Id: Date: Thu, 08 Sep 2022 11:34:15 +0000 commit d0d81052b4e7493acf8c8dc18fe1911c4ee1d2ac Author: Henry Wang AuthorDate: Thu Sep 8 11:09:07 2022 +0000 Commit: Julien Grall CommitDate: Thu Sep 8 12:23:39 2022 +0100 xen/arm: bootfdt: Make process_chosen_node() return int At the boot time, it is saner to stop booting early if an error occurs when parsing the device tree chosen node, rather than seeing random behavior afterwards. Therefore, this commit changes the return type of the process_chosen_node() from void to int, and return correct errno based on the error type. Signed-off-by: Henry Wang Reviewed-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/bootfdt.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index ec81a45de9..1a79b969af 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -293,9 +293,9 @@ static void __init process_multiboot_node(const void *fdt, int node, kind, start, domU); } -static void __init process_chosen_node(const void *fdt, int node, - const char *name, - u32 address_cells, u32 size_cells) +static int __init process_chosen_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) { const struct fdt_property *prop; paddr_t start, end; @@ -306,11 +306,11 @@ static void __init process_chosen_node(const void *fdt, int node, prop = fdt_get_property(fdt, node, "linux,initrd-start", &len); if ( !prop ) /* No initrd present. */ - return; + return 0; if ( len != sizeof(u32) && len != sizeof(u64) ) { printk("linux,initrd-start property has invalid length %d\n", len); - return; + return -EINVAL; } start = dt_read_number((void *)&prop->data, dt_size_to_cells(len)); @@ -318,12 +318,12 @@ static void __init process_chosen_node(const void *fdt, int node, if ( !prop ) { printk("linux,initrd-end not present but -start was\n"); - return; + return -EINVAL; } if ( len != sizeof(u32) && len != sizeof(u64) ) { printk("linux,initrd-end property has invalid length %d\n", len); - return; + return -EINVAL; } end = dt_read_number((void *)&prop->data, dt_size_to_cells(len)); @@ -331,12 +331,14 @@ static void __init process_chosen_node(const void *fdt, int node, { printk("linux,initrd limits invalid: %"PRIpaddr" >= %"PRIpaddr"\n", start, end); - return; + return -EINVAL; } printk("Initrd %"PRIpaddr"-%"PRIpaddr"\n", start, end); add_boot_module(BOOTMOD_RAMDISK, start, end-start, false); + + return 0; } static int __init process_domain_node(const void *fdt, int node, @@ -383,7 +385,7 @@ static int __init early_scan_node(const void *fdt, device_tree_node_compatible(fdt, node, "multiboot,module" ))) process_multiboot_node(fdt, node, name, address_cells, size_cells); else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") ) - process_chosen_node(fdt, node, name, address_cells, size_cells); + rc = process_chosen_node(fdt, node, name, address_cells, size_cells); else if ( depth == 2 && device_tree_node_compatible(fdt, node, "xen,domain") ) rc = process_domain_node(fdt, node, name, address_cells, size_cells); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 11:34:27 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 11:34:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403194.645231 (Exim 4.92) (envelope-from ) id 1oWFnf-0000NA-3N; Thu, 08 Sep 2022 11:34:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403194.645231; Thu, 08 Sep 2022 11:34:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnf-0000N0-0e; Thu, 08 Sep 2022 11:34:27 +0000 Received: by outflank-mailman (input) for mailman id 403194; Thu, 08 Sep 2022 11:34:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnd-0000Mg-FX for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnd-0006EJ-Cj for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWFnd-0005Wv-Bp for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mTR6PrdkkPqUDpxoW+Fqxgg45Wpkdhn1H/48MB2HzI0=; b=uaEqK3YitJ15mgX2d4wmj/17B4 K8csADzJn0dY7i+TVZiB2VOtLEEKEJeRhjw8ErLJ0qg118RY3pH4d8GXyszP+dCsPWp81REcNXSWS heTQsFCk0CAl5cGTVVdKll6J25CKk0vLf5GoBYmXwiKg0xbK9rtU9SP83gjcwe7MYHuA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs, xen/arm: Introduce static heap memory Message-Id: Date: Thu, 08 Sep 2022 11:34:25 +0000 commit 4596329291f5cff9c28d269d21aac17ef993e9fb Author: Henry Wang AuthorDate: Thu Sep 8 11:09:08 2022 +0000 Commit: Julien Grall CommitDate: Thu Sep 8 12:27:15 2022 +0100 docs, xen/arm: Introduce static heap memory This commit introduces the static heap memory, which is parts of RAM reserved in the beginning of the boot time for heap. Firstly, since a new type of memory bank is needed for marking the memory bank solely as the heap, this commit defines `enum membank_type` and use this enum in function device_tree_get_meminfo(). Changes of code are done accordingly following the introduction of this enum. Also, this commit introduces the logic to parse the static heap configuration in device tree. If the memory bank is reserved as heap through `xen,static-heap` property in device tree `chosen` node, the memory will be marked as static heap type. A documentation section is added, describing the definition of static heap memory and the method of enabling the static heap memory through device tree at boot time. Signed-off-by: Henry Wang Signed-off-by: Penny Zheng Reviewed-by: Julien Grall --- SUPPORT.md | 7 ++++++ docs/misc/arm/device-tree/booting.txt | 43 +++++++++++++++++++++++++++++++++++ xen/arch/arm/bootfdt.c | 23 +++++++++++++++---- xen/arch/arm/domain_build.c | 8 ++++--- xen/arch/arm/include/asm/setup.h | 22 +++++++++++++++++- xen/arch/arm/setup.c | 2 +- 6 files changed, 96 insertions(+), 9 deletions(-) diff --git a/SUPPORT.md b/SUPPORT.md index 8e040d1c1e..b02a5d25ca 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -293,6 +293,13 @@ pre-defined by configuration using physical address ranges. Status, ARM: Tech Preview +### Static Heap + +Allow reserving parts of RAM through the device tree using physical +address ranges as heap. + + Status, ARM: Tech Preview + ### Memory Sharing Allow sharing of identical pages between guests diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index e03e5e9e4c..5395a1077c 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -425,6 +425,49 @@ The static event channel node has the following properties: link-to-foreign-evtchn is a single phandle to a remote evtchn to which local-evtchn will be connected. +Static Heap Memory +================== + +The static heap memory refers to parts of RAM reserved in the beginning of +boot time for heap. The memory is reserved by configuration in the device +tree using physical address ranges. + +The static heap memory declared in the device tree defines the memory areas +that will be reserved to be used exclusively as heap. + +- For Arm32, since there are separated heaps, the static heap will be used +for both domheap and xenheap. The admin should make sure that the static +heap region should contain enough memory below 4GB to cater 32-bit DMA. + +- For Arm64, since there is a single heap, the defined static heap areas +shall always go to the heap allocator. + +The static heap memory is an optional feature and can be enabled by adding +below device tree property. + +- xen,static-heap + + Property under the top-level "chosen" node. It specifies the address + and size of Xen static heap memory. Number of address and size cells + for the "xen,static-heap" property is determined by the root node + "#address-cells" and "#size-cells". Note that at least a 64KB alignment + is required. + +Below is an example on how to specify the static heap in device tree: + + / { + #address-cells = <0x2>; + #size-cells = <0x2>; + ... + chosen { + xen,static-heap = <0x0 0x30000000 0x0 0x40000000>; + ... + }; + }; + +RAM starting from the host physical address 0x30000000 of 1GB size will +be reserved as static heap. + Example ======= diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index 1a79b969af..0ca7b44446 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -64,7 +64,7 @@ void __init device_tree_get_reg(const __be32 **cell, u32 address_cells, static int __init device_tree_get_meminfo(const void *fdt, int node, const char *prop_name, u32 address_cells, u32 size_cells, - void *data, bool xen_domain) + void *data, enum membank_type type) { const struct fdt_property *prop; unsigned int i, banks; @@ -95,7 +95,7 @@ static int __init device_tree_get_meminfo(const void *fdt, int node, continue; mem->bank[mem->nr_banks].start = start; mem->bank[mem->nr_banks].size = size; - mem->bank[mem->nr_banks].xen_domain = xen_domain; + mem->bank[mem->nr_banks].type = type; mem->nr_banks++; } @@ -185,7 +185,7 @@ static int __init process_memory_node(const void *fdt, int node, void *data) { return device_tree_get_meminfo(fdt, node, "reg", address_cells, size_cells, - data, false); + data, MEMBANK_DEFAULT); } static int __init process_reserved_memory_node(const void *fdt, int node, @@ -301,6 +301,20 @@ static int __init process_chosen_node(const void *fdt, int node, paddr_t start, end; int len; + if ( fdt_get_property(fdt, node, "xen,static-heap", NULL) ) + { + int rc; + + printk("Checking for static heap in /chosen\n"); + + rc = device_tree_get_meminfo(fdt, node, "xen,static-heap", + address_cells, size_cells, + &bootinfo.reserved_mem, + MEMBANK_STATIC_HEAP); + if ( rc ) + return rc; + } + printk("Checking for initrd in /chosen\n"); prop = fdt_get_property(fdt, node, "linux,initrd-start", &len); @@ -360,7 +374,8 @@ static int __init process_domain_node(const void *fdt, int node, "#xen,static-mem-size-cells", 0); return device_tree_get_meminfo(fdt, node, "xen,static-mem", address_cells, - size_cells, &bootinfo.reserved_mem, true); + size_cells, &bootinfo.reserved_mem, + MEMBANK_STATIC_DOMAIN); } static int __init early_scan_node(const void *fdt, diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 1d6b414c73..7412303d20 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1040,9 +1040,11 @@ static int __init make_memory_node(const struct domain *d, if ( mem->nr_banks == 0 ) return -ENOENT; - /* find first memory range not bound to a Xen domain */ - for ( i = 0; i < mem->nr_banks && mem->bank[i].xen_domain; i++ ) + /* find the first memory range that is reserved for device (or firmware) */ + for ( i = 0; i < mem->nr_banks && + (mem->bank[i].type != MEMBANK_DEFAULT); i++ ) ; + if ( i == mem->nr_banks ) return 0; @@ -1064,7 +1066,7 @@ static int __init make_memory_node(const struct domain *d, u64 start = mem->bank[i].start; u64 size = mem->bank[i].size; - if ( mem->bank[i].xen_domain ) + if ( mem->bank[i].type == MEMBANK_STATIC_DOMAIN ) continue; dt_dprintk(" Bank %d: %#"PRIx64"->%#"PRIx64"\n", diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 5ee28b270f..94b7e74b4d 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -22,11 +22,31 @@ typedef enum { BOOTMOD_UNKNOWN } bootmodule_kind; +enum membank_type { + /* + * The MEMBANK_DEFAULT type refers to either reserved memory for the + * device/firmware (when the bank is in 'reserved_mem') or any RAM (when + * the bank is in 'mem'). + */ + MEMBANK_DEFAULT, + /* + * The MEMBANK_STATIC_DOMAIN type is used to indicate whether the memory + * bank is bound to a static Xen domain. It is only valid when the bank + * is in reserved_mem. + */ + MEMBANK_STATIC_DOMAIN, + /* + * The MEMBANK_STATIC_HEAP type is used to indicate whether the memory + * bank is reserved as static heap. It is only valid when the bank is + * in reserved_mem. + */ + MEMBANK_STATIC_HEAP, +}; struct membank { paddr_t start; paddr_t size; - bool xen_domain; /* whether the memory bank is bound to a Xen domain. */ + enum membank_type type; }; struct meminfo { diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 909013992e..5b7602fdac 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -644,7 +644,7 @@ static void __init init_staticmem_pages(void) for ( bank = 0 ; bank < bootinfo.reserved_mem.nr_banks; bank++ ) { - if ( bootinfo.reserved_mem.bank[bank].xen_domain ) + if ( bootinfo.reserved_mem.bank[bank].type == MEMBANK_STATIC_DOMAIN ) { mfn_t bank_start = _mfn(PFN_UP(bootinfo.reserved_mem.bank[bank].start)); unsigned long bank_pages = PFN_DOWN(bootinfo.reserved_mem.bank[bank].size); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 11:34:37 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 11:34:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403195.645235 (Exim 4.92) (envelope-from ) id 1oWFnp-0000Pv-4q; Thu, 08 Sep 2022 11:34:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403195.645235; Thu, 08 Sep 2022 11:34: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 1oWFnp-0000Pn-2A; Thu, 08 Sep 2022 11:34:37 +0000 Received: by outflank-mailman (input) for mailman id 403195; Thu, 08 Sep 2022 11:34:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnn-0000PQ-GR for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnn-0006EX-Fk for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWFnn-0005XU-Ev for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34: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=0pC84s0Kr0nIhERjm1OgHMcLzh0ra/T5+I98P5cIJzA=; b=D6Ut3k+VifB18GDMex5FF6IkvW FLJehfHJ4yVH68QWDB4/xkvrzoPwsAXEBMZIG/ty4qd4emBkO4gv/bfl7TX58VhsBpDvnvyxICpUD QtYHNjwhQGa+M7ihOUfJ/6xCQHfzD5M4FvLQLs/ienZD7TLMyWkXxfrOyp+vC68wThBI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: mm: Rename xenheap_* variable to directmap_* Message-Id: Date: Thu, 08 Sep 2022 11:34:35 +0000 commit f030935efb376bcbdf2e69692f951775bdf9ab58 Author: Henry Wang AuthorDate: Thu Sep 8 11:09:09 2022 +0000 Commit: Julien Grall CommitDate: Thu Sep 8 12:27:15 2022 +0100 xen/arm: mm: Rename xenheap_* variable to directmap_* With the static heap setup, keep using xenheap_* in the function setup_xenheap_mappings() will make the code confusing to read, because we always need to map the full RAM on Arm64. Therefore, renaming all "xenheap_*" variables to "directmap_*" to make clear the area is used to access the RAM easily. On Arm32, only the xenheap is direct mapped today. So the renaming to "directmap_*" would be still valid for Arm32. As the xenheap_* is renamed to directmap_*, rename the function setup_xenheap_mappings() to setup_directmap_mappings() to reflect the variable renaming, also change the code comment and printed error message in the function accordingly. No functional change is intended. Signed-off-by: Henry Wang Acked-by: Julien Grall --- xen/arch/arm/bootfdt.c | 2 +- xen/arch/arm/include/asm/config.h | 2 +- xen/arch/arm/include/asm/mm.h | 31 +++++++++++++----------- xen/arch/arm/mm.c | 50 +++++++++++++++++++++------------------ xen/arch/arm/setup.c | 36 ++++++++++++++-------------- 5 files changed, 64 insertions(+), 57 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index 0ca7b44446..c39aacbd60 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -494,7 +494,7 @@ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) device_tree_for_each_node((void *)fdt, 0, early_scan_node, NULL); /* - * On Arm64 setup_xenheap_mappings() expects to be called with the lowest + * On Arm64 setup_directmap_mappings() expects to be called with the lowest * bank in memory first. There is no requirement that the DT will provide * the banks sorted in ascending order. So sort them through. */ diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h index 2fafb9f228..0fefed1b8a 100644 --- a/xen/arch/arm/include/asm/config.h +++ b/xen/arch/arm/include/asm/config.h @@ -160,7 +160,7 @@ #define DIRECTMAP_SIZE (SLOT0_ENTRY_SIZE * (265-256)) #define DIRECTMAP_VIRT_END (DIRECTMAP_VIRT_START + DIRECTMAP_SIZE - 1) -#define XENHEAP_VIRT_START xenheap_virt_start +#define XENHEAP_VIRT_START directmap_virt_start #define HYPERVISOR_VIRT_END DIRECTMAP_VIRT_END diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 749fbefa0c..7d21120f98 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -154,19 +154,19 @@ struct page_info #define _PGC_need_scrub _PGC_allocated #define PGC_need_scrub PGC_allocated -extern mfn_t xenheap_mfn_start, xenheap_mfn_end; -extern vaddr_t xenheap_virt_end; +extern mfn_t directmap_mfn_start, directmap_mfn_end; +extern vaddr_t directmap_virt_end; #ifdef CONFIG_ARM_64 -extern vaddr_t xenheap_virt_start; -extern unsigned long xenheap_base_pdx; +extern vaddr_t directmap_virt_start; +extern unsigned long directmap_base_pdx; #endif #ifdef CONFIG_ARM_32 #define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page)) #define is_xen_heap_mfn(mfn) ({ \ unsigned long mfn_ = mfn_x(mfn); \ - (mfn_ >= mfn_x(xenheap_mfn_start) && \ - mfn_ < mfn_x(xenheap_mfn_end)); \ + (mfn_ >= mfn_x(directmap_mfn_start) && \ + mfn_ < mfn_x(directmap_mfn_end)); \ }) #else #define is_xen_heap_page(page) ((page)->count_info & PGC_xen_heap) @@ -203,9 +203,12 @@ extern void remove_early_mappings(void); extern int init_secondary_pagetables(int cpu); /* Switch secondary CPUS to its own pagetables and finalise MMU setup */ extern void mmu_init_secondary_cpu(void); -/* Set up the xenheap: up to 1GB of contiguous, always-mapped memory. - * Base must be 32MB aligned and size a multiple of 32MB. */ -extern void setup_xenheap_mappings(unsigned long base_mfn, unsigned long nr_mfns); +/* + * For Arm32, set up the direct-mapped xenheap: up to 1GB of contiguous, + * always-mapped memory. Base must be 32MB aligned and size a multiple of 32MB. + * For Arm64, map the region in the directmap area. + */ +extern void setup_directmap_mappings(unsigned long base_mfn, unsigned long nr_mfns); /* Map a frame table to cover physical addresses ps through pe */ extern void setup_frametable_mappings(paddr_t ps, paddr_t pe); /* map a physical range in virtual memory */ @@ -267,16 +270,16 @@ static inline paddr_t __virt_to_maddr(vaddr_t va) static inline void *maddr_to_virt(paddr_t ma) { ASSERT(is_xen_heap_mfn(maddr_to_mfn(ma))); - ma -= mfn_to_maddr(xenheap_mfn_start); + ma -= mfn_to_maddr(directmap_mfn_start); return (void *)(unsigned long) ma + XENHEAP_VIRT_START; } #else static inline void *maddr_to_virt(paddr_t ma) { - ASSERT((mfn_to_pdx(maddr_to_mfn(ma)) - xenheap_base_pdx) < + ASSERT((mfn_to_pdx(maddr_to_mfn(ma)) - directmap_base_pdx) < (DIRECTMAP_SIZE >> PAGE_SHIFT)); return (void *)(XENHEAP_VIRT_START - - (xenheap_base_pdx << PAGE_SHIFT) + + (directmap_base_pdx << PAGE_SHIFT) + ((ma & ma_va_bottom_mask) | ((ma & ma_top_mask) >> pfn_pdx_hole_shift))); } @@ -319,10 +322,10 @@ static inline struct page_info *virt_to_page(const void *v) unsigned long pdx; ASSERT(va >= XENHEAP_VIRT_START); - ASSERT(va < xenheap_virt_end); + ASSERT(va < directmap_virt_end); pdx = (va - XENHEAP_VIRT_START) >> PAGE_SHIFT; - pdx += mfn_to_pdx(xenheap_mfn_start); + pdx += mfn_to_pdx(directmap_mfn_start); return frame_table + pdx - frametable_base_pdx; } diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 7f5b317d3e..11ee49598b 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -132,12 +132,12 @@ uint64_t init_ttbr; static paddr_t phys_offset; /* Limits of the Xen heap */ -mfn_t xenheap_mfn_start __read_mostly = INVALID_MFN_INITIALIZER; -mfn_t xenheap_mfn_end __read_mostly; -vaddr_t xenheap_virt_end __read_mostly; +mfn_t directmap_mfn_start __read_mostly = INVALID_MFN_INITIALIZER; +mfn_t directmap_mfn_end __read_mostly; +vaddr_t directmap_virt_end __read_mostly; #ifdef CONFIG_ARM_64 -vaddr_t xenheap_virt_start __read_mostly; -unsigned long xenheap_base_pdx __read_mostly; +vaddr_t directmap_virt_start __read_mostly; +unsigned long directmap_base_pdx __read_mostly; #endif unsigned long frametable_base_pdx __read_mostly; @@ -597,55 +597,59 @@ void mmu_init_secondary_cpu(void) } #ifdef CONFIG_ARM_32 -/* Set up the xenheap: up to 1GB of contiguous, always-mapped memory. */ -void __init setup_xenheap_mappings(unsigned long base_mfn, - unsigned long nr_mfns) +/* + * Set up the direct-mapped xenheap: + * up to 1GB of contiguous, always-mapped memory. + */ +void __init setup_directmap_mappings(unsigned long base_mfn, + unsigned long nr_mfns) { int rc; rc = map_pages_to_xen(XENHEAP_VIRT_START, _mfn(base_mfn), nr_mfns, PAGE_HYPERVISOR_RW | _PAGE_BLOCK); if ( rc ) - panic("Unable to setup the xenheap mappings.\n"); + panic("Unable to setup the directmap mappings.\n"); - /* Record where the xenheap is, for translation routines. */ - xenheap_virt_end = XENHEAP_VIRT_START + nr_mfns * PAGE_SIZE; + /* Record where the directmap is, for translation routines. */ + directmap_virt_end = XENHEAP_VIRT_START + nr_mfns * PAGE_SIZE; } #else /* CONFIG_ARM_64 */ -void __init setup_xenheap_mappings(unsigned long base_mfn, - unsigned long nr_mfns) +/* Map the region in the directmap area. */ +void __init setup_directmap_mappings(unsigned long base_mfn, + unsigned long nr_mfns) { int rc; - /* First call sets the xenheap physical and virtual offset. */ - if ( mfn_eq(xenheap_mfn_start, INVALID_MFN) ) + /* First call sets the directmap physical and virtual offset. */ + if ( mfn_eq(directmap_mfn_start, INVALID_MFN) ) { unsigned long mfn_gb = base_mfn & ~((FIRST_SIZE >> PAGE_SHIFT) - 1); - xenheap_mfn_start = _mfn(base_mfn); - xenheap_base_pdx = mfn_to_pdx(_mfn(base_mfn)); + directmap_mfn_start = _mfn(base_mfn); + directmap_base_pdx = mfn_to_pdx(_mfn(base_mfn)); /* * The base address may not be aligned to the first level * size (e.g. 1GB when using 4KB pages). This would prevent * superpage mappings for all the regions because the virtual * address and machine address should both be suitably aligned. * - * Prevent that by offsetting the start of the xenheap virtual + * Prevent that by offsetting the start of the directmap virtual * address. */ - xenheap_virt_start = DIRECTMAP_VIRT_START + + directmap_virt_start = DIRECTMAP_VIRT_START + (base_mfn - mfn_gb) * PAGE_SIZE; } - if ( base_mfn < mfn_x(xenheap_mfn_start) ) - panic("cannot add xenheap mapping at %lx below heap start %lx\n", - base_mfn, mfn_x(xenheap_mfn_start)); + if ( base_mfn < mfn_x(directmap_mfn_start) ) + panic("cannot add directmap mapping at %lx below heap start %lx\n", + base_mfn, mfn_x(directmap_mfn_start)); rc = map_pages_to_xen((vaddr_t)__mfn_to_virt(base_mfn), _mfn(base_mfn), nr_mfns, PAGE_HYPERVISOR_RW | _PAGE_BLOCK); if ( rc ) - panic("Unable to setup the xenheap mappings.\n"); + panic("Unable to setup the directmap mappings.\n"); } #endif diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 5b7602fdac..6687572fca 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -697,11 +697,11 @@ static void __init populate_boot_allocator(void) #ifdef CONFIG_ARM_32 /* Avoid the xenheap */ - if ( s < mfn_to_maddr(xenheap_mfn_end) && - mfn_to_maddr(xenheap_mfn_start) < e ) + if ( s < mfn_to_maddr(directmap_mfn_end) && + mfn_to_maddr(directmap_mfn_start) < e ) { - e = mfn_to_maddr(xenheap_mfn_start); - n = mfn_to_maddr(xenheap_mfn_end); + e = mfn_to_maddr(directmap_mfn_start); + n = mfn_to_maddr(directmap_mfn_end); } #endif @@ -791,17 +791,17 @@ static void __init setup_mm(void) /* * We need some memory to allocate the page-tables used for the - * xenheap mappings. So populate the boot allocator first. + * directmap mappings. So populate the boot allocator first. * - * This requires us to set xenheap_mfn_{start, end} first so the Xenheap - * region can be avoided. + * This requires us to set directmap_mfn_{start, end} first so the + * direct-mapped Xenheap region can be avoided. */ - xenheap_mfn_start = _mfn((e >> PAGE_SHIFT) - xenheap_pages); - xenheap_mfn_end = mfn_add(xenheap_mfn_start, xenheap_pages); + directmap_mfn_start = _mfn((e >> PAGE_SHIFT) - xenheap_pages); + directmap_mfn_end = mfn_add(directmap_mfn_start, xenheap_pages); populate_boot_allocator(); - setup_xenheap_mappings(mfn_x(xenheap_mfn_start), xenheap_pages); + setup_directmap_mappings(mfn_x(directmap_mfn_start), xenheap_pages); /* Frame table covers all of RAM region, including holes */ setup_frametable_mappings(ram_start, ram_end); @@ -816,8 +816,8 @@ static void __init setup_mm(void) smp_processor_id()); /* Add xenheap memory that was not already added to the boot allocator. */ - init_xenheap_pages(mfn_to_maddr(xenheap_mfn_start), - mfn_to_maddr(xenheap_mfn_end)); + init_xenheap_pages(mfn_to_maddr(directmap_mfn_start), + mfn_to_maddr(directmap_mfn_end)); init_staticmem_pages(); } @@ -833,7 +833,7 @@ static void __init setup_mm(void) init_pdx(); /* - * We need some memory to allocate the page-tables used for the xenheap + * We need some memory to allocate the page-tables used for the directmap * mappings. But some regions may contain memory already allocated * for other uses (e.g. modules, reserved-memory...). * @@ -852,15 +852,15 @@ static void __init setup_mm(void) ram_start = min(ram_start, bank->start); ram_end = max(ram_end, bank_end); - setup_xenheap_mappings(PFN_DOWN(bank->start), - PFN_DOWN(bank->size)); + setup_directmap_mappings(PFN_DOWN(bank->start), + PFN_DOWN(bank->size)); } total_pages += ram_size >> PAGE_SHIFT; - xenheap_virt_end = XENHEAP_VIRT_START + ram_end - ram_start; - xenheap_mfn_start = maddr_to_mfn(ram_start); - xenheap_mfn_end = maddr_to_mfn(ram_end); + directmap_virt_end = XENHEAP_VIRT_START + ram_end - ram_start; + directmap_mfn_start = maddr_to_mfn(ram_start); + directmap_mfn_end = maddr_to_mfn(ram_end); setup_frametable_mappings(ram_start, ram_end); max_page = PFN_DOWN(ram_end); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 11:34:47 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 11:34:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403196.645238 (Exim 4.92) (envelope-from ) id 1oWFnz-0000TH-7n; Thu, 08 Sep 2022 11:34:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403196.645238; Thu, 08 Sep 2022 11:34: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 1oWFnz-0000TA-5E; Thu, 08 Sep 2022 11:34:47 +0000 Received: by outflank-mailman (input) for mailman id 403196; Thu, 08 Sep 2022 11:34:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnx-0000Sv-Kp for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFnx-0006Ek-IU for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWFnx-0005YW-Hn for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34: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=NW1SCf5njvkFoy/dzJFksSn9pK2yo9lwuNwKeWtHLmM=; b=T7Wi8z/Hl+kDXDFKT0s9YUuhSA Ju1rD+uSd71Mm96gt6hO54qqn6oOTaR4YAECkHk5Z2kHsT7RvhjUKwm+MJYKFtRMeDpRHxBX1ZK0y qVrkFUrxJi1yHssmY2Qkpht27ZR9xOEKIcDf/mZbYy6e1WRM7ddh+Q36/dZOHjdO8fWs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Handle static heap pages in boot and heap allocator Message-Id: Date: Thu, 08 Sep 2022 11:34:45 +0000 commit f541464af3799c91534c48c2df55708662b78b88 Author: Henry Wang AuthorDate: Thu Sep 8 11:09:10 2022 +0000 Commit: Julien Grall CommitDate: Thu Sep 8 12:27:15 2022 +0100 xen/arm: Handle static heap pages in boot and heap allocator This commit firstly adds a bool field `static_heap` to bootinfo. This newly introduced field is set at the device tree parsing time if the static heap ranges are defined in the device tree chosen node. For Arm32, In `setup_mm`, if the static heap is enabled, we use the static heap region for both domheap and xenheap allocation. Note that the xenheap on Arm32 should be always contiguous, so also add a helper fit_xenheap_in_static_heap() for Arm32 to find the required xenheap in the static heap regions. For Arm64, In `setup_mm`, if the static heap is enabled and used, we make sure that only these static heap pages are added to the boot allocator. These static heap pages in the boot allocator are added to the heap allocator at `end_boot_allocator()`. If the static heap is disabled, we stick to current page allocation strategy at boot time. Also, take the chance to correct a "double not" print in Arm32 `setup_mm()` and replace the open-coding address ~0 by INVALID_PADDR. Signed-off-by: Henry Wang Reviewed-by: Julien Grall --- xen/arch/arm/bootfdt.c | 2 + xen/arch/arm/include/asm/setup.h | 1 + xen/arch/arm/setup.c | 118 ++++++++++++++++++++++++++++++++++----- 3 files changed, 107 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index c39aacbd60..9e1ea60094 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -313,6 +313,8 @@ static int __init process_chosen_node(const void *fdt, int node, MEMBANK_STATIC_HEAP); if ( rc ) return rc; + + bootinfo.static_heap = true; } printk("Checking for initrd in /chosen\n"); diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 94b7e74b4d..0651059537 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -97,6 +97,7 @@ struct bootinfo { #ifdef CONFIG_ACPI struct meminfo acpi; #endif + bool static_heap; }; struct map_range_data diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 6687572fca..61b4f258a0 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -556,6 +556,44 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, } return e; } + +/* + * Find a contiguous region that fits in the static heap region with + * required size and alignment, and return the end address of the region + * if found otherwise 0. + */ +static paddr_t __init fit_xenheap_in_static_heap(uint32_t size, paddr_t align) +{ + unsigned int i; + paddr_t end = 0, aligned_start, aligned_end; + paddr_t bank_start, bank_size, bank_end; + + for ( i = 0 ; i < bootinfo.reserved_mem.nr_banks; i++ ) + { + if ( bootinfo.reserved_mem.bank[i].type != MEMBANK_STATIC_HEAP ) + continue; + + bank_start = bootinfo.reserved_mem.bank[i].start; + bank_size = bootinfo.reserved_mem.bank[i].size; + bank_end = bank_start + bank_size; + + if ( bank_size < size ) + continue; + + aligned_end = bank_end & ~(align - 1); + aligned_start = (aligned_end - size) & ~(align - 1); + + if ( aligned_start > bank_start ) + /* + * Allocate the xenheap as high as possible to keep low-memory + * available (assuming the admin supplied region below 4GB) + * for other use (e.g. domain memory allocation). + */ + end = max(end, aligned_end); + } + + return end; +} #endif /* @@ -661,22 +699,51 @@ static void __init init_staticmem_pages(void) } /* - * Populate the boot allocator. All the RAM but the following regions - * will be added: + * Populate the boot allocator. + * If a static heap was not provided by the admin, all the RAM but the + * following regions will be added: * - Modules (e.g., Xen, Kernel) * - Reserved regions * - Xenheap (arm32 only) + * If a static heap was provided by the admin, populate the boot + * allocator with the corresponding regions only, but with Xenheap excluded + * on arm32. */ static void __init populate_boot_allocator(void) { unsigned int i; const struct meminfo *banks = &bootinfo.mem; + paddr_t s, e; + + if ( bootinfo.static_heap ) + { + for ( i = 0 ; i < bootinfo.reserved_mem.nr_banks; i++ ) + { + if ( bootinfo.reserved_mem.bank[i].type != MEMBANK_STATIC_HEAP ) + continue; + + s = bootinfo.reserved_mem.bank[i].start; + e = s + bootinfo.reserved_mem.bank[i].size; +#ifdef CONFIG_ARM_32 + /* Avoid the xenheap, note that the xenheap cannot across a bank */ + if ( s <= mfn_to_maddr(directmap_mfn_start) && + e >= mfn_to_maddr(directmap_mfn_end) ) + { + init_boot_pages(s, mfn_to_maddr(directmap_mfn_start)); + init_boot_pages(mfn_to_maddr(directmap_mfn_end), e); + } + else +#endif + init_boot_pages(s, e); + } + + return; + } for ( i = 0; i < banks->nr_banks; i++ ) { const struct membank *bank = &banks->bank[i]; paddr_t bank_end = bank->start + bank->size; - paddr_t s, e; s = bank->start; while ( s < bank_end ) @@ -714,8 +781,8 @@ static void __init populate_boot_allocator(void) #ifdef CONFIG_ARM_32 static void __init setup_mm(void) { - paddr_t ram_start, ram_end, ram_size, e; - unsigned long ram_pages; + paddr_t ram_start, ram_end, ram_size, e, bank_start, bank_end, bank_size; + paddr_t static_heap_end = 0, static_heap_size = 0; unsigned long heap_pages, xenheap_pages, domheap_pages; unsigned int i; const uint32_t ctr = READ_CP32(CTR); @@ -735,30 +802,51 @@ static void __init setup_mm(void) for ( i = 1; i < bootinfo.mem.nr_banks; i++ ) { - paddr_t bank_start = bootinfo.mem.bank[i].start; - paddr_t bank_size = bootinfo.mem.bank[i].size; - paddr_t bank_end = bank_start + bank_size; + bank_start = bootinfo.mem.bank[i].start; + bank_size = bootinfo.mem.bank[i].size; + bank_end = bank_start + bank_size; ram_size = ram_size + bank_size; ram_start = min(ram_start,bank_start); ram_end = max(ram_end,bank_end); } - total_pages = ram_pages = ram_size >> PAGE_SHIFT; + total_pages = ram_size >> PAGE_SHIFT; + + if ( bootinfo.static_heap ) + { + for ( i = 0 ; i < bootinfo.reserved_mem.nr_banks; i++ ) + { + if ( bootinfo.reserved_mem.bank[i].type != MEMBANK_STATIC_HEAP ) + continue; + + bank_start = bootinfo.reserved_mem.bank[i].start; + bank_size = bootinfo.reserved_mem.bank[i].size; + bank_end = bank_start + bank_size; + + static_heap_size += bank_size; + static_heap_end = max(static_heap_end, bank_end); + } + + heap_pages = static_heap_size >> PAGE_SHIFT; + } + else + heap_pages = total_pages; /* * If the user has not requested otherwise via the command line * then locate the xenheap using these constraints: * + * - must be contiguous * - must be 32 MiB aligned * - must not include Xen itself or the boot modules - * - must be at most 1GB or 1/32 the total RAM in the system if less + * - must be at most 1GB or 1/32 the total RAM in the system (or static + heap if enabled) if less * - must be at least 32M * * We try to allocate the largest xenheap possible within these * constraints. */ - heap_pages = ram_pages; if ( opt_xenheap_megabytes ) xenheap_pages = opt_xenheap_megabytes << (20-PAGE_SHIFT); else @@ -770,7 +858,9 @@ static void __init setup_mm(void) do { - e = consider_modules(ram_start, ram_end, + e = bootinfo.static_heap ? + fit_xenheap_in_static_heap(pfn_to_paddr(xenheap_pages), MB(32)) : + consider_modules(ram_start, ram_end, pfn_to_paddr(xenheap_pages), 32<<20, 0); if ( e ) @@ -780,7 +870,7 @@ static void __init setup_mm(void) } while ( !opt_xenheap_megabytes && xenheap_pages > 32<<(20-PAGE_SHIFT) ); if ( ! e ) - panic("Not not enough space for xenheap\n"); + panic("Not enough space for xenheap\n"); domheap_pages = heap_pages - xenheap_pages; @@ -825,7 +915,7 @@ static void __init setup_mm(void) static void __init setup_mm(void) { const struct meminfo *banks = &bootinfo.mem; - paddr_t ram_start = ~0; + paddr_t ram_start = INVALID_PADDR; paddr_t ram_end = 0; paddr_t ram_size = 0; unsigned int i; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 11:34:57 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 11:34:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403197.645243 (Exim 4.92) (envelope-from ) id 1oWFo9-0000WE-9c; Thu, 08 Sep 2022 11:34:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403197.645243; Thu, 08 Sep 2022 11:34: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 1oWFo9-0000W6-6v; Thu, 08 Sep 2022 11:34:57 +0000 Received: by outflank-mailman (input) for mailman id 403197; Thu, 08 Sep 2022 11:34:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFo7-0000Vv-Lw for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWFo7-0006F4-LE for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWFo7-0005ZK-KT for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 11:34: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=tPz3ziZzz8zVeMZBdf0H19f793YsjAO0hhTQlhDVuyo=; b=etOqu7xKA18EFW8NSaEUoReNN7 DtOitaPo4lF1yJqPgHv+xcafcqKby3azMOXzyvDFAzU3D9GTm8AsCBTqFKdIZdIS9+JvJKovPrr7k vGlyYoyhX2/F1qtCN4MX3T9g8xBC+trIv3NwMKeWnZj3ukHZ0zpqS/dCcwQnktGOvjRY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add migration stream extensions for new features Message-Id: Date: Thu, 08 Sep 2022 11:34:55 +0000 commit 6bc1c1aba01f663687d7d2b48ccdf8d9432d92cc Author: Juergen Gross AuthorDate: Thu Sep 8 10:15:52 2022 +0200 Commit: Julien Grall CommitDate: Thu Sep 8 12:28:54 2022 +0100 tools/xenstore: add migration stream extensions for new features Extend the definition of the Xenstore migration stream to cover new features: - per domain features - extended watches (watch depth) - per domain quota Some of those additions (per domain features and extended watches) require bumping the migration stream version to "2", as usage of those features will require to transport mandatory new information in the migration stream. One note regarding the GLOBAL_QUOTA_DATA record: the split of quota between global and per-domain ones is meant to support the possibility to pass on unknown quota settings for newly created domains to other Xenstore instances: Imagine Xenstore A knows about global quota g and domain quota d, while Xenstore B doesn't know both. Initially I'm running Xenstore A on a host, then I'm live-updating to B. B gets the information that g is global, and d is per-domain, but has no other idea what to do with the values of g and d. OTOH it knows that each new domain should get d with the related value, so it can set d for each newly created domain. When B is either downgraded to A again, or a domain is migrated to another host running A, B can add the quota information of d for all domains. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- docs/designs/xenstore-migration.md | 165 +++++++++++++++++++++++++++++++++++-- 1 file changed, 159 insertions(+), 6 deletions(-) diff --git a/docs/designs/xenstore-migration.md b/docs/designs/xenstore-migration.md index efa526f420..5022268386 100644 --- a/docs/designs/xenstore-migration.md +++ b/docs/designs/xenstore-migration.md @@ -43,7 +43,14 @@ the setting of the endianness bit. |-----------|---------------------------------------------------| | `ident` | 0x78656e73746f7265 ('xenstore' in ASCII) | | | | -| `version` | 0x00000001 (the version of the specification) | +| `version` | The version of the specification, defined values: | +| | 0x00000001: all fields and records without any | +| | explicitly mentioned version | +| | dependency are valid. | +| | 0x00000002: all fields and records valid for | +| | version 1 plus fields and records | +| | explicitly stated to be supported in | +| | version 2 are valid. | | | | | `flags` | 0 (LSB): Endianness: 0 = little, 1 = big | | | | @@ -65,8 +72,9 @@ Records immediately follow the header and have the following format: +-------+-------------------------------------------------------+ ``` -NOTE: padding octets here and in all subsequent format specifications must be - written as zero and should be ignored when the stream is read. +NOTE: padding octets or fields not valid in the used version here and in all + subsequent format specifications must be written as zero and should be + ignored when the stream is read. | Field | Description | @@ -77,7 +85,10 @@ NOTE: padding octets here and in all subsequent format specifications must be | | 0x00000003: WATCH_DATA | | | 0x00000004: TRANSACTION_DATA | | | 0x00000005: NODE_DATA | -| | 0x00000006 - 0xFFFFFFFF: reserved for future use | +| | 0x00000006: GLOBAL_QUOTA_DATA | +| | 0x00000007: DOMAIN_DATA | +| | 0x00000008: WATCH_DATA_EXTENDED (version 2 and up) | +| | 0x00000009 - 0xFFFFFFFF: reserved for future use | | | | | `len` | The length (in octets) of `body` | | | | @@ -241,9 +252,49 @@ the file descriptor of the socket connection. ### WATCH_DATA -The image format will contain a `WATCH_DATA` record for each watch registered -by a connection for which there is `CONNECTION_DATA` record previously present. +The image format will contain either a `WATCH_DATA` or a `WATCH_DATA_EXTENDED` +record for each watch registered by a connection for which there is +`CONNECTION_DATA` record previously present. +``` + 0 1 2 3 octet ++-------+-------+-------+-------+ +| conn-id | ++---------------+---------------+ +| wpath-len | token-len | ++---------------+---------------+ +| wpath +... +| token +... +``` + + +| Field | Description | +|-------------|-------------------------------------------------| +| `conn-id` | The connection that issued the `WATCH` | +| | operation [2] | +| | | +| `wpath-len` | The length (in octets) of `wpath` including the | +| | NUL terminator | +| | | +| `token-len` | The length (in octets) of `token` including the | +| | NUL terminator | +| | | +| `wpath` | The watch path, as specified in the `WATCH` | +| | operation | +| | | +| `token` | The watch identifier token, as specified in the | +| | `WATCH` operation | + +\pagebreak + +### WATCH_DATA_EXTENDED + +The image format will contain either a `WATCH_DATA` or a `WATCH_DATA_EXTENDED` +record for each watch registered by a connection for which there is +`CONNECTION_DATA` record previously present. The `WATCH_DATA_EXTENDED` record +type is valid only in version 2 and later. ``` 0 1 2 3 octet @@ -252,6 +303,8 @@ by a connection for which there is `CONNECTION_DATA` record previously present. +---------------+---------------+ | wpath-len | token-len | +---------------+---------------+ +| depth | pad | ++---------------+---------------+ | wpath ... | token @@ -270,6 +323,10 @@ by a connection for which there is `CONNECTION_DATA` record previously present. | `token-len` | The length (in octets) of `token` including the | | | NUL terminator | | | | +| `depth` | The number of directory levels below the | +| | watched path to consider for a match. | +| | A value of 0xffff is used for unlimited depth. | +| | | | `wpath` | The watch path, as specified in the `WATCH` | | | operation | | | | @@ -406,6 +463,102 @@ A node permission specifier has the following format: Note that perm1 defines the domain owning the node. See [4] for more explanation of node permissions. +\pagebreak + +### GLOBAL_QUOTA_DATA + +This record is only relevant for live update. It contains the global settings +of xenstored quota. + +``` + 0 1 2 3 octet ++-------+-------+-------+-------+ +| n-dom-quota | n-glob-quota | ++---------------+---------------+ +| quota-val 1 | ++-------------------------------+ +... ++-------------------------------+ +| quota-val N | ++-------------------------------+ +| quota-names +... +``` + + +| Field | Description | +|----------------|----------------------------------------------| +| `n-dom-quota` | Number of quota values which apply per | +| | domain by default. | +| | | +| `n-glob-quota` | Number of quota values which apply globally | +| | only. | +| | | +| `quota-val` | Quota values, first the ones applying per | +| | domain, then the ones applying globally. A | +| | value of 0 has the semantics of "unlimited". | +| | | +| `quota-names` | 0 delimited strings of the quota names in | +| | the same sequence as the `quota-val` values. | + + +Allowed quota names are those explicitly named in [2] for the `GET_QUOTA` +and `SET_QUOTA` commands, plus implementation specific ones. Quota names not +recognized by the receiving side should not have any effect on behavior for +the receiving side (they can be ignored or preserved for inclusion in +future live migration/update streams). + +\pagebreak + +### DOMAIN_DATA + +This record is optional and can be present once for each domain. + + +``` + 0 1 2 3 octet ++-------+-------+-------+-------+ +| domain-id | n-quota | ++---------------+---------------+ +| features | ++-------------------------------+ +| quota-val 1 | ++-------------------------------+ +... ++-------------------------------+ +| quota-val N | ++-------------------------------+ +| quota-names +... +``` + + +| Field | Description | +|----------------|----------------------------------------------| +| `domain-id` | The domain-id of the domain this record | +| | belongs to. | +| | | +| `n-quota` | Number of quota values. | +| | | +| `features` | Value of the feature field visible by the | +| | guest at offset 2064 of the ring page. | +| | Only valid for version 2 and later. | +| | | +| `quota-val` | Quota values, a value of 0 has the semantics | +| | "unlimited". | +| | | +| `quota-names` | 0 delimited strings of the quota names in | +| | the same sequence as the `quota-val` values. | + +Allowed quota names are those explicitly named in [2] for the `GET_QUOTA` +and `SET_QUOTA` commands, plus implementation specific ones. Quota names not +recognized by the receiving side should not have any effect on behavior for +the receiving side (they can be ignored or preserved for inclusion in +future live migration/update streams). + +\pagebreak + + * * * [1] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/designs/non-cooperative-migration.md -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 22:00:09 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 22:00:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403669.645831 (Exim 4.92) (envelope-from ) id 1oWPZ5-0001Zo-Hd; Thu, 08 Sep 2022 22:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403669.645831; Thu, 08 Sep 2022 22:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZ5-0001ZR-Ee; Thu, 08 Sep 2022 22:00:03 +0000 Received: by outflank-mailman (input) for mailman id 403669; Thu, 08 Sep 2022 22:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZ4-0001LS-4H for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZ4-0001RU-1p for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWPZ4-0007Av-0h for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22: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=GxIFtgPMCiN3kcnhHcOnBY5QXmIVsioLL+e05YWSt9M=; b=T8QzaYpZ/t9qn3ZWYfODfSyWFh /YJkwWHrBQOG2Ma22nenSG2xV1QyC5MPRXuaIxfB8RjbTizfV2JjAsINsS/Xn35D/etninHmgWs4O FV9nPJbV8EkANBkZ/WUWUuvd5vGy3CC/tbBlDOFjhAbsCH5b8TG0pp8jTiOVzuVK/J84=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Config.mk: correct PIE-related option(s) in EMBEDDED_EXTRA_CFLAGS Message-Id: Date: Thu, 08 Sep 2022 22:00:02 +0000 commit ecd6b9759919fa6335b0be1b5fc5cce29a30c4f1 Author: Jan Beulich AuthorDate: Thu Sep 8 09:25:26 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 8 09:25:26 2022 +0200 Config.mk: correct PIE-related option(s) in EMBEDDED_EXTRA_CFLAGS I haven't been able to find evidence of "-nopie" ever having been a supported compiler option. The correct spelling is "-no-pie". Furthermore like "-pie" this is an option which is solely passed to the linker. The compiler only recognizes "-fpie" / "-fPIE" / "-fno-pie", and it doesn't infer these options from "-pie" / "-no-pie". Add the compiler recognized form, but for the possible case of the variable also being used somewhere for linking keep the linker option as well (with corrected spelling). Signed-off-by: Jan Beulich Acked-by: Julien Grall --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index e56844d964..000e57e57b 100644 --- a/Config.mk +++ b/Config.mk @@ -188,7 +188,7 @@ endif APPEND_LDFLAGS += $(foreach i, $(APPEND_LIB), -L$(i)) APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i)) -EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all +EMBEDDED_EXTRA_CFLAGS := -fno-pie -no-pie -fno-stack-protector -fno-stack-protector-all EMBEDDED_EXTRA_CFLAGS += -fno-exceptions -fno-asynchronous-unwind-tables XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 22:00:13 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 22:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403670.645835 (Exim 4.92) (envelope-from ) id 1oWPZF-0001y4-JK; Thu, 08 Sep 2022 22:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403670.645835; Thu, 08 Sep 2022 22: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 1oWPZF-0001xx-GL; Thu, 08 Sep 2022 22:00:13 +0000 Received: by outflank-mailman (input) for mailman id 403670; Thu, 08 Sep 2022 22:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZE-0001xn-6y for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZE-0001Rd-6B for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWPZE-0007Ch-42 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22: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=hazSbS+NBjchfMpeXAvQHXQ7DhZXmjrflQr7i9UKkNw=; b=j7zP2W7Bfz5FyMqLs1pl6zjk87 mNoysy/iozIcd402LpneMuSYa7klpPhRzznI5ybind75giuu3ebriD2/rVPdrH7Ok6x3SzxCRnuiO MbohRonRsAKm4jpQDz3d/gOObGKuJhQrLwGx+1dfLgX3MHwpPd/jwtKjnUb5PurX7sSU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: minor fix of the migration stream doc Message-Id: Date: Thu, 08 Sep 2022 22:00:12 +0000 commit ace1d2eff80d3d66c37ae765dae3e3cb5697e5a4 Author: Juergen Gross AuthorDate: Thu Sep 8 09:25:58 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 8 09:25:58 2022 +0200 tools/xenstore: minor fix of the migration stream doc Drop mentioning the non-existent read-only socket in the migration stream description document. The related record field was removed in commit 8868a0e3f674 ("docs: update the xenstore migration stream documentation). Signed-off-by: Juergen Gross Acked-by: Julien Grall --- docs/designs/xenstore-migration.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/designs/xenstore-migration.md b/docs/designs/xenstore-migration.md index b94af7fd7c..efa526f420 100644 --- a/docs/designs/xenstore-migration.md +++ b/docs/designs/xenstore-migration.md @@ -129,11 +129,9 @@ xenstored state that needs to be restored. | `evtchn-fd` | The file descriptor used to communicate with | | | the event channel driver | -xenstored will resume in the original process context. Hence `rw-socket-fd` and -`ro-socket-fd` simply specify the file descriptors of the sockets. Sockets -are not always used, however, and so -1 will be used to denote an unused -socket. - +xenstored will resume in the original process context. Hence `rw-socket-fd` +simply specifies the file descriptor of the socket. Sockets are not always +used, however, and so -1 will be used to denote an unused socket. \pagebreak -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 22:00:23 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 22:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403672.645840 (Exim 4.92) (envelope-from ) id 1oWPZP-00021X-LH; Thu, 08 Sep 2022 22:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403672.645840; Thu, 08 Sep 2022 22: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 1oWPZP-00021P-I8; Thu, 08 Sep 2022 22:00:23 +0000 Received: by outflank-mailman (input) for mailman id 403672; Thu, 08 Sep 2022 22:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZO-000212-A4 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZO-0001Ru-9H for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWPZO-0007DX-8J for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22: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=Ty9PwYEAjxs/lOYf82v1DvNiFfTiYMSzriaVyZSFWy0=; b=qNnCoEkUoJ7r5pQR6jg7aHKTew f60+8NCSEjpSgpmE281jGvU6+5CE03Nrmbsc/ernLq9rBCwbuzsCaNO8vm/W14TnhayvBuCFPj/9F apOC82VxroF/M2KYbSg6taT5IkZr6fhkWqIx552N5XV/DOETVjQfqGvbu03gz7TZ7058=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: add documentation for new set/get-quota commands Message-Id: Date: Thu, 08 Sep 2022 22:00:22 +0000 commit 4d4cf97d418fffec76b8adf0aac3f9da81e10260 Author: Juergen Gross AuthorDate: Thu Sep 8 09:27:59 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 8 09:27:59 2022 +0200 tools/xenstore: add documentation for new set/get-quota commands Add documentation for two new Xenstore wire commands SET_QUOTA and GET_QUOTA used to set or query the global Xenstore quota or those of a given domain. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- docs/misc/xenstore.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 054247c404..d49a07db21 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -337,6 +337,23 @@ SET_FEATURE || xenstored prevents the use of GET_FEATURE and SET_FEATURE other than by dom0. +GET_QUOTA [[|]|] | +SET_QUOTA [|]|| + Returns or sets a quota value for the domain being specified by + . Omitting will return or set the global quota + values, which are the default values for new domains. is + one of "nodes", "watches", "transactions", "node-size", + "permissions", or any other implementation defined value. For + GET_QUOTA it is possible to omit the parameter together + with the parameter, which will return a single string of + all supported values separated by blanks. is a + decimal number specifying the quota value, with "0" having the + special meaning of quota checks being disabled. The initial quota + settings for a domain are the global ones of Xenstore. + + xenstored prevents the use of GET_QUOTA and SET_QUOTA other + than by dom0. + ---------- Miscellaneous ---------- CONTROL |[|] -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 22:00:33 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 22:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403674.645843 (Exim 4.92) (envelope-from ) id 1oWPZZ-00024P-Mg; Thu, 08 Sep 2022 22:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403674.645843; Thu, 08 Sep 2022 22: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 1oWPZZ-00024H-Jm; Thu, 08 Sep 2022 22:00:33 +0000 Received: by outflank-mailman (input) for mailman id 403674; Thu, 08 Sep 2022 22:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZY-000243-D0 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZY-0001S5-CD for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWPZY-0007Dw-BP for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22: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=yjTwSTZWV+31ZTGDDAvf6haW1dItUd0js5XT0eOzvuY=; b=0Bi7lH/xlp+IknYRMMjNrXPAhh E69K88cQgjIU8cVnpONLxFPRlU1agBAtHaxCpy8cJTrOxM92Z+OcBli2mZWnmQnt8dy+FQBFiJNaf kZlpylWC+BJO45xkhw+qIM8nH2xFPoTC1KKouFHSQv2gSMvAj8FhsON03eUCt38L4KFY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: add documentation for extended watch command Message-Id: Date: Thu, 08 Sep 2022 22:00:32 +0000 commit 3a2feae17e0e43ab87565ab58334147fc8443915 Author: Juergen Gross AuthorDate: Thu Sep 8 09:28:30 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 8 09:28:30 2022 +0200 tools/xenstore: add documentation for extended watch command Add documentation for an extension of the WATCH command used to limit the scope of watched paths. Additionally it enables to receive more information in the events related to special watches (@introduceDomain or @releaseDomain). Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- docs/misc/xenstore-ring.txt | 1 + docs/misc/xenstore.txt | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/misc/xenstore-ring.txt b/docs/misc/xenstore-ring.txt index 2792d13530..dbc7335e24 100644 --- a/docs/misc/xenstore-ring.txt +++ b/docs/misc/xenstore-ring.txt @@ -69,6 +69,7 @@ Bit Description ----------------------------------------------------------------- 0 Ring reconnection (see the ring reconnection feature below) 1 Connection error indicator (see connection error feature below) +2 WATCH can take a third parameter limiting its scope The "Connection state" field is used to request a ring close and reconnect. The "Connection state" field only contains valid data if the server has diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index d49a07db21..4bc262fd5d 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -176,7 +176,7 @@ SET_PERMS ||+? ---------- Watches ---------- -WATCH ||? +WATCH ||[|]? Adds a watch. When a is modified (including path creation, removal, @@ -187,7 +187,11 @@ WATCH ||? matching watch results in a WATCH_EVENT message (see below). The event's path matches the watch's if it is an child - of . + of . This match can be limited by specifying (a + decimal value of 0 or larger): it denotes the directory levels + below to consider for a match ("0" would not match for + a child of , "1" would match only for a direct child, + etc.). can be a to watch or @. In the latter case may have any syntax but it matches @@ -198,7 +202,13 @@ WATCH ||? shutdown, and also on RELEASE and domain destruction events are sent to privileged callers or explicitly - via SET_PERMS enabled domains only. + via SET_PERMS enabled domains only. The semantics for a + specification of differ for generating + events: specifying "1" will report the related domid by using + @/ for the reported path. Other + values are not supported. + For @releaseDomain it is possible to watch only for a specific + domain by specifying @releaseDomain/ for the path. When a watch is first set up it is triggered once straight away, with equal to . Watches may be triggered -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 22:00:43 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 22:00:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403676.645847 (Exim 4.92) (envelope-from ) id 1oWPZj-00027L-OE; Thu, 08 Sep 2022 22:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403676.645847; Thu, 08 Sep 2022 22: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 1oWPZj-00027D-LK; Thu, 08 Sep 2022 22:00:43 +0000 Received: by outflank-mailman (input) for mailman id 403676; Thu, 08 Sep 2022 22:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZi-00026y-G7 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZi-0001SF-FM for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWPZi-0007EU-EW for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22: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=xZtayG53d3ZsENRH/H/fCrkQ/xXRHfZknkX4/EF8+tU=; b=P0UOhadSo43jLQAcvQVayG0eLy Ii3vTO5YprrcmrS8N5l02+5AEOqGUK2Z24O2xJOJrHtqhMron7Armd5sZBwwqe6iPgmv7gNnhcG1k fT8UxItsMbUIzsCF4cKEH8r2pp9W/7b1QVoml0VZXVBN/CIzOfXEGPuS7ODVVJi65ncg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: add macro for version number string Message-Id: Date: Thu, 08 Sep 2022 22:00:42 +0000 commit f2bf0a45b005d7e296a7597922fcca1bab0e56f1 Author: Leo Yan AuthorDate: Thu Sep 8 09:28:58 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 8 09:28:58 2022 +0200 xen: add macro for version number string On Arm64 Linux kernel prints log for Xen version number: Xen XEN_VERSION.XEN_SUBVERSION support found The header file "xen/compile.h" is missed so that XEN_VERSION and XEN_SUBVERSION are not defined, __stringify() wrongly converts them as strings and concatenate to string "XEN_VERSION.XEN_SUBVERSION". This patch introduces a string macro XEN_VERSION_STRING, we can directly use it as version number string, as a result it drops to use of __stringify() to make the code more readable. The change has been tested on Ampere AVA Arm64 platform. Fixes: 5d797ee199b3 ("xen/arm: split domain_build.c") Suggested-by: Bertrand Marquis Signed-off-by: Leo Yan Reviewed-by: Bertrand Marquis Reviewed-by: Jan Beulich --- xen/arch/arm/acpi/domain_build.c | 3 ++- xen/arch/arm/domain_build.c | 2 +- xen/common/efi/boot.c | 4 ++-- xen/include/xen/compile.h.in | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/acpi/domain_build.c b/xen/arch/arm/acpi/domain_build.c index bbdc90f92c..ed824c0178 100644 --- a/xen/arch/arm/acpi/domain_build.c +++ b/xen/arch/arm/acpi/domain_build.c @@ -9,6 +9,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -91,7 +92,7 @@ static int __init acpi_make_hypervisor_node(const struct kernel_info *kinfo, struct membank tbl_add[]) { const char compat[] = - "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" + "xen,xen-" XEN_VERSION_STRING "\0" "xen,xen"; int res; /* Convenience alias */ diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index b76a84e8f5..0277790088 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1367,7 +1367,7 @@ static int __init make_hypervisor_node(struct domain *d, int addrcells, int sizecells) { const char compat[] = - "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" + "xen,xen-" XEN_VERSION_STRING "\0" "xen,xen"; __be32 *reg, *cells; gic_interrupt_t intr; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index a5b2d6ddb8..db0340c8e2 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1341,8 +1341,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_console_set_mode(); } - PrintStr(L"Xen " __stringify(XEN_VERSION) "." __stringify(XEN_SUBVERSION) - XEN_EXTRAVERSION " (c/s " XEN_CHANGESET ") EFI loader\r\n"); + PrintStr(L"Xen " XEN_VERSION_STRING XEN_EXTRAVERSION + " (c/s " XEN_CHANGESET ") EFI loader\r\n"); efi_arch_relocate_image(0); diff --git a/xen/include/xen/compile.h.in b/xen/include/xen/compile.h.in index 440ecb25c1..3151d1e7d1 100644 --- a/xen/include/xen/compile.h.in +++ b/xen/include/xen/compile.h.in @@ -7,6 +7,7 @@ #define XEN_VERSION @@version@@ #define XEN_SUBVERSION @@subversion@@ +#define XEN_VERSION_STRING "@@version@@.@@subversion@@" #define XEN_EXTRAVERSION "@@extraversion@@" #define XEN_CHANGESET "@@changeset@@" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 22:00:53 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 22:00:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403677.645850 (Exim 4.92) (envelope-from ) id 1oWPZt-0002AY-PR; Thu, 08 Sep 2022 22:00:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403677.645850; Thu, 08 Sep 2022 22: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 1oWPZt-0002AS-Mm; Thu, 08 Sep 2022 22:00:53 +0000 Received: by outflank-mailman (input) for mailman id 403677; Thu, 08 Sep 2022 22:00:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZs-0002A0-J6 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWPZs-0001Si-IP for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWPZs-0007Et-HJ for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 22:00:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kGWcJ5vxud4TFVLDRh2kg2SGzQ0hJPC30K1oeL6Kc74=; b=C9MJ53JauGDnRT4Dov043y2/4s gDW7uJQiWlrJfjd3swVddL9EjVhqAtI+aWG+bDdXq6mp9BV9Uo9w0hg3xoYwiUbEcsoUno7o7iWg5 GttqApIPxbNzEEPdFm5mjC+TXpP5nuVgX3RYNf/+2jHGlVU9P13b2t2/sj0SxukY0voM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] .gitignore: add init-dom0less Message-Id: Date: Thu, 08 Sep 2022 22:00:52 +0000 commit 64e302157a87b246473a31fa104377a6d48eb046 Author: Viresh Kumar AuthorDate: Thu Sep 8 09:32:14 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 8 09:32:14 2022 +0200 .gitignore: add init-dom0less Add tools/helpers/init-dom0less to gitignore. Signed-off-by: Viresh Kumar Acked-by: Jan Beulich --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 27881c9764..af9bf749c4 100644 --- a/.gitignore +++ b/.gitignore @@ -169,6 +169,7 @@ tools/flask/utils/flask-loadpolicy tools/flask/utils/flask-setenforce tools/flask/utils/flask-set-bool tools/flask/utils/flask-label-pci +tools/helpers/init-dom0less tools/helpers/init-xenstore-domain tools/helpers/xen-init-dom0 tools/hotplug/common/hotplugpath.sh -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 23:33:08 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 23:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403720.645910 (Exim 4.92) (envelope-from ) id 1oWR17-0006ng-Px; Thu, 08 Sep 2022 23:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403720.645910; Thu, 08 Sep 2022 23:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWR17-0006nZ-NC; Thu, 08 Sep 2022 23:33:05 +0000 Received: by outflank-mailman (input) for mailman id 403720; Thu, 08 Sep 2022 23:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWR17-0006nT-41 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 23:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWR17-00035H-2G for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 23:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWR17-0003mw-16 for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 23:33:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9XnaFvG/SOXxNfsVN/PX2boQ4DudkqGaFcLEOZbn0dg=; b=SvEil774tswF6fvBWt50ReFXUC Vyw0xx4Y2b0sGJXP14O35/eSexCNEgAV+AoVxKRp4esaeipnkRa5pjRSUTvMDAUsFyR/lY0EXStag 0075GT+vbFSL2qbo70xetjAvs/EX2FpAh1ALyo0fQvnYsp0wOwa7gqhCSzheyhPiDdk8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: qemu-alpine-arm64-gcc: Use kernel 5.19 Message-Id: Date: Thu, 08 Sep 2022 23:33:05 +0000 commit d88431107713873d86f668c08d329cdb34197050 Author: Michal Orzel AuthorDate: Thu Sep 8 11:22:28 2022 +0200 Commit: Stefano Stabellini CommitDate: Thu Sep 8 16:28:03 2022 -0700 automation: qemu-alpine-arm64-gcc: Use kernel 5.19 After qemu-smoke-arm64 was changed to use kernel 5.19 we end up having two kernel configurations. This is something not needed and maintaining a single kernel version is always easier. Modify qemu-alpine-arm64-gcc to use kernel 5.19 and remove kernel 5.9 from tests-artifacts. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Ayan Kumar Halder Acked-by: Stefano Stabellini --- automation/gitlab-ci/build.yaml | 11 ------- automation/gitlab-ci/test.yaml | 2 +- .../kernel/5.9.9-arm64v8.dockerfile | 34 ---------------------- 3 files changed, 1 insertion(+), 46 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index d2f75a090c..720ce6e07b 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -586,17 +586,6 @@ alpine-3.12-arm64-rootfs-export: tags: - arm64 -kernel-5.9.9-arm64-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.9.9-arm64v8 - script: - - mkdir binaries && cp /Image binaries/Image - artifacts: - paths: - - binaries/Image - tags: - - arm64 - kernel-5.19-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8 diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 2eb6c3866e..07209820b4 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -34,7 +34,7 @@ qemu-alpine-arm64-gcc: needs: - alpine-3.12-gcc-arm64 - alpine-3.12-arm64-rootfs-export - - kernel-5.9.9-arm64-export + - kernel-5.19-arm64-export - qemu-system-aarch64-6.0.0-arm64-export artifacts: paths: diff --git a/automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile b/automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile deleted file mode 100644 index 053d65a345..0000000000 --- a/automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM arm64v8/debian:unstable -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=5.9.9 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - libssl-dev \ - bc \ - curl \ - flex \ - bison \ - && \ - \ - # Build the kernel - curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - make -j$(nproc) Image.gz && \ - cp arch/arm64/boot/Image / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 23:33:15 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 23:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403721.645916 (Exim 4.92) (envelope-from ) id 1oWR1H-0006rU-Tw; Thu, 08 Sep 2022 23:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403721.645916; Thu, 08 Sep 2022 23:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWR1H-0006rK-QK; Thu, 08 Sep 2022 23:33:15 +0000 Received: by outflank-mailman (input) for mailman id 403721; Thu, 08 Sep 2022 23:33:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWR1H-0006r5-5y for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 23:33:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWR1H-00035U-5E for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 23:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWR1H-0003nS-4J for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 23:33:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lG9RKXHfm8vAizLRhm4yIie3bCwJnBJhmlwECbgqIZg=; b=l8T7lBXMvSys2ssf1qrcosg8yE 4OOVyLzRl0xC8RD2KBZrym5qRr6nA/oNAHgNwimsKvzkdwe2BilFNMC3qaeTVNodfxh4aBsclZsnt dJlUDqb3CvB7G/+6Vieo2wYzqQLvge5uWNOo1re+b9uVWdpWvVCy3kIa4Zwj0teaF9vY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: qemu-smoke-arm64: Silence ifconfig error messages Message-Id: Date: Thu, 08 Sep 2022 23:33:15 +0000 commit e17ca18747cad3933e975b56560e49c3b3f705d3 Author: Michal Orzel AuthorDate: Thu Sep 8 11:22:29 2022 +0200 Commit: Stefano Stabellini CommitDate: Thu Sep 8 16:28:21 2022 -0700 automation: qemu-smoke-arm64: Silence ifconfig error messages During the ping test, dom1 tries to assign an ip to eth0 in a loop. Before setting up the network interface by dom0, this results in printing the following error message several times: (XEN) DOM1: ifconfig: SIOCSIFADDR: No such device Silence this by redirecting stderr/stdout to /dev/null as we do not care about the output and we should not pollute the log file. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Ayan Kumar Halder Acked-by: Stefano Stabellini --- automation/scripts/qemu-smoke-arm64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index c80d9b2aee..7ac9602776 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -6,7 +6,7 @@ test_variant=$1 passed="passed" check=" -until ifconfig eth0 192.168.0.2 && ping -c 10 192.168.0.1; do +until ifconfig eth0 192.168.0.2 &> /dev/null && ping -c 10 192.168.0.1; do sleep 30 done echo \"${passed}\" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 08 23:33:25 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Sep 2022 23:33:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.403722.645918 (Exim 4.92) (envelope-from ) id 1oWR1R-0006ua-Uk; Thu, 08 Sep 2022 23:33:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 403722.645918; Thu, 08 Sep 2022 23:33:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWR1R-0006uS-Rq; Thu, 08 Sep 2022 23:33:25 +0000 Received: by outflank-mailman (input) for mailman id 403722; Thu, 08 Sep 2022 23:33:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWR1R-0006uI-8z for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 23:33:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWR1R-00035e-8H for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 23:33:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWR1R-0003nz-7I for xen-changelog@lists.xenproject.org; Thu, 08 Sep 2022 23:33:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5Zmad9c16D1L3FjEhTqum892etso9WrhINJxa1yVKUg=; b=p+CfzLf0aZHiGas1S4ZDEpN7Wo P7v9MrSBTwzeCgNFI03HfPRe7NotJUtBngsYxaQ/+y29yd1KXPc0ZT+LEDI7SNUlgvon5KmunHdiz Gbhx30tHsEHmJZRB9QXwokzKtizNQl7VsLSgWEzPHmDg6Byc5B9d6lapUEtXOyM0j/ag=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: Add a new job for testing boot time cpupools on arm64 Message-Id: Date: Thu, 08 Sep 2022 23:33:25 +0000 commit 36e3f41587788c60813b088b373960b7fb88c021 Author: Michal Orzel AuthorDate: Thu Sep 8 11:22:30 2022 +0200 Commit: Stefano Stabellini CommitDate: Thu Sep 8 16:28:26 2022 -0700 automation: Add a new job for testing boot time cpupools on arm64 Add a new test job qemu-smoke-arm64-gcc-boot-cpupools that will execute script qemu-smoke-arm64.sh to test boot time cpupools feature. Enable CONFIG_BOOT_TIME_CPUPOOLS for the arm64 build and add a new test case in qemu-smoke-arm64.sh that if selected will make use of the ImageBuilder feature to create cpupool with cpu@1, null scheduler and assign it to domU. Add a check in dom0 xen.start to see if domU is assigned a Pool-1 with null scheduler. Take the opportunity to refactor the qemu-smoke-arm64.sh script as follows: - use domU_check to store the test's commands to be run from domU - use dom0_check to store the test's commands to be run from dom0 - use fdtput instead of sed to perform dtb modifications - use more meaningful messages for "passed" variable. This way we can grep for messages reported either by domU or dom0 and get rid of assumption that tests can only be run from domU Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- automation/gitlab-ci/test.yaml | 19 ++++++++++++++++++ automation/scripts/build | 3 ++- automation/scripts/qemu-smoke-arm64.sh | 36 +++++++++++++++++++++++++--------- 3 files changed, 48 insertions(+), 10 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 07209820b4..d899b3bdbf 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -100,6 +100,25 @@ qemu-smoke-arm64-gcc-staticmem: tags: - arm64 +qemu-smoke-arm64-gcc-boot-cpupools: + extends: .test-jobs-common + variables: + CONTAINER: debian:unstable-arm64v8 + script: + - ./automation/scripts/qemu-smoke-arm64.sh boot-cpupools 2>&1 | tee qemu-smoke-arm64.log + needs: + - alpine-3.12-gcc-arm64 + - alpine-3.12-arm64-rootfs-export + - kernel-5.19-arm64-export + - qemu-system-aarch64-6.0.0-arm64-export + artifacts: + paths: + - smoke.serial + - '*.log' + when: always + tags: + - arm64 + qemu-smoke-arm32-gcc: extends: .test-jobs-common variables: diff --git a/automation/scripts/build b/automation/scripts/build index 2b9f2d2b54..2f15ab3198 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -19,7 +19,8 @@ else echo " CONFIG_EXPERT=y CONFIG_UNSUPPORTED=y -CONFIG_STATIC_MEMORY=y" > xen/.config +CONFIG_STATIC_MEMORY=y +CONFIG_BOOT_TIME_CPUPOOLS=y" > xen/.config make -j$(nproc) -C xen olddefconfig else make -j$(nproc) -C xen defconfig diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index 7ac9602776..f803835779 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -4,20 +4,22 @@ set -ex test_variant=$1 -passed="passed" -check=" +if [ -z "${test_variant}" ]; then + passed="ping test passed" + domU_check=" until ifconfig eth0 192.168.0.2 &> /dev/null && ping -c 10 192.168.0.1; do sleep 30 done echo \"${passed}\" " +fi if [[ "${test_variant}" == "static-mem" ]]; then # Memory range that is statically allocated to DOM1 domu_base="50000000" domu_size="10000000" passed="${test_variant} test passed" - check=" + domU_check=" current=\$(hexdump -e '16/1 \"%02x\"' /proc/device-tree/memory@${domu_base}/reg 2>/dev/null) expected=$(printf \"%016x%016x\" 0x${domu_base} 0x${domu_size}) if [[ \"\${expected}\" == \"\${current}\" ]]; then @@ -26,6 +28,16 @@ fi " fi +if [[ "${test_variant}" == "boot-cpupools" ]]; then + # Check if domU0 (id=1) is assigned to Pool-1 with null scheduler + passed="${test_variant} test passed" + dom0_check=" +if xl list -c 1 | grep -q Pool-1 && xl cpupool-list Pool-1 | grep -q Pool-1; then + echo ${passed} +fi +" +fi + export DEBIAN_FRONTENT=noninteractive apt-get -qy update apt-get -qy install --no-install-recommends u-boot-qemu \ @@ -42,11 +54,9 @@ curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom -cpu cortex-a57 -machine type=virt \ -m 1024 -smp 2 -display none \ -machine dumpdtb=binaries/virt-gicv2.dtb -# XXX disable pl061 to avoid Linux crash -dtc -I dtb -O dts binaries/virt-gicv2.dtb > binaries/virt-gicv2.dts -sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv2.dts > binaries/virt-gicv2-edited.dts -dtc -I dts -O dtb binaries/virt-gicv2-edited.dts > binaries/virt-gicv2.dtb +# XXX disable pl061 to avoid Linux crash +fdtput binaries/virt-gicv2.dtb -p -t s /pl061@9030000 status disabled # Busybox mkdir -p initrd @@ -66,7 +76,7 @@ echo "#!/bin/sh mount -t proc proc /proc mount -t sysfs sysfs /sys mount -t devtmpfs devtmpfs /dev -${check} +${domU_check} /bin/sh" > initrd/init chmod +x initrd/init cd initrd @@ -98,6 +108,7 @@ ifconfig xenbr0 up ifconfig xenbr0 192.168.0.1 xl network-attach 1 type=vif +${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf @@ -127,6 +138,13 @@ if [[ "${test_variant}" == "static-mem" ]]; then echo -e "\nDOMU_STATIC_MEM[0]=\"0x${domu_base} 0x${domu_size}\"" >> binaries/config fi +if [[ "${test_variant}" == "boot-cpupools" ]]; then + echo ' +CPUPOOL[0]="cpu@1 null" +DOMU_CPUPOOL[0]=0 +NUM_CPUPOOLS=1' >> binaries/config +fi + rm -rf imagebuilder git clone https://gitlab.com/ViryaOS/imagebuilder bash imagebuilder/scripts/uboot-script-gen -t tftp -d binaries/ -c binaries/config @@ -148,5 +166,5 @@ timeout -k 1 240 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& tee smoke.serial set -e -(grep -q "^Welcome to Alpine Linux" smoke.serial && grep -q "DOM1: ${passed}" smoke.serial) || exit 1 +(grep -q "^Welcome to Alpine Linux" smoke.serial && grep -q "${passed}" smoke.serial) || exit 1 exit 0 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 09:33:11 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 09:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404023.646329 (Exim 4.92) (envelope-from ) id 1oWaNm-0004Hn-JE; Fri, 09 Sep 2022 09:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404023.646329; Fri, 09 Sep 2022 09:33:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWaNm-0004Hf-GL; Fri, 09 Sep 2022 09:33:06 +0000 Received: by outflank-mailman (input) for mailman id 404023; Fri, 09 Sep 2022 09:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWaNk-0004Gn-Ic for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 09:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWaNk-00063I-Fk for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 09:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWaNk-0000Gc-Ei for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 09:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jfJFIthAvf8Pl7omAr42odAtIKlhhSomEWMx60D/ncs=; b=rfX2lFgto0B9qoSMf1JOXSdRcJ U7zf9JLliKzCcdJDeGCpJDBYmH7ZaWPKlMVP64MRUfiQuBU6WqUCDRXR3+nzksAH1pvlDw+SDolj0 752JxQwgmyGLIx8Gso1TZPGCp5PIjH82/evrUvhApo/VwvtgNn8/fkSXXMbKGpQsmrNA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs/device-tree: Place the static-heap dt-binding in proper place Message-Id: Date: Fri, 09 Sep 2022 09:33:04 +0000 commit 9066d877bf57a47b0f09741dac996ee1055d6407 Author: Henry Wang AuthorDate: Thu Sep 8 12:07:28 2022 +0000 Commit: Julien Grall CommitDate: Fri Sep 9 10:07:34 2022 +0100 docs/device-tree: Place the static-heap dt-binding in proper place The static-heap dt-binding should be placed after the last feature, namely static-evtchn. Fixes: 4596329291f5 ("docs, xen/arm: Introduce static heap memory") Signed-off-by: Henry Wang Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 86 +++++++++++++++++------------------ 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 5395a1077c..93bf6fe577 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -425,49 +425,6 @@ The static event channel node has the following properties: link-to-foreign-evtchn is a single phandle to a remote evtchn to which local-evtchn will be connected. -Static Heap Memory -================== - -The static heap memory refers to parts of RAM reserved in the beginning of -boot time for heap. The memory is reserved by configuration in the device -tree using physical address ranges. - -The static heap memory declared in the device tree defines the memory areas -that will be reserved to be used exclusively as heap. - -- For Arm32, since there are separated heaps, the static heap will be used -for both domheap and xenheap. The admin should make sure that the static -heap region should contain enough memory below 4GB to cater 32-bit DMA. - -- For Arm64, since there is a single heap, the defined static heap areas -shall always go to the heap allocator. - -The static heap memory is an optional feature and can be enabled by adding -below device tree property. - -- xen,static-heap - - Property under the top-level "chosen" node. It specifies the address - and size of Xen static heap memory. Number of address and size cells - for the "xen,static-heap" property is determined by the root node - "#address-cells" and "#size-cells". Note that at least a 64KB alignment - is required. - -Below is an example on how to specify the static heap in device tree: - - / { - #address-cells = <0x2>; - #size-cells = <0x2>; - ... - chosen { - xen,static-heap = <0x0 0x30000000 0x0 0x40000000>; - ... - }; - }; - -RAM starting from the host physical address 0x30000000 of 1GB size will -be reserved as static heap. - Example ======= @@ -523,3 +480,46 @@ chosen { }; }; }; + +Static Heap Memory +================== + +The static heap memory refers to parts of RAM reserved in the beginning of +boot time for heap. The memory is reserved by configuration in the device +tree using physical address ranges. + +The static heap memory declared in the device tree defines the memory areas +that will be reserved to be used exclusively as heap. + +- For Arm32, since there are separated heaps, the static heap will be used +for both domheap and xenheap. The admin should make sure that the static +heap region should contain enough memory below 4GB to cater 32-bit DMA. + +- For Arm64, since there is a single heap, the defined static heap areas +shall always go to the heap allocator. + +The static heap memory is an optional feature and can be enabled by adding +below device tree property. + +- xen,static-heap + + Property under the top-level "chosen" node. It specifies the address + and size of Xen static heap memory. Number of address and size cells + for the "xen,static-heap" property is determined by the root node + "#address-cells" and "#size-cells". Note that at least a 64KB alignment + is required. + +Below is an example on how to specify the static heap in device tree: + + / { + #address-cells = <0x2>; + #size-cells = <0x2>; + ... + chosen { + xen,static-heap = <0x0 0x30000000 0x0 0x40000000>; + ... + }; + }; + +RAM starting from the host physical address 0x30000000 of 1GB size will +be reserved as static heap. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 12:11:07 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 12:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404251.646644 (Exim 4.92) (envelope-from ) id 1oWcqd-0006u3-FS; Fri, 09 Sep 2022 12:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404251.646644; Fri, 09 Sep 2022 12:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcqd-0006tv-CS; Fri, 09 Sep 2022 12:11:03 +0000 Received: by outflank-mailman (input) for mailman id 404251; Fri, 09 Sep 2022 12:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcqc-0006t6-Iv for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcqc-0000zS-FH for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWcqc-0000HD-EH for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=64RZogoOgoZvl3+Irt2fQbOlCkFed3vUOVolk4/wXb0=; b=F1ytWvNz9ZSHn5Vzc8WTlAxXaO XWehXvQ+oBUPXa3m5KRZCrFmK89ni36AQCFaE1FKZi08k+1Y0db4IHLCyIcZb4yUkK+ze7PEhFUkh 4xBuEUjhkg12TuVUyV0qMpg0qtnUrrdu2Mz9Qn2uVFJz+qppMJEiWS5nfiN1xT6Lfxk0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/evtchn: Make sure all buckets below d->valid_evtchns are allocated Message-Id: Date: Fri, 09 Sep 2022 12:11:02 +0000 commit 5d1cfe844e23cb1610ef07f60bc8076e058891d6 Author: Julien Grall AuthorDate: Wed Sep 7 17:27:32 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:58 2022 +0100 xen/evtchn: Make sure all buckets below d->valid_evtchns are allocated Since commit 01280dc19cf3 "evtchn: simplify port_is_valid()", the event channels code assumes that all the buckets below d->valid_evtchns are always allocated. This assumption hold in most of the situation because a guest is not allowed to chose the port. Instead, it will be the first free from port 0. When static event channel support will be added for dom0less domains user can request to allocate the evtchn port numbers that are scattered in nature. The existing implementation of evtchn_allocate_port() is not able to deal with such situation and will end up to override bucket or/and leave some bucket unallocated. The latter will result to a droplet crash if the event channel belongs to an unallocated bucket. This can be solved by making sure that all the buckets below d->valid_evtchns are allocated. There should be no impact for most of the situation but LM/LU as only one bucket would be allocated. For LM/LU, we may end up to allocate multiple buckets if ports in use are sparse. A potential alternative is to check that the bucket is valid in is_port_valid(). This should still possible to do it without taking per-domain lock but will result a couple more of memory access. Signed-off-by: Julien Grall Signed-off-by: Rahul Singh Reviewed-by: Michal Orzel Reviewed-by: Jan Beulich --- xen/common/event_channel.c | 55 +++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index c2c6f8c151..f81c229358 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -193,6 +193,15 @@ static struct evtchn *alloc_evtchn_bucket(struct domain *d, unsigned int port) return NULL; } +/* + * Allocate a given port and ensure all the buckets up to that ports + * have been allocated. + * + * The last part is important because the rest of the event channel code + * relies on all the buckets up to d->valid_evtchns to be valid. However, + * event channels may be sparsed when allocating the static evtchn port + * numbers that are scattered in nature. + */ int evtchn_allocate_port(struct domain *d, evtchn_port_t port) { if ( port > d->max_evtchn_port || port >= max_evtchns(d) ) @@ -207,30 +216,36 @@ int evtchn_allocate_port(struct domain *d, evtchn_port_t port) } else { - struct evtchn *chn; - struct evtchn **grp; + unsigned int alloc_port = read_atomic(&d->valid_evtchns); - if ( !group_from_port(d, port) ) + do { - grp = xzalloc_array(struct evtchn *, BUCKETS_PER_GROUP); - if ( !grp ) - return -ENOMEM; - group_from_port(d, port) = grp; - } + struct evtchn *chn; + struct evtchn **grp; - chn = alloc_evtchn_bucket(d, port); - if ( !chn ) - return -ENOMEM; - bucket_from_port(d, port) = chn; + if ( !group_from_port(d, alloc_port) ) + { + grp = xzalloc_array(struct evtchn *, BUCKETS_PER_GROUP); + if ( !grp ) + return -ENOMEM; + group_from_port(d, alloc_port) = grp; + } - /* - * d->valid_evtchns is used to check whether the bucket can be - * accessed without the per-domain lock. Therefore, - * d->valid_evtchns should be seen *after* the new bucket has - * been setup. - */ - smp_wmb(); - write_atomic(&d->valid_evtchns, d->valid_evtchns + EVTCHNS_PER_BUCKET); + chn = alloc_evtchn_bucket(d, alloc_port); + if ( !chn ) + return -ENOMEM; + bucket_from_port(d, alloc_port) = chn; + + /* + * d->valid_evtchns is used to check whether the bucket can be + * accessed without the per-domain lock. Therefore, + * d->valid_evtchns should be seen *after* the new bucket has + * been setup. + */ + smp_wmb(); + alloc_port += EVTCHNS_PER_BUCKET; + write_atomic(&d->valid_evtchns, alloc_port); + } while ( port >= alloc_port ); } write_atomic(&d->active_evtchns, d->active_evtchns + 1); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 12:11:13 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 12:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404258.646648 (Exim 4.92) (envelope-from ) id 1oWcqn-00078K-Gr; Fri, 09 Sep 2022 12:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404258.646648; Fri, 09 Sep 2022 12:11: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 1oWcqn-00078A-E4; Fri, 09 Sep 2022 12:11:13 +0000 Received: by outflank-mailman (input) for mailman id 404258; Fri, 09 Sep 2022 12:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcqm-00076a-Iv for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcqm-0000za-I6 for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWcqm-0000Hk-HI for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HlmARrWrBcqLwO/ygVD7u+NM5lyM7gWqsXWtuOmwj58=; b=MAmR2NwrI2HEHASMSSpJCZlJ5Z IDAIzLiqMH5/8h85xP0bf8W3dOz145YvP3jP4OwISpX2XJGQ0WY8oyID+qt51Ezv4gEyIwCtiiNNO LnylbCkLPj9PC9Lg0URTVhgDZVZipZG8GFdLPkYz3o23Qb4cnVLUi+mPzgRom15Ht68A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/evtchn: Add an helper to reserve/allocate a port Message-Id: Date: Fri, 09 Sep 2022 12:11:12 +0000 commit 4e1eade78ef3f339ed671851abce398e80ba04ca Author: Stanislav Kinsburskii AuthorDate: Wed Sep 7 17:27:33 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:58 2022 +0100 xen/evtchn: Add an helper to reserve/allocate a port In a follow-up patch we will want to either reserve or allocate a port for various event channel helpers. A new wrapper is introduced to either reserve a given port or allocate a fresh one if zero. Take the opportunity to replace the open-coded version in evtchn_bind_virq(). Signed-off-by: Stanislav Kinsburskii Signed-off-by: Julien Grall Signed-off-by: Rahul Singh Acked-by: Jan Beulich --- xen/common/event_channel.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index f81c229358..565ab71881 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -305,6 +305,18 @@ void evtchn_free(struct domain *d, struct evtchn *chn) xsm_evtchn_close_post(chn); } +static int evtchn_get_port(struct domain *d, evtchn_port_t port) +{ + int rc; + + if ( port != 0 ) + rc = evtchn_allocate_port(d, port); + else + rc = get_free_port(d); + + return rc ?: port; +} + int evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) { struct evtchn *chn; @@ -462,19 +474,10 @@ int evtchn_bind_virq(evtchn_bind_virq_t *bind, evtchn_port_t port) if ( read_atomic(&v->virq_to_evtchn[virq]) ) ERROR_EXIT(-EEXIST); - if ( port != 0 ) - { - if ( (rc = evtchn_allocate_port(d, port)) != 0 ) - ERROR_EXIT(rc); - } - else - { - int alloc_port = get_free_port(d); - - if ( alloc_port < 0 ) - ERROR_EXIT(alloc_port); - port = alloc_port; - } + port = rc = evtchn_get_port(d, port); + if ( rc < 0 ) + ERROR_EXIT(rc); + rc = 0; chn = evtchn_from_port(d, port); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 12:11:23 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 12:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404264.646652 (Exim 4.92) (envelope-from ) id 1oWcqx-0007GO-IO; Fri, 09 Sep 2022 12:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404264.646652; Fri, 09 Sep 2022 12:11: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 1oWcqx-0007GG-FV; Fri, 09 Sep 2022 12:11:23 +0000 Received: by outflank-mailman (input) for mailman id 404264; Fri, 09 Sep 2022 12:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcqw-0007En-PB for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcqw-0000zu-OO for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWcqw-0000IH-KB for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ejEUA6ZcSRPCLgWV7jbrm5GnT30H5GthpnMSQ7IGcPU=; b=Kwe95FFOLsEc2VCjXGvrVwsz/c aBDGLOUtScWXJBSSdlpRyOTkR+PR7hQR+bzeirRvVMRP6383LLr+Z4fCmqBgNynhqdsT2D5BIywog jnKJmV6S80GbqzUFIoyvAt2KjSS9Ry5MZwAP9eYQwcU4u3ahV1G1/wqKtByiMZw1W4zk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/evtchn: restrict the maximum number of evtchn supported for domUs Message-Id: Date: Fri, 09 Sep 2022 12:11:22 +0000 commit 0a8ef2fa450aa9673dd2e0d25bb16931aea2bf1e Author: Rahul Singh AuthorDate: Wed Sep 7 17:27:34 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:58 2022 +0100 xen/evtchn: restrict the maximum number of evtchn supported for domUs Restrict the maximum number of evtchn supported for domUs to avoid allocating a large amount of memory in Xen. Set the default value of max_evtchn_port to 1023. The value of 1023 should be sufficient for guests because on ARM we don't bind physical interrupts to event channels. The only use of the evtchn port is inter-domain communications. Another reason why we choose the value of 1023 is to follow the default behavior of libxl. Signed-off-by: Rahul Singh Reviewed-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 0277790088..f899766860 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -3277,7 +3277,13 @@ void __init create_domUs(void) struct xen_domctl_createdomain d_cfg = { .arch.gic_version = XEN_DOMCTL_CONFIG_GIC_NATIVE, .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, - .max_evtchn_port = -1, + /* + * The default of 1023 should be sufficient for guests because + * on ARM we don't bind physical interrupts to event channels. + * The only use of the evtchn port is inter-domain communications. + * 1023 is also the default value used in libxl. + */ + .max_evtchn_port = 1023, .max_grant_frames = -1, .max_maptrack_frames = -1, .grant_opts = XEN_DOMCTL_GRANT_version(opt_gnttab_max_version), -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 12:11:33 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 12:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404267.646655 (Exim 4.92) (envelope-from ) id 1oWcr7-0007KC-JR; Fri, 09 Sep 2022 12:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404267.646655; Fri, 09 Sep 2022 12:11: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 1oWcr7-0007K5-H0; Fri, 09 Sep 2022 12:11:33 +0000 Received: by outflank-mailman (input) for mailman id 404267; Fri, 09 Sep 2022 12:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcr6-0007Jl-SP for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcr6-000104-Rc for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWcr6-0000Ii-Qn for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11: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=vCTdApr7lQYyl65mUW2dUV16LwO5OqLkrTW7e0k+kPw=; b=PzpllUjFYp5r0cSa2Rum/+Ix18 r3OfnClZZp56d4sYtcaqqI6rWJL6qZmJz6tql3W4NybZHIv1XyQCn5fTWZ5EsAH3jm0HKLLb4Muu9 krT9AzFFaOCgjxUxuXE78nCtUcgta/gknkMhnkXH7xh8LcYo2+e58LmXODnFsVRfrxu0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/evtchn: modify evtchn_alloc_unbound to allocate specified port Message-Id: Date: Fri, 09 Sep 2022 12:11:32 +0000 commit 5324b179e4658b270c33004038b34c7eaf197ce6 Author: Rahul Singh AuthorDate: Wed Sep 7 17:27:35 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:59 2022 +0100 xen/evtchn: modify evtchn_alloc_unbound to allocate specified port Currently evtchn_alloc_unbound() always allocates the next available port. Static event channel support for dom0less domains requires allocating a specified port. Modify the evtchn_alloc_unbound() to accept the port number as an argument and allocate the specified port if available. If the port number argument is zero, the next available port will be allocated. Signed-off-by: Rahul Singh Acked-by: Jan Beulich Reviewed-by: Julien Grall --- xen/arch/arm/domain_build.c | 2 +- xen/common/event_channel.c | 17 ++++++++++++----- xen/include/xen/event.h | 3 ++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f899766860..7192293068 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -3171,7 +3171,7 @@ static int __init alloc_xenstore_evtchn(struct domain *d) alloc.dom = d->domain_id; alloc.remote_dom = hardware_domain->domain_id; - rc = evtchn_alloc_unbound(&alloc); + rc = evtchn_alloc_unbound(&alloc, 0); if ( rc ) { printk("Failed allocating event channel for domain\n"); diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 565ab71881..f546e81758 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -317,11 +317,15 @@ static int evtchn_get_port(struct domain *d, evtchn_port_t port) return rc ?: port; } -int evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) +/* + * If port is zero get the next free port and allocate. If port is non-zero + * allocate the specified port. + */ +int evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc, evtchn_port_t port) { struct evtchn *chn; struct domain *d; - int port, rc; + int rc; domid_t dom = alloc->dom; d = rcu_lock_domain_by_any_id(dom); @@ -330,8 +334,11 @@ int evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) write_lock(&d->event_lock); - if ( (port = get_free_port(d)) < 0 ) - ERROR_EXIT_DOM(port, d); + port = rc = evtchn_get_port(d, port); + if ( rc < 0 ) + ERROR_EXIT(rc); + rc = 0; + chn = evtchn_from_port(d, port); rc = xsm_evtchn_unbound(XSM_TARGET, d, chn, alloc->remote_dom); @@ -1222,7 +1229,7 @@ long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct evtchn_alloc_unbound alloc_unbound; if ( copy_from_guest(&alloc_unbound, arg, 1) != 0 ) return -EFAULT; - rc = evtchn_alloc_unbound(&alloc_unbound); + rc = evtchn_alloc_unbound(&alloc_unbound, 0); if ( !rc && __copy_to_guest(arg, &alloc_unbound, 1) ) rc = -EFAULT; /* Cleaning up here would be a mess! */ break; diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index f3021fe304..f31963703f 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -72,7 +72,8 @@ void evtchn_free(struct domain *d, struct evtchn *chn); int evtchn_allocate_port(struct domain *d, unsigned int port); /* Allocate a new event channel */ -int __must_check evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc); +int __must_check evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc, + evtchn_port_t port); /* Unmask a local event-channel port. */ int evtchn_unmask(unsigned int port); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 12:11:43 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 12:11:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404269.646660 (Exim 4.92) (envelope-from ) id 1oWcrH-0007PR-LR; Fri, 09 Sep 2022 12:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404269.646660; Fri, 09 Sep 2022 12:11: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 1oWcrH-0007PF-IP; Fri, 09 Sep 2022 12:11:43 +0000 Received: by outflank-mailman (input) for mailman id 404269; Fri, 09 Sep 2022 12:11:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcrG-0007P7-VD for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcrG-00010E-UZ for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWcrG-0000JI-To for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11: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=LHC4nuyYSFi/Ukh/AJn8rxZt4DOGKupPFmkWVXrIDiE=; b=bKA6qgllL5Bw6zCs7akFlZI9y2 QgW0T2g0dhm2Et99MlHFrWxgO/dvu92cRnpl0UYggRZPr5m49kzxrdINkeddsMyIC5tK4+dStoGwi HPcK32v2FK3P6D2hBVLEI3H99a1mD3Q6RJ6+kCRMfVriTpZH2UnyqMy0b3ekXAbtRmHI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/evtchn: modify evtchn_bind_interdomain to support static evtchn Message-Id: Date: Fri, 09 Sep 2022 12:11:42 +0000 commit 7ba046a538cba2bc196d9d6d609594aa3b393f94 Author: Rahul Singh AuthorDate: Wed Sep 7 17:27:36 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:59 2022 +0100 xen/evtchn: modify evtchn_bind_interdomain to support static evtchn Static event channel support will be added for dom0less domains. Modify evtchn_bind_interdomain to support static evtchn. It is necessary to have access to the evtchn_bind_interdomain function to do that, so make evtchn_bind_interdomain global and also make it __must_check. Currently evtchn_bind_interdomain() always allocates the next available local port. Static event channel support for dom0less domains requires allocating a specified port. Modify the evtchn_bind_interdomain to accept the port number as an argument and allocate the specified port if available. If the port number argument is zero, the next available port will be allocated. Currently evtchn_bind_interdomain() finds the local domain from "current->domain" pointer. evtchn_bind_interdomain() will be called from the XEN to create static event channel during domain creation. "current" pointer is not valid at that time, therefore modify the evtchn_bind_interdomain() to pass domain as an argument. Signed-off-by: Rahul Singh Acked-by: Jan Beulich Reviewed-by: Julien Grall --- xen/common/event_channel.c | 20 ++++++++++++++------ xen/include/xen/event.h | 5 +++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index f546e81758..f5e0b12d15 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -381,11 +381,16 @@ static void double_evtchn_unlock(struct evtchn *lchn, struct evtchn *rchn) evtchn_write_unlock(rchn); } -static int evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) +/* + * If lport is zero get the next free port and allocate. If port is non-zero + * allocate the specified lport. + */ +int evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind, struct domain *ld, + evtchn_port_t lport) { struct evtchn *lchn, *rchn; - struct domain *ld = current->domain, *rd; - int lport, rc; + struct domain *rd; + int rc; evtchn_port_t rport = bind->remote_port; domid_t rdom = bind->remote_dom; @@ -405,8 +410,11 @@ static int evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) write_lock(&ld->event_lock); } - if ( (lport = get_free_port(ld)) < 0 ) - ERROR_EXIT(lport); + lport = rc = evtchn_get_port(ld, lport); + if ( rc < 0 ) + ERROR_EXIT(rc); + rc = 0; + lchn = evtchn_from_port(ld, lport); rchn = _evtchn_from_port(rd, rport); @@ -1239,7 +1247,7 @@ long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct evtchn_bind_interdomain bind_interdomain; if ( copy_from_guest(&bind_interdomain, arg, 1) != 0 ) return -EFAULT; - rc = evtchn_bind_interdomain(&bind_interdomain); + rc = evtchn_bind_interdomain(&bind_interdomain, current->domain, 0); if ( !rc && __copy_to_guest(arg, &bind_interdomain, 1) ) rc = -EFAULT; /* Cleaning up here would be a mess! */ break; diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index f31963703f..8eae9984a9 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -75,6 +75,11 @@ int evtchn_allocate_port(struct domain *d, unsigned int port); int __must_check evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc, evtchn_port_t port); +/* Bind an event channel port to interdomain */ +int __must_check evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind, + struct domain *ld, + evtchn_port_t port); + /* Unmask a local event-channel port. */ int evtchn_unmask(unsigned int port); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 12:11:53 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 12:11:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404270.646663 (Exim 4.92) (envelope-from ) id 1oWcrR-0007Sz-N1; Fri, 09 Sep 2022 12:11:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404270.646663; Fri, 09 Sep 2022 12:11: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 1oWcrR-0007Ss-K5; Fri, 09 Sep 2022 12:11:53 +0000 Received: by outflank-mailman (input) for mailman id 404270; Fri, 09 Sep 2022 12:11:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcrR-0007Sm-2D for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcrR-00010e-1R for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWcrR-0000Jo-0Y for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:11: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=zR2P4FPdi1eoJyKbrUDspSVTtsnO2EfYjyiot5YsIls=; b=D/P4tescPGay7rPCCABt4tmml9 lf77olM4KsutCsFjPon8VQAcObaIUNJ9NLbjX3u0Is+HymZSfzQo4EOhBRv/9FyxgBLTaqjdr7QfF 4M9FWJH3qz7E3AcxD9tAkgG8vPz7m77ZnSOmqyMoMKaNgAV4Sg8NOt2DbLvi6MPamzBU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: introduce new xen,enhanced property value Message-Id: Date: Fri, 09 Sep 2022 12:11:53 +0000 commit 4a6d155a840de41e59050e2dc06d86293112c0f3 Author: Rahul Singh AuthorDate: Wed Sep 7 17:27:37 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:59 2022 +0100 xen/arm: introduce new xen,enhanced property value Introduce a new "xen,enhanced" dom0less property value "no-xenstore" to disable xenstore interface for dom0less guests. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 4 ++++ xen/arch/arm/domain_build.c | 10 ++++++---- xen/arch/arm/include/asm/kernel.h | 23 +++++++++++++++++++++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 98253414b8..47567b3906 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -204,6 +204,10 @@ with the following properties: - "disabled" Xen PV interfaces are disabled. + - "no-xenstore" + All default Xen PV interfaces, including grant-table will be enabled but + xenstore will be disabled for the VM. + If the xen,enhanced property is present with no value, it defaults to "enabled". If the xen,enhanced property is not present, PV interfaces are disabled. diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 7192293068..e5aba9841f 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2891,7 +2891,7 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) goto err; } - if ( kinfo->dom0less_enhanced ) + if ( kinfo->dom0less_feature & DOM0LESS_ENHANCED_NO_XS ) { ret = make_hypervisor_node(d, kinfo, addrcells, sizecells); if ( ret ) @@ -3209,10 +3209,12 @@ static int __init construct_domU(struct domain *d, (rc == 0 && !strcmp(dom0less_enhanced, "enabled")) ) { if ( hardware_domain ) - kinfo.dom0less_enhanced = true; + kinfo.dom0less_feature = DOM0LESS_ENHANCED; else - panic("Tried to use xen,enhanced without dom0\n"); + panic("At the moment, Xenstore support requires dom0 to be present\n"); } + else if ( rc == 0 && !strcmp(dom0less_enhanced, "no-xenstore") ) + kinfo.dom0less_feature = DOM0LESS_ENHANCED_NO_XS; if ( vcpu_create(d, 0) == NULL ) return -ENOMEM; @@ -3252,7 +3254,7 @@ static int __init construct_domU(struct domain *d, if ( rc < 0 ) return rc; - if ( kinfo.dom0less_enhanced ) + if ( kinfo.dom0less_feature & DOM0LESS_XENSTORE ) { ASSERT(hardware_domain); rc = alloc_xenstore_evtchn(d); diff --git a/xen/arch/arm/include/asm/kernel.h b/xen/arch/arm/include/asm/kernel.h index c4dc039b54..f8bb85767b 100644 --- a/xen/arch/arm/include/asm/kernel.h +++ b/xen/arch/arm/include/asm/kernel.h @@ -9,6 +9,25 @@ #include #include +/* + * List of possible features for dom0less domUs + * + * DOM0LESS_ENHANCED_NO_XS: Notify the OS it is running on top of Xen. All the + * default features (excluding Xenstore) will be + * available. Note that an OS *must* not rely on the + * availability of Xen features if this is not set. + * DOM0LESS_XENSTORE: Xenstore will be enabled for the VM. This feature + * can't be enabled without the + * DOM0LESS_ENHANCED_NO_XS. + * DOM0LESS_ENHANCED: Notify the OS it is running on top of Xen. All the + * default features (including Xenstore) will be + * available. Note that an OS *must* not rely on the + * availability of Xen features if this is not set. + */ +#define DOM0LESS_ENHANCED_NO_XS BIT(0, U) +#define DOM0LESS_XENSTORE BIT(1, U) +#define DOM0LESS_ENHANCED (DOM0LESS_ENHANCED_NO_XS | DOM0LESS_XENSTORE) + struct kernel_info { #ifdef CONFIG_ARM_64 enum domain_type type; @@ -36,8 +55,8 @@ struct kernel_info { /* Enable pl011 emulation */ bool vpl011; - /* Enable PV drivers */ - bool dom0less_enhanced; + /* Enable/Disable PV drivers interfaces */ + uint16_t dom0less_feature; /* GIC phandle */ uint32_t phandle_gic; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 12:12:04 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 12:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404271.646667 (Exim 4.92) (envelope-from ) id 1oWcrc-0007Wj-RB; Fri, 09 Sep 2022 12:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404271.646667; Fri, 09 Sep 2022 12:12: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 1oWcrc-0007Wb-O8; Fri, 09 Sep 2022 12:12:04 +0000 Received: by outflank-mailman (input) for mailman id 404271; Fri, 09 Sep 2022 12:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcrb-0007WN-5Z for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcrb-00011M-4l for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWcrb-0000KS-3n for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12: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=oOnA64z9pAudSwgOqLrT1sMZdfTYxs4YQ1UZgu75poM=; b=gH+3sFOwCpt1oRbmNduihBqSFP tC38Dgajqn9UzoWZd9Ca9zlsvuMUJRHk8eXKrS3q8ZofOthGcyuR5zrSN96ZlNjh8ATp1Z+s9X6tT Ox5Je+rMO1knbAklp5wvDNi1f5C4OCtdHL57i/bfl9HHWMxlN4eusq4dW6R3liEQ1LD8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: introduce xen-evtchn dom0less property Message-Id: Date: Fri, 09 Sep 2022 12:12:03 +0000 commit 1fe16b3ed78a041e17a9625a073a6d4540fb1a20 Author: Rahul Singh AuthorDate: Wed Sep 7 17:27:38 2022 +0100 Commit: Julien Grall CommitDate: Thu Sep 8 12:21:59 2022 +0100 xen/arm: introduce xen-evtchn dom0less property Introduce a new sub-node under /chosen node to establish static event channel communication between domains on dom0less systems. An event channel will be created beforehand to allow the domains to send notifications to each other. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 98 +++++++++++++++++++++++ xen/arch/arm/domain_build.c | 147 ++++++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/setup.h | 1 + xen/arch/arm/setup.c | 2 + xen/include/xen/device_tree.h | 16 ++++ 5 files changed, 264 insertions(+) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 47567b3906..e03e5e9e4c 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -382,3 +382,101 @@ device-tree: This will reserve a 512MB region starting at the host physical address 0x30000000 to be exclusively used by DomU1. + +Static Event Channel +==================== +The event channel communication will be established statically between two +domains (dom0 and domU also). Event channel connection information between +domains will be passed to Xen via the device tree node. The event channel +will be created and established in Xen before the domain started. The domain +does not need to do any operation to establish a connection. Domain only +needs hypercall EVTCHNOP_send(local port) to send notifications to the +remote guest. + +There is no need to describe the static event channel info in the domU device +tree. Static event channels are only useful in fully static configurations, +and in those configurations, the domU device tree dynamically generated by Xen +is not needed. + +To enable the event-channel interface for domU guests include the +xen,enhanced = "no-xenstore" property in the domU Xen device tree node. + +Under the "xen,domain" compatible node for domU, there needs to be sub-nodes +with compatible "xen,evtchn" that describe the event channel connection +between two domUs. For dom0, there needs to be sub-nodes with compatible +"xen,evtchn" under the chosen node. + +The static event channel node has the following properties: + +- compatible + + "xen,evtchn" + +- xen,evtchn + + The property is tuples of two numbers + (local-evtchn link-to-foreign-evtchn) where: + + local-evtchn is an integer value that will be used to allocate local port + for a domain to send and receive event notifications to/from the remote + domain. Maximum supported value is 2^17 for FIFO ABI and 4096 for 2L ABI. + It is recommended to use low event channel IDs. + + link-to-foreign-evtchn is a single phandle to a remote evtchn to which + local-evtchn will be connected. + +Example +======= + +chosen { + + /* One sub-node per local event channel. This sub-node is for Dom0. */ + ec1: evtchn@1 { + compatible = "xen,evtchn-v1"; + /* local-evtchn link-to-foreign-evtchn */ + xen,evtchn = <0xa &ec2>; + }; + + domU1 { + compatible = "xen,domain"; + #address-cells = <0x2>; + #size-cells = <0x1>; + xen,enhanced = "no-xenstore"; + + /* One sub-node per local event channel */ + ec2: evtchn@2 { + compatible = "xen,evtchn-v1"; + /* local-evtchn link-to-foreign-evtchn */ + xen,evtchn = <0xa &ec1>; + }; + + ec3: evtchn@3 { + compatible = "xen,evtchn-v1"; + xen,evtchn = <0xb &ec5>; + }; + + ec4: evtchn@4 { + compatible = "xen,evtchn-v1"; + xen,evtchn = <0xc &ec6>; + }; + }; + + domU2 { + compatible = "xen,domain"; + #address-cells = <0x2>; + #size-cells = <0x1>; + xen,enhanced = "no-xenstore"; + + /* One sub-node per local event channel */ + ec5: evtchn@5 { + compatible = "xen,evtchn-v1"; + /* local-evtchn link-to-foreign-evtchn */ + xen,evtchn = <0xb &ec3>; + }; + + ec6: evtchn@6 { + compatible = "xen,evtchn-v1"; + xen,evtchn = <0xd &ec4>; + }; + }; +}; diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e5aba9841f..1d6b414c73 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -33,6 +33,8 @@ #include #include +#define STATIC_EVTCHN_NODE_SIZE_CELLS 2 + static unsigned int __initdata opt_dom0_max_vcpus; integer_param("dom0_max_vcpus", opt_dom0_max_vcpus); @@ -3052,6 +3054,150 @@ void __init evtchn_allocate(struct domain *d) d->arch.hvm.params[HVM_PARAM_CALLBACK_IRQ] = val; } +static int __init get_evtchn_dt_property(const struct dt_device_node *np, + uint32_t *port, uint32_t *phandle) +{ + const __be32 *prop = NULL; + uint32_t len; + + prop = dt_get_property(np, "xen,evtchn", &len); + if ( !prop ) + { + printk(XENLOG_ERR "xen,evtchn property should not be empty.\n"); + return -EINVAL; + } + + if ( !len || len < dt_cells_to_size(STATIC_EVTCHN_NODE_SIZE_CELLS) ) + { + printk(XENLOG_ERR "xen,evtchn property value is not valid.\n"); + return -EINVAL; + } + + *port = dt_next_cell(1, &prop); + *phandle = dt_next_cell(1, &prop); + + return 0; +} + +static int __init alloc_domain_evtchn(struct dt_device_node *node) +{ + int rc; + uint32_t domU1_port, domU2_port, remote_phandle; + struct dt_device_node *remote_node; + const struct dt_device_node *p1_node, *p2_node; + struct evtchn_alloc_unbound alloc_unbound; + struct evtchn_bind_interdomain bind_interdomain; + struct domain *d1 = NULL, *d2 = NULL; + + if ( !dt_device_is_compatible(node, "xen,evtchn-v1") ) + return 0; + + /* + * Event channel is already created while parsing the other side of + * evtchn node. + */ + if ( dt_device_static_evtchn_created(node) ) + return 0; + + rc = get_evtchn_dt_property(node, &domU1_port, &remote_phandle); + if ( rc ) + return rc; + + remote_node = dt_find_node_by_phandle(remote_phandle); + if ( !remote_node ) + { + printk(XENLOG_ERR + "evtchn: could not find remote evtchn phandle\n"); + return -EINVAL; + } + + rc = get_evtchn_dt_property(remote_node, &domU2_port, &remote_phandle); + if ( rc ) + return rc; + + if ( node->phandle != remote_phandle ) + { + printk(XENLOG_ERR "xen,evtchn property is not setup correctly.\n"); + return -EINVAL; + } + + p1_node = dt_get_parent(node); + if ( !p1_node ) + { + printk(XENLOG_ERR "evtchn: evtchn parent node is NULL\n" ); + return -EINVAL; + } + + p2_node = dt_get_parent(remote_node); + if ( !p2_node ) + { + printk(XENLOG_ERR "evtchn: remote parent node is NULL\n" ); + return -EINVAL; + } + + d1 = get_domain_by_id(p1_node->used_by); + d2 = get_domain_by_id(p2_node->used_by); + + if ( !d1 || !d2 ) + { + printk(XENLOG_ERR "evtchn: could not find domains\n" ); + return -EINVAL; + } + + alloc_unbound.dom = d1->domain_id; + alloc_unbound.remote_dom = d2->domain_id; + + rc = evtchn_alloc_unbound(&alloc_unbound, domU1_port); + if ( rc < 0 ) + { + printk(XENLOG_ERR + "evtchn_alloc_unbound() failure (Error %d) \n", rc); + return rc; + } + + bind_interdomain.remote_dom = d1->domain_id; + bind_interdomain.remote_port = domU1_port; + + rc = evtchn_bind_interdomain(&bind_interdomain, d2, domU2_port); + if ( rc < 0 ) + { + printk(XENLOG_ERR + "evtchn_bind_interdomain() failure (Error %d) \n", rc); + return rc; + } + + dt_device_set_static_evtchn_created(node); + dt_device_set_static_evtchn_created(remote_node); + + return 0; +} + +void __init alloc_static_evtchn(void) +{ + struct dt_device_node *node, *evtchn_node; + struct dt_device_node *chosen = dt_find_node_by_path("/chosen"); + + BUG_ON(chosen == NULL); + + if ( hardware_domain ) + dt_device_set_used_by(chosen, hardware_domain->domain_id); + + dt_for_each_child_node(chosen, node) + { + if ( hardware_domain ) + { + if ( alloc_domain_evtchn(node) != 0 ) + panic("Could not set up domains evtchn\n"); + } + + dt_for_each_child_node(node, evtchn_node) + { + if ( alloc_domain_evtchn(evtchn_node) != 0 ) + panic("Could not set up domains evtchn\n"); + } + } +} + static void __init find_gnttab_region(struct domain *d, struct kernel_info *kinfo) { @@ -3369,6 +3515,7 @@ void __init create_domUs(void) panic("Error creating domain %s\n", dt_node_name(node)); d->is_console = true; + dt_device_set_used_by(node, d->domain_id); if ( construct_domU(d, node) != 0 ) panic("Could not set up domain %s\n", dt_node_name(node)); diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 5815ccf8c5..5ee28b270f 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -106,6 +106,7 @@ int acpi_make_efi_nodes(void *fdt, struct membank tbl_add[]); void create_domUs(void); void create_dom0(void); +void alloc_static_evtchn(void); void discard_initial_modules(void); void fw_unreserved_regions(paddr_t s, paddr_t e, diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 7814fe323d..909013992e 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -1078,6 +1078,8 @@ void __init start_xen(unsigned long boot_phys_offset, if ( acpi_disabled ) create_domUs(); + alloc_static_evtchn(); + /* * This needs to be called **before** heap_init_late() so modules * will be scrubbed (unless suppressed). diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 430a1ef445..a28937d12a 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -92,6 +92,10 @@ struct dt_device_node { /* IOMMU specific fields */ bool is_protected; + + /* HACK: Remove this if there is a need of space */ + bool_t static_evtchn_created; + /* * The main purpose of this list is to link the structure in the list * of devices assigned to domain. @@ -317,6 +321,18 @@ static inline bool_t dt_property_name_is_equal(const struct dt_property *pp, return !dt_prop_cmp(pp->name, name); } +static inline void +dt_device_set_static_evtchn_created(struct dt_device_node *device) +{ + device->static_evtchn_created = true; +} + +static inline bool_t +dt_device_static_evtchn_created(const struct dt_device_node *device) +{ + return device->static_evtchn_created; +} + /** * dt_find_compatible_node - Find a node based on type and one of the * tokens in its "compatible" property -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 12:12:14 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 12:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404272.646672 (Exim 4.92) (envelope-from ) id 1oWcrm-0007Zx-SR; Fri, 09 Sep 2022 12:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404272.646672; Fri, 09 Sep 2022 12:12: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 1oWcrm-0007Zp-Pk; Fri, 09 Sep 2022 12:12:14 +0000 Received: by outflank-mailman (input) for mailman id 404272; Fri, 09 Sep 2022 12:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcrl-0007ZY-8b for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcrl-00011c-7q for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWcrl-0000L9-6r for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12: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=w3hvcRaEPAs3eX2wiTDRiAbCGgrvgGdnGaVcxuBl01o=; b=2YJSmtmWg8p9u87O8UxPDIP63g wcuktxEP+2R9zEoBtHYMfrCo90B5r65syin7c84NnXxoV05D+32O1YiEDQuxE4n0OE20GXoXGbfUb 5rB+h9gSFT20sXVjA8cyg7TcSVgy5u4DjcORUM6c+F0EZtle+flCB0xeDuf/1eqvoTdc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: bootfdt: Make process_chosen_node() return int Message-Id: Date: Fri, 09 Sep 2022 12:12:13 +0000 commit d0d81052b4e7493acf8c8dc18fe1911c4ee1d2ac Author: Henry Wang AuthorDate: Thu Sep 8 11:09:07 2022 +0000 Commit: Julien Grall CommitDate: Thu Sep 8 12:23:39 2022 +0100 xen/arm: bootfdt: Make process_chosen_node() return int At the boot time, it is saner to stop booting early if an error occurs when parsing the device tree chosen node, rather than seeing random behavior afterwards. Therefore, this commit changes the return type of the process_chosen_node() from void to int, and return correct errno based on the error type. Signed-off-by: Henry Wang Reviewed-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/bootfdt.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index ec81a45de9..1a79b969af 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -293,9 +293,9 @@ static void __init process_multiboot_node(const void *fdt, int node, kind, start, domU); } -static void __init process_chosen_node(const void *fdt, int node, - const char *name, - u32 address_cells, u32 size_cells) +static int __init process_chosen_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) { const struct fdt_property *prop; paddr_t start, end; @@ -306,11 +306,11 @@ static void __init process_chosen_node(const void *fdt, int node, prop = fdt_get_property(fdt, node, "linux,initrd-start", &len); if ( !prop ) /* No initrd present. */ - return; + return 0; if ( len != sizeof(u32) && len != sizeof(u64) ) { printk("linux,initrd-start property has invalid length %d\n", len); - return; + return -EINVAL; } start = dt_read_number((void *)&prop->data, dt_size_to_cells(len)); @@ -318,12 +318,12 @@ static void __init process_chosen_node(const void *fdt, int node, if ( !prop ) { printk("linux,initrd-end not present but -start was\n"); - return; + return -EINVAL; } if ( len != sizeof(u32) && len != sizeof(u64) ) { printk("linux,initrd-end property has invalid length %d\n", len); - return; + return -EINVAL; } end = dt_read_number((void *)&prop->data, dt_size_to_cells(len)); @@ -331,12 +331,14 @@ static void __init process_chosen_node(const void *fdt, int node, { printk("linux,initrd limits invalid: %"PRIpaddr" >= %"PRIpaddr"\n", start, end); - return; + return -EINVAL; } printk("Initrd %"PRIpaddr"-%"PRIpaddr"\n", start, end); add_boot_module(BOOTMOD_RAMDISK, start, end-start, false); + + return 0; } static int __init process_domain_node(const void *fdt, int node, @@ -383,7 +385,7 @@ static int __init early_scan_node(const void *fdt, device_tree_node_compatible(fdt, node, "multiboot,module" ))) process_multiboot_node(fdt, node, name, address_cells, size_cells); else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") ) - process_chosen_node(fdt, node, name, address_cells, size_cells); + rc = process_chosen_node(fdt, node, name, address_cells, size_cells); else if ( depth == 2 && device_tree_node_compatible(fdt, node, "xen,domain") ) rc = process_domain_node(fdt, node, name, address_cells, size_cells); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 12:12:24 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 12:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404273.646676 (Exim 4.92) (envelope-from ) id 1oWcrw-0007ce-U3; Fri, 09 Sep 2022 12:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404273.646676; Fri, 09 Sep 2022 12:12: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 1oWcrw-0007cW-RF; Fri, 09 Sep 2022 12:12:24 +0000 Received: by outflank-mailman (input) for mailman id 404273; Fri, 09 Sep 2022 12:12:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcrv-0007cK-Bb for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcrv-00011g-As for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWcrv-0000LY-AC for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12: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=oXNxwPIiWvP5x+dN8n0ErNNHolZixM/kRD77STCkDPM=; b=BSRgQM5DWfpaWUswgLwePQnoD6 wEDY9dVRHw7T4gwpgcjXfN8cbF4jCW4E/ja/X7M5U4GnFltorHNOxvOsX1087sVnEKXX2HlKD6rO9 HWNvC2BGy7MciyvvjdTqAhXHDd//KcJUIH+nb4Mayd48jOLhV2k9F9gBEh0ATW5XKn6Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs, xen/arm: Introduce static heap memory Message-Id: Date: Fri, 09 Sep 2022 12:12:23 +0000 commit 4596329291f5cff9c28d269d21aac17ef993e9fb Author: Henry Wang AuthorDate: Thu Sep 8 11:09:08 2022 +0000 Commit: Julien Grall CommitDate: Thu Sep 8 12:27:15 2022 +0100 docs, xen/arm: Introduce static heap memory This commit introduces the static heap memory, which is parts of RAM reserved in the beginning of the boot time for heap. Firstly, since a new type of memory bank is needed for marking the memory bank solely as the heap, this commit defines `enum membank_type` and use this enum in function device_tree_get_meminfo(). Changes of code are done accordingly following the introduction of this enum. Also, this commit introduces the logic to parse the static heap configuration in device tree. If the memory bank is reserved as heap through `xen,static-heap` property in device tree `chosen` node, the memory will be marked as static heap type. A documentation section is added, describing the definition of static heap memory and the method of enabling the static heap memory through device tree at boot time. Signed-off-by: Henry Wang Signed-off-by: Penny Zheng Reviewed-by: Julien Grall --- SUPPORT.md | 7 ++++++ docs/misc/arm/device-tree/booting.txt | 43 +++++++++++++++++++++++++++++++++++ xen/arch/arm/bootfdt.c | 23 +++++++++++++++---- xen/arch/arm/domain_build.c | 8 ++++--- xen/arch/arm/include/asm/setup.h | 22 +++++++++++++++++- xen/arch/arm/setup.c | 2 +- 6 files changed, 96 insertions(+), 9 deletions(-) diff --git a/SUPPORT.md b/SUPPORT.md index 8e040d1c1e..b02a5d25ca 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -293,6 +293,13 @@ pre-defined by configuration using physical address ranges. Status, ARM: Tech Preview +### Static Heap + +Allow reserving parts of RAM through the device tree using physical +address ranges as heap. + + Status, ARM: Tech Preview + ### Memory Sharing Allow sharing of identical pages between guests diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index e03e5e9e4c..5395a1077c 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -425,6 +425,49 @@ The static event channel node has the following properties: link-to-foreign-evtchn is a single phandle to a remote evtchn to which local-evtchn will be connected. +Static Heap Memory +================== + +The static heap memory refers to parts of RAM reserved in the beginning of +boot time for heap. The memory is reserved by configuration in the device +tree using physical address ranges. + +The static heap memory declared in the device tree defines the memory areas +that will be reserved to be used exclusively as heap. + +- For Arm32, since there are separated heaps, the static heap will be used +for both domheap and xenheap. The admin should make sure that the static +heap region should contain enough memory below 4GB to cater 32-bit DMA. + +- For Arm64, since there is a single heap, the defined static heap areas +shall always go to the heap allocator. + +The static heap memory is an optional feature and can be enabled by adding +below device tree property. + +- xen,static-heap + + Property under the top-level "chosen" node. It specifies the address + and size of Xen static heap memory. Number of address and size cells + for the "xen,static-heap" property is determined by the root node + "#address-cells" and "#size-cells". Note that at least a 64KB alignment + is required. + +Below is an example on how to specify the static heap in device tree: + + / { + #address-cells = <0x2>; + #size-cells = <0x2>; + ... + chosen { + xen,static-heap = <0x0 0x30000000 0x0 0x40000000>; + ... + }; + }; + +RAM starting from the host physical address 0x30000000 of 1GB size will +be reserved as static heap. + Example ======= diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index 1a79b969af..0ca7b44446 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -64,7 +64,7 @@ void __init device_tree_get_reg(const __be32 **cell, u32 address_cells, static int __init device_tree_get_meminfo(const void *fdt, int node, const char *prop_name, u32 address_cells, u32 size_cells, - void *data, bool xen_domain) + void *data, enum membank_type type) { const struct fdt_property *prop; unsigned int i, banks; @@ -95,7 +95,7 @@ static int __init device_tree_get_meminfo(const void *fdt, int node, continue; mem->bank[mem->nr_banks].start = start; mem->bank[mem->nr_banks].size = size; - mem->bank[mem->nr_banks].xen_domain = xen_domain; + mem->bank[mem->nr_banks].type = type; mem->nr_banks++; } @@ -185,7 +185,7 @@ static int __init process_memory_node(const void *fdt, int node, void *data) { return device_tree_get_meminfo(fdt, node, "reg", address_cells, size_cells, - data, false); + data, MEMBANK_DEFAULT); } static int __init process_reserved_memory_node(const void *fdt, int node, @@ -301,6 +301,20 @@ static int __init process_chosen_node(const void *fdt, int node, paddr_t start, end; int len; + if ( fdt_get_property(fdt, node, "xen,static-heap", NULL) ) + { + int rc; + + printk("Checking for static heap in /chosen\n"); + + rc = device_tree_get_meminfo(fdt, node, "xen,static-heap", + address_cells, size_cells, + &bootinfo.reserved_mem, + MEMBANK_STATIC_HEAP); + if ( rc ) + return rc; + } + printk("Checking for initrd in /chosen\n"); prop = fdt_get_property(fdt, node, "linux,initrd-start", &len); @@ -360,7 +374,8 @@ static int __init process_domain_node(const void *fdt, int node, "#xen,static-mem-size-cells", 0); return device_tree_get_meminfo(fdt, node, "xen,static-mem", address_cells, - size_cells, &bootinfo.reserved_mem, true); + size_cells, &bootinfo.reserved_mem, + MEMBANK_STATIC_DOMAIN); } static int __init early_scan_node(const void *fdt, diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 1d6b414c73..7412303d20 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1040,9 +1040,11 @@ static int __init make_memory_node(const struct domain *d, if ( mem->nr_banks == 0 ) return -ENOENT; - /* find first memory range not bound to a Xen domain */ - for ( i = 0; i < mem->nr_banks && mem->bank[i].xen_domain; i++ ) + /* find the first memory range that is reserved for device (or firmware) */ + for ( i = 0; i < mem->nr_banks && + (mem->bank[i].type != MEMBANK_DEFAULT); i++ ) ; + if ( i == mem->nr_banks ) return 0; @@ -1064,7 +1066,7 @@ static int __init make_memory_node(const struct domain *d, u64 start = mem->bank[i].start; u64 size = mem->bank[i].size; - if ( mem->bank[i].xen_domain ) + if ( mem->bank[i].type == MEMBANK_STATIC_DOMAIN ) continue; dt_dprintk(" Bank %d: %#"PRIx64"->%#"PRIx64"\n", diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 5ee28b270f..94b7e74b4d 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -22,11 +22,31 @@ typedef enum { BOOTMOD_UNKNOWN } bootmodule_kind; +enum membank_type { + /* + * The MEMBANK_DEFAULT type refers to either reserved memory for the + * device/firmware (when the bank is in 'reserved_mem') or any RAM (when + * the bank is in 'mem'). + */ + MEMBANK_DEFAULT, + /* + * The MEMBANK_STATIC_DOMAIN type is used to indicate whether the memory + * bank is bound to a static Xen domain. It is only valid when the bank + * is in reserved_mem. + */ + MEMBANK_STATIC_DOMAIN, + /* + * The MEMBANK_STATIC_HEAP type is used to indicate whether the memory + * bank is reserved as static heap. It is only valid when the bank is + * in reserved_mem. + */ + MEMBANK_STATIC_HEAP, +}; struct membank { paddr_t start; paddr_t size; - bool xen_domain; /* whether the memory bank is bound to a Xen domain. */ + enum membank_type type; }; struct meminfo { diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 909013992e..5b7602fdac 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -644,7 +644,7 @@ static void __init init_staticmem_pages(void) for ( bank = 0 ; bank < bootinfo.reserved_mem.nr_banks; bank++ ) { - if ( bootinfo.reserved_mem.bank[bank].xen_domain ) + if ( bootinfo.reserved_mem.bank[bank].type == MEMBANK_STATIC_DOMAIN ) { mfn_t bank_start = _mfn(PFN_UP(bootinfo.reserved_mem.bank[bank].start)); unsigned long bank_pages = PFN_DOWN(bootinfo.reserved_mem.bank[bank].size); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 12:12:35 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 12:12:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404274.646679 (Exim 4.92) (envelope-from ) id 1oWcs7-0007g8-1b; Fri, 09 Sep 2022 12:12:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404274.646679; Fri, 09 Sep 2022 12:12: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 1oWcs6-0007g0-VJ; Fri, 09 Sep 2022 12:12:34 +0000 Received: by outflank-mailman (input) for mailman id 404274; Fri, 09 Sep 2022 12:12:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcs5-0007fk-ET for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcs5-00011k-Dp for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWcs5-0000M1-D6 for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12: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=TbfHDQudo/AO8s2kCBAufNbPzheCvlY/Y3WdsH9gzC4=; b=rzbCEiQGI2zv8qEU8CfZIK4kMe RY5ZCpdCIhXAP340637McotDEwXt56oAg51zP+W8yH+vIPmPYrwhR5pxaFr+lPtJJnXjVj2DYtmJR /DI853T2K7E12wKT2tgAje2DA901tD9e1rj/ygngR3lAPpyx6L5Um7+3qpXRloReK208=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: mm: Rename xenheap_* variable to directmap_* Message-Id: Date: Fri, 09 Sep 2022 12:12:33 +0000 commit f030935efb376bcbdf2e69692f951775bdf9ab58 Author: Henry Wang AuthorDate: Thu Sep 8 11:09:09 2022 +0000 Commit: Julien Grall CommitDate: Thu Sep 8 12:27:15 2022 +0100 xen/arm: mm: Rename xenheap_* variable to directmap_* With the static heap setup, keep using xenheap_* in the function setup_xenheap_mappings() will make the code confusing to read, because we always need to map the full RAM on Arm64. Therefore, renaming all "xenheap_*" variables to "directmap_*" to make clear the area is used to access the RAM easily. On Arm32, only the xenheap is direct mapped today. So the renaming to "directmap_*" would be still valid for Arm32. As the xenheap_* is renamed to directmap_*, rename the function setup_xenheap_mappings() to setup_directmap_mappings() to reflect the variable renaming, also change the code comment and printed error message in the function accordingly. No functional change is intended. Signed-off-by: Henry Wang Acked-by: Julien Grall --- xen/arch/arm/bootfdt.c | 2 +- xen/arch/arm/include/asm/config.h | 2 +- xen/arch/arm/include/asm/mm.h | 31 +++++++++++++----------- xen/arch/arm/mm.c | 50 +++++++++++++++++++++------------------ xen/arch/arm/setup.c | 36 ++++++++++++++-------------- 5 files changed, 64 insertions(+), 57 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index 0ca7b44446..c39aacbd60 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -494,7 +494,7 @@ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) device_tree_for_each_node((void *)fdt, 0, early_scan_node, NULL); /* - * On Arm64 setup_xenheap_mappings() expects to be called with the lowest + * On Arm64 setup_directmap_mappings() expects to be called with the lowest * bank in memory first. There is no requirement that the DT will provide * the banks sorted in ascending order. So sort them through. */ diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h index 2fafb9f228..0fefed1b8a 100644 --- a/xen/arch/arm/include/asm/config.h +++ b/xen/arch/arm/include/asm/config.h @@ -160,7 +160,7 @@ #define DIRECTMAP_SIZE (SLOT0_ENTRY_SIZE * (265-256)) #define DIRECTMAP_VIRT_END (DIRECTMAP_VIRT_START + DIRECTMAP_SIZE - 1) -#define XENHEAP_VIRT_START xenheap_virt_start +#define XENHEAP_VIRT_START directmap_virt_start #define HYPERVISOR_VIRT_END DIRECTMAP_VIRT_END diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 749fbefa0c..7d21120f98 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -154,19 +154,19 @@ struct page_info #define _PGC_need_scrub _PGC_allocated #define PGC_need_scrub PGC_allocated -extern mfn_t xenheap_mfn_start, xenheap_mfn_end; -extern vaddr_t xenheap_virt_end; +extern mfn_t directmap_mfn_start, directmap_mfn_end; +extern vaddr_t directmap_virt_end; #ifdef CONFIG_ARM_64 -extern vaddr_t xenheap_virt_start; -extern unsigned long xenheap_base_pdx; +extern vaddr_t directmap_virt_start; +extern unsigned long directmap_base_pdx; #endif #ifdef CONFIG_ARM_32 #define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page)) #define is_xen_heap_mfn(mfn) ({ \ unsigned long mfn_ = mfn_x(mfn); \ - (mfn_ >= mfn_x(xenheap_mfn_start) && \ - mfn_ < mfn_x(xenheap_mfn_end)); \ + (mfn_ >= mfn_x(directmap_mfn_start) && \ + mfn_ < mfn_x(directmap_mfn_end)); \ }) #else #define is_xen_heap_page(page) ((page)->count_info & PGC_xen_heap) @@ -203,9 +203,12 @@ extern void remove_early_mappings(void); extern int init_secondary_pagetables(int cpu); /* Switch secondary CPUS to its own pagetables and finalise MMU setup */ extern void mmu_init_secondary_cpu(void); -/* Set up the xenheap: up to 1GB of contiguous, always-mapped memory. - * Base must be 32MB aligned and size a multiple of 32MB. */ -extern void setup_xenheap_mappings(unsigned long base_mfn, unsigned long nr_mfns); +/* + * For Arm32, set up the direct-mapped xenheap: up to 1GB of contiguous, + * always-mapped memory. Base must be 32MB aligned and size a multiple of 32MB. + * For Arm64, map the region in the directmap area. + */ +extern void setup_directmap_mappings(unsigned long base_mfn, unsigned long nr_mfns); /* Map a frame table to cover physical addresses ps through pe */ extern void setup_frametable_mappings(paddr_t ps, paddr_t pe); /* map a physical range in virtual memory */ @@ -267,16 +270,16 @@ static inline paddr_t __virt_to_maddr(vaddr_t va) static inline void *maddr_to_virt(paddr_t ma) { ASSERT(is_xen_heap_mfn(maddr_to_mfn(ma))); - ma -= mfn_to_maddr(xenheap_mfn_start); + ma -= mfn_to_maddr(directmap_mfn_start); return (void *)(unsigned long) ma + XENHEAP_VIRT_START; } #else static inline void *maddr_to_virt(paddr_t ma) { - ASSERT((mfn_to_pdx(maddr_to_mfn(ma)) - xenheap_base_pdx) < + ASSERT((mfn_to_pdx(maddr_to_mfn(ma)) - directmap_base_pdx) < (DIRECTMAP_SIZE >> PAGE_SHIFT)); return (void *)(XENHEAP_VIRT_START - - (xenheap_base_pdx << PAGE_SHIFT) + + (directmap_base_pdx << PAGE_SHIFT) + ((ma & ma_va_bottom_mask) | ((ma & ma_top_mask) >> pfn_pdx_hole_shift))); } @@ -319,10 +322,10 @@ static inline struct page_info *virt_to_page(const void *v) unsigned long pdx; ASSERT(va >= XENHEAP_VIRT_START); - ASSERT(va < xenheap_virt_end); + ASSERT(va < directmap_virt_end); pdx = (va - XENHEAP_VIRT_START) >> PAGE_SHIFT; - pdx += mfn_to_pdx(xenheap_mfn_start); + pdx += mfn_to_pdx(directmap_mfn_start); return frame_table + pdx - frametable_base_pdx; } diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 7f5b317d3e..11ee49598b 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -132,12 +132,12 @@ uint64_t init_ttbr; static paddr_t phys_offset; /* Limits of the Xen heap */ -mfn_t xenheap_mfn_start __read_mostly = INVALID_MFN_INITIALIZER; -mfn_t xenheap_mfn_end __read_mostly; -vaddr_t xenheap_virt_end __read_mostly; +mfn_t directmap_mfn_start __read_mostly = INVALID_MFN_INITIALIZER; +mfn_t directmap_mfn_end __read_mostly; +vaddr_t directmap_virt_end __read_mostly; #ifdef CONFIG_ARM_64 -vaddr_t xenheap_virt_start __read_mostly; -unsigned long xenheap_base_pdx __read_mostly; +vaddr_t directmap_virt_start __read_mostly; +unsigned long directmap_base_pdx __read_mostly; #endif unsigned long frametable_base_pdx __read_mostly; @@ -597,55 +597,59 @@ void mmu_init_secondary_cpu(void) } #ifdef CONFIG_ARM_32 -/* Set up the xenheap: up to 1GB of contiguous, always-mapped memory. */ -void __init setup_xenheap_mappings(unsigned long base_mfn, - unsigned long nr_mfns) +/* + * Set up the direct-mapped xenheap: + * up to 1GB of contiguous, always-mapped memory. + */ +void __init setup_directmap_mappings(unsigned long base_mfn, + unsigned long nr_mfns) { int rc; rc = map_pages_to_xen(XENHEAP_VIRT_START, _mfn(base_mfn), nr_mfns, PAGE_HYPERVISOR_RW | _PAGE_BLOCK); if ( rc ) - panic("Unable to setup the xenheap mappings.\n"); + panic("Unable to setup the directmap mappings.\n"); - /* Record where the xenheap is, for translation routines. */ - xenheap_virt_end = XENHEAP_VIRT_START + nr_mfns * PAGE_SIZE; + /* Record where the directmap is, for translation routines. */ + directmap_virt_end = XENHEAP_VIRT_START + nr_mfns * PAGE_SIZE; } #else /* CONFIG_ARM_64 */ -void __init setup_xenheap_mappings(unsigned long base_mfn, - unsigned long nr_mfns) +/* Map the region in the directmap area. */ +void __init setup_directmap_mappings(unsigned long base_mfn, + unsigned long nr_mfns) { int rc; - /* First call sets the xenheap physical and virtual offset. */ - if ( mfn_eq(xenheap_mfn_start, INVALID_MFN) ) + /* First call sets the directmap physical and virtual offset. */ + if ( mfn_eq(directmap_mfn_start, INVALID_MFN) ) { unsigned long mfn_gb = base_mfn & ~((FIRST_SIZE >> PAGE_SHIFT) - 1); - xenheap_mfn_start = _mfn(base_mfn); - xenheap_base_pdx = mfn_to_pdx(_mfn(base_mfn)); + directmap_mfn_start = _mfn(base_mfn); + directmap_base_pdx = mfn_to_pdx(_mfn(base_mfn)); /* * The base address may not be aligned to the first level * size (e.g. 1GB when using 4KB pages). This would prevent * superpage mappings for all the regions because the virtual * address and machine address should both be suitably aligned. * - * Prevent that by offsetting the start of the xenheap virtual + * Prevent that by offsetting the start of the directmap virtual * address. */ - xenheap_virt_start = DIRECTMAP_VIRT_START + + directmap_virt_start = DIRECTMAP_VIRT_START + (base_mfn - mfn_gb) * PAGE_SIZE; } - if ( base_mfn < mfn_x(xenheap_mfn_start) ) - panic("cannot add xenheap mapping at %lx below heap start %lx\n", - base_mfn, mfn_x(xenheap_mfn_start)); + if ( base_mfn < mfn_x(directmap_mfn_start) ) + panic("cannot add directmap mapping at %lx below heap start %lx\n", + base_mfn, mfn_x(directmap_mfn_start)); rc = map_pages_to_xen((vaddr_t)__mfn_to_virt(base_mfn), _mfn(base_mfn), nr_mfns, PAGE_HYPERVISOR_RW | _PAGE_BLOCK); if ( rc ) - panic("Unable to setup the xenheap mappings.\n"); + panic("Unable to setup the directmap mappings.\n"); } #endif diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 5b7602fdac..6687572fca 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -697,11 +697,11 @@ static void __init populate_boot_allocator(void) #ifdef CONFIG_ARM_32 /* Avoid the xenheap */ - if ( s < mfn_to_maddr(xenheap_mfn_end) && - mfn_to_maddr(xenheap_mfn_start) < e ) + if ( s < mfn_to_maddr(directmap_mfn_end) && + mfn_to_maddr(directmap_mfn_start) < e ) { - e = mfn_to_maddr(xenheap_mfn_start); - n = mfn_to_maddr(xenheap_mfn_end); + e = mfn_to_maddr(directmap_mfn_start); + n = mfn_to_maddr(directmap_mfn_end); } #endif @@ -791,17 +791,17 @@ static void __init setup_mm(void) /* * We need some memory to allocate the page-tables used for the - * xenheap mappings. So populate the boot allocator first. + * directmap mappings. So populate the boot allocator first. * - * This requires us to set xenheap_mfn_{start, end} first so the Xenheap - * region can be avoided. + * This requires us to set directmap_mfn_{start, end} first so the + * direct-mapped Xenheap region can be avoided. */ - xenheap_mfn_start = _mfn((e >> PAGE_SHIFT) - xenheap_pages); - xenheap_mfn_end = mfn_add(xenheap_mfn_start, xenheap_pages); + directmap_mfn_start = _mfn((e >> PAGE_SHIFT) - xenheap_pages); + directmap_mfn_end = mfn_add(directmap_mfn_start, xenheap_pages); populate_boot_allocator(); - setup_xenheap_mappings(mfn_x(xenheap_mfn_start), xenheap_pages); + setup_directmap_mappings(mfn_x(directmap_mfn_start), xenheap_pages); /* Frame table covers all of RAM region, including holes */ setup_frametable_mappings(ram_start, ram_end); @@ -816,8 +816,8 @@ static void __init setup_mm(void) smp_processor_id()); /* Add xenheap memory that was not already added to the boot allocator. */ - init_xenheap_pages(mfn_to_maddr(xenheap_mfn_start), - mfn_to_maddr(xenheap_mfn_end)); + init_xenheap_pages(mfn_to_maddr(directmap_mfn_start), + mfn_to_maddr(directmap_mfn_end)); init_staticmem_pages(); } @@ -833,7 +833,7 @@ static void __init setup_mm(void) init_pdx(); /* - * We need some memory to allocate the page-tables used for the xenheap + * We need some memory to allocate the page-tables used for the directmap * mappings. But some regions may contain memory already allocated * for other uses (e.g. modules, reserved-memory...). * @@ -852,15 +852,15 @@ static void __init setup_mm(void) ram_start = min(ram_start, bank->start); ram_end = max(ram_end, bank_end); - setup_xenheap_mappings(PFN_DOWN(bank->start), - PFN_DOWN(bank->size)); + setup_directmap_mappings(PFN_DOWN(bank->start), + PFN_DOWN(bank->size)); } total_pages += ram_size >> PAGE_SHIFT; - xenheap_virt_end = XENHEAP_VIRT_START + ram_end - ram_start; - xenheap_mfn_start = maddr_to_mfn(ram_start); - xenheap_mfn_end = maddr_to_mfn(ram_end); + directmap_virt_end = XENHEAP_VIRT_START + ram_end - ram_start; + directmap_mfn_start = maddr_to_mfn(ram_start); + directmap_mfn_end = maddr_to_mfn(ram_end); setup_frametable_mappings(ram_start, ram_end); max_page = PFN_DOWN(ram_end); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 12:12:45 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 12:12:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404275.646684 (Exim 4.92) (envelope-from ) id 1oWcsH-0007j4-3O; Fri, 09 Sep 2022 12:12:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404275.646684; Fri, 09 Sep 2022 12:12: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 1oWcsH-0007iw-0l; Fri, 09 Sep 2022 12:12:45 +0000 Received: by outflank-mailman (input) for mailman id 404275; Fri, 09 Sep 2022 12:12:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcsF-0007ie-Ha for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcsF-00011o-Gn for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWcsF-0000Mc-G6 for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12: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=r9nXkvC2RKZhoh03R+gEtwBHhR77NJd4IFA9nsat77c=; b=E5cWVDhoZf43ADir6BXuQKpKMf 5vnHl+DcpBEGBSCVTwYdaEW4PkXOBMtjvKNpN/xsW083uFONehUy24cn7JnVjXWmBGV1SUs6q3m0X TLqFLyTbb86vdzoZ0xXJX7YGeNrWeEZZKbgf/75IkbH+mwQ66nQMKK/gwitIYJQGOa0g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Handle static heap pages in boot and heap allocator Message-Id: Date: Fri, 09 Sep 2022 12:12:43 +0000 commit f541464af3799c91534c48c2df55708662b78b88 Author: Henry Wang AuthorDate: Thu Sep 8 11:09:10 2022 +0000 Commit: Julien Grall CommitDate: Thu Sep 8 12:27:15 2022 +0100 xen/arm: Handle static heap pages in boot and heap allocator This commit firstly adds a bool field `static_heap` to bootinfo. This newly introduced field is set at the device tree parsing time if the static heap ranges are defined in the device tree chosen node. For Arm32, In `setup_mm`, if the static heap is enabled, we use the static heap region for both domheap and xenheap allocation. Note that the xenheap on Arm32 should be always contiguous, so also add a helper fit_xenheap_in_static_heap() for Arm32 to find the required xenheap in the static heap regions. For Arm64, In `setup_mm`, if the static heap is enabled and used, we make sure that only these static heap pages are added to the boot allocator. These static heap pages in the boot allocator are added to the heap allocator at `end_boot_allocator()`. If the static heap is disabled, we stick to current page allocation strategy at boot time. Also, take the chance to correct a "double not" print in Arm32 `setup_mm()` and replace the open-coding address ~0 by INVALID_PADDR. Signed-off-by: Henry Wang Reviewed-by: Julien Grall --- xen/arch/arm/bootfdt.c | 2 + xen/arch/arm/include/asm/setup.h | 1 + xen/arch/arm/setup.c | 118 ++++++++++++++++++++++++++++++++++----- 3 files changed, 107 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index c39aacbd60..9e1ea60094 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -313,6 +313,8 @@ static int __init process_chosen_node(const void *fdt, int node, MEMBANK_STATIC_HEAP); if ( rc ) return rc; + + bootinfo.static_heap = true; } printk("Checking for initrd in /chosen\n"); diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 94b7e74b4d..0651059537 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -97,6 +97,7 @@ struct bootinfo { #ifdef CONFIG_ACPI struct meminfo acpi; #endif + bool static_heap; }; struct map_range_data diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 6687572fca..61b4f258a0 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -556,6 +556,44 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, } return e; } + +/* + * Find a contiguous region that fits in the static heap region with + * required size and alignment, and return the end address of the region + * if found otherwise 0. + */ +static paddr_t __init fit_xenheap_in_static_heap(uint32_t size, paddr_t align) +{ + unsigned int i; + paddr_t end = 0, aligned_start, aligned_end; + paddr_t bank_start, bank_size, bank_end; + + for ( i = 0 ; i < bootinfo.reserved_mem.nr_banks; i++ ) + { + if ( bootinfo.reserved_mem.bank[i].type != MEMBANK_STATIC_HEAP ) + continue; + + bank_start = bootinfo.reserved_mem.bank[i].start; + bank_size = bootinfo.reserved_mem.bank[i].size; + bank_end = bank_start + bank_size; + + if ( bank_size < size ) + continue; + + aligned_end = bank_end & ~(align - 1); + aligned_start = (aligned_end - size) & ~(align - 1); + + if ( aligned_start > bank_start ) + /* + * Allocate the xenheap as high as possible to keep low-memory + * available (assuming the admin supplied region below 4GB) + * for other use (e.g. domain memory allocation). + */ + end = max(end, aligned_end); + } + + return end; +} #endif /* @@ -661,22 +699,51 @@ static void __init init_staticmem_pages(void) } /* - * Populate the boot allocator. All the RAM but the following regions - * will be added: + * Populate the boot allocator. + * If a static heap was not provided by the admin, all the RAM but the + * following regions will be added: * - Modules (e.g., Xen, Kernel) * - Reserved regions * - Xenheap (arm32 only) + * If a static heap was provided by the admin, populate the boot + * allocator with the corresponding regions only, but with Xenheap excluded + * on arm32. */ static void __init populate_boot_allocator(void) { unsigned int i; const struct meminfo *banks = &bootinfo.mem; + paddr_t s, e; + + if ( bootinfo.static_heap ) + { + for ( i = 0 ; i < bootinfo.reserved_mem.nr_banks; i++ ) + { + if ( bootinfo.reserved_mem.bank[i].type != MEMBANK_STATIC_HEAP ) + continue; + + s = bootinfo.reserved_mem.bank[i].start; + e = s + bootinfo.reserved_mem.bank[i].size; +#ifdef CONFIG_ARM_32 + /* Avoid the xenheap, note that the xenheap cannot across a bank */ + if ( s <= mfn_to_maddr(directmap_mfn_start) && + e >= mfn_to_maddr(directmap_mfn_end) ) + { + init_boot_pages(s, mfn_to_maddr(directmap_mfn_start)); + init_boot_pages(mfn_to_maddr(directmap_mfn_end), e); + } + else +#endif + init_boot_pages(s, e); + } + + return; + } for ( i = 0; i < banks->nr_banks; i++ ) { const struct membank *bank = &banks->bank[i]; paddr_t bank_end = bank->start + bank->size; - paddr_t s, e; s = bank->start; while ( s < bank_end ) @@ -714,8 +781,8 @@ static void __init populate_boot_allocator(void) #ifdef CONFIG_ARM_32 static void __init setup_mm(void) { - paddr_t ram_start, ram_end, ram_size, e; - unsigned long ram_pages; + paddr_t ram_start, ram_end, ram_size, e, bank_start, bank_end, bank_size; + paddr_t static_heap_end = 0, static_heap_size = 0; unsigned long heap_pages, xenheap_pages, domheap_pages; unsigned int i; const uint32_t ctr = READ_CP32(CTR); @@ -735,30 +802,51 @@ static void __init setup_mm(void) for ( i = 1; i < bootinfo.mem.nr_banks; i++ ) { - paddr_t bank_start = bootinfo.mem.bank[i].start; - paddr_t bank_size = bootinfo.mem.bank[i].size; - paddr_t bank_end = bank_start + bank_size; + bank_start = bootinfo.mem.bank[i].start; + bank_size = bootinfo.mem.bank[i].size; + bank_end = bank_start + bank_size; ram_size = ram_size + bank_size; ram_start = min(ram_start,bank_start); ram_end = max(ram_end,bank_end); } - total_pages = ram_pages = ram_size >> PAGE_SHIFT; + total_pages = ram_size >> PAGE_SHIFT; + + if ( bootinfo.static_heap ) + { + for ( i = 0 ; i < bootinfo.reserved_mem.nr_banks; i++ ) + { + if ( bootinfo.reserved_mem.bank[i].type != MEMBANK_STATIC_HEAP ) + continue; + + bank_start = bootinfo.reserved_mem.bank[i].start; + bank_size = bootinfo.reserved_mem.bank[i].size; + bank_end = bank_start + bank_size; + + static_heap_size += bank_size; + static_heap_end = max(static_heap_end, bank_end); + } + + heap_pages = static_heap_size >> PAGE_SHIFT; + } + else + heap_pages = total_pages; /* * If the user has not requested otherwise via the command line * then locate the xenheap using these constraints: * + * - must be contiguous * - must be 32 MiB aligned * - must not include Xen itself or the boot modules - * - must be at most 1GB or 1/32 the total RAM in the system if less + * - must be at most 1GB or 1/32 the total RAM in the system (or static + heap if enabled) if less * - must be at least 32M * * We try to allocate the largest xenheap possible within these * constraints. */ - heap_pages = ram_pages; if ( opt_xenheap_megabytes ) xenheap_pages = opt_xenheap_megabytes << (20-PAGE_SHIFT); else @@ -770,7 +858,9 @@ static void __init setup_mm(void) do { - e = consider_modules(ram_start, ram_end, + e = bootinfo.static_heap ? + fit_xenheap_in_static_heap(pfn_to_paddr(xenheap_pages), MB(32)) : + consider_modules(ram_start, ram_end, pfn_to_paddr(xenheap_pages), 32<<20, 0); if ( e ) @@ -780,7 +870,7 @@ static void __init setup_mm(void) } while ( !opt_xenheap_megabytes && xenheap_pages > 32<<(20-PAGE_SHIFT) ); if ( ! e ) - panic("Not not enough space for xenheap\n"); + panic("Not enough space for xenheap\n"); domheap_pages = heap_pages - xenheap_pages; @@ -825,7 +915,7 @@ static void __init setup_mm(void) static void __init setup_mm(void) { const struct meminfo *banks = &bootinfo.mem; - paddr_t ram_start = ~0; + paddr_t ram_start = INVALID_PADDR; paddr_t ram_end = 0; paddr_t ram_size = 0; unsigned int i; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 12:12:55 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 12:12:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404276.646688 (Exim 4.92) (envelope-from ) id 1oWcsR-0007mF-5A; Fri, 09 Sep 2022 12:12:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404276.646688; Fri, 09 Sep 2022 12:12: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 1oWcsR-0007m6-2B; Fri, 09 Sep 2022 12:12:55 +0000 Received: by outflank-mailman (input) for mailman id 404276; Fri, 09 Sep 2022 12:12:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcsP-0007le-KK for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWcsP-00011z-Jb for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWcsP-0000NB-Ir for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 12:12: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=StURbNdvCw4t4erj1DZPL7cBEXt43jVw0V9xPJSYW0s=; b=XAOzpAWLWixqwwNEjAIUnX5GTk Fa0I2hWJhx9QB/GetXbV6M+fBTWWmpb7rKcsMXMDXW2Xyd+XsavCsExTYMXhE4XlrIz5t7ZjDJ9D3 Wrjz9JP8TwUyE+Ud/OBkYIT0r+WWWMAtyDfZjtWAaduAJuFL2NiN89DbMwJ5Ta7spIsg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: add migration stream extensions for new features Message-Id: Date: Fri, 09 Sep 2022 12:12:53 +0000 commit 6bc1c1aba01f663687d7d2b48ccdf8d9432d92cc Author: Juergen Gross AuthorDate: Thu Sep 8 10:15:52 2022 +0200 Commit: Julien Grall CommitDate: Thu Sep 8 12:28:54 2022 +0100 tools/xenstore: add migration stream extensions for new features Extend the definition of the Xenstore migration stream to cover new features: - per domain features - extended watches (watch depth) - per domain quota Some of those additions (per domain features and extended watches) require bumping the migration stream version to "2", as usage of those features will require to transport mandatory new information in the migration stream. One note regarding the GLOBAL_QUOTA_DATA record: the split of quota between global and per-domain ones is meant to support the possibility to pass on unknown quota settings for newly created domains to other Xenstore instances: Imagine Xenstore A knows about global quota g and domain quota d, while Xenstore B doesn't know both. Initially I'm running Xenstore A on a host, then I'm live-updating to B. B gets the information that g is global, and d is per-domain, but has no other idea what to do with the values of g and d. OTOH it knows that each new domain should get d with the related value, so it can set d for each newly created domain. When B is either downgraded to A again, or a domain is migrated to another host running A, B can add the quota information of d for all domains. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- docs/designs/xenstore-migration.md | 165 +++++++++++++++++++++++++++++++++++-- 1 file changed, 159 insertions(+), 6 deletions(-) diff --git a/docs/designs/xenstore-migration.md b/docs/designs/xenstore-migration.md index efa526f420..5022268386 100644 --- a/docs/designs/xenstore-migration.md +++ b/docs/designs/xenstore-migration.md @@ -43,7 +43,14 @@ the setting of the endianness bit. |-----------|---------------------------------------------------| | `ident` | 0x78656e73746f7265 ('xenstore' in ASCII) | | | | -| `version` | 0x00000001 (the version of the specification) | +| `version` | The version of the specification, defined values: | +| | 0x00000001: all fields and records without any | +| | explicitly mentioned version | +| | dependency are valid. | +| | 0x00000002: all fields and records valid for | +| | version 1 plus fields and records | +| | explicitly stated to be supported in | +| | version 2 are valid. | | | | | `flags` | 0 (LSB): Endianness: 0 = little, 1 = big | | | | @@ -65,8 +72,9 @@ Records immediately follow the header and have the following format: +-------+-------------------------------------------------------+ ``` -NOTE: padding octets here and in all subsequent format specifications must be - written as zero and should be ignored when the stream is read. +NOTE: padding octets or fields not valid in the used version here and in all + subsequent format specifications must be written as zero and should be + ignored when the stream is read. | Field | Description | @@ -77,7 +85,10 @@ NOTE: padding octets here and in all subsequent format specifications must be | | 0x00000003: WATCH_DATA | | | 0x00000004: TRANSACTION_DATA | | | 0x00000005: NODE_DATA | -| | 0x00000006 - 0xFFFFFFFF: reserved for future use | +| | 0x00000006: GLOBAL_QUOTA_DATA | +| | 0x00000007: DOMAIN_DATA | +| | 0x00000008: WATCH_DATA_EXTENDED (version 2 and up) | +| | 0x00000009 - 0xFFFFFFFF: reserved for future use | | | | | `len` | The length (in octets) of `body` | | | | @@ -241,9 +252,49 @@ the file descriptor of the socket connection. ### WATCH_DATA -The image format will contain a `WATCH_DATA` record for each watch registered -by a connection for which there is `CONNECTION_DATA` record previously present. +The image format will contain either a `WATCH_DATA` or a `WATCH_DATA_EXTENDED` +record for each watch registered by a connection for which there is +`CONNECTION_DATA` record previously present. +``` + 0 1 2 3 octet ++-------+-------+-------+-------+ +| conn-id | ++---------------+---------------+ +| wpath-len | token-len | ++---------------+---------------+ +| wpath +... +| token +... +``` + + +| Field | Description | +|-------------|-------------------------------------------------| +| `conn-id` | The connection that issued the `WATCH` | +| | operation [2] | +| | | +| `wpath-len` | The length (in octets) of `wpath` including the | +| | NUL terminator | +| | | +| `token-len` | The length (in octets) of `token` including the | +| | NUL terminator | +| | | +| `wpath` | The watch path, as specified in the `WATCH` | +| | operation | +| | | +| `token` | The watch identifier token, as specified in the | +| | `WATCH` operation | + +\pagebreak + +### WATCH_DATA_EXTENDED + +The image format will contain either a `WATCH_DATA` or a `WATCH_DATA_EXTENDED` +record for each watch registered by a connection for which there is +`CONNECTION_DATA` record previously present. The `WATCH_DATA_EXTENDED` record +type is valid only in version 2 and later. ``` 0 1 2 3 octet @@ -252,6 +303,8 @@ by a connection for which there is `CONNECTION_DATA` record previously present. +---------------+---------------+ | wpath-len | token-len | +---------------+---------------+ +| depth | pad | ++---------------+---------------+ | wpath ... | token @@ -270,6 +323,10 @@ by a connection for which there is `CONNECTION_DATA` record previously present. | `token-len` | The length (in octets) of `token` including the | | | NUL terminator | | | | +| `depth` | The number of directory levels below the | +| | watched path to consider for a match. | +| | A value of 0xffff is used for unlimited depth. | +| | | | `wpath` | The watch path, as specified in the `WATCH` | | | operation | | | | @@ -406,6 +463,102 @@ A node permission specifier has the following format: Note that perm1 defines the domain owning the node. See [4] for more explanation of node permissions. +\pagebreak + +### GLOBAL_QUOTA_DATA + +This record is only relevant for live update. It contains the global settings +of xenstored quota. + +``` + 0 1 2 3 octet ++-------+-------+-------+-------+ +| n-dom-quota | n-glob-quota | ++---------------+---------------+ +| quota-val 1 | ++-------------------------------+ +... ++-------------------------------+ +| quota-val N | ++-------------------------------+ +| quota-names +... +``` + + +| Field | Description | +|----------------|----------------------------------------------| +| `n-dom-quota` | Number of quota values which apply per | +| | domain by default. | +| | | +| `n-glob-quota` | Number of quota values which apply globally | +| | only. | +| | | +| `quota-val` | Quota values, first the ones applying per | +| | domain, then the ones applying globally. A | +| | value of 0 has the semantics of "unlimited". | +| | | +| `quota-names` | 0 delimited strings of the quota names in | +| | the same sequence as the `quota-val` values. | + + +Allowed quota names are those explicitly named in [2] for the `GET_QUOTA` +and `SET_QUOTA` commands, plus implementation specific ones. Quota names not +recognized by the receiving side should not have any effect on behavior for +the receiving side (they can be ignored or preserved for inclusion in +future live migration/update streams). + +\pagebreak + +### DOMAIN_DATA + +This record is optional and can be present once for each domain. + + +``` + 0 1 2 3 octet ++-------+-------+-------+-------+ +| domain-id | n-quota | ++---------------+---------------+ +| features | ++-------------------------------+ +| quota-val 1 | ++-------------------------------+ +... ++-------------------------------+ +| quota-val N | ++-------------------------------+ +| quota-names +... +``` + + +| Field | Description | +|----------------|----------------------------------------------| +| `domain-id` | The domain-id of the domain this record | +| | belongs to. | +| | | +| `n-quota` | Number of quota values. | +| | | +| `features` | Value of the feature field visible by the | +| | guest at offset 2064 of the ring page. | +| | Only valid for version 2 and later. | +| | | +| `quota-val` | Quota values, a value of 0 has the semantics | +| | "unlimited". | +| | | +| `quota-names` | 0 delimited strings of the quota names in | +| | the same sequence as the `quota-val` values. | + +Allowed quota names are those explicitly named in [2] for the `GET_QUOTA` +and `SET_QUOTA` commands, plus implementation specific ones. Quota names not +recognized by the receiving side should not have any effect on behavior for +the receiving side (they can be ignored or preserved for inclusion in +future live migration/update streams). + +\pagebreak + + * * * [1] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/designs/non-cooperative-migration.md -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 15:33:10 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 15:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404469.646948 (Exim 4.92) (envelope-from ) id 1oWg09-0004Xd-Fb; Fri, 09 Sep 2022 15:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404469.646948; Fri, 09 Sep 2022 15:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWg09-0004XV-Ct; Fri, 09 Sep 2022 15:33:05 +0000 Received: by outflank-mailman (input) for mailman id 404469; Fri, 09 Sep 2022 15:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWg08-0004XB-K1 for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 15:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWg08-0004tG-HO for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 15:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWg08-0001zz-GL for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 15:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XzDE/bz+/mb+KnxEQYIbVDfDkGyN5OWJdgYuHbCu4Gg=; b=63t2W4F6kc10ySdeUYbvpos27M IJW6yLxzxzIRh2o0whf9ME3orKG/IbtRVdUbe+gbO/sJpgMbvuHat1Hxlet+HHFvJLBoHwRQssCiA lDKg1UG3r03HNknxlki2qOVl6Khtt2YdY7GtFG8NIx3ZN2dWxAtRiHO3+YRJ+NllhO/o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/gnttab: fix gnttab_acquire_resource() Message-Id: Date: Fri, 09 Sep 2022 15:33:04 +0000 commit 52daa6a8483e4fbd6757c9d1b791e23931791608 Author: Juergen Gross AuthorDate: Fri Sep 9 14:53:47 2022 +0200 Commit: Andrew Cooper CommitDate: Fri Sep 9 16:28:38 2022 +0100 xen/gnttab: fix gnttab_acquire_resource() Commit 9dc46386d89d ("gnttab: work around "may be used uninitialized" warning") was wrong, as vaddrs can legitimately be NULL in case XENMEM_resource_grant_table_id_status was specified for a grant table v1. This would result in crashes in debug builds due to ASSERT_UNREACHABLE() triggering. Check vaddrs only to be NULL in the rc == 0 case. Expand the tests in tools/tests/resource to tickle this path, and verify that using XENMEM_resource_grant_table_id_status on a v1 grant table fails. Fixes: 9dc46386d89d ("gnttab: work around "may be used uninitialized" warning") Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich # xen Reviewed-by: Andrew Cooper Release-acked-by: Henry Wang --- tools/tests/resource/test-resource.c | 15 +++++++++++++++ xen/common/grant_table.c | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/tests/resource/test-resource.c b/tools/tests/resource/test-resource.c index 189353ebcb..0a950072f9 100644 --- a/tools/tests/resource/test-resource.c +++ b/tools/tests/resource/test-resource.c @@ -106,6 +106,21 @@ static void test_gnttab(uint32_t domid, unsigned int nr_frames, if ( rc ) return fail(" Fail: Unmap grant table %d - %s\n", errno, strerror(errno)); + + /* + * Verify that an attempt to map the status frames fails, as the domain is + * in gnttab v1 mode. + */ + res = xenforeignmemory_map_resource( + fh, domid, XENMEM_resource_grant_table, + XENMEM_resource_grant_table_id_status, 0, 1, + (void **)&gnttab, PROT_READ | PROT_WRITE, 0); + + if ( res ) + { + fail(" Fail: Managed to map gnttab v2 status frames in v1 mode\n"); + xenforeignmemory_unmap_resource(fh, res); + } } static void test_domain_configurations(void) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index ad773a6996..fba329dcc2 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -4140,7 +4140,7 @@ int gnttab_acquire_resource( * on non-error paths, and hence it needs setting to NULL at the top of the * function. Leave some runtime safety. */ - if ( !vaddrs ) + if ( !rc && !vaddrs ) { ASSERT_UNREACHABLE(); rc = -ENODATA; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 20:55:11 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 20:55:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404555.647062 (Exim 4.92) (envelope-from ) id 1oWl1m-0008AT-CF; Fri, 09 Sep 2022 20:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404555.647062; Fri, 09 Sep 2022 20:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl1m-0008AL-9e; Fri, 09 Sep 2022 20:55:06 +0000 Received: by outflank-mailman (input) for mailman id 404555; Fri, 09 Sep 2022 20:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl1k-0008AF-RF for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl1k-0002oq-PR for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWl1k-00052u-OL for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PxIWO3ygZAiJFhhRFoelCJHCfaMgQQbTfhHUljWJsyo=; b=MbfVKzvyqRxw0Al1R/BV+uokgJ 2TXhutogZtpFq9/X2fZuCS4AbK6LnDBWqg0s3q0oI9H8lSSQzrr0Q5thx+klQw0ehTUKybtcAKlUg sr2oPfIk8pNKHdWAuGOmYyXMuli3i61pX4fYc9ZykA1SFYjTBpRFUukS9RCjXcJAiefM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: introduce static shared memory Message-Id: Date: Fri, 09 Sep 2022 20:55:04 +0000 commit 1d98281adf41abc7cf4c30f48349577dc42aa6c0 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:05 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:57:57 2022 -0700 xen/arm: introduce static shared memory This patch series introduces a new feature: setting up static shared memory on a dom0less system, through device tree configuration. This commit parses shared memory node at boot-time, and reserve it in bootinfo.reserved_mem to avoid other use. This commits proposes a new Kconfig CONFIG_STATIC_SHM to wrap static-shm-related codes, and this option depends on static memory( CONFIG_STATIC_MEMORY). That's because that later we want to reuse a few helpers, guarded with CONFIG_STATIC_MEMORY, like acquire_staticmem_pages, etc, on static shared memory. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 132 +++++++++++++++++++++++++++ xen/arch/arm/Kconfig | 6 ++ xen/arch/arm/bootfdt.c | 167 ++++++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/setup.h | 7 ++ 4 files changed, 312 insertions(+) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 93bf6fe577..12c5e1d189 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -523,3 +523,135 @@ Below is an example on how to specify the static heap in device tree: RAM starting from the host physical address 0x30000000 of 1GB size will be reserved as static heap. + +Static Shared Memory +==================== + +The static shared memory device tree nodes allow users to statically set up +shared memory on dom0less system, enabling domains to do shm-based +communication. + +- compatible + + "xen,domain-shared-memory-v1" + +- xen,shm-id + + An arbitrary string that represents the unique identifier of the shared + memory region, with a strict limit on the number of characters(\0 included), + `MAX_SHM_ID_LENGTH(16)`. e.g. "xen,shm-id = "my-shared-mem-1"". + +- xen,shared-mem + + An array takes a physical address, which is the base address of the + shared memory region in host physical address space, a size, and a guest + physical address, as the target address of the mapping. + e.g. xen,shared-mem = < [host physical address] [guest address] [size] > + + It shall also meet the following criteria: + 1) If the SHM ID matches with an existing region, the address range of the + region shall also exactly match. + 2) If the SHM ID does not match with any other existing region, it should + also not overlap with any other regions. + + The number of cells for the host address (and size) is the same as the + guest pseudo-physical address and they are inherited from the parent node. + + Host physical address is optional, when missing Xen decides the location + (currently unimplemented). + +- role (Optional) + + A string property specifying the ownership of a shared memory region, + the value must be one of the following: "owner", or "borrower" + A shared memory region could be explicitly backed by one domain, which is + called "owner domain", and all the other domains who are also sharing + this region are called "borrower domain". + If not specified, the default value is "borrower" and owner is + DOMID_IO, a system domain. + +As an example: + +chosen { + #address-cells = <0x1>; + #size-cells = <0x1>; + xen,xen-bootargs = "console=dtuart dtuart=serial0 bootscrub=0"; + + ...... + + /* this is for Dom0 */ + dom0-shared-mem@10000000 { + compatible = "xen,domain-shared-memory-v1"; + role = "owner"; + xen,shm-id = "my-shared-mem-0"; + xen,shared-mem = <0x10000000 0x10000000 0x10000000>; + } + + domU1 { + compatible = "xen,domain"; + #address-cells = <0x1>; + #size-cells = <0x1>; + memory = <0 131072>; + cpus = <2>; + vpl011; + + /* + * shared memory region identified as 0x0(xen,shm-id = <0x0>) + * is shared between Dom0 and DomU1. + */ + domU1-shared-mem@10000000 { + compatible = "xen,domain-shared-memory-v1"; + role = "borrower"; + xen,shm-id = "my-shared-mem-0"; + xen,shared-mem = <0x10000000 0x50000000 0x10000000>; + } + + /* + * shared memory region identified as 0x1(xen,shm-id = <0x1>) + * is shared between DomU1 and DomU2. + */ + domU1-shared-mem@50000000 { + compatible = "xen,domain-shared-memory-v1"; + xen,shm-id = "my-shared-mem-1"; + xen,shared-mem = <0x50000000 0x60000000 0x20000000>; + } + + ...... + + }; + + domU2 { + compatible = "xen,domain"; + #address-cells = <0x1>; + #size-cells = <0x1>; + memory = <0 65536>; + cpus = <1>; + + /* + * shared memory region identified as 0x1(xen,shm-id = <0x1>) + * is shared between domU1 and domU2. + */ + domU2-shared-mem@50000000 { + compatible = "xen,domain-shared-memory-v1"; + xen,shm-id = "my-shared-mem-1"; + xen,shared-mem = <0x50000000 0x70000000 0x20000000>; + } + + ...... + }; +}; + +This is an example with two static shared memory regions. + +For the static shared memory region identified as "my-shared-mem-0", host +physical address starting at 0x10000000 of 256MB will be reserved to be +shared between Dom0 and DomU1. It will get mapped at 0x10000000 in Dom0 guest +physical address space, and at 0x50000000 in DomU1 guest physical address space. +Dom0 is explicitly defined as the owner domain, and DomU1 is the borrower domain. + +For the static shared memory region identified as "my-shared-mem-1", host +physical address starting at 0x50000000 of 512MB will be reserved to be +shared between DomU1 and DomU2. It will get mapped at 0x60000000 in DomU1 guest +physical address space, and at 0x70000000 in DomU2 guest physical address space. +DomU1 and DomU2 are both the borrower domain, the owner domain is the default +owner domain DOMID_IO. diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 33e004d702..1fe5faf847 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -140,6 +140,12 @@ config TEE source "arch/arm/tee/Kconfig" +config STATIC_SHM + bool "Statically shared memory on a dom0less system" if UNSUPPORTED + depends on STATIC_MEMORY + help + This option enables statically shared memory on a dom0less system. + endmenu menu "ARM errata workaround via the alternative framework" diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index 9e1ea60094..f8b88ee3da 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -380,6 +381,170 @@ static int __init process_domain_node(const void *fdt, int node, MEMBANK_STATIC_DOMAIN); } +#ifdef CONFIG_STATIC_SHM +static int __init process_shm_node(const void *fdt, int node, + uint32_t address_cells, uint32_t size_cells) +{ + const struct fdt_property *prop, *prop_id, *prop_role; + const __be32 *cell; + paddr_t paddr, gaddr, size; + struct meminfo *mem = &bootinfo.reserved_mem; + unsigned int i; + int len; + bool owner = false; + const char *shm_id; + + if ( address_cells < 1 || size_cells < 1 ) + { + printk("fdt: invalid #address-cells or #size-cells for static shared memory node.\n"); + return -EINVAL; + } + + /* + * "xen,shm-id" property holds an arbitrary string with a strict limit + * on the number of characters, MAX_SHM_ID_LENGTH + */ + prop_id = fdt_get_property(fdt, node, "xen,shm-id", NULL); + if ( !prop_id ) + return -ENOENT; + shm_id = (const char *)prop_id->data; + if ( strnlen(shm_id, MAX_SHM_ID_LENGTH) == MAX_SHM_ID_LENGTH ) + { + printk("fdt: invalid xen,shm-id %s, it must be limited to %u characters\n", + shm_id, MAX_SHM_ID_LENGTH); + return -EINVAL; + } + + /* + * "role" property is optional and if it is defined explicitly, + * it must be either `owner` or `borrower`. + */ + prop_role = fdt_get_property(fdt, node, "role", NULL); + if ( prop_role ) + { + if ( !strcmp(prop_role->data, "owner") ) + owner = true; + else if ( strcmp(prop_role->data, "borrower") ) + { + printk("fdt: invalid `role` property for static shared memory node.\n"); + return -EINVAL; + } + } + + /* + * xen,shared-mem = ; + * Memory region starting from physical address #paddr of #size shall + * be mapped to guest physical address #gaddr as static shared memory + * region. + */ + prop = fdt_get_property(fdt, node, "xen,shared-mem", &len); + if ( !prop ) + return -ENOENT; + + if ( len != dt_cells_to_size(address_cells + size_cells + address_cells) ) + { + if ( len == dt_cells_to_size(size_cells + address_cells) ) + printk("fdt: host physical address must be chosen by users at the moment.\n"); + + printk("fdt: invalid `xen,shared-mem` property.\n"); + return -EINVAL; + } + + cell = (const __be32 *)prop->data; + device_tree_get_reg(&cell, address_cells, address_cells, &paddr, &gaddr); + size = dt_next_cell(size_cells, &cell); + + if ( !size ) + { + printk("fdt: the size for static shared memory region can not be zero\n"); + return -EINVAL; + } + + for ( i = 0; i < mem->nr_banks; i++ ) + { + /* + * Meet the following check: + * 1) The shm ID matches and the region exactly match + * 2) The shm ID doesn't match and the region doesn't overlap + * with an existing one + */ + if ( paddr == mem->bank[i].start && size == mem->bank[i].size ) + { + if ( strncmp(shm_id, mem->bank[i].shm_id, MAX_SHM_ID_LENGTH) == 0 ) + break; + else + { + printk("fdt: xen,shm-id %s does not match for all the nodes using the same region.\n", + shm_id); + return -EINVAL; + } + } + else + { + paddr_t end = paddr + size; + paddr_t bank_end = mem->bank[i].start + mem->bank[i].size; + + if ( (end <= paddr) || (bank_end <= mem->bank[i].start) ) + { + printk("fdt: static shared memory region %s overflow\n", shm_id); + return -EINVAL; + } + + if ( (end <= mem->bank[i].start) || (paddr >= bank_end) ) + { + if ( strcmp(shm_id, mem->bank[i].shm_id) != 0 ) + continue; + else + { + printk("fdt: different shared memory region could not share the same shm ID %s\n", + shm_id); + return -EINVAL; + } + } + else + { + printk("fdt: shared memory region overlap with an existing entry %#"PRIpaddr" - %#"PRIpaddr"\n", + mem->bank[i].start, bank_end); + return -EINVAL; + } + } + } + + if ( i == mem->nr_banks ) + { + if ( i < NR_MEM_BANKS ) + { + /* Static shared memory shall be reserved from any other use. */ + safe_strcpy(mem->bank[mem->nr_banks].shm_id, shm_id); + mem->bank[mem->nr_banks].start = paddr; + mem->bank[mem->nr_banks].size = size; + mem->bank[mem->nr_banks].type = MEMBANK_STATIC_DOMAIN; + mem->nr_banks++; + } + else + { + printk("Warning: Max number of supported memory regions reached.\n"); + return -ENOSPC; + } + } + /* + * keep a count of the number of borrowers, which later may be used + * to calculate the reference count. + */ + if ( !owner ) + mem->bank[i].nr_shm_borrowers++; + + return 0; +} +#else +static int __init process_shm_node(const void *fdt, int node, + uint32_t address_cells, uint32_t size_cells) +{ + printk("CONFIG_STATIC_SHM must be enabled for parsing static shared memory nodes\n"); + return -EINVAL; +} +#endif + static int __init early_scan_node(const void *fdt, int node, const char *name, int depth, u32 address_cells, u32 size_cells, @@ -405,6 +570,8 @@ static int __init early_scan_node(const void *fdt, rc = process_chosen_node(fdt, node, name, address_cells, size_cells); else if ( depth == 2 && device_tree_node_compatible(fdt, node, "xen,domain") ) rc = process_domain_node(fdt, node, name, address_cells, size_cells); + else if ( depth <= 3 && device_tree_node_compatible(fdt, node, "xen,domain-shared-memory-v1") ) + rc = process_shm_node(fdt, node, address_cells, size_cells); if ( rc < 0 ) printk("fdt: node `%s': parsing failed\n", name); diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 0651059537..fdbf68aadc 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -43,10 +43,17 @@ enum membank_type { MEMBANK_STATIC_HEAP, }; +/* Indicates the maximum number of characters(\0 included) for shm_id */ +#define MAX_SHM_ID_LENGTH 16 + struct membank { paddr_t start; paddr_t size; enum membank_type type; +#ifdef CONFIG_STATIC_SHM + char shm_id[MAX_SHM_ID_LENGTH]; + unsigned int nr_shm_borrowers; +#endif }; struct meminfo { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 20:55:16 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 20:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404556.647065 (Exim 4.92) (envelope-from ) id 1oWl1w-0008CO-E2; Fri, 09 Sep 2022 20:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404556.647065; Fri, 09 Sep 2022 20:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl1w-0008CG-BA; Fri, 09 Sep 2022 20:55:16 +0000 Received: by outflank-mailman (input) for mailman id 404556; Fri, 09 Sep 2022 20:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl1u-0008C3-TO for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl1u-0002pF-SZ for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWl1u-00053p-Ri for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=G8XTvK/VJ3gsUTZFB6RuMO8YJ53EPKv+Cqsf6v9ApWA=; b=zUCdx+TmxQNeqWKArZbuNotQOj fF9jW6FvwvLPOcV8SkUkEdxIHa8t9LuUJtIasTEeMVSG+VHBmKYuDgZm0ZO0KC0AJ/NOfTucikwqV rU18rYs5aflHW9KvyWxA1ntV9FSBcNsEfAr1ZRm7zxb0CU/bJgn43iiBJNGds1hnN2dA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: assign static shared memory to the default owner dom_io Message-Id: Date: Fri, 09 Sep 2022 20:55:14 +0000 commit 5597f32f409c789199749b82585b96fef6969d21 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:06 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:57:58 2022 -0700 xen/arm: assign static shared memory to the default owner dom_io This commit introduces process_shm to cope with static shared memory in domain construction. DOMID_IO will be the default owner of memory pre-shared among multiple domains at boot time, when no explicit owner is specified. And DOMID_IO is a fake domain and is not described in the Device-Tree. Therefore When the owner of the shared region is DOMID_IO, we will only find the borrowers when parsing the Device-Tree. When we found the first borrower of the region, we need to assign the region to DOMID_IO This commit only considers allocating static shared memory to dom_io when owner domain is not explicitly defined in device tree, all the left, including the "borrower" code path, the "explicit owner" code path, shall be introduced later in the following patches. Signed-off-by: Penny Zheng Reviewed-by: Julien Grall --- xen/arch/arm/domain_build.c | 160 ++++++++++++++++++++++++++++++++++++++++++++ xen/common/domain.c | 3 + 2 files changed, 163 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 7412303d20..4746155211 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -761,6 +761,160 @@ static void __init assign_static_memory_11(struct domain *d, panic("Failed to assign requested static memory for direct-map domain %pd.", d); } + +#ifdef CONFIG_STATIC_SHM +/* + * This function checks whether the static shared memory region is + * already allocated to dom_io. + */ +static bool __init is_shm_allocated_to_domio(paddr_t pbase) +{ + struct page_info *page; + struct domain *d; + + page = maddr_to_page(pbase); + d = page_get_owner_and_reference(page); + if ( d == NULL ) + return false; + put_page(page); + + if ( d != dom_io ) + { + printk(XENLOG_ERR + "shm memory node has already been allocated to a specific owner %pd, Please check your configuration\n", + d); + return false; + } + + return true; +} + +static mfn_t __init acquire_shared_memory_bank(struct domain *d, + paddr_t pbase, paddr_t psize) +{ + mfn_t smfn; + unsigned long nr_pfns; + int res; + + /* + * Pages of statically shared memory shall be included + * into domain_tot_pages(). + */ + nr_pfns = PFN_DOWN(psize); + if ( (UINT_MAX - d->max_pages) < nr_pfns ) + { + printk(XENLOG_ERR "%pd: Over-allocation for d->max_pages: %lu.\n", + d, nr_pfns); + return INVALID_MFN; + } + d->max_pages += nr_pfns; + + smfn = maddr_to_mfn(pbase); + res = acquire_domstatic_pages(d, smfn, nr_pfns, 0); + if ( res ) + { + printk(XENLOG_ERR + "%pd: failed to acquire static memory: %d.\n", d, res); + d->max_pages -= nr_pfns; + return INVALID_MFN; + } + + return smfn; +} + +static int __init assign_shared_memory(struct domain *d, + uint32_t addr_cells, uint32_t size_cells, + paddr_t pbase, paddr_t psize) +{ + mfn_t smfn; + + dprintk(XENLOG_INFO, + "%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpaddr".\n", + d, pbase, pbase + psize); + + smfn = acquire_shared_memory_bank(d, pbase, psize); + if ( mfn_eq(smfn, INVALID_MFN) ) + return -EINVAL; + + /* + * DOMID_IO is not auto-translated (i.e. it sees RAM 1:1). So we do not need + * to create mapping in the P2M. + */ + ASSERT(d == dom_io); + return 0; +} + +static int __init process_shm(struct domain *d, + const struct dt_device_node *node) +{ + struct dt_device_node *shm_node; + + dt_for_each_child_node(node, shm_node) + { + const struct dt_property *prop; + const __be32 *cells; + uint32_t addr_cells, size_cells; + paddr_t gbase, pbase, psize; + int ret = 0; + unsigned int i; + + if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) + continue; + + /* + * xen,shared-mem = ; + * TODO: pbase is optional. + */ + addr_cells = dt_n_addr_cells(shm_node); + size_cells = dt_n_size_cells(shm_node); + prop = dt_find_property(shm_node, "xen,shared-mem", NULL); + BUG_ON(!prop); + cells = (const __be32 *)prop->value; + device_tree_get_reg(&cells, addr_cells, addr_cells, &pbase, &gbase); + psize = dt_read_number(cells, size_cells); + if ( !IS_ALIGNED(pbase, PAGE_SIZE) || !IS_ALIGNED(gbase, PAGE_SIZE) ) + { + printk("%pd: physical address 0x%"PRIpaddr", or guest address 0x%"PRIpaddr" is not suitably aligned.\n", + d, pbase, gbase); + return -EINVAL; + } + if ( !IS_ALIGNED(psize, PAGE_SIZE) ) + { + printk("%pd: size 0x%"PRIpaddr" is not suitably aligned\n", + d, psize); + return -EINVAL; + } + + for ( i = 0; i < PFN_DOWN(psize); i++ ) + if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) + { + printk("%pd: invalid physical address 0x%"PRI_mfn"\n", + d, mfn_x(mfn_add(maddr_to_mfn(pbase), i))); + return -EINVAL; + } + + /* TODO: Consider owner domain is not the default dom_io. */ + /* + * DOMID_IO is a fake domain and is not described in the Device-Tree. + * Therefore when the owner of the shared region is DOMID_IO, we will + * only find the borrowers. + */ + if ( !is_shm_allocated_to_domio(pbase) ) + { + /* + * We found the first borrower of the region, the owner was not + * specified, so they should be assigned to dom_io. + */ + ret = assign_shared_memory(dom_io, addr_cells, size_cells, + pbase, psize); + if ( ret ) + return ret; + } + } + + return 0; +} +#endif /* CONFIG_STATIC_SHM */ #else static void __init allocate_static_memory(struct domain *d, struct kernel_info *kinfo, @@ -3386,6 +3540,12 @@ static int __init construct_domU(struct domain *d, else assign_static_memory_11(d, &kinfo, node); +#ifdef CONFIG_STATIC_SHM + rc = process_shm(d, node); + if ( rc < 0 ) + return rc; +#endif + /* * Base address and irq number are needed when creating vpl011 device * tree node in prepare_dtb_domU, so initialization on related variables diff --git a/xen/common/domain.c b/xen/common/domain.c index c23f449451..8dd6cd5a8f 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -787,6 +787,9 @@ void __init setup_system_domains(void) * This domain owns I/O pages that are within the range of the page_info * array. Mappings occur at the priv of the caller. * Quarantined PCI devices will be associated with this domain. + * + * DOMID_IO is also the default owner of memory pre-shared among multiple + * domains at boot time. */ dom_io = domain_create(DOMID_IO, NULL, 0); if ( IS_ERR(dom_io) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 20:55:25 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 20:55:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404557.647070 (Exim 4.92) (envelope-from ) id 1oWl25-0008FU-Hz; Fri, 09 Sep 2022 20:55:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404557.647070; Fri, 09 Sep 2022 20:55: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 1oWl25-0008FM-F5; Fri, 09 Sep 2022 20:55:25 +0000 Received: by outflank-mailman (input) for mailman id 404557; Fri, 09 Sep 2022 20:55:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl25-0008FF-0N for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl24-0002pX-Vs for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWl24-00054K-Un for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55: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=Txmjnj0FKLvO4/1lEtSjpeQy1W5paGds3jStVWmBvnE=; b=TxqQOdTbK71Cin+Fxq4qNyMbzG P0247b7ikmp+TxHGCD/9IZ0eIiguG2S9E9wviXcVjwil/zbaY/4R6uF25rlpY9cmK+yVX70dP1bgX YqHJhkpuvXW6wPth5WnZbFUb2M5WupL5XWt6tgb/ErkfpX82ku2nU9RbI/UO0cnB35IM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: allocate static shared memory to a specific owner domain Message-Id: Date: Fri, 09 Sep 2022 20:55:24 +0000 commit 83d55ba81783f9fd4f2a4c37e11bd6e89f858a36 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:07 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:57:58 2022 -0700 xen/arm: allocate static shared memory to a specific owner domain If owner property is defined, then owner domain of a static shared memory region is not the default dom_io anymore, but a specific domain. This commit implements allocating static shared memory to a specific domain when owner property is defined. Coding flow for dealing borrower domain will be introduced later in the following commits. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4746155211..c6c6c942d8 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -824,9 +824,11 @@ static mfn_t __init acquire_shared_memory_bank(struct domain *d, static int __init assign_shared_memory(struct domain *d, uint32_t addr_cells, uint32_t size_cells, - paddr_t pbase, paddr_t psize) + paddr_t pbase, paddr_t psize, + paddr_t gbase) { mfn_t smfn; + int ret = 0; dprintk(XENLOG_INFO, "%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpaddr".\n", @@ -840,8 +842,18 @@ static int __init assign_shared_memory(struct domain *d, * DOMID_IO is not auto-translated (i.e. it sees RAM 1:1). So we do not need * to create mapping in the P2M. */ - ASSERT(d == dom_io); - return 0; + if ( d != dom_io ) + { + ret = guest_physmap_add_pages(d, gaddr_to_gfn(gbase), smfn, + PFN_DOWN(psize)); + if ( ret ) + { + printk(XENLOG_ERR "Failed to map shared memory to %pd.\n", d); + return ret; + } + } + + return ret; } static int __init process_shm(struct domain *d, @@ -857,6 +869,8 @@ static int __init process_shm(struct domain *d, paddr_t gbase, pbase, psize; int ret = 0; unsigned int i; + const char *role_str; + bool owner_dom_io = true; if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) continue; @@ -893,20 +907,28 @@ static int __init process_shm(struct domain *d, return -EINVAL; } - /* TODO: Consider owner domain is not the default dom_io. */ + /* + * "role" property is optional and if it is defined explicitly, + * then the owner domain is not the default "dom_io" domain. + */ + if ( dt_property_read_string(shm_node, "role", &role_str) == 0 ) + owner_dom_io = false; + /* * DOMID_IO is a fake domain and is not described in the Device-Tree. * Therefore when the owner of the shared region is DOMID_IO, we will * only find the borrowers. */ - if ( !is_shm_allocated_to_domio(pbase) ) + if ( (owner_dom_io && !is_shm_allocated_to_domio(pbase)) || + (!owner_dom_io && strcmp(role_str, "owner") == 0) ) { /* * We found the first borrower of the region, the owner was not * specified, so they should be assigned to dom_io. */ - ret = assign_shared_memory(dom_io, addr_cells, size_cells, - pbase, psize); + ret = assign_shared_memory(owner_dom_io ? dom_io : d, + addr_cells, size_cells, + pbase, psize, gbase); if ( ret ) return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 20:55:35 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 20:55:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404558.647073 (Exim 4.92) (envelope-from ) id 1oWl2F-0008I3-JF; Fri, 09 Sep 2022 20:55:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404558.647073; Fri, 09 Sep 2022 20:55: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 1oWl2F-0008Hw-Gl; Fri, 09 Sep 2022 20:55:35 +0000 Received: by outflank-mailman (input) for mailman id 404558; Fri, 09 Sep 2022 20:55:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl2F-0008Hq-3C for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl2F-0002ph-2Z for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWl2F-00054n-1h for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qjMSdMMv7rzfw9PVcSpRoWodKBdzoj2u9PKWVC1vONM=; b=jvGD8MsMnmm6CkCyHlwmb5Yb6Z jx/ew6LEB3uh+Mhp4g3tMDBBWePA3SsIWXk0U9wcwtBuQI2+ABYIWjQFcElmoyBD4WoAUVGv2lium 35660sJUW8l8UI2N5wC/MRZ6+awUZWH5BP5XbY9a1GHpunS0/DUCN8A7aqcnb6w0VPcM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: introduce put_page_nr and get_page_nr Message-Id: Date: Fri, 09 Sep 2022 20:55:35 +0000 commit 5951b856d8d0af57212b54f2afbb404b7579bd27 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:08 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:57:59 2022 -0700 xen/arm: introduce put_page_nr and get_page_nr Later, we need to add the right amount of references, which should be the number of borrower domains, to the owner domain. Since we only have get_page() to increment the page reference by 1, a loop is needed per page, which is inefficient and time-consuming. To save the loop time, this commit introduces a set of new helpers put_page_nr() and get_page_nr() to increment/drop the page reference by nr. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Reviewed-by: Julien Grall --- xen/arch/arm/include/asm/mm.h | 4 ++++ xen/arch/arm/mm.c | 42 +++++++++++++++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 7d21120f98..68adcac9fa 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -363,6 +363,10 @@ void free_init_memory(void); int guest_physmap_mark_populate_on_demand(struct domain *d, unsigned long gfn, unsigned int order); +extern bool get_page_nr(struct page_info *page, const struct domain *domain, + unsigned long nr); +extern void put_page_nr(struct page_info *page, unsigned long nr); + extern void put_page_type(struct page_info *page); static inline void put_page_and_type(struct page_info *page) { diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 11ee49598b..6ccffeaea5 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1465,21 +1465,29 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) return 0; } -struct domain *page_get_owner_and_reference(struct page_info *page) +static struct domain *page_get_owner_and_nr_reference(struct page_info *page, + unsigned long nr) { unsigned long x, y = page->count_info; struct domain *owner; + /* Restrict nr to avoid "double" overflow */ + if ( nr >= PGC_count_mask ) + { + ASSERT_UNREACHABLE(); + return NULL; + } + do { x = y; /* * Count == 0: Page is not allocated, so we cannot take a reference. * Count == -1: Reference count would wrap, which is invalid. */ - if ( unlikely(((x + 1) & PGC_count_mask) <= 1) ) + if ( unlikely(((x + nr) & PGC_count_mask) <= nr) ) return NULL; } - while ( (y = cmpxchg(&page->count_info, x, x + 1)) != x ); + while ( (y = cmpxchg(&page->count_info, x, x + nr)) != x ); owner = page_get_owner(page); ASSERT(owner); @@ -1487,14 +1495,19 @@ struct domain *page_get_owner_and_reference(struct page_info *page) return owner; } -void put_page(struct page_info *page) +struct domain *page_get_owner_and_reference(struct page_info *page) +{ + return page_get_owner_and_nr_reference(page, 1); +} + +void put_page_nr(struct page_info *page, unsigned long nr) { unsigned long nx, x, y = page->count_info; do { - ASSERT((y & PGC_count_mask) != 0); + ASSERT((y & PGC_count_mask) >= nr); x = y; - nx = x - 1; + nx = x - nr; } while ( unlikely((y = cmpxchg(&page->count_info, x, nx)) != x) ); @@ -1507,19 +1520,30 @@ void put_page(struct page_info *page) } } -bool get_page(struct page_info *page, const struct domain *domain) +void put_page(struct page_info *page) +{ + put_page_nr(page, 1); +} + +bool get_page_nr(struct page_info *page, const struct domain *domain, + unsigned long nr) { - const struct domain *owner = page_get_owner_and_reference(page); + const struct domain *owner = page_get_owner_and_nr_reference(page, nr); if ( likely(owner == domain) ) return true; if ( owner != NULL ) - put_page(page); + put_page_nr(page, nr); return false; } +bool get_page(struct page_info *page, const struct domain *domain) +{ + return get_page_nr(page, domain, 1); +} + /* Common code requires get_page_type and put_page_type. * We don't care about typecounts so we just do the minimum to make it * happy. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 20:55:45 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 20:55:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404559.647078 (Exim 4.92) (envelope-from ) id 1oWl2P-0008LZ-Ks; Fri, 09 Sep 2022 20:55:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404559.647078; Fri, 09 Sep 2022 20:55: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 1oWl2P-0008LR-IK; Fri, 09 Sep 2022 20:55:45 +0000 Received: by outflank-mailman (input) for mailman id 404559; Fri, 09 Sep 2022 20:55:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl2P-0008LJ-6N for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl2P-0002ps-5h for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWl2P-00055D-4n for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=AfAkD9/1PI94cJWqFHT8ASnRU7A8T223KOoWYLICnmc=; b=YREynrUbr+3NLdeVvPXsnbvHN2 2Txmsrlj72Ha6k5ZAtVtEalU2/a6YWqg1xhCicRfzbhnXg9mb9GEzFJBkmcm3r6KuYfSqipHSbv3K psJhqljzhBO2SoDu4zB66ueo797/Ri2FNQbc/dwPNn6otCpqJowZY1deeWyu1NWwmSkU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add additional reference to owner domain when the owner is allocated Message-Id: Date: Fri, 09 Sep 2022 20:55:45 +0000 commit 041957bad382ba0a393164e8530aa66eacbbb8a3 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:09 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:58:00 2022 -0700 xen/arm: Add additional reference to owner domain when the owner is allocated Borrower domain will fail to get a page ref using the owner domain during allocation, when the owner is created after borrower. So here, we decide to get and add the right amount of reference, which is the number of borrowers, when the owner is allocated. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c6c6c942d8..417a0e82ba 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -763,6 +763,30 @@ static void __init assign_static_memory_11(struct domain *d, } #ifdef CONFIG_STATIC_SHM +static int __init acquire_nr_borrower_domain(struct domain *d, + paddr_t pbase, paddr_t psize, + unsigned long *nr_borrowers) +{ + unsigned int bank; + + /* Iterate reserved memory to find requested shm bank. */ + for ( bank = 0 ; bank < bootinfo.reserved_mem.nr_banks; bank++ ) + { + paddr_t bank_start = bootinfo.reserved_mem.bank[bank].start; + paddr_t bank_size = bootinfo.reserved_mem.bank[bank].size; + + if ( (pbase == bank_start) && (psize == bank_size) ) + break; + } + + if ( bank == bootinfo.reserved_mem.nr_banks ) + return -ENOENT; + + *nr_borrowers = bootinfo.reserved_mem.bank[bank].nr_shm_borrowers; + + return 0; +} + /* * This function checks whether the static shared memory region is * already allocated to dom_io. @@ -829,6 +853,8 @@ static int __init assign_shared_memory(struct domain *d, { mfn_t smfn; int ret = 0; + unsigned long nr_pages, nr_borrowers, i; + struct page_info *page; dprintk(XENLOG_INFO, "%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpaddr".\n", @@ -842,6 +868,7 @@ static int __init assign_shared_memory(struct domain *d, * DOMID_IO is not auto-translated (i.e. it sees RAM 1:1). So we do not need * to create mapping in the P2M. */ + nr_pages = PFN_DOWN(psize); if ( d != dom_io ) { ret = guest_physmap_add_pages(d, gaddr_to_gfn(gbase), smfn, @@ -853,6 +880,39 @@ static int __init assign_shared_memory(struct domain *d, } } + /* + * Get the right amount of references per page, which is the number of + * borrower domains. + */ + ret = acquire_nr_borrower_domain(d, pbase, psize, &nr_borrowers); + if ( ret ) + return ret; + + /* + * Instead of letting borrower domain get a page ref, we add as many + * additional reference as the number of borrowers when the owner + * is allocated, since there is a chance that owner is created + * after borrower. + * So if the borrower is created first, it will cause adding pages + * in the P2M without reference. + */ + page = mfn_to_page(smfn); + for ( i = 0; i < nr_pages; i++ ) + { + if ( !get_page_nr(page + i, d, nr_borrowers) ) + { + printk(XENLOG_ERR + "Failed to add %lu references to page %"PRI_mfn".\n", + nr_borrowers, mfn_x(smfn) + i); + goto fail; + } + } + + return 0; + + fail: + while ( --i >= 0 ) + put_page_nr(page + i, nr_borrowers); return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 20:55:55 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 20:55:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404560.647082 (Exim 4.92) (envelope-from ) id 1oWl2Z-0008OH-Mb; Fri, 09 Sep 2022 20:55:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404560.647082; Fri, 09 Sep 2022 20:55: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 1oWl2Z-0008O9-Ju; Fri, 09 Sep 2022 20:55:55 +0000 Received: by outflank-mailman (input) for mailman id 404560; Fri, 09 Sep 2022 20:55:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl2Z-0008O3-9N for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl2Z-0002q5-8b for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWl2Z-00055c-7o for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:55:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=axcuMmPWfWOQzAOhBTnCSFl8MG4W9W04w4swQIAc2A4=; b=ab0k5Dw/8HhwuzSlrSluV6/Jm7 nX83gJoWWj0/AjFjq+QntvOFPdTBTqDEcMz0DQBKTs4UD2TxsI3YTFOgOlmYMCTY5H3/p5cDRL+7k 7rSS6PCksSJB4UTPmIOzjuGg0sXj5fnwXT/Q4bNBSctquksZtu7eTDL/wk7HtjfJuuik=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: set up shared memory foreign mapping for borrower domain Message-Id: Date: Fri, 09 Sep 2022 20:55:55 +0000 commit b7133c10a3fd3b66b8d6a657a55855ab78f0a75b Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:10 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:58:00 2022 -0700 xen/arm: set up shared memory foreign mapping for borrower domain This commit sets up shared memory foreign mapping for borrower domain. If owner domain is the default dom_io, all shared domain are treated as borrower domain. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 417a0e82ba..dfcda604b3 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -992,6 +992,15 @@ static int __init process_shm(struct domain *d, if ( ret ) return ret; } + + if ( owner_dom_io || (strcmp(role_str, "borrower") == 0) ) + { + /* Set up P2M foreign mapping for borrower domain. */ + ret = map_regions_p2mt(d, _gfn(PFN_UP(gbase)), PFN_DOWN(psize), + _mfn(PFN_UP(pbase)), p2m_map_foreign_rw); + if ( ret ) + return ret; + } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 20:56:06 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 20:56:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404561.647086 (Exim 4.92) (envelope-from ) id 1oWl2k-0008R7-OZ; Fri, 09 Sep 2022 20:56:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404561.647086; Fri, 09 Sep 2022 20:56: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 1oWl2k-0008R0-LU; Fri, 09 Sep 2022 20:56:06 +0000 Received: by outflank-mailman (input) for mailman id 404561; Fri, 09 Sep 2022 20:56:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl2j-0008Qq-CM for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl2j-0002sh-Bf for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWl2j-00056R-Am for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56: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=VqrQzA/+S+SmmBWY445/AFwB22sw/ILqnKcGRSfnxaI=; b=X6qx4vhRpItEGZRxdyrqUi600W HY4rgGzVIrPB5loVBCQOk/i1gcwZOs6ycRQ8SPyVn4mBb87K6NLKloY3LYY4Di0ogMOclOiHULEiN jJ5rEwJOHFd0qGt4EWeyQoM1l570w9XKay7OmFpy16ZtpqLi9LilZqUcXICn/i1Ar39A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: create shared memory nodes in guest device tree Message-Id: Date: Fri, 09 Sep 2022 20:56:05 +0000 commit c7fe72607a37c0bb251b662006a5020e4d7db67e Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:11 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:59:10 2022 -0700 xen/arm: create shared memory nodes in guest device tree We expose the shared memory to the domU using the "xen,shared-memory-v1" reserved-memory binding. See Documentation/devicetree/bindings/reserved-memory/xen,shared-memory.txt in Linux for the corresponding device tree binding. To save the cost of re-parsing shared memory device tree configuration when creating shared memory nodes in guest device tree, this commit adds new field "shm_mem" to store shm-info per domain. For each shared memory region, a range is exposed under the /reserved-memory node as a child node. Each range sub-node is named xen-shmem@
and has the following properties: - compatible: compatible = "xen,shared-memory-v1" - reg: the base guest physical address and size of the shared memory region - xen,id: a string that identifies the shared memory region. - xen,offset: (borrower VMs only) 64 bit integer offset within the owner virtual machine's shared memory region used for the mapping in the borrower VM. Currently, we provide "xen,offset=<0x0>" as a temporary placeholder. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis [stefano: fix code style, add return -EOPNOTSUPP;] Signed-off-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 162 +++++++++++++++++++++++++++++++++++++- xen/arch/arm/include/asm/kernel.h | 1 + 2 files changed, 161 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index dfcda604b3..35343e0373 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -916,7 +916,22 @@ static int __init assign_shared_memory(struct domain *d, return ret; } -static int __init process_shm(struct domain *d, +static int __init append_shm_bank_to_domain(struct kernel_info *kinfo, + paddr_t start, paddr_t size, + const char *shm_id) +{ + if ( kinfo->shm_mem.nr_banks >= NR_MEM_BANKS ) + return -ENOMEM; + + kinfo->shm_mem.bank[kinfo->shm_mem.nr_banks].start = start; + kinfo->shm_mem.bank[kinfo->shm_mem.nr_banks].size = size; + safe_strcpy(kinfo->shm_mem.bank[kinfo->shm_mem.nr_banks].shm_id, shm_id); + kinfo->shm_mem.nr_banks++; + + return 0; +} + +static int __init process_shm(struct domain *d, struct kernel_info *kinfo, const struct dt_device_node *node) { struct dt_device_node *shm_node; @@ -930,6 +945,7 @@ static int __init process_shm(struct domain *d, int ret = 0; unsigned int i; const char *role_str; + const char *shm_id; bool owner_dom_io = true; if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) @@ -974,6 +990,13 @@ static int __init process_shm(struct domain *d, if ( dt_property_read_string(shm_node, "role", &role_str) == 0 ) owner_dom_io = false; + if ( dt_property_read_string(shm_node, "xen,shm-id", &shm_id) ) + { + printk("%pd: invalid \"xen,shm-id\" property", d); + return -EINVAL; + } + BUG_ON((strlen(shm_id) <= 0) || (strlen(shm_id) >= MAX_SHM_ID_LENGTH)); + /* * DOMID_IO is a fake domain and is not described in the Device-Tree. * Therefore when the owner of the shared region is DOMID_IO, we will @@ -1001,6 +1024,14 @@ static int __init process_shm(struct domain *d, if ( ret ) return ret; } + + /* + * Record static shared memory region info for later setting + * up shm-node in guest device tree. + */ + ret = append_shm_bank_to_domain(kinfo, gbase, psize, shm_id); + if ( ret ) + return ret; } return 0; @@ -1333,6 +1364,128 @@ static int __init make_memory_node(const struct domain *d, return res; } +#ifdef CONFIG_STATIC_SHM +static int __init make_shm_memory_node(const struct domain *d, + void *fdt, + int addrcells, int sizecells, + const struct meminfo *mem) +{ + unsigned int i = 0; + int res = 0; + + if ( mem->nr_banks == 0 ) + return -ENOENT; + + /* + * For each shared memory region, a range is exposed under + * the /reserved-memory node as a child node. Each range sub-node is + * named xen-shmem@
. + */ + dt_dprintk("Create xen-shmem node\n"); + + for ( ; i < mem->nr_banks; i++ ) + { + uint64_t start = mem->bank[i].start; + uint64_t size = mem->bank[i].size; + /* Placeholder for xen-shmem@ + a 64-bit number + \0 */ + char buf[27]; + const char compat[] = "xen,shared-memory-v1"; + /* Worst case addrcells + sizecells */ + __be32 reg[GUEST_ROOT_ADDRESS_CELLS + GUEST_ROOT_SIZE_CELLS]; + __be32 *cells; + unsigned int len = (addrcells + sizecells) * sizeof(__be32); + + snprintf(buf, sizeof(buf), "xen-shmem@%"PRIx64, mem->bank[i].start); + res = fdt_begin_node(fdt, buf); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compat, sizeof(compat)); + if ( res ) + return res; + + cells = reg; + dt_child_set_range(&cells, addrcells, sizecells, start, size); + + res = fdt_property(fdt, "reg", reg, len); + if ( res ) + return res; + + dt_dprintk("Shared memory bank %u: %#"PRIx64"->%#"PRIx64"\n", + i, start, start + size); + + res = fdt_property_string(fdt, "xen,id", mem->bank[i].shm_id); + if ( res ) + return res; + + /* + * TODO: + * - xen,offset: (borrower VMs only) + * 64 bit integer offset within the owner virtual machine's shared + * memory region used for the mapping in the borrower VM + */ + res = fdt_property_u64(fdt, "xen,offset", 0); + if ( res ) + return res; + + res = fdt_end_node(fdt); + if ( res ) + return res; + } + + return res; +} +#else +static int __init make_shm_memory_node(const struct domain *d, + void *fdt, + int addrcells, int sizecells, + const struct meminfo *mem) +{ + ASSERT_UNREACHABLE(); + return -EOPNOTSUPP; +} +#endif + +static int __init make_resv_memory_node(const struct domain *d, + void *fdt, + int addrcells, int sizecells, + const struct meminfo *mem) +{ + int res = 0; + /* Placeholder for reserved-memory\0 */ + const char resvbuf[16] = "reserved-memory"; + + if ( mem->nr_banks == 0 ) + /* No shared memory provided. */ + return 0; + + dt_dprintk("Create reserved-memory node\n"); + + res = fdt_begin_node(fdt, resvbuf); + if ( res ) + return res; + + res = fdt_property(fdt, "ranges", NULL, 0); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#address-cells", addrcells); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#size-cells", sizecells); + if ( res ) + return res; + + res = make_shm_memory_node(d, fdt, addrcells, sizecells, mem); + if ( res ) + return res; + + res = fdt_end_node(fdt); + + return res; +} + static int __init add_ext_regions(unsigned long s, unsigned long e, void *data) { struct meminfo *ext_regions = data; @@ -3110,6 +3263,11 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) if ( ret ) goto err; + ret = make_resv_memory_node(d, kinfo->fdt, addrcells, sizecells, + &kinfo->shm_mem); + if ( ret ) + goto err; + /* * domain_handle_dtb_bootmodule has to be called before the rest of * the device tree is generated because it depends on the value of @@ -3632,7 +3790,7 @@ static int __init construct_domU(struct domain *d, assign_static_memory_11(d, &kinfo, node); #ifdef CONFIG_STATIC_SHM - rc = process_shm(d, node); + rc = process_shm(d, &kinfo, node); if ( rc < 0 ) return rc; #endif diff --git a/xen/arch/arm/include/asm/kernel.h b/xen/arch/arm/include/asm/kernel.h index f8bb85767b..5bb30c3f2f 100644 --- a/xen/arch/arm/include/asm/kernel.h +++ b/xen/arch/arm/include/asm/kernel.h @@ -38,6 +38,7 @@ struct kernel_info { void *fdt; /* flat device tree */ paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */ struct meminfo mem; + struct meminfo shm_mem; /* kernel entry point */ paddr_t entry; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 20:56:16 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 20:56:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404562.647091 (Exim 4.92) (envelope-from ) id 1oWl2u-0008U7-S2; Fri, 09 Sep 2022 20:56:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404562.647091; Fri, 09 Sep 2022 20:56: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 1oWl2u-0008Tz-OZ; Fri, 09 Sep 2022 20:56:16 +0000 Received: by outflank-mailman (input) for mailman id 404562; Fri, 09 Sep 2022 20:56:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl2t-0008Tn-FP for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl2t-0002tA-Ej for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWl2t-00056q-Dt for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56: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=8IWO+1J8OhP33bUkVobICcok7NG4TbrZ09RwJg8S22g=; b=P3DRadeuHAylWeY/IAXgn+GsrX wY7oQYuskvPemGcJRddScG4N1PLIPPbYgKmldDJ63lj4t+uuYrKe1lPpAIDPnnw0XsC1h602sHnd0 8eiQmwEphIQHvUuvN0xOp7tkp1xtD47NkiGe0UYN/ow86NXI5D56+o3hVfyA6t9py27s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: enable statically shared memory on Dom0 Message-Id: Date: Fri, 09 Sep 2022 20:56:15 +0000 commit 09c0a8976acf6fa21fd853c675b2cbde20f56528 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:12 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 13:00:10 2022 -0700 xen/arm: enable statically shared memory on Dom0 To add statically shared memory nodes in Dom0, user shall put according static shared memory configuration under /chosen node. This commit adds shm-processing function process_shm in construct_dom0 to enable statically shared memory on Dom0. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 35343e0373..1e4b5d2df8 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2709,6 +2709,11 @@ static int __init handle_node(struct domain *d, struct kernel_info *kinfo, if ( res ) return res; } + + res = make_resv_memory_node(d, kinfo->fdt, addrcells, sizecells, + &kinfo->shm_mem); + if ( res ) + return res; } res = fdt_end_node(kinfo->fdt); @@ -3937,6 +3942,9 @@ static int __init construct_dom0(struct domain *d) { struct kernel_info kinfo = {}; int rc; +#ifdef CONFIG_STATIC_SHM + const struct dt_device_node *chosen = dt_find_node_by_path("/chosen"); +#endif /* Sanity! */ BUG_ON(d->domain_id != 0); @@ -3971,6 +3979,12 @@ static int __init construct_dom0(struct domain *d) allocate_memory_11(d, &kinfo); find_gnttab_region(d, &kinfo); +#ifdef CONFIG_STATIC_SHM + rc = process_shm(d, &kinfo, chosen); + if ( rc < 0 ) + return rc; +#endif + /* Map extra GIC MMIO, irqs and other hw stuffs to dom0. */ rc = gic_map_hwdom_extra_mappings(d); if ( rc < 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 20:56:26 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 20:56:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404563.647095 (Exim 4.92) (envelope-from ) id 1oWl34-00005X-U1; Fri, 09 Sep 2022 20:56:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404563.647095; Fri, 09 Sep 2022 20:56: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 1oWl34-00005P-QA; Fri, 09 Sep 2022 20:56:26 +0000 Received: by outflank-mailman (input) for mailman id 404563; Fri, 09 Sep 2022 20:56:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl33-000059-IJ for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl33-0002tR-Hc for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWl33-00057R-Go for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56: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=SQnj2WocuKaiNvQ46JYilPcoIfvpI3j1bwIRSjtc0wQ=; b=64ePwoN18ZxWQCYisrZfaKdgIU pe5kTje7Qrv7GroT1COb9O5wPNKu2QWyYYcoE58Qiw8PAfbIUrSOyT6pf5iX2PzOOQBwKrF5D+psH 8PLx5xUr1z6MnOrXYtL1rR9SWL6k/IeUj7qrXoiGjYB5YMTOZ87vbJPSjPpzlRi99QF8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Add static memory sharing in SUPPORT.md Message-Id: Date: Fri, 09 Sep 2022 20:56:25 +0000 commit 826956157d52ebf6b926eef70d8bb3b849de8e08 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:13 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 13:00:10 2022 -0700 xen: Add static memory sharing in SUPPORT.md on ARM, static memory sharing is tech preview, which shall be documented in SUPPORT.md Signed-off-by: Penny Zheng Reviewed-by: Michal Orzel Acked-by: Julien Grall --- SUPPORT.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/SUPPORT.md b/SUPPORT.md index b02a5d25ca..8ebd63ad82 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -306,6 +306,13 @@ Allow sharing of identical pages between guests Status, x86 HVM: Experimental +### Static Memory Sharing + +Allow to statically set up shared memory on dom0less system, +enabling domains to do shm-based communication + + Status, ARM: Tech Preview + ### Memory Paging Allow pages belonging to guests to be paged to disk -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 20:56:36 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 20:56:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404564.647097 (Exim 4.92) (envelope-from ) id 1oWl3E-00008H-UT; Fri, 09 Sep 2022 20:56:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404564.647097; Fri, 09 Sep 2022 20:56: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 1oWl3E-000089-Rl; Fri, 09 Sep 2022 20:56:36 +0000 Received: by outflank-mailman (input) for mailman id 404564; Fri, 09 Sep 2022 20:56:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl3D-000080-LD for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl3D-0002tb-KO for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWl3D-00057t-Jd for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56: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=s8PO4uE1UG5hZRPcl8Uq9MoGYKPYPYWE8OTUyd4z7g8=; b=sMcWxZ1FpPlhQ2sNgpohFWnU9H SxAJnJI2rc58OEnozMiKdh/Is/uYn8gw9Qw8BqXEn8zVTn7bOwg4/tMMmYVbPqFEWlhA1AavL9teX OQgUjKK4IkLryELoO4x1ouqwD+lPg4eS22Js3PRvyIwKgzmspr0CuonngikoR5OTazFE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: pci: modify pci_find_host_bridge_node argument to const pdev Message-Id: Date: Fri, 09 Sep 2022 20:56:35 +0000 commit 943941fb7a5f968cb48c2b7a8c00f53ad6728575 Author: Rahul Singh AuthorDate: Fri Sep 9 10:34:39 2022 +0100 Commit: Stefano Stabellini CommitDate: Fri Sep 9 13:48:13 2022 -0700 xen/arm: pci: modify pci_find_host_bridge_node argument to const pdev Modify pci_find_host_bridge_node argument to const pdev to avoid converting the dev to pdev in pci_find_host_bridge_node and also constify the return. Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini Reviewed-by: Oleksandr Tyshchenko --- xen/arch/arm/include/asm/pci.h | 3 ++- xen/arch/arm/pci/pci-host-common.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 7c7449d64f..80a2431804 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -106,7 +106,8 @@ bool pci_ecam_need_p2m_hwdom_mapping(struct domain *d, struct pci_host_bridge *bridge, uint64_t addr); struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus); -struct dt_device_node *pci_find_host_bridge_node(struct device *dev); +const struct dt_device_node * +pci_find_host_bridge_node(const struct pci_dev *pdev); int pci_get_host_bridge_segment(const struct dt_device_node *node, uint16_t *segment); diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index fd8c0f837a..89ef30028e 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -243,10 +243,10 @@ err_exit: /* * Get host bridge node given a device attached to it. */ -struct dt_device_node *pci_find_host_bridge_node(struct device *dev) +const struct dt_device_node * +pci_find_host_bridge_node(const struct pci_dev *pdev) { struct pci_host_bridge *bridge; - struct pci_dev *pdev = dev_to_pci(dev); bridge = pci_find_host_bridge(pdev->seg, pdev->bus); if ( unlikely(!bridge) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 20:56:47 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 20:56:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404565.647101 (Exim 4.92) (envelope-from ) id 1oWl3O-0000BH-Vn; Fri, 09 Sep 2022 20:56:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404565.647101; Fri, 09 Sep 2022 20:56: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 1oWl3O-0000BA-TL; Fri, 09 Sep 2022 20:56:46 +0000 Received: by outflank-mailman (input) for mailman id 404565; Fri, 09 Sep 2022 20:56:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl3N-0000Az-PL for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl3N-0002tl-OZ for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWl3N-00058Q-NQ for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56: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=i5bNzY5U3RmwjG/tL2uQLAouRId0MaOm0RCSaZb209k=; b=2aOmOtz+GFfjp6JKwQpyxKnMp3 IuwNvI9lGE8w36gwrf/RVfrQJ8UxkV8uXp0XAoi180ZFUJBN92zwy5qNWBcWZ93+1orGBsG8CKQn2 +kkPgNjG0+zykUN1+HaoaV9TgUlDJAWYskpyNGZeFjZHnqVOBzawlMwHhOkCgO+AHGiU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/pci: replace call to is_memory_hole to pci_check_bar Message-Id: Date: Fri, 09 Sep 2022 20:56:45 +0000 commit cc80e2bab0d09b50397811d5441a8cda071f4e46 Author: Rahul Singh AuthorDate: Fri Sep 9 10:34:40 2022 +0100 Commit: Stefano Stabellini CommitDate: Fri Sep 9 13:48:25 2022 -0700 xen/pci: replace call to is_memory_hole to pci_check_bar is_memory_hole was implemented for x86 and not for ARM when introduced. Replace is_memory_hole call to pci_check_bar as function should check if device BAR is in defined memory range. Also, add an implementation for ARM which is required for PCI passthrough. On x86, pci_check_bar will call is_memory_hole which will check if BAR is not overlapping with any memory region defined in the memory map. On ARM, pci_check_bar will go through the host bridge ranges and check if the BAR is in the range of defined ranges. Signed-off-by: Rahul Singh Acked-by: Jan Beulich Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/pci.h | 2 ++ xen/arch/arm/pci/pci-host-common.c | 54 ++++++++++++++++++++++++++++++++++++++ xen/arch/x86/include/asm/pci.h | 10 +++++++ xen/drivers/passthrough/pci.c | 8 +++--- 4 files changed, 70 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 80a2431804..8cb46f6b71 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -126,6 +126,8 @@ int pci_host_iterate_bridges_and_count(struct domain *d, int pci_host_bridge_mappings(struct domain *d); +bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); + #else /*!CONFIG_HAS_PCI*/ struct arch_pci_dev { }; diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index 89ef30028e..a8ece94303 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -24,6 +24,16 @@ #include +/* + * struct to hold pci device bar. + */ +struct pdev_bar_check +{ + paddr_t start; + paddr_t end; + bool is_valid; +}; + /* * List for all the pci host bridges. */ @@ -363,6 +373,50 @@ int __init pci_host_bridge_mappings(struct domain *d) return 0; } +/* + * TODO: BAR addresses and Root Complex window addresses are not guaranteed + * to be page aligned. We should check for alignment but this is not the + * right place for alignment check. + */ +static int is_bar_valid(const struct dt_device_node *dev, + paddr_t addr, paddr_t len, void *data) +{ + struct pdev_bar_check *bar_data = data; + paddr_t s = bar_data->start; + paddr_t e = bar_data->end; + + if ( (s >= addr) && (e <= (addr + len - 1)) ) + bar_data->is_valid = true; + + return 0; +} + +/* TODO: Revisit this function when ACPI PCI passthrough support is added. */ +bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end) +{ + int ret; + const struct dt_device_node *dt_node; + paddr_t s = mfn_to_maddr(start); + paddr_t e = mfn_to_maddr(end); + struct pdev_bar_check bar_data = { + .start = s, + .end = e, + .is_valid = false + }; + + if ( s >= e ) + return false; + + dt_node = pci_find_host_bridge_node(pdev); + if ( !dt_node ) + return false; + + ret = dt_for_each_range(dt_node, &is_bar_valid, &bar_data); + if ( ret < 0 ) + return false; + + return bar_data.is_valid; +} /* * Local variables: * mode: C diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index c8e1a9ecdb..f4a58c8acf 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -57,4 +57,14 @@ static always_inline bool is_pci_passthrough_enabled(void) void arch_pci_init_pdev(struct pci_dev *pdev); +static inline bool pci_check_bar(const struct pci_dev *pdev, + mfn_t start, mfn_t end) +{ + /* + * Check if BAR is not overlapping with any memory region defined + * in the memory map. + */ + return is_memory_hole(start, end); +} + #endif /* __X86_PCI_H__ */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index cdaf5c247f..149f68bb6e 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -304,8 +304,8 @@ static void check_pdev(const struct pci_dev *pdev) if ( rc < 0 ) /* Unable to size, better leave memory decoding disabled. */ return; - if ( size && !is_memory_hole(maddr_to_mfn(addr), - maddr_to_mfn(addr + size - 1)) ) + if ( size && !pci_check_bar(pdev, maddr_to_mfn(addr), + maddr_to_mfn(addr + size - 1)) ) { /* * Return without enabling memory decoding if BAR position is not @@ -331,8 +331,8 @@ static void check_pdev(const struct pci_dev *pdev) if ( rc < 0 ) return; - if ( size && !is_memory_hole(maddr_to_mfn(addr), - maddr_to_mfn(addr + size - 1)) ) + if ( size && !pci_check_bar(pdev, maddr_to_mfn(addr), + maddr_to_mfn(addr + size - 1)) ) { printk(warn, &pdev->sbdf, "ROM ", PFN_DOWN(addr), PFN_DOWN(addr + size - 1)); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 09 20:56:57 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Sep 2022 20:56:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404566.647107 (Exim 4.92) (envelope-from ) id 1oWl3Z-0000EC-1a; Fri, 09 Sep 2022 20:56:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404566.647107; Fri, 09 Sep 2022 20:56: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 1oWl3Y-0000E2-Un; Fri, 09 Sep 2022 20:56:56 +0000 Received: by outflank-mailman (input) for mailman id 404566; Fri, 09 Sep 2022 20:56:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl3X-0000Dv-TO for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWl3X-0002tz-Sj for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWl3X-00058s-R5 for xen-changelog@lists.xenproject.org; Fri, 09 Sep 2022 20:56: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=QkuuE5syY83BPoiirT7oZ208vx8bGF2tX45Jir920Y0=; b=uioZcv7EJTo9V92ACn+Fx9JHqS Cbn552NvciCK77wBlxPvD1qHP+6Zxzp0WXTrIrU7Ao5dfD2GaIuT+xu0UmE18Z/xjGCTbonjLDkuL x2BzpTAI15CdbpevEDP2PsiQF/pSSP4vFi+9XD4Iv8QlGcDBsj8Fr3Gx7brjrtG8qgv4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm, device-tree: Make static-mem use #{address,size}-cells Message-Id: Date: Fri, 09 Sep 2022 20:56:55 +0000 commit 942ac5fc15ecc2f7ef1d9331c76d89d2cef10e5c Author: Henry Wang AuthorDate: Fri Sep 9 05:23:57 2022 +0000 Commit: Stefano Stabellini CommitDate: Fri Sep 9 13:49:02 2022 -0700 xen/arm, device-tree: Make static-mem use #{address,size}-cells In order to keep consistency in the device tree binding, there is no need for static memory allocation feature to define a specific set of address and size cells for "xen,static-mem" property. Therefore, this commit reuses the regular #{address,size}-cells for parsing the device tree "xen,static-mem" property. Update the documentation accordingly. Also, take the chance to remove the unnecessary "#address-cells" and "#size-cells" in the domU1 node of the device tree to only emphasize the related part that the example is showing. Signed-off-by: Henry Wang Reviewed-by: Michal Orzel Reviewed-by: Bertrand Marquis Acked-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 11 +++++------ docs/misc/arm/passthrough-noiommu.txt | 7 +++---- xen/arch/arm/bootfdt.c | 5 ----- xen/arch/arm/domain_build.c | 16 ++-------------- 4 files changed, 10 insertions(+), 29 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 12c5e1d189..c47a05e0da 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -350,8 +350,8 @@ areas are pre-defined by configuration using physical address ranges. Memory can be statically allocated to a domain using the property "xen,static- mem" defined in the domain configuration. The number of cells for the address -and the size must be defined using respectively the properties -"#xen,static-mem-address-cells" and "#xen,static-mem-size-cells". +and the size must be defined respectively by the parent node properties +"#address-cells" and "#size-cells". The property 'memory' is still needed and should match the amount of memory given to the guest. Currently, it either comes from static memory or lets Xen @@ -366,14 +366,13 @@ device-tree: / { chosen { + #address-cells = <0x1>; + #size-cells = <0x1>; + ... domU1 { compatible = "xen,domain"; - #address-cells = <0x2>; - #size-cells = <0x2>; cpus = <2>; memory = <0x0 0x80000>; - #xen,static-mem-address-cells = <0x1>; - #xen,static-mem-size-cells = <0x1>; xen,static-mem = <0x30000000 0x20000000>; ... }; diff --git a/docs/misc/arm/passthrough-noiommu.txt b/docs/misc/arm/passthrough-noiommu.txt index 3e2ef21ad7..69b8de1975 100644 --- a/docs/misc/arm/passthrough-noiommu.txt +++ b/docs/misc/arm/passthrough-noiommu.txt @@ -33,14 +33,13 @@ on static allocation in the device-tree: / { chosen { + #address-cells = <0x1>; + #size-cells = <0x1>; + ... domU1 { compatible = "xen,domain"; - #address-cells = <0x2>; - #size-cells = <0x2>; cpus = <2>; memory = <0x0 0x80000>; - #xen,static-mem-address-cells = <0x1>; - #xen,static-mem-size-cells = <0x1>; xen,static-mem = <0x30000000 0x20000000>; direct-map; ... diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index f8b88ee3da..6014c0f852 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -371,11 +371,6 @@ static int __init process_domain_node(const void *fdt, int node, /* No "xen,static-mem" present. */ return 0; - address_cells = device_tree_get_u32(fdt, node, - "#xen,static-mem-address-cells", 0); - size_cells = device_tree_get_u32(fdt, node, - "#xen,static-mem-size-cells", 0); - return device_tree_get_meminfo(fdt, node, "xen,static-mem", address_cells, size_cells, &bootinfo.reserved_mem, MEMBANK_STATIC_DOMAIN); diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 1e4b5d2df8..01c2aaccd8 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -565,21 +565,9 @@ static int __init parse_static_mem_prop(const struct dt_device_node *node, const struct dt_property *prop; prop = dt_find_property(node, "xen,static-mem", NULL); - if ( !dt_property_read_u32(node, "#xen,static-mem-address-cells", - addr_cells) ) - { - printk(XENLOG_ERR - "failed to read \"#xen,static-mem-address-cells\".\n"); - return -EINVAL; - } - if ( !dt_property_read_u32(node, "#xen,static-mem-size-cells", - size_cells) ) - { - printk(XENLOG_ERR - "failed to read \"#xen,static-mem-size-cells\".\n"); - return -EINVAL; - } + *addr_cells = dt_n_addr_cells(node); + *size_cells = dt_n_size_cells(node); *cell = (const __be32 *)prop->value; *length = prop->length; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Sep 10 03:11:09 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Sep 2022 03:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404627.647178 (Exim 4.92) (envelope-from ) id 1oWqta-0006OB-Gh; Sat, 10 Sep 2022 03:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404627.647178; Sat, 10 Sep 2022 03:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWqta-0006O4-Ds; Sat, 10 Sep 2022 03:11:02 +0000 Received: by outflank-mailman (input) for mailman id 404627; Sat, 10 Sep 2022 03:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWqtZ-0006Nv-Mj for xen-changelog@lists.xenproject.org; Sat, 10 Sep 2022 03:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWqtZ-000135-KP for xen-changelog@lists.xenproject.org; Sat, 10 Sep 2022 03:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWqtZ-0006eZ-I5 for xen-changelog@lists.xenproject.org; Sat, 10 Sep 2022 03:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oKyfsxkv05RoXW9BK9kX2b6khuxvJtAV+sVlGN3tMHw=; b=zCyx9v5kj8aqUWtaa1/rh+afAb Uz0aflXVtTfP15C+O3ZHFSphjA87KFFaFPDmC9rC/j9iNv7zqYP4BPg68Q4I+bh/h41VBCghHyRZs emXq0nTohJ4ZwXmCHPdB7HllYG+A/g0y1RlRB6c8ZLGooLnNg+BM7NjQueZ2siaRzuBY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: qemu-alpine-arm64-gcc: Use kernel 5.19 Message-Id: Date: Sat, 10 Sep 2022 03:11:01 +0000 commit d88431107713873d86f668c08d329cdb34197050 Author: Michal Orzel AuthorDate: Thu Sep 8 11:22:28 2022 +0200 Commit: Stefano Stabellini CommitDate: Thu Sep 8 16:28:03 2022 -0700 automation: qemu-alpine-arm64-gcc: Use kernel 5.19 After qemu-smoke-arm64 was changed to use kernel 5.19 we end up having two kernel configurations. This is something not needed and maintaining a single kernel version is always easier. Modify qemu-alpine-arm64-gcc to use kernel 5.19 and remove kernel 5.9 from tests-artifacts. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Ayan Kumar Halder Acked-by: Stefano Stabellini --- automation/gitlab-ci/build.yaml | 11 ------- automation/gitlab-ci/test.yaml | 2 +- .../kernel/5.9.9-arm64v8.dockerfile | 34 ---------------------- 3 files changed, 1 insertion(+), 46 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index d2f75a090c..720ce6e07b 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -586,17 +586,6 @@ alpine-3.12-arm64-rootfs-export: tags: - arm64 -kernel-5.9.9-arm64-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.9.9-arm64v8 - script: - - mkdir binaries && cp /Image binaries/Image - artifacts: - paths: - - binaries/Image - tags: - - arm64 - kernel-5.19-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8 diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 2eb6c3866e..07209820b4 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -34,7 +34,7 @@ qemu-alpine-arm64-gcc: needs: - alpine-3.12-gcc-arm64 - alpine-3.12-arm64-rootfs-export - - kernel-5.9.9-arm64-export + - kernel-5.19-arm64-export - qemu-system-aarch64-6.0.0-arm64-export artifacts: paths: diff --git a/automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile b/automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile deleted file mode 100644 index 053d65a345..0000000000 --- a/automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM arm64v8/debian:unstable -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=5.9.9 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - libssl-dev \ - bc \ - curl \ - flex \ - bison \ - && \ - \ - # Build the kernel - curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - make -j$(nproc) Image.gz && \ - cp arch/arm64/boot/Image / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 10 03:11:12 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Sep 2022 03:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404628.647182 (Exim 4.92) (envelope-from ) id 1oWqtk-0006QF-Jk; Sat, 10 Sep 2022 03:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404628.647182; Sat, 10 Sep 2022 03:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWqtk-0006Q8-HH; Sat, 10 Sep 2022 03:11:12 +0000 Received: by outflank-mailman (input) for mailman id 404628; Sat, 10 Sep 2022 03:11:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWqtj-0006Q2-OD for xen-changelog@lists.xenproject.org; Sat, 10 Sep 2022 03:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWqtj-00013c-NP for xen-changelog@lists.xenproject.org; Sat, 10 Sep 2022 03:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWqtj-0006f1-MU for xen-changelog@lists.xenproject.org; Sat, 10 Sep 2022 03:11: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=hC71VzlsoS84+dUqFy9ZTImRZacwq8o+m9ZC8qpUkNk=; b=dY5QArqi2db+yPFprnUxB9xaZL JiYI8FdkcwY1lKwf/wGfsw7jYCcKT5vN1s4M5GMn9w35RzqA5dy58eBsguHuvxiS+ttGfZtMv0wIO 7/HOUEa86wOd2EPBLG09ikOYgBDITVOWJy/uRbdx5COsqAARfBj9WasPsdiK5hiMqUrg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: qemu-smoke-arm64: Silence ifconfig error messages Message-Id: Date: Sat, 10 Sep 2022 03:11:11 +0000 commit e17ca18747cad3933e975b56560e49c3b3f705d3 Author: Michal Orzel AuthorDate: Thu Sep 8 11:22:29 2022 +0200 Commit: Stefano Stabellini CommitDate: Thu Sep 8 16:28:21 2022 -0700 automation: qemu-smoke-arm64: Silence ifconfig error messages During the ping test, dom1 tries to assign an ip to eth0 in a loop. Before setting up the network interface by dom0, this results in printing the following error message several times: (XEN) DOM1: ifconfig: SIOCSIFADDR: No such device Silence this by redirecting stderr/stdout to /dev/null as we do not care about the output and we should not pollute the log file. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Ayan Kumar Halder Acked-by: Stefano Stabellini --- automation/scripts/qemu-smoke-arm64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index c80d9b2aee..7ac9602776 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -6,7 +6,7 @@ test_variant=$1 passed="passed" check=" -until ifconfig eth0 192.168.0.2 && ping -c 10 192.168.0.1; do +until ifconfig eth0 192.168.0.2 &> /dev/null && ping -c 10 192.168.0.1; do sleep 30 done echo \"${passed}\" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 10 03:11:23 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Sep 2022 03:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404632.647198 (Exim 4.92) (envelope-from ) id 1oWqtv-0006jW-39; Sat, 10 Sep 2022 03:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404632.647198; Sat, 10 Sep 2022 03:11: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 1oWqtu-0006jN-Vm; Sat, 10 Sep 2022 03:11:22 +0000 Received: by outflank-mailman (input) for mailman id 404632; Sat, 10 Sep 2022 03:11:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWqtt-0006id-RO for xen-changelog@lists.xenproject.org; Sat, 10 Sep 2022 03:11:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWqtt-000145-Qa for xen-changelog@lists.xenproject.org; Sat, 10 Sep 2022 03:11:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oWqtt-0006fR-Pc for xen-changelog@lists.xenproject.org; Sat, 10 Sep 2022 03:11: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=Y+Fu0RSwCEa7IatcuxPTzaISCQVxOND7xaglWhF954A=; b=T54brVYfEhKaUNRzCAZulOfJgL PVAwieRnG13mxrq3Bog6Fyg+7Z1+m14LQcWxzkl6GGdAv0o1VqhavrxiDUT4msO6PkDGXzE3EqsJD dog4fxMPzGlntto1AEhb/UMOrT9mv7XoPTLrYp/ImI+XbFXGsY3tpLPp1cCW3taas7rM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Add a new job for testing boot time cpupools on arm64 Message-Id: Date: Sat, 10 Sep 2022 03:11:21 +0000 commit 36e3f41587788c60813b088b373960b7fb88c021 Author: Michal Orzel AuthorDate: Thu Sep 8 11:22:30 2022 +0200 Commit: Stefano Stabellini CommitDate: Thu Sep 8 16:28:26 2022 -0700 automation: Add a new job for testing boot time cpupools on arm64 Add a new test job qemu-smoke-arm64-gcc-boot-cpupools that will execute script qemu-smoke-arm64.sh to test boot time cpupools feature. Enable CONFIG_BOOT_TIME_CPUPOOLS for the arm64 build and add a new test case in qemu-smoke-arm64.sh that if selected will make use of the ImageBuilder feature to create cpupool with cpu@1, null scheduler and assign it to domU. Add a check in dom0 xen.start to see if domU is assigned a Pool-1 with null scheduler. Take the opportunity to refactor the qemu-smoke-arm64.sh script as follows: - use domU_check to store the test's commands to be run from domU - use dom0_check to store the test's commands to be run from dom0 - use fdtput instead of sed to perform dtb modifications - use more meaningful messages for "passed" variable. This way we can grep for messages reported either by domU or dom0 and get rid of assumption that tests can only be run from domU Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- automation/gitlab-ci/test.yaml | 19 ++++++++++++++++++ automation/scripts/build | 3 ++- automation/scripts/qemu-smoke-arm64.sh | 36 +++++++++++++++++++++++++--------- 3 files changed, 48 insertions(+), 10 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 07209820b4..d899b3bdbf 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -100,6 +100,25 @@ qemu-smoke-arm64-gcc-staticmem: tags: - arm64 +qemu-smoke-arm64-gcc-boot-cpupools: + extends: .test-jobs-common + variables: + CONTAINER: debian:unstable-arm64v8 + script: + - ./automation/scripts/qemu-smoke-arm64.sh boot-cpupools 2>&1 | tee qemu-smoke-arm64.log + needs: + - alpine-3.12-gcc-arm64 + - alpine-3.12-arm64-rootfs-export + - kernel-5.19-arm64-export + - qemu-system-aarch64-6.0.0-arm64-export + artifacts: + paths: + - smoke.serial + - '*.log' + when: always + tags: + - arm64 + qemu-smoke-arm32-gcc: extends: .test-jobs-common variables: diff --git a/automation/scripts/build b/automation/scripts/build index 2b9f2d2b54..2f15ab3198 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -19,7 +19,8 @@ else echo " CONFIG_EXPERT=y CONFIG_UNSUPPORTED=y -CONFIG_STATIC_MEMORY=y" > xen/.config +CONFIG_STATIC_MEMORY=y +CONFIG_BOOT_TIME_CPUPOOLS=y" > xen/.config make -j$(nproc) -C xen olddefconfig else make -j$(nproc) -C xen defconfig diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index 7ac9602776..f803835779 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -4,20 +4,22 @@ set -ex test_variant=$1 -passed="passed" -check=" +if [ -z "${test_variant}" ]; then + passed="ping test passed" + domU_check=" until ifconfig eth0 192.168.0.2 &> /dev/null && ping -c 10 192.168.0.1; do sleep 30 done echo \"${passed}\" " +fi if [[ "${test_variant}" == "static-mem" ]]; then # Memory range that is statically allocated to DOM1 domu_base="50000000" domu_size="10000000" passed="${test_variant} test passed" - check=" + domU_check=" current=\$(hexdump -e '16/1 \"%02x\"' /proc/device-tree/memory@${domu_base}/reg 2>/dev/null) expected=$(printf \"%016x%016x\" 0x${domu_base} 0x${domu_size}) if [[ \"\${expected}\" == \"\${current}\" ]]; then @@ -26,6 +28,16 @@ fi " fi +if [[ "${test_variant}" == "boot-cpupools" ]]; then + # Check if domU0 (id=1) is assigned to Pool-1 with null scheduler + passed="${test_variant} test passed" + dom0_check=" +if xl list -c 1 | grep -q Pool-1 && xl cpupool-list Pool-1 | grep -q Pool-1; then + echo ${passed} +fi +" +fi + export DEBIAN_FRONTENT=noninteractive apt-get -qy update apt-get -qy install --no-install-recommends u-boot-qemu \ @@ -42,11 +54,9 @@ curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom -cpu cortex-a57 -machine type=virt \ -m 1024 -smp 2 -display none \ -machine dumpdtb=binaries/virt-gicv2.dtb -# XXX disable pl061 to avoid Linux crash -dtc -I dtb -O dts binaries/virt-gicv2.dtb > binaries/virt-gicv2.dts -sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv2.dts > binaries/virt-gicv2-edited.dts -dtc -I dts -O dtb binaries/virt-gicv2-edited.dts > binaries/virt-gicv2.dtb +# XXX disable pl061 to avoid Linux crash +fdtput binaries/virt-gicv2.dtb -p -t s /pl061@9030000 status disabled # Busybox mkdir -p initrd @@ -66,7 +76,7 @@ echo "#!/bin/sh mount -t proc proc /proc mount -t sysfs sysfs /sys mount -t devtmpfs devtmpfs /dev -${check} +${domU_check} /bin/sh" > initrd/init chmod +x initrd/init cd initrd @@ -98,6 +108,7 @@ ifconfig xenbr0 up ifconfig xenbr0 192.168.0.1 xl network-attach 1 type=vif +${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf @@ -127,6 +138,13 @@ if [[ "${test_variant}" == "static-mem" ]]; then echo -e "\nDOMU_STATIC_MEM[0]=\"0x${domu_base} 0x${domu_size}\"" >> binaries/config fi +if [[ "${test_variant}" == "boot-cpupools" ]]; then + echo ' +CPUPOOL[0]="cpu@1 null" +DOMU_CPUPOOL[0]=0 +NUM_CPUPOOLS=1' >> binaries/config +fi + rm -rf imagebuilder git clone https://gitlab.com/ViryaOS/imagebuilder bash imagebuilder/scripts/uboot-script-gen -t tftp -d binaries/ -c binaries/config @@ -148,5 +166,5 @@ timeout -k 1 240 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& tee smoke.serial set -e -(grep -q "^Welcome to Alpine Linux" smoke.serial && grep -q "DOM1: ${passed}" smoke.serial) || exit 1 +(grep -q "^Welcome to Alpine Linux" smoke.serial && grep -q "${passed}" smoke.serial) || exit 1 exit 0 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Sep 10 13:44:08 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Sep 2022 13:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404750.647315 (Exim 4.92) (envelope-from ) id 1oX0mB-000255-O4; Sat, 10 Sep 2022 13:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404750.647315; Sat, 10 Sep 2022 13: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 1oX0mB-00024x-LE; Sat, 10 Sep 2022 13:44:03 +0000 Received: by outflank-mailman (input) for mailman id 404750; Sat, 10 Sep 2022 13:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oX0m9-00024r-KD for xen-changelog@lists.xenproject.org; Sat, 10 Sep 2022 13:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oX0m9-0004a0-Ib for xen-changelog@lists.xenproject.org; Sat, 10 Sep 2022 13:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oX0m9-0002oG-Hb for xen-changelog@lists.xenproject.org; Sat, 10 Sep 2022 13: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=Qo2WqJTkabslqg9dghwUtSCGAabZcLa94QwMvR9bJp4=; b=y2kZLhy2sk8F3oAFFkGEhOg4M9 FVOuJXjwAbP1DATErOVNNToG5PXGx5FGTD6Phyy9tDV+WvCbzImhfqEa6r2sBgLOfObkiKLsSw4PW nTnPySm4k/tznRofZ4Tkoii809MhW5ehuSEHVRnF0PB213JBzjZcSPbAIEblmEThBHHQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/device-tree: Place the static-heap dt-binding in proper place Message-Id: Date: Sat, 10 Sep 2022 13:44:01 +0000 commit 9066d877bf57a47b0f09741dac996ee1055d6407 Author: Henry Wang AuthorDate: Thu Sep 8 12:07:28 2022 +0000 Commit: Julien Grall CommitDate: Fri Sep 9 10:07:34 2022 +0100 docs/device-tree: Place the static-heap dt-binding in proper place The static-heap dt-binding should be placed after the last feature, namely static-evtchn. Fixes: 4596329291f5 ("docs, xen/arm: Introduce static heap memory") Signed-off-by: Henry Wang Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 86 +++++++++++++++++------------------ 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 5395a1077c..93bf6fe577 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -425,49 +425,6 @@ The static event channel node has the following properties: link-to-foreign-evtchn is a single phandle to a remote evtchn to which local-evtchn will be connected. -Static Heap Memory -================== - -The static heap memory refers to parts of RAM reserved in the beginning of -boot time for heap. The memory is reserved by configuration in the device -tree using physical address ranges. - -The static heap memory declared in the device tree defines the memory areas -that will be reserved to be used exclusively as heap. - -- For Arm32, since there are separated heaps, the static heap will be used -for both domheap and xenheap. The admin should make sure that the static -heap region should contain enough memory below 4GB to cater 32-bit DMA. - -- For Arm64, since there is a single heap, the defined static heap areas -shall always go to the heap allocator. - -The static heap memory is an optional feature and can be enabled by adding -below device tree property. - -- xen,static-heap - - Property under the top-level "chosen" node. It specifies the address - and size of Xen static heap memory. Number of address and size cells - for the "xen,static-heap" property is determined by the root node - "#address-cells" and "#size-cells". Note that at least a 64KB alignment - is required. - -Below is an example on how to specify the static heap in device tree: - - / { - #address-cells = <0x2>; - #size-cells = <0x2>; - ... - chosen { - xen,static-heap = <0x0 0x30000000 0x0 0x40000000>; - ... - }; - }; - -RAM starting from the host physical address 0x30000000 of 1GB size will -be reserved as static heap. - Example ======= @@ -523,3 +480,46 @@ chosen { }; }; }; + +Static Heap Memory +================== + +The static heap memory refers to parts of RAM reserved in the beginning of +boot time for heap. The memory is reserved by configuration in the device +tree using physical address ranges. + +The static heap memory declared in the device tree defines the memory areas +that will be reserved to be used exclusively as heap. + +- For Arm32, since there are separated heaps, the static heap will be used +for both domheap and xenheap. The admin should make sure that the static +heap region should contain enough memory below 4GB to cater 32-bit DMA. + +- For Arm64, since there is a single heap, the defined static heap areas +shall always go to the heap allocator. + +The static heap memory is an optional feature and can be enabled by adding +below device tree property. + +- xen,static-heap + + Property under the top-level "chosen" node. It specifies the address + and size of Xen static heap memory. Number of address and size cells + for the "xen,static-heap" property is determined by the root node + "#address-cells" and "#size-cells". Note that at least a 64KB alignment + is required. + +Below is an example on how to specify the static heap in device tree: + + / { + #address-cells = <0x2>; + #size-cells = <0x2>; + ... + chosen { + xen,static-heap = <0x0 0x30000000 0x0 0x40000000>; + ... + }; + }; + +RAM starting from the host physical address 0x30000000 of 1GB size will +be reserved as static heap. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:22:10 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404891.647501 (Exim 4.92) (envelope-from ) id 1oXCbj-0005Mn-3m; Sun, 11 Sep 2022 02:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404891.647501; Sun, 11 Sep 2022 02:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCbj-0005Me-0P; Sun, 11 Sep 2022 02:22:03 +0000 Received: by outflank-mailman (input) for mailman id 404891; Sun, 11 Sep 2022 02:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCbi-0005ME-A1 for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCbi-0000qF-1S for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCbi-0002jE-0I for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02: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=hh2AZ3FGSTvCf47unHL5IW3S/pR1bDYtNM4r2epc9sU=; b=w+kt58710RVbh5CZqANex2GPcz OCQooRSWFF1BA3IKpdQgHST72FHkzr4ncixjCpSaZC572oD2I/QN9NRHpQnURyp89cGm6h+ptzsGZ 1krZ9usioO0pcvs2nD5pJFnEe36Z6jCxwLHbRLsAKZjnDTF3MRe4wUKbvpwgnNFZILBM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/gnttab: fix gnttab_acquire_resource() Message-Id: Date: Sun, 11 Sep 2022 02:22:02 +0000 commit 52daa6a8483e4fbd6757c9d1b791e23931791608 Author: Juergen Gross AuthorDate: Fri Sep 9 14:53:47 2022 +0200 Commit: Andrew Cooper CommitDate: Fri Sep 9 16:28:38 2022 +0100 xen/gnttab: fix gnttab_acquire_resource() Commit 9dc46386d89d ("gnttab: work around "may be used uninitialized" warning") was wrong, as vaddrs can legitimately be NULL in case XENMEM_resource_grant_table_id_status was specified for a grant table v1. This would result in crashes in debug builds due to ASSERT_UNREACHABLE() triggering. Check vaddrs only to be NULL in the rc == 0 case. Expand the tests in tools/tests/resource to tickle this path, and verify that using XENMEM_resource_grant_table_id_status on a v1 grant table fails. Fixes: 9dc46386d89d ("gnttab: work around "may be used uninitialized" warning") Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich # xen Reviewed-by: Andrew Cooper Release-acked-by: Henry Wang --- tools/tests/resource/test-resource.c | 15 +++++++++++++++ xen/common/grant_table.c | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/tests/resource/test-resource.c b/tools/tests/resource/test-resource.c index 189353ebcb..0a950072f9 100644 --- a/tools/tests/resource/test-resource.c +++ b/tools/tests/resource/test-resource.c @@ -106,6 +106,21 @@ static void test_gnttab(uint32_t domid, unsigned int nr_frames, if ( rc ) return fail(" Fail: Unmap grant table %d - %s\n", errno, strerror(errno)); + + /* + * Verify that an attempt to map the status frames fails, as the domain is + * in gnttab v1 mode. + */ + res = xenforeignmemory_map_resource( + fh, domid, XENMEM_resource_grant_table, + XENMEM_resource_grant_table_id_status, 0, 1, + (void **)&gnttab, PROT_READ | PROT_WRITE, 0); + + if ( res ) + { + fail(" Fail: Managed to map gnttab v2 status frames in v1 mode\n"); + xenforeignmemory_unmap_resource(fh, res); + } } static void test_domain_configurations(void) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index ad773a6996..fba329dcc2 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -4140,7 +4140,7 @@ int gnttab_acquire_resource( * on non-error paths, and hence it needs setting to NULL at the top of the * function. Leave some runtime safety. */ - if ( !vaddrs ) + if ( !rc && !vaddrs ) { ASSERT_UNREACHABLE(); rc = -ENODATA; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:22:13 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404892.647505 (Exim 4.92) (envelope-from ) id 1oXCbt-0005OQ-54; Sun, 11 Sep 2022 02:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404892.647505; Sun, 11 Sep 2022 02:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCbt-0005OI-2G; Sun, 11 Sep 2022 02:22:13 +0000 Received: by outflank-mailman (input) for mailman id 404892; Sun, 11 Sep 2022 02:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCbs-0005OB-6G for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCbs-0000qL-5P for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCbs-0002jd-3h for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=osE/uN/H1f9diTrsbuLKI98UA2P28IJ1nmD/tCYKoWI=; b=3XmmfpPjjalOwpLemxG+Z9tzoi uNOQcM6ASdeRoQvDRVXZJV4CTk8ddgCKc4hOwqeHjPwDvNzCbY/FCGx5FwVQrwwow7GHir3KxAhsK Oc0yOV8TGayVGI/cRkCxmv1wIwLtHZDlxHpoxHzQNXS22CFiXKVT/dbWqpOE3YphdfzQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: introduce static shared memory Message-Id: Date: Sun, 11 Sep 2022 02:22:12 +0000 commit 1d98281adf41abc7cf4c30f48349577dc42aa6c0 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:05 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:57:57 2022 -0700 xen/arm: introduce static shared memory This patch series introduces a new feature: setting up static shared memory on a dom0less system, through device tree configuration. This commit parses shared memory node at boot-time, and reserve it in bootinfo.reserved_mem to avoid other use. This commits proposes a new Kconfig CONFIG_STATIC_SHM to wrap static-shm-related codes, and this option depends on static memory( CONFIG_STATIC_MEMORY). That's because that later we want to reuse a few helpers, guarded with CONFIG_STATIC_MEMORY, like acquire_staticmem_pages, etc, on static shared memory. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 132 +++++++++++++++++++++++++++ xen/arch/arm/Kconfig | 6 ++ xen/arch/arm/bootfdt.c | 167 ++++++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/setup.h | 7 ++ 4 files changed, 312 insertions(+) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 93bf6fe577..12c5e1d189 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -523,3 +523,135 @@ Below is an example on how to specify the static heap in device tree: RAM starting from the host physical address 0x30000000 of 1GB size will be reserved as static heap. + +Static Shared Memory +==================== + +The static shared memory device tree nodes allow users to statically set up +shared memory on dom0less system, enabling domains to do shm-based +communication. + +- compatible + + "xen,domain-shared-memory-v1" + +- xen,shm-id + + An arbitrary string that represents the unique identifier of the shared + memory region, with a strict limit on the number of characters(\0 included), + `MAX_SHM_ID_LENGTH(16)`. e.g. "xen,shm-id = "my-shared-mem-1"". + +- xen,shared-mem + + An array takes a physical address, which is the base address of the + shared memory region in host physical address space, a size, and a guest + physical address, as the target address of the mapping. + e.g. xen,shared-mem = < [host physical address] [guest address] [size] > + + It shall also meet the following criteria: + 1) If the SHM ID matches with an existing region, the address range of the + region shall also exactly match. + 2) If the SHM ID does not match with any other existing region, it should + also not overlap with any other regions. + + The number of cells for the host address (and size) is the same as the + guest pseudo-physical address and they are inherited from the parent node. + + Host physical address is optional, when missing Xen decides the location + (currently unimplemented). + +- role (Optional) + + A string property specifying the ownership of a shared memory region, + the value must be one of the following: "owner", or "borrower" + A shared memory region could be explicitly backed by one domain, which is + called "owner domain", and all the other domains who are also sharing + this region are called "borrower domain". + If not specified, the default value is "borrower" and owner is + DOMID_IO, a system domain. + +As an example: + +chosen { + #address-cells = <0x1>; + #size-cells = <0x1>; + xen,xen-bootargs = "console=dtuart dtuart=serial0 bootscrub=0"; + + ...... + + /* this is for Dom0 */ + dom0-shared-mem@10000000 { + compatible = "xen,domain-shared-memory-v1"; + role = "owner"; + xen,shm-id = "my-shared-mem-0"; + xen,shared-mem = <0x10000000 0x10000000 0x10000000>; + } + + domU1 { + compatible = "xen,domain"; + #address-cells = <0x1>; + #size-cells = <0x1>; + memory = <0 131072>; + cpus = <2>; + vpl011; + + /* + * shared memory region identified as 0x0(xen,shm-id = <0x0>) + * is shared between Dom0 and DomU1. + */ + domU1-shared-mem@10000000 { + compatible = "xen,domain-shared-memory-v1"; + role = "borrower"; + xen,shm-id = "my-shared-mem-0"; + xen,shared-mem = <0x10000000 0x50000000 0x10000000>; + } + + /* + * shared memory region identified as 0x1(xen,shm-id = <0x1>) + * is shared between DomU1 and DomU2. + */ + domU1-shared-mem@50000000 { + compatible = "xen,domain-shared-memory-v1"; + xen,shm-id = "my-shared-mem-1"; + xen,shared-mem = <0x50000000 0x60000000 0x20000000>; + } + + ...... + + }; + + domU2 { + compatible = "xen,domain"; + #address-cells = <0x1>; + #size-cells = <0x1>; + memory = <0 65536>; + cpus = <1>; + + /* + * shared memory region identified as 0x1(xen,shm-id = <0x1>) + * is shared between domU1 and domU2. + */ + domU2-shared-mem@50000000 { + compatible = "xen,domain-shared-memory-v1"; + xen,shm-id = "my-shared-mem-1"; + xen,shared-mem = <0x50000000 0x70000000 0x20000000>; + } + + ...... + }; +}; + +This is an example with two static shared memory regions. + +For the static shared memory region identified as "my-shared-mem-0", host +physical address starting at 0x10000000 of 256MB will be reserved to be +shared between Dom0 and DomU1. It will get mapped at 0x10000000 in Dom0 guest +physical address space, and at 0x50000000 in DomU1 guest physical address space. +Dom0 is explicitly defined as the owner domain, and DomU1 is the borrower domain. + +For the static shared memory region identified as "my-shared-mem-1", host +physical address starting at 0x50000000 of 512MB will be reserved to be +shared between DomU1 and DomU2. It will get mapped at 0x60000000 in DomU1 guest +physical address space, and at 0x70000000 in DomU2 guest physical address space. +DomU1 and DomU2 are both the borrower domain, the owner domain is the default +owner domain DOMID_IO. diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 33e004d702..1fe5faf847 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -140,6 +140,12 @@ config TEE source "arch/arm/tee/Kconfig" +config STATIC_SHM + bool "Statically shared memory on a dom0less system" if UNSUPPORTED + depends on STATIC_MEMORY + help + This option enables statically shared memory on a dom0less system. + endmenu menu "ARM errata workaround via the alternative framework" diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index 9e1ea60094..f8b88ee3da 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -380,6 +381,170 @@ static int __init process_domain_node(const void *fdt, int node, MEMBANK_STATIC_DOMAIN); } +#ifdef CONFIG_STATIC_SHM +static int __init process_shm_node(const void *fdt, int node, + uint32_t address_cells, uint32_t size_cells) +{ + const struct fdt_property *prop, *prop_id, *prop_role; + const __be32 *cell; + paddr_t paddr, gaddr, size; + struct meminfo *mem = &bootinfo.reserved_mem; + unsigned int i; + int len; + bool owner = false; + const char *shm_id; + + if ( address_cells < 1 || size_cells < 1 ) + { + printk("fdt: invalid #address-cells or #size-cells for static shared memory node.\n"); + return -EINVAL; + } + + /* + * "xen,shm-id" property holds an arbitrary string with a strict limit + * on the number of characters, MAX_SHM_ID_LENGTH + */ + prop_id = fdt_get_property(fdt, node, "xen,shm-id", NULL); + if ( !prop_id ) + return -ENOENT; + shm_id = (const char *)prop_id->data; + if ( strnlen(shm_id, MAX_SHM_ID_LENGTH) == MAX_SHM_ID_LENGTH ) + { + printk("fdt: invalid xen,shm-id %s, it must be limited to %u characters\n", + shm_id, MAX_SHM_ID_LENGTH); + return -EINVAL; + } + + /* + * "role" property is optional and if it is defined explicitly, + * it must be either `owner` or `borrower`. + */ + prop_role = fdt_get_property(fdt, node, "role", NULL); + if ( prop_role ) + { + if ( !strcmp(prop_role->data, "owner") ) + owner = true; + else if ( strcmp(prop_role->data, "borrower") ) + { + printk("fdt: invalid `role` property for static shared memory node.\n"); + return -EINVAL; + } + } + + /* + * xen,shared-mem = ; + * Memory region starting from physical address #paddr of #size shall + * be mapped to guest physical address #gaddr as static shared memory + * region. + */ + prop = fdt_get_property(fdt, node, "xen,shared-mem", &len); + if ( !prop ) + return -ENOENT; + + if ( len != dt_cells_to_size(address_cells + size_cells + address_cells) ) + { + if ( len == dt_cells_to_size(size_cells + address_cells) ) + printk("fdt: host physical address must be chosen by users at the moment.\n"); + + printk("fdt: invalid `xen,shared-mem` property.\n"); + return -EINVAL; + } + + cell = (const __be32 *)prop->data; + device_tree_get_reg(&cell, address_cells, address_cells, &paddr, &gaddr); + size = dt_next_cell(size_cells, &cell); + + if ( !size ) + { + printk("fdt: the size for static shared memory region can not be zero\n"); + return -EINVAL; + } + + for ( i = 0; i < mem->nr_banks; i++ ) + { + /* + * Meet the following check: + * 1) The shm ID matches and the region exactly match + * 2) The shm ID doesn't match and the region doesn't overlap + * with an existing one + */ + if ( paddr == mem->bank[i].start && size == mem->bank[i].size ) + { + if ( strncmp(shm_id, mem->bank[i].shm_id, MAX_SHM_ID_LENGTH) == 0 ) + break; + else + { + printk("fdt: xen,shm-id %s does not match for all the nodes using the same region.\n", + shm_id); + return -EINVAL; + } + } + else + { + paddr_t end = paddr + size; + paddr_t bank_end = mem->bank[i].start + mem->bank[i].size; + + if ( (end <= paddr) || (bank_end <= mem->bank[i].start) ) + { + printk("fdt: static shared memory region %s overflow\n", shm_id); + return -EINVAL; + } + + if ( (end <= mem->bank[i].start) || (paddr >= bank_end) ) + { + if ( strcmp(shm_id, mem->bank[i].shm_id) != 0 ) + continue; + else + { + printk("fdt: different shared memory region could not share the same shm ID %s\n", + shm_id); + return -EINVAL; + } + } + else + { + printk("fdt: shared memory region overlap with an existing entry %#"PRIpaddr" - %#"PRIpaddr"\n", + mem->bank[i].start, bank_end); + return -EINVAL; + } + } + } + + if ( i == mem->nr_banks ) + { + if ( i < NR_MEM_BANKS ) + { + /* Static shared memory shall be reserved from any other use. */ + safe_strcpy(mem->bank[mem->nr_banks].shm_id, shm_id); + mem->bank[mem->nr_banks].start = paddr; + mem->bank[mem->nr_banks].size = size; + mem->bank[mem->nr_banks].type = MEMBANK_STATIC_DOMAIN; + mem->nr_banks++; + } + else + { + printk("Warning: Max number of supported memory regions reached.\n"); + return -ENOSPC; + } + } + /* + * keep a count of the number of borrowers, which later may be used + * to calculate the reference count. + */ + if ( !owner ) + mem->bank[i].nr_shm_borrowers++; + + return 0; +} +#else +static int __init process_shm_node(const void *fdt, int node, + uint32_t address_cells, uint32_t size_cells) +{ + printk("CONFIG_STATIC_SHM must be enabled for parsing static shared memory nodes\n"); + return -EINVAL; +} +#endif + static int __init early_scan_node(const void *fdt, int node, const char *name, int depth, u32 address_cells, u32 size_cells, @@ -405,6 +570,8 @@ static int __init early_scan_node(const void *fdt, rc = process_chosen_node(fdt, node, name, address_cells, size_cells); else if ( depth == 2 && device_tree_node_compatible(fdt, node, "xen,domain") ) rc = process_domain_node(fdt, node, name, address_cells, size_cells); + else if ( depth <= 3 && device_tree_node_compatible(fdt, node, "xen,domain-shared-memory-v1") ) + rc = process_shm_node(fdt, node, address_cells, size_cells); if ( rc < 0 ) printk("fdt: node `%s': parsing failed\n", name); diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 0651059537..fdbf68aadc 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -43,10 +43,17 @@ enum membank_type { MEMBANK_STATIC_HEAP, }; +/* Indicates the maximum number of characters(\0 included) for shm_id */ +#define MAX_SHM_ID_LENGTH 16 + struct membank { paddr_t start; paddr_t size; enum membank_type type; +#ifdef CONFIG_STATIC_SHM + char shm_id[MAX_SHM_ID_LENGTH]; + unsigned int nr_shm_borrowers; +#endif }; struct meminfo { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:22:23 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404893.647508 (Exim 4.92) (envelope-from ) id 1oXCc3-0005RQ-6Q; Sun, 11 Sep 2022 02:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404893.647508; Sun, 11 Sep 2022 02:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCc3-0005RJ-3x; Sun, 11 Sep 2022 02:22:23 +0000 Received: by outflank-mailman (input) for mailman id 404893; Sun, 11 Sep 2022 02:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCc2-0005RB-BU for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCc2-0000qc-Ae for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCc2-0002k2-7m for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wMss7yHUOh3OCf2s7bg8zC9NM5UsGEL9WBAX9iP9rKM=; b=3oAfo+5IiaSvs6fvH/rIhDeRmM ywT9E8L3lQ+hxtAyp0NKrkf7N3x1/8QxbiaVGhvF02Erradux37YUV0y3B0ouYxO3JdcovYcMcszG VgPrfuIFJrS6bwKw6iEck9WQKbQ23EUlGvdH14NzUoWF2xr2tpQe0ajOT5bHF9NTDFjQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: assign static shared memory to the default owner dom_io Message-Id: Date: Sun, 11 Sep 2022 02:22:22 +0000 commit 5597f32f409c789199749b82585b96fef6969d21 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:06 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:57:58 2022 -0700 xen/arm: assign static shared memory to the default owner dom_io This commit introduces process_shm to cope with static shared memory in domain construction. DOMID_IO will be the default owner of memory pre-shared among multiple domains at boot time, when no explicit owner is specified. And DOMID_IO is a fake domain and is not described in the Device-Tree. Therefore When the owner of the shared region is DOMID_IO, we will only find the borrowers when parsing the Device-Tree. When we found the first borrower of the region, we need to assign the region to DOMID_IO This commit only considers allocating static shared memory to dom_io when owner domain is not explicitly defined in device tree, all the left, including the "borrower" code path, the "explicit owner" code path, shall be introduced later in the following patches. Signed-off-by: Penny Zheng Reviewed-by: Julien Grall --- xen/arch/arm/domain_build.c | 160 ++++++++++++++++++++++++++++++++++++++++++++ xen/common/domain.c | 3 + 2 files changed, 163 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 7412303d20..4746155211 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -761,6 +761,160 @@ static void __init assign_static_memory_11(struct domain *d, panic("Failed to assign requested static memory for direct-map domain %pd.", d); } + +#ifdef CONFIG_STATIC_SHM +/* + * This function checks whether the static shared memory region is + * already allocated to dom_io. + */ +static bool __init is_shm_allocated_to_domio(paddr_t pbase) +{ + struct page_info *page; + struct domain *d; + + page = maddr_to_page(pbase); + d = page_get_owner_and_reference(page); + if ( d == NULL ) + return false; + put_page(page); + + if ( d != dom_io ) + { + printk(XENLOG_ERR + "shm memory node has already been allocated to a specific owner %pd, Please check your configuration\n", + d); + return false; + } + + return true; +} + +static mfn_t __init acquire_shared_memory_bank(struct domain *d, + paddr_t pbase, paddr_t psize) +{ + mfn_t smfn; + unsigned long nr_pfns; + int res; + + /* + * Pages of statically shared memory shall be included + * into domain_tot_pages(). + */ + nr_pfns = PFN_DOWN(psize); + if ( (UINT_MAX - d->max_pages) < nr_pfns ) + { + printk(XENLOG_ERR "%pd: Over-allocation for d->max_pages: %lu.\n", + d, nr_pfns); + return INVALID_MFN; + } + d->max_pages += nr_pfns; + + smfn = maddr_to_mfn(pbase); + res = acquire_domstatic_pages(d, smfn, nr_pfns, 0); + if ( res ) + { + printk(XENLOG_ERR + "%pd: failed to acquire static memory: %d.\n", d, res); + d->max_pages -= nr_pfns; + return INVALID_MFN; + } + + return smfn; +} + +static int __init assign_shared_memory(struct domain *d, + uint32_t addr_cells, uint32_t size_cells, + paddr_t pbase, paddr_t psize) +{ + mfn_t smfn; + + dprintk(XENLOG_INFO, + "%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpaddr".\n", + d, pbase, pbase + psize); + + smfn = acquire_shared_memory_bank(d, pbase, psize); + if ( mfn_eq(smfn, INVALID_MFN) ) + return -EINVAL; + + /* + * DOMID_IO is not auto-translated (i.e. it sees RAM 1:1). So we do not need + * to create mapping in the P2M. + */ + ASSERT(d == dom_io); + return 0; +} + +static int __init process_shm(struct domain *d, + const struct dt_device_node *node) +{ + struct dt_device_node *shm_node; + + dt_for_each_child_node(node, shm_node) + { + const struct dt_property *prop; + const __be32 *cells; + uint32_t addr_cells, size_cells; + paddr_t gbase, pbase, psize; + int ret = 0; + unsigned int i; + + if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) + continue; + + /* + * xen,shared-mem = ; + * TODO: pbase is optional. + */ + addr_cells = dt_n_addr_cells(shm_node); + size_cells = dt_n_size_cells(shm_node); + prop = dt_find_property(shm_node, "xen,shared-mem", NULL); + BUG_ON(!prop); + cells = (const __be32 *)prop->value; + device_tree_get_reg(&cells, addr_cells, addr_cells, &pbase, &gbase); + psize = dt_read_number(cells, size_cells); + if ( !IS_ALIGNED(pbase, PAGE_SIZE) || !IS_ALIGNED(gbase, PAGE_SIZE) ) + { + printk("%pd: physical address 0x%"PRIpaddr", or guest address 0x%"PRIpaddr" is not suitably aligned.\n", + d, pbase, gbase); + return -EINVAL; + } + if ( !IS_ALIGNED(psize, PAGE_SIZE) ) + { + printk("%pd: size 0x%"PRIpaddr" is not suitably aligned\n", + d, psize); + return -EINVAL; + } + + for ( i = 0; i < PFN_DOWN(psize); i++ ) + if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) + { + printk("%pd: invalid physical address 0x%"PRI_mfn"\n", + d, mfn_x(mfn_add(maddr_to_mfn(pbase), i))); + return -EINVAL; + } + + /* TODO: Consider owner domain is not the default dom_io. */ + /* + * DOMID_IO is a fake domain and is not described in the Device-Tree. + * Therefore when the owner of the shared region is DOMID_IO, we will + * only find the borrowers. + */ + if ( !is_shm_allocated_to_domio(pbase) ) + { + /* + * We found the first borrower of the region, the owner was not + * specified, so they should be assigned to dom_io. + */ + ret = assign_shared_memory(dom_io, addr_cells, size_cells, + pbase, psize); + if ( ret ) + return ret; + } + } + + return 0; +} +#endif /* CONFIG_STATIC_SHM */ #else static void __init allocate_static_memory(struct domain *d, struct kernel_info *kinfo, @@ -3386,6 +3540,12 @@ static int __init construct_domU(struct domain *d, else assign_static_memory_11(d, &kinfo, node); +#ifdef CONFIG_STATIC_SHM + rc = process_shm(d, node); + if ( rc < 0 ) + return rc; +#endif + /* * Base address and irq number are needed when creating vpl011 device * tree node in prepare_dtb_domU, so initialization on related variables diff --git a/xen/common/domain.c b/xen/common/domain.c index c23f449451..8dd6cd5a8f 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -787,6 +787,9 @@ void __init setup_system_domains(void) * This domain owns I/O pages that are within the range of the page_info * array. Mappings occur at the priv of the caller. * Quarantined PCI devices will be associated with this domain. + * + * DOMID_IO is also the default owner of memory pre-shared among multiple + * domains at boot time. */ dom_io = domain_create(DOMID_IO, NULL, 0); if ( IS_ERR(dom_io) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:22:33 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404894.647513 (Exim 4.92) (envelope-from ) id 1oXCcD-0005Um-9y; Sun, 11 Sep 2022 02:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404894.647513; Sun, 11 Sep 2022 02:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCcD-0005Ue-72; Sun, 11 Sep 2022 02:22:33 +0000 Received: by outflank-mailman (input) for mailman id 404894; Sun, 11 Sep 2022 02:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCcC-0005UV-Eh for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCcC-0000r7-Dq for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCcC-0002kk-D2 for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TLW7Sr+4vpGJ6fd5rzlmYtf2qzQ3vDZmXRc1yHfffA8=; b=yW40BdFMDfTXFNHQD6G/TaWmKZ Q8TQ7WNQJZ6sJ0MjG1lkYaVZDYBGxIK8m3KieV5TcrRuk+pgUI0vCcqE9/z8iCl04F/UMdDzLHSCN uuFtYj86wxZwj3+Jfv8Qqh84S8TwXPsJ4D++MrokxZcWjGXARchIQULmbsp8Jt0t6fjs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: allocate static shared memory to a specific owner domain Message-Id: Date: Sun, 11 Sep 2022 02:22:32 +0000 commit 83d55ba81783f9fd4f2a4c37e11bd6e89f858a36 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:07 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:57:58 2022 -0700 xen/arm: allocate static shared memory to a specific owner domain If owner property is defined, then owner domain of a static shared memory region is not the default dom_io anymore, but a specific domain. This commit implements allocating static shared memory to a specific domain when owner property is defined. Coding flow for dealing borrower domain will be introduced later in the following commits. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4746155211..c6c6c942d8 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -824,9 +824,11 @@ static mfn_t __init acquire_shared_memory_bank(struct domain *d, static int __init assign_shared_memory(struct domain *d, uint32_t addr_cells, uint32_t size_cells, - paddr_t pbase, paddr_t psize) + paddr_t pbase, paddr_t psize, + paddr_t gbase) { mfn_t smfn; + int ret = 0; dprintk(XENLOG_INFO, "%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpaddr".\n", @@ -840,8 +842,18 @@ static int __init assign_shared_memory(struct domain *d, * DOMID_IO is not auto-translated (i.e. it sees RAM 1:1). So we do not need * to create mapping in the P2M. */ - ASSERT(d == dom_io); - return 0; + if ( d != dom_io ) + { + ret = guest_physmap_add_pages(d, gaddr_to_gfn(gbase), smfn, + PFN_DOWN(psize)); + if ( ret ) + { + printk(XENLOG_ERR "Failed to map shared memory to %pd.\n", d); + return ret; + } + } + + return ret; } static int __init process_shm(struct domain *d, @@ -857,6 +869,8 @@ static int __init process_shm(struct domain *d, paddr_t gbase, pbase, psize; int ret = 0; unsigned int i; + const char *role_str; + bool owner_dom_io = true; if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) continue; @@ -893,20 +907,28 @@ static int __init process_shm(struct domain *d, return -EINVAL; } - /* TODO: Consider owner domain is not the default dom_io. */ + /* + * "role" property is optional and if it is defined explicitly, + * then the owner domain is not the default "dom_io" domain. + */ + if ( dt_property_read_string(shm_node, "role", &role_str) == 0 ) + owner_dom_io = false; + /* * DOMID_IO is a fake domain and is not described in the Device-Tree. * Therefore when the owner of the shared region is DOMID_IO, we will * only find the borrowers. */ - if ( !is_shm_allocated_to_domio(pbase) ) + if ( (owner_dom_io && !is_shm_allocated_to_domio(pbase)) || + (!owner_dom_io && strcmp(role_str, "owner") == 0) ) { /* * We found the first borrower of the region, the owner was not * specified, so they should be assigned to dom_io. */ - ret = assign_shared_memory(dom_io, addr_cells, size_cells, - pbase, psize); + ret = assign_shared_memory(owner_dom_io ? dom_io : d, + addr_cells, size_cells, + pbase, psize, gbase); if ( ret ) return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:22:43 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404895.647518 (Exim 4.92) (envelope-from ) id 1oXCcN-0005XI-Bj; Sun, 11 Sep 2022 02:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404895.647518; Sun, 11 Sep 2022 02: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 1oXCcN-0005X8-8a; Sun, 11 Sep 2022 02:22:43 +0000 Received: by outflank-mailman (input) for mailman id 404895; Sun, 11 Sep 2022 02:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCcM-0005X0-Hp for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCcM-0000rK-H3 for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCcM-0002lF-GD for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02: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=0qdZeKerPrPRqW2irc0os+jQ4l1HOymeD5cwLIA9lkc=; b=uSKRD7wd1RnH0XfZ3PVKw7WF9s SIAl84P2ihUDQCczQkdTSosQVp82kcgdjzvoqG3gKa0VZYw7dXcekyuRJgInUab+gCCrjdgqYZKyf LiFSwkQtjbRSHQUWDdEgrHor0y4B6UUkesOt9I9fNjyT8oe7AW6+titFXWGOak4A57rE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: introduce put_page_nr and get_page_nr Message-Id: Date: Sun, 11 Sep 2022 02:22:42 +0000 commit 5951b856d8d0af57212b54f2afbb404b7579bd27 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:08 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:57:59 2022 -0700 xen/arm: introduce put_page_nr and get_page_nr Later, we need to add the right amount of references, which should be the number of borrower domains, to the owner domain. Since we only have get_page() to increment the page reference by 1, a loop is needed per page, which is inefficient and time-consuming. To save the loop time, this commit introduces a set of new helpers put_page_nr() and get_page_nr() to increment/drop the page reference by nr. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Reviewed-by: Julien Grall --- xen/arch/arm/include/asm/mm.h | 4 ++++ xen/arch/arm/mm.c | 42 +++++++++++++++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 7d21120f98..68adcac9fa 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -363,6 +363,10 @@ void free_init_memory(void); int guest_physmap_mark_populate_on_demand(struct domain *d, unsigned long gfn, unsigned int order); +extern bool get_page_nr(struct page_info *page, const struct domain *domain, + unsigned long nr); +extern void put_page_nr(struct page_info *page, unsigned long nr); + extern void put_page_type(struct page_info *page); static inline void put_page_and_type(struct page_info *page) { diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 11ee49598b..6ccffeaea5 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1465,21 +1465,29 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) return 0; } -struct domain *page_get_owner_and_reference(struct page_info *page) +static struct domain *page_get_owner_and_nr_reference(struct page_info *page, + unsigned long nr) { unsigned long x, y = page->count_info; struct domain *owner; + /* Restrict nr to avoid "double" overflow */ + if ( nr >= PGC_count_mask ) + { + ASSERT_UNREACHABLE(); + return NULL; + } + do { x = y; /* * Count == 0: Page is not allocated, so we cannot take a reference. * Count == -1: Reference count would wrap, which is invalid. */ - if ( unlikely(((x + 1) & PGC_count_mask) <= 1) ) + if ( unlikely(((x + nr) & PGC_count_mask) <= nr) ) return NULL; } - while ( (y = cmpxchg(&page->count_info, x, x + 1)) != x ); + while ( (y = cmpxchg(&page->count_info, x, x + nr)) != x ); owner = page_get_owner(page); ASSERT(owner); @@ -1487,14 +1495,19 @@ struct domain *page_get_owner_and_reference(struct page_info *page) return owner; } -void put_page(struct page_info *page) +struct domain *page_get_owner_and_reference(struct page_info *page) +{ + return page_get_owner_and_nr_reference(page, 1); +} + +void put_page_nr(struct page_info *page, unsigned long nr) { unsigned long nx, x, y = page->count_info; do { - ASSERT((y & PGC_count_mask) != 0); + ASSERT((y & PGC_count_mask) >= nr); x = y; - nx = x - 1; + nx = x - nr; } while ( unlikely((y = cmpxchg(&page->count_info, x, nx)) != x) ); @@ -1507,19 +1520,30 @@ void put_page(struct page_info *page) } } -bool get_page(struct page_info *page, const struct domain *domain) +void put_page(struct page_info *page) +{ + put_page_nr(page, 1); +} + +bool get_page_nr(struct page_info *page, const struct domain *domain, + unsigned long nr) { - const struct domain *owner = page_get_owner_and_reference(page); + const struct domain *owner = page_get_owner_and_nr_reference(page, nr); if ( likely(owner == domain) ) return true; if ( owner != NULL ) - put_page(page); + put_page_nr(page, nr); return false; } +bool get_page(struct page_info *page, const struct domain *domain) +{ + return get_page_nr(page, domain, 1); +} + /* Common code requires get_page_type and put_page_type. * We don't care about typecounts so we just do the minimum to make it * happy. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:22:53 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404896.647521 (Exim 4.92) (envelope-from ) id 1oXCcX-0005Zn-Ch; Sun, 11 Sep 2022 02:22:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404896.647521; Sun, 11 Sep 2022 02: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 1oXCcX-0005Zf-A3; Sun, 11 Sep 2022 02:22:53 +0000 Received: by outflank-mailman (input) for mailman id 404896; Sun, 11 Sep 2022 02:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCcW-0005ZS-Km for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCcW-0000rV-K0 for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCcW-0002m1-JK for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02: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=tpv8ihXT2o0Mg9ZWWB2MXKrRvCslWdYFqc1s9yalg1Q=; b=YDWBw8MiFhP9PZgIzljwTZhhNm IxPgF78pbmGzHvLKnYiOJRcNSSf+ErpzKAB9A2TFQNwYvGJyvzQEscsjt111c5fyQXIyVooIKU9xx 83fPxKyAOETjb4JT7Q8EVCfTnnzNaKr8X1LHzIU+7FBjZXeoIvpuZEEUCboWNsV4kWqw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add additional reference to owner domain when the owner is allocated Message-Id: Date: Sun, 11 Sep 2022 02:22:52 +0000 commit 041957bad382ba0a393164e8530aa66eacbbb8a3 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:09 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:58:00 2022 -0700 xen/arm: Add additional reference to owner domain when the owner is allocated Borrower domain will fail to get a page ref using the owner domain during allocation, when the owner is created after borrower. So here, we decide to get and add the right amount of reference, which is the number of borrowers, when the owner is allocated. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c6c6c942d8..417a0e82ba 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -763,6 +763,30 @@ static void __init assign_static_memory_11(struct domain *d, } #ifdef CONFIG_STATIC_SHM +static int __init acquire_nr_borrower_domain(struct domain *d, + paddr_t pbase, paddr_t psize, + unsigned long *nr_borrowers) +{ + unsigned int bank; + + /* Iterate reserved memory to find requested shm bank. */ + for ( bank = 0 ; bank < bootinfo.reserved_mem.nr_banks; bank++ ) + { + paddr_t bank_start = bootinfo.reserved_mem.bank[bank].start; + paddr_t bank_size = bootinfo.reserved_mem.bank[bank].size; + + if ( (pbase == bank_start) && (psize == bank_size) ) + break; + } + + if ( bank == bootinfo.reserved_mem.nr_banks ) + return -ENOENT; + + *nr_borrowers = bootinfo.reserved_mem.bank[bank].nr_shm_borrowers; + + return 0; +} + /* * This function checks whether the static shared memory region is * already allocated to dom_io. @@ -829,6 +853,8 @@ static int __init assign_shared_memory(struct domain *d, { mfn_t smfn; int ret = 0; + unsigned long nr_pages, nr_borrowers, i; + struct page_info *page; dprintk(XENLOG_INFO, "%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpaddr".\n", @@ -842,6 +868,7 @@ static int __init assign_shared_memory(struct domain *d, * DOMID_IO is not auto-translated (i.e. it sees RAM 1:1). So we do not need * to create mapping in the P2M. */ + nr_pages = PFN_DOWN(psize); if ( d != dom_io ) { ret = guest_physmap_add_pages(d, gaddr_to_gfn(gbase), smfn, @@ -853,6 +880,39 @@ static int __init assign_shared_memory(struct domain *d, } } + /* + * Get the right amount of references per page, which is the number of + * borrower domains. + */ + ret = acquire_nr_borrower_domain(d, pbase, psize, &nr_borrowers); + if ( ret ) + return ret; + + /* + * Instead of letting borrower domain get a page ref, we add as many + * additional reference as the number of borrowers when the owner + * is allocated, since there is a chance that owner is created + * after borrower. + * So if the borrower is created first, it will cause adding pages + * in the P2M without reference. + */ + page = mfn_to_page(smfn); + for ( i = 0; i < nr_pages; i++ ) + { + if ( !get_page_nr(page + i, d, nr_borrowers) ) + { + printk(XENLOG_ERR + "Failed to add %lu references to page %"PRI_mfn".\n", + nr_borrowers, mfn_x(smfn) + i); + goto fail; + } + } + + return 0; + + fail: + while ( --i >= 0 ) + put_page_nr(page + i, nr_borrowers); return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:23:04 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404897.647525 (Exim 4.92) (envelope-from ) id 1oXCci-0005dL-F5; Sun, 11 Sep 2022 02:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404897.647525; Sun, 11 Sep 2022 02: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 1oXCci-0005dD-Be; Sun, 11 Sep 2022 02:23:04 +0000 Received: by outflank-mailman (input) for mailman id 404897; Sun, 11 Sep 2022 02:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCcg-0005cI-O0 for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCcg-0000rz-N9 for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCcg-0002mb-MG for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02: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=IfqlN1JItRSfQBBN6UXsBuHsPA2m4pH5Xc1oXhkU0Cs=; b=fysD/8YEkVfP9DGvLk2hwO/qXV Qc5icOmkPnr/Nr45xLtPytPdBI033DOePTCSsVjVSMhFr9b2WiO3nNzSK/ZvcDG75ox8/Ghb7KWf2 U5n8POUZabyXf2TpcSN0n/ahXFOya0bo1mEulUO0rKdknwPYMIU3ExiqKXikipxdTKbQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: set up shared memory foreign mapping for borrower domain Message-Id: Date: Sun, 11 Sep 2022 02:23:02 +0000 commit b7133c10a3fd3b66b8d6a657a55855ab78f0a75b Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:10 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:58:00 2022 -0700 xen/arm: set up shared memory foreign mapping for borrower domain This commit sets up shared memory foreign mapping for borrower domain. If owner domain is the default dom_io, all shared domain are treated as borrower domain. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 417a0e82ba..dfcda604b3 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -992,6 +992,15 @@ static int __init process_shm(struct domain *d, if ( ret ) return ret; } + + if ( owner_dom_io || (strcmp(role_str, "borrower") == 0) ) + { + /* Set up P2M foreign mapping for borrower domain. */ + ret = map_regions_p2mt(d, _gfn(PFN_UP(gbase)), PFN_DOWN(psize), + _mfn(PFN_UP(pbase)), p2m_map_foreign_rw); + if ( ret ) + return ret; + } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:23:14 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404898.647529 (Exim 4.92) (envelope-from ) id 1oXCcs-0005gm-GK; Sun, 11 Sep 2022 02:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404898.647529; Sun, 11 Sep 2022 02: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 1oXCcs-0005gb-DH; Sun, 11 Sep 2022 02:23:14 +0000 Received: by outflank-mailman (input) for mailman id 404898; Sun, 11 Sep 2022 02:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCcq-0005gR-Qx for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCcq-0000sw-Q6 for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCcq-0002n2-PN for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02: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=MUnGQ5J9nBx5lYe8Hdk6hAtjqL47bfHp5zZSOUi3FEg=; b=ZW8CNmJDBwlMPmNhOMb9BYZU4H mimoiNkQrK38FpCRGYk3Ba8C6gn1no7Lg84CWEjoK0reoVAWV9w+PxwxWaRkhOb9KHNWpFesOWyi4 m/lvEeWl2MW+QYzDP6upvnlkf1PprBZnw5jG2YS95oMMWUCQEzyTHe0Uka+OoBelrWWY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: create shared memory nodes in guest device tree Message-Id: Date: Sun, 11 Sep 2022 02:23:12 +0000 commit c7fe72607a37c0bb251b662006a5020e4d7db67e Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:11 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 12:59:10 2022 -0700 xen/arm: create shared memory nodes in guest device tree We expose the shared memory to the domU using the "xen,shared-memory-v1" reserved-memory binding. See Documentation/devicetree/bindings/reserved-memory/xen,shared-memory.txt in Linux for the corresponding device tree binding. To save the cost of re-parsing shared memory device tree configuration when creating shared memory nodes in guest device tree, this commit adds new field "shm_mem" to store shm-info per domain. For each shared memory region, a range is exposed under the /reserved-memory node as a child node. Each range sub-node is named xen-shmem@
and has the following properties: - compatible: compatible = "xen,shared-memory-v1" - reg: the base guest physical address and size of the shared memory region - xen,id: a string that identifies the shared memory region. - xen,offset: (borrower VMs only) 64 bit integer offset within the owner virtual machine's shared memory region used for the mapping in the borrower VM. Currently, we provide "xen,offset=<0x0>" as a temporary placeholder. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis [stefano: fix code style, add return -EOPNOTSUPP;] Signed-off-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 162 +++++++++++++++++++++++++++++++++++++- xen/arch/arm/include/asm/kernel.h | 1 + 2 files changed, 161 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index dfcda604b3..35343e0373 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -916,7 +916,22 @@ static int __init assign_shared_memory(struct domain *d, return ret; } -static int __init process_shm(struct domain *d, +static int __init append_shm_bank_to_domain(struct kernel_info *kinfo, + paddr_t start, paddr_t size, + const char *shm_id) +{ + if ( kinfo->shm_mem.nr_banks >= NR_MEM_BANKS ) + return -ENOMEM; + + kinfo->shm_mem.bank[kinfo->shm_mem.nr_banks].start = start; + kinfo->shm_mem.bank[kinfo->shm_mem.nr_banks].size = size; + safe_strcpy(kinfo->shm_mem.bank[kinfo->shm_mem.nr_banks].shm_id, shm_id); + kinfo->shm_mem.nr_banks++; + + return 0; +} + +static int __init process_shm(struct domain *d, struct kernel_info *kinfo, const struct dt_device_node *node) { struct dt_device_node *shm_node; @@ -930,6 +945,7 @@ static int __init process_shm(struct domain *d, int ret = 0; unsigned int i; const char *role_str; + const char *shm_id; bool owner_dom_io = true; if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) @@ -974,6 +990,13 @@ static int __init process_shm(struct domain *d, if ( dt_property_read_string(shm_node, "role", &role_str) == 0 ) owner_dom_io = false; + if ( dt_property_read_string(shm_node, "xen,shm-id", &shm_id) ) + { + printk("%pd: invalid \"xen,shm-id\" property", d); + return -EINVAL; + } + BUG_ON((strlen(shm_id) <= 0) || (strlen(shm_id) >= MAX_SHM_ID_LENGTH)); + /* * DOMID_IO is a fake domain and is not described in the Device-Tree. * Therefore when the owner of the shared region is DOMID_IO, we will @@ -1001,6 +1024,14 @@ static int __init process_shm(struct domain *d, if ( ret ) return ret; } + + /* + * Record static shared memory region info for later setting + * up shm-node in guest device tree. + */ + ret = append_shm_bank_to_domain(kinfo, gbase, psize, shm_id); + if ( ret ) + return ret; } return 0; @@ -1333,6 +1364,128 @@ static int __init make_memory_node(const struct domain *d, return res; } +#ifdef CONFIG_STATIC_SHM +static int __init make_shm_memory_node(const struct domain *d, + void *fdt, + int addrcells, int sizecells, + const struct meminfo *mem) +{ + unsigned int i = 0; + int res = 0; + + if ( mem->nr_banks == 0 ) + return -ENOENT; + + /* + * For each shared memory region, a range is exposed under + * the /reserved-memory node as a child node. Each range sub-node is + * named xen-shmem@
. + */ + dt_dprintk("Create xen-shmem node\n"); + + for ( ; i < mem->nr_banks; i++ ) + { + uint64_t start = mem->bank[i].start; + uint64_t size = mem->bank[i].size; + /* Placeholder for xen-shmem@ + a 64-bit number + \0 */ + char buf[27]; + const char compat[] = "xen,shared-memory-v1"; + /* Worst case addrcells + sizecells */ + __be32 reg[GUEST_ROOT_ADDRESS_CELLS + GUEST_ROOT_SIZE_CELLS]; + __be32 *cells; + unsigned int len = (addrcells + sizecells) * sizeof(__be32); + + snprintf(buf, sizeof(buf), "xen-shmem@%"PRIx64, mem->bank[i].start); + res = fdt_begin_node(fdt, buf); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compat, sizeof(compat)); + if ( res ) + return res; + + cells = reg; + dt_child_set_range(&cells, addrcells, sizecells, start, size); + + res = fdt_property(fdt, "reg", reg, len); + if ( res ) + return res; + + dt_dprintk("Shared memory bank %u: %#"PRIx64"->%#"PRIx64"\n", + i, start, start + size); + + res = fdt_property_string(fdt, "xen,id", mem->bank[i].shm_id); + if ( res ) + return res; + + /* + * TODO: + * - xen,offset: (borrower VMs only) + * 64 bit integer offset within the owner virtual machine's shared + * memory region used for the mapping in the borrower VM + */ + res = fdt_property_u64(fdt, "xen,offset", 0); + if ( res ) + return res; + + res = fdt_end_node(fdt); + if ( res ) + return res; + } + + return res; +} +#else +static int __init make_shm_memory_node(const struct domain *d, + void *fdt, + int addrcells, int sizecells, + const struct meminfo *mem) +{ + ASSERT_UNREACHABLE(); + return -EOPNOTSUPP; +} +#endif + +static int __init make_resv_memory_node(const struct domain *d, + void *fdt, + int addrcells, int sizecells, + const struct meminfo *mem) +{ + int res = 0; + /* Placeholder for reserved-memory\0 */ + const char resvbuf[16] = "reserved-memory"; + + if ( mem->nr_banks == 0 ) + /* No shared memory provided. */ + return 0; + + dt_dprintk("Create reserved-memory node\n"); + + res = fdt_begin_node(fdt, resvbuf); + if ( res ) + return res; + + res = fdt_property(fdt, "ranges", NULL, 0); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#address-cells", addrcells); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#size-cells", sizecells); + if ( res ) + return res; + + res = make_shm_memory_node(d, fdt, addrcells, sizecells, mem); + if ( res ) + return res; + + res = fdt_end_node(fdt); + + return res; +} + static int __init add_ext_regions(unsigned long s, unsigned long e, void *data) { struct meminfo *ext_regions = data; @@ -3110,6 +3263,11 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) if ( ret ) goto err; + ret = make_resv_memory_node(d, kinfo->fdt, addrcells, sizecells, + &kinfo->shm_mem); + if ( ret ) + goto err; + /* * domain_handle_dtb_bootmodule has to be called before the rest of * the device tree is generated because it depends on the value of @@ -3632,7 +3790,7 @@ static int __init construct_domU(struct domain *d, assign_static_memory_11(d, &kinfo, node); #ifdef CONFIG_STATIC_SHM - rc = process_shm(d, node); + rc = process_shm(d, &kinfo, node); if ( rc < 0 ) return rc; #endif diff --git a/xen/arch/arm/include/asm/kernel.h b/xen/arch/arm/include/asm/kernel.h index f8bb85767b..5bb30c3f2f 100644 --- a/xen/arch/arm/include/asm/kernel.h +++ b/xen/arch/arm/include/asm/kernel.h @@ -38,6 +38,7 @@ struct kernel_info { void *fdt; /* flat device tree */ paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */ struct meminfo mem; + struct meminfo shm_mem; /* kernel entry point */ paddr_t entry; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:23:24 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404900.647534 (Exim 4.92) (envelope-from ) id 1oXCd2-0005l5-Jb; Sun, 11 Sep 2022 02:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404900.647534; Sun, 11 Sep 2022 02: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 1oXCd2-0005kt-GA; Sun, 11 Sep 2022 02:23:24 +0000 Received: by outflank-mailman (input) for mailman id 404900; Sun, 11 Sep 2022 02:23:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCd1-0005kI-1z for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:23:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCd1-0000t8-1F for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:23:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCd1-0002nb-0J for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02: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=kiTjjG/T8UGPE8UwTsSnniR9xJoRcY42kefo6U0erpo=; b=HPWmXkzVT+mCrsxQi0S1t8wWfw Te7Bor4aYl57+jBKP3oeXb/zd21Klqb+qsXR/VQFs6bCOLwIpvxGfl/nFxyQKVfTRYSYmJ2iUbq5/ 81Vo7gdWtEhvbTMbvWdMpiE+BvT0X6KhM2MloNgH/k9/pu0Vxt0mJgOt0CU93TQgQg9w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: enable statically shared memory on Dom0 Message-Id: Date: Sun, 11 Sep 2022 02:23:23 +0000 commit 09c0a8976acf6fa21fd853c675b2cbde20f56528 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:12 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 13:00:10 2022 -0700 xen/arm: enable statically shared memory on Dom0 To add statically shared memory nodes in Dom0, user shall put according static shared memory configuration under /chosen node. This commit adds shm-processing function process_shm in construct_dom0 to enable statically shared memory on Dom0. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 35343e0373..1e4b5d2df8 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2709,6 +2709,11 @@ static int __init handle_node(struct domain *d, struct kernel_info *kinfo, if ( res ) return res; } + + res = make_resv_memory_node(d, kinfo->fdt, addrcells, sizecells, + &kinfo->shm_mem); + if ( res ) + return res; } res = fdt_end_node(kinfo->fdt); @@ -3937,6 +3942,9 @@ static int __init construct_dom0(struct domain *d) { struct kernel_info kinfo = {}; int rc; +#ifdef CONFIG_STATIC_SHM + const struct dt_device_node *chosen = dt_find_node_by_path("/chosen"); +#endif /* Sanity! */ BUG_ON(d->domain_id != 0); @@ -3971,6 +3979,12 @@ static int __init construct_dom0(struct domain *d) allocate_memory_11(d, &kinfo); find_gnttab_region(d, &kinfo); +#ifdef CONFIG_STATIC_SHM + rc = process_shm(d, &kinfo, chosen); + if ( rc < 0 ) + return rc; +#endif + /* Map extra GIC MMIO, irqs and other hw stuffs to dom0. */ rc = gic_map_hwdom_extra_mappings(d); if ( rc < 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:23:34 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404901.647537 (Exim 4.92) (envelope-from ) id 1oXCdC-0005oE-Kc; Sun, 11 Sep 2022 02:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404901.647537; Sun, 11 Sep 2022 02: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 1oXCdC-0005o4-Hh; Sun, 11 Sep 2022 02:23:34 +0000 Received: by outflank-mailman (input) for mailman id 404901; Sun, 11 Sep 2022 02:23:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCdB-0005nq-4e for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:23:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCdB-0000tY-40 for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:23:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCdB-0002o9-3J for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02: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=a4sD+PzfIB8+LuXFxsiPSp5aa8TE/R363jtJ7q/1UpI=; b=GMmQfvs9pQbe1XmeS/Pbjx+bJz mPUY5jguhyngYPWxoiExahKbemX1sZeQxngpqsxIDDBKpyaZClnno9Wm0kWrnXDtMW0inB37yqB6b 3odeMobCGbvWPi+t1aEb54g0VjbnZWnm+QdKZW4dcIP1NrZwMyYPQv8k31ZTAdUW4HVE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Add static memory sharing in SUPPORT.md Message-Id: Date: Sun, 11 Sep 2022 02:23:33 +0000 commit 826956157d52ebf6b926eef70d8bb3b849de8e08 Author: Penny Zheng AuthorDate: Thu Sep 8 21:55:13 2022 +0800 Commit: Stefano Stabellini CommitDate: Fri Sep 9 13:00:10 2022 -0700 xen: Add static memory sharing in SUPPORT.md on ARM, static memory sharing is tech preview, which shall be documented in SUPPORT.md Signed-off-by: Penny Zheng Reviewed-by: Michal Orzel Acked-by: Julien Grall --- SUPPORT.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/SUPPORT.md b/SUPPORT.md index b02a5d25ca..8ebd63ad82 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -306,6 +306,13 @@ Allow sharing of identical pages between guests Status, x86 HVM: Experimental +### Static Memory Sharing + +Allow to statically set up shared memory on dom0less system, +enabling domains to do shm-based communication + + Status, ARM: Tech Preview + ### Memory Paging Allow pages belonging to guests to be paged to disk -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:23:44 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:23:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404902.647541 (Exim 4.92) (envelope-from ) id 1oXCdM-0005rA-Lg; Sun, 11 Sep 2022 02:23:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404902.647541; Sun, 11 Sep 2022 02: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 1oXCdM-0005r2-J6; Sun, 11 Sep 2022 02:23:44 +0000 Received: by outflank-mailman (input) for mailman id 404902; Sun, 11 Sep 2022 02:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCdL-0005qp-7b for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCdL-0000tj-6w for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCdL-0002oY-68 for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02: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=bq0sM4U9Wv/pLJIG+M0cUVuFfK27uWeN6yeEgbuZL2A=; b=qsTX1hI6/CG8bEbvMY+9ZZlud9 nw6ZHMoPrrg6aQP6lTUJPcrW8OtbQ4oLZtioNi2J6r/dXPrMsHGScKCxDELQ2QBA4lgsnGhhcsQeL coCztrBCBlKY0x3Bk/WHHsPY2BtwlSJQpuqwE39vzFnqzAqt55AyxB1bqRQiz1vTSLU4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: pci: modify pci_find_host_bridge_node argument to const pdev Message-Id: Date: Sun, 11 Sep 2022 02:23:43 +0000 commit 943941fb7a5f968cb48c2b7a8c00f53ad6728575 Author: Rahul Singh AuthorDate: Fri Sep 9 10:34:39 2022 +0100 Commit: Stefano Stabellini CommitDate: Fri Sep 9 13:48:13 2022 -0700 xen/arm: pci: modify pci_find_host_bridge_node argument to const pdev Modify pci_find_host_bridge_node argument to const pdev to avoid converting the dev to pdev in pci_find_host_bridge_node and also constify the return. Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini Reviewed-by: Oleksandr Tyshchenko --- xen/arch/arm/include/asm/pci.h | 3 ++- xen/arch/arm/pci/pci-host-common.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 7c7449d64f..80a2431804 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -106,7 +106,8 @@ bool pci_ecam_need_p2m_hwdom_mapping(struct domain *d, struct pci_host_bridge *bridge, uint64_t addr); struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus); -struct dt_device_node *pci_find_host_bridge_node(struct device *dev); +const struct dt_device_node * +pci_find_host_bridge_node(const struct pci_dev *pdev); int pci_get_host_bridge_segment(const struct dt_device_node *node, uint16_t *segment); diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index fd8c0f837a..89ef30028e 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -243,10 +243,10 @@ err_exit: /* * Get host bridge node given a device attached to it. */ -struct dt_device_node *pci_find_host_bridge_node(struct device *dev) +const struct dt_device_node * +pci_find_host_bridge_node(const struct pci_dev *pdev) { struct pci_host_bridge *bridge; - struct pci_dev *pdev = dev_to_pci(dev); bridge = pci_find_host_bridge(pdev->seg, pdev->bus); if ( unlikely(!bridge) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:23:54 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:23:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404903.647545 (Exim 4.92) (envelope-from ) id 1oXCdW-0005tm-NP; Sun, 11 Sep 2022 02:23:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404903.647545; Sun, 11 Sep 2022 02: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 1oXCdW-0005te-Kg; Sun, 11 Sep 2022 02:23:54 +0000 Received: by outflank-mailman (input) for mailman id 404903; Sun, 11 Sep 2022 02:23:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCdV-0005tX-Af for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:23:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCdV-0000tu-9v for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:23:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCdV-0002oz-97 for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02: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=CWJ61UWumWFZ6tBQvTDBnFn9BszRjVtiq7N+eKgEPzs=; b=X1Q+vKT1cshZPFr5+PZfAYdu0f ZcYfB3nODXRjDYd6rDfaVNs/kykgs5VMHGjmE0K/dDMHJbnmH4fAnKHXHpr7v7qcAo8n7yX/iqrkC SQFb06EKmJT4S7kd8nsmHawx6g6mykvleZa5MsoJ0KoPncgpv2cE69XjCRuwPOdelz7Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/pci: replace call to is_memory_hole to pci_check_bar Message-Id: Date: Sun, 11 Sep 2022 02:23:53 +0000 commit cc80e2bab0d09b50397811d5441a8cda071f4e46 Author: Rahul Singh AuthorDate: Fri Sep 9 10:34:40 2022 +0100 Commit: Stefano Stabellini CommitDate: Fri Sep 9 13:48:25 2022 -0700 xen/pci: replace call to is_memory_hole to pci_check_bar is_memory_hole was implemented for x86 and not for ARM when introduced. Replace is_memory_hole call to pci_check_bar as function should check if device BAR is in defined memory range. Also, add an implementation for ARM which is required for PCI passthrough. On x86, pci_check_bar will call is_memory_hole which will check if BAR is not overlapping with any memory region defined in the memory map. On ARM, pci_check_bar will go through the host bridge ranges and check if the BAR is in the range of defined ranges. Signed-off-by: Rahul Singh Acked-by: Jan Beulich Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/pci.h | 2 ++ xen/arch/arm/pci/pci-host-common.c | 54 ++++++++++++++++++++++++++++++++++++++ xen/arch/x86/include/asm/pci.h | 10 +++++++ xen/drivers/passthrough/pci.c | 8 +++--- 4 files changed, 70 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 80a2431804..8cb46f6b71 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -126,6 +126,8 @@ int pci_host_iterate_bridges_and_count(struct domain *d, int pci_host_bridge_mappings(struct domain *d); +bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); + #else /*!CONFIG_HAS_PCI*/ struct arch_pci_dev { }; diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index 89ef30028e..a8ece94303 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -24,6 +24,16 @@ #include +/* + * struct to hold pci device bar. + */ +struct pdev_bar_check +{ + paddr_t start; + paddr_t end; + bool is_valid; +}; + /* * List for all the pci host bridges. */ @@ -363,6 +373,50 @@ int __init pci_host_bridge_mappings(struct domain *d) return 0; } +/* + * TODO: BAR addresses and Root Complex window addresses are not guaranteed + * to be page aligned. We should check for alignment but this is not the + * right place for alignment check. + */ +static int is_bar_valid(const struct dt_device_node *dev, + paddr_t addr, paddr_t len, void *data) +{ + struct pdev_bar_check *bar_data = data; + paddr_t s = bar_data->start; + paddr_t e = bar_data->end; + + if ( (s >= addr) && (e <= (addr + len - 1)) ) + bar_data->is_valid = true; + + return 0; +} + +/* TODO: Revisit this function when ACPI PCI passthrough support is added. */ +bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end) +{ + int ret; + const struct dt_device_node *dt_node; + paddr_t s = mfn_to_maddr(start); + paddr_t e = mfn_to_maddr(end); + struct pdev_bar_check bar_data = { + .start = s, + .end = e, + .is_valid = false + }; + + if ( s >= e ) + return false; + + dt_node = pci_find_host_bridge_node(pdev); + if ( !dt_node ) + return false; + + ret = dt_for_each_range(dt_node, &is_bar_valid, &bar_data); + if ( ret < 0 ) + return false; + + return bar_data.is_valid; +} /* * Local variables: * mode: C diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index c8e1a9ecdb..f4a58c8acf 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -57,4 +57,14 @@ static always_inline bool is_pci_passthrough_enabled(void) void arch_pci_init_pdev(struct pci_dev *pdev); +static inline bool pci_check_bar(const struct pci_dev *pdev, + mfn_t start, mfn_t end) +{ + /* + * Check if BAR is not overlapping with any memory region defined + * in the memory map. + */ + return is_memory_hole(start, end); +} + #endif /* __X86_PCI_H__ */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index cdaf5c247f..149f68bb6e 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -304,8 +304,8 @@ static void check_pdev(const struct pci_dev *pdev) if ( rc < 0 ) /* Unable to size, better leave memory decoding disabled. */ return; - if ( size && !is_memory_hole(maddr_to_mfn(addr), - maddr_to_mfn(addr + size - 1)) ) + if ( size && !pci_check_bar(pdev, maddr_to_mfn(addr), + maddr_to_mfn(addr + size - 1)) ) { /* * Return without enabling memory decoding if BAR position is not @@ -331,8 +331,8 @@ static void check_pdev(const struct pci_dev *pdev) if ( rc < 0 ) return; - if ( size && !is_memory_hole(maddr_to_mfn(addr), - maddr_to_mfn(addr + size - 1)) ) + if ( size && !pci_check_bar(pdev, maddr_to_mfn(addr), + maddr_to_mfn(addr + size - 1)) ) { printk(warn, &pdev->sbdf, "ROM ", PFN_DOWN(addr), PFN_DOWN(addr + size - 1)); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Sep 11 02:24:04 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Sep 2022 02:24:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.404904.647548 (Exim 4.92) (envelope-from ) id 1oXCdg-0005wq-PB; Sun, 11 Sep 2022 02:24:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 404904.647548; Sun, 11 Sep 2022 02: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 1oXCdg-0005wj-MJ; Sun, 11 Sep 2022 02:24:04 +0000 Received: by outflank-mailman (input) for mailman id 404904; Sun, 11 Sep 2022 02:24:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCdf-0005wT-Dd for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:24:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oXCdf-0000uH-Cw for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02:24:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oXCdf-0002pl-CG for xen-changelog@lists.xenproject.org; Sun, 11 Sep 2022 02: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=jFjkIMxJLS3OGpfVT5w1zLZvSls0vaCQRpik6lAy6SA=; b=QHOmKTisa575mIfZv75n7E1HcD 9A6NYewBnJ0skrcv2VrlM38XtgA2i7KAg/UompQN47BVeVjjXB2vkT0N3aoBobH6LAco17HZycWKo JXv49qhvt1BVDUwqbkb11eyAVHoKrxVvvxvua5UqnCRNmt/rZQWo8x5bOSZHhnvEJz9I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm, device-tree: Make static-mem use #{address,size}-cells Message-Id: Date: Sun, 11 Sep 2022 02:24:03 +0000 commit 942ac5fc15ecc2f7ef1d9331c76d89d2cef10e5c Author: Henry Wang AuthorDate: Fri Sep 9 05:23:57 2022 +0000 Commit: Stefano Stabellini CommitDate: Fri Sep 9 13:49:02 2022 -0700 xen/arm, device-tree: Make static-mem use #{address,size}-cells In order to keep consistency in the device tree binding, there is no need for static memory allocation feature to define a specific set of address and size cells for "xen,static-mem" property. Therefore, this commit reuses the regular #{address,size}-cells for parsing the device tree "xen,static-mem" property. Update the documentation accordingly. Also, take the chance to remove the unnecessary "#address-cells" and "#size-cells" in the domU1 node of the device tree to only emphasize the related part that the example is showing. Signed-off-by: Henry Wang Reviewed-by: Michal Orzel Reviewed-by: Bertrand Marquis Acked-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 11 +++++------ docs/misc/arm/passthrough-noiommu.txt | 7 +++---- xen/arch/arm/bootfdt.c | 5 ----- xen/arch/arm/domain_build.c | 16 ++-------------- 4 files changed, 10 insertions(+), 29 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 12c5e1d189..c47a05e0da 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -350,8 +350,8 @@ areas are pre-defined by configuration using physical address ranges. Memory can be statically allocated to a domain using the property "xen,static- mem" defined in the domain configuration. The number of cells for the address -and the size must be defined using respectively the properties -"#xen,static-mem-address-cells" and "#xen,static-mem-size-cells". +and the size must be defined respectively by the parent node properties +"#address-cells" and "#size-cells". The property 'memory' is still needed and should match the amount of memory given to the guest. Currently, it either comes from static memory or lets Xen @@ -366,14 +366,13 @@ device-tree: / { chosen { + #address-cells = <0x1>; + #size-cells = <0x1>; + ... domU1 { compatible = "xen,domain"; - #address-cells = <0x2>; - #size-cells = <0x2>; cpus = <2>; memory = <0x0 0x80000>; - #xen,static-mem-address-cells = <0x1>; - #xen,static-mem-size-cells = <0x1>; xen,static-mem = <0x30000000 0x20000000>; ... }; diff --git a/docs/misc/arm/passthrough-noiommu.txt b/docs/misc/arm/passthrough-noiommu.txt index 3e2ef21ad7..69b8de1975 100644 --- a/docs/misc/arm/passthrough-noiommu.txt +++ b/docs/misc/arm/passthrough-noiommu.txt @@ -33,14 +33,13 @@ on static allocation in the device-tree: / { chosen { + #address-cells = <0x1>; + #size-cells = <0x1>; + ... domU1 { compatible = "xen,domain"; - #address-cells = <0x2>; - #size-cells = <0x2>; cpus = <2>; memory = <0x0 0x80000>; - #xen,static-mem-address-cells = <0x1>; - #xen,static-mem-size-cells = <0x1>; xen,static-mem = <0x30000000 0x20000000>; direct-map; ... diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index f8b88ee3da..6014c0f852 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -371,11 +371,6 @@ static int __init process_domain_node(const void *fdt, int node, /* No "xen,static-mem" present. */ return 0; - address_cells = device_tree_get_u32(fdt, node, - "#xen,static-mem-address-cells", 0); - size_cells = device_tree_get_u32(fdt, node, - "#xen,static-mem-size-cells", 0); - return device_tree_get_meminfo(fdt, node, "xen,static-mem", address_cells, size_cells, &bootinfo.reserved_mem, MEMBANK_STATIC_DOMAIN); diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 1e4b5d2df8..01c2aaccd8 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -565,21 +565,9 @@ static int __init parse_static_mem_prop(const struct dt_device_node *node, const struct dt_property *prop; prop = dt_find_property(node, "xen,static-mem", NULL); - if ( !dt_property_read_u32(node, "#xen,static-mem-address-cells", - addr_cells) ) - { - printk(XENLOG_ERR - "failed to read \"#xen,static-mem-address-cells\".\n"); - return -EINVAL; - } - if ( !dt_property_read_u32(node, "#xen,static-mem-size-cells", - size_cells) ) - { - printk(XENLOG_ERR - "failed to read \"#xen,static-mem-size-cells\".\n"); - return -EINVAL; - } + *addr_cells = dt_n_addr_cells(node); + *size_cells = dt_n_size_cells(node); *cell = (const __be32 *)prop->value; *length = prop->length; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 14 13:33:10 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Sep 2022 13:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.406964.649375 (Exim 4.92) (envelope-from ) id 1oYSVl-000415-83; Wed, 14 Sep 2022 13:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 406964.649375; Wed, 14 Sep 2022 13:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oYSVl-00040x-4z; Wed, 14 Sep 2022 13:33:05 +0000 Received: by outflank-mailman (input) for mailman id 406964; Wed, 14 Sep 2022 13:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oYSVk-00040r-7a for xen-changelog@lists.xenproject.org; Wed, 14 Sep 2022 13:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oYSVk-0006uR-64 for xen-changelog@lists.xenproject.org; Wed, 14 Sep 2022 13:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oYSVk-0002sB-4s for xen-changelog@lists.xenproject.org; Wed, 14 Sep 2022 13:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8hSU0IQtvhpU0XZXW6JIk4E4/aQyqR1Mnr30gZ2U4Tc=; b=uEdWjkGUIiak9J1Xsb33IGsTzJ NivrA7yYbprc5Sifa84a02hl9DSOA0t/LzwCuW5b0ZweBjGPOqqsk1xUqiGD+IP58/1r+FHMX0aNr +GUvyUTCmuuLT3y4+xo7yqiWXC8PWVqTfM1Ijxf73qCWvTOvu1jDykTQd4y9C3iqkpK4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xsm/flask: correcting initial sid assignment on context allocation Message-Id: Date: Wed, 14 Sep 2022 13:33:04 +0000 commit 3007efadf74d6146a1c0ff1c2fbbae6b53ce7898 Author: Daniel P. Smith AuthorDate: Wed Sep 14 15:22:01 2022 +0200 Commit: Jan Beulich CommitDate: Wed Sep 14 15:22:01 2022 +0200 xsm/flask: correcting initial sid assignment on context allocation The current flow for initial SID assignment is that the function flask_domain_alloc_security() allocates the security context and assigns an initial SID based on the limited state information it can access. Specifically the initial SID is determined by the domid of the domain, where it would assign the label for one of the domains the hypervisor constructed with the exception of initial domain (dom0). In the case of the initial domain and all other domains it would use the unlabeled_t SID. When it came to the SID for the initial domain, its assignment was managed by flask_domain_create() where it would be switched from unlabeled_t to dom0_t. This logic worked under the assumption that the first call to flask_domain_create() would be the hypervisor constructing the initial domain. After which it would be the toolstack constructing the domain, for which it is expected to provide an appropriate SID or else unlabeled_t would be used. The issue is that the assumptions upon which the current flow is built were weak and are invalid for PV shim and dom0less. Under the current flow even though the initial domain for PV shim is not set as privileged, flask would label the domain as dom0_t. For dom0less, the situation is two-fold. First is that every domain after the first domain creation will fail as they will be labeled as unlabeled_t. The second is that if the dom0less configuration does not include a "dom0", the first domain created would be labeled as dom0_t. This commit only seeks to address the situation for PV shim, by including a check for xenboot_t context in flask_domain_alloc_security() to determine if the domain is being constructed at system boot. Then a check for is_privilged and pv_shim is added to differentiate between a "dom0" initial domain and a PV shim initial domain. The logic for flask_domain_create() was altered to allow the incoming SID to override the initial label. This allows a domain builder, whether it is a toolstack, dom0less, or hyperlaunch, to provide the correct label for the domain at construction. The base policy was adjusted to allow the idle domain under the xenboot_t context the ability to construct domains of both types, dom0_t and domu_t. This will enable a hypervisor resident domain builder to construct domains beyond the initial domain, Signed-off-by: Daniel P. Smith Reviewed-by: Jason Andryuk --- tools/flask/policy/modules/dom0.te | 3 +++ tools/flask/policy/modules/domU.te | 3 +++ xen/xsm/flask/hooks.c | 55 +++++++++++++++++++++++++++++--------- 3 files changed, 49 insertions(+), 12 deletions(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index 0a63ce15b6..f710ff9941 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -75,3 +75,6 @@ admin_device(dom0_t, ioport_t) admin_device(dom0_t, iomem_t) domain_comms(dom0_t, dom0_t) + +# Allow the hypervisor to build domains of type dom0_t +xen_build_domain(dom0_t) diff --git a/tools/flask/policy/modules/domU.te b/tools/flask/policy/modules/domU.te index b77df29d56..3f269018f9 100644 --- a/tools/flask/policy/modules/domU.te +++ b/tools/flask/policy/modules/domU.te @@ -13,6 +13,9 @@ domain_comms(domU_t, domU_t) migrate_domain_out(dom0_t, domU_t) domain_self_comms(domU_t) +# Allow the hypervisor to build domains of type domU_t +xen_build_domain(domU_t) + # Device model for domU_t. You can define distinct types for device models for # domains of other types, or add more make_device_model lines for this type. declare_domain(dm_dom_t) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 8bd56644ef..e7db7fe07a 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -38,6 +38,12 @@ #include #include "private.h" +#ifdef CONFIG_X86 +#include +#else +#define pv_shim false +#endif + static uint32_t domain_sid(const struct domain *dom) { struct domain_security_struct *dsec = dom->ssid; @@ -170,6 +176,9 @@ static int cf_check flask_domain_alloc_security(struct domain *d) if ( !dsec ) return -ENOMEM; + /* Set as unlabeled then change as appropriate. */ + dsec->sid = SECINITSID_UNLABELED; + switch ( d->domain_id ) { case DOMID_IDLE: @@ -182,7 +191,13 @@ static int cf_check flask_domain_alloc_security(struct domain *d) dsec->sid = SECINITSID_DOMIO; break; default: - dsec->sid = SECINITSID_UNLABELED; + if ( domain_sid(current->domain) == SECINITSID_XENBOOT ) + { + if ( d->is_privileged ) + dsec->sid = SECINITSID_DOM0; + else if ( pv_shim ) + dsec->sid = SECINITSID_DOMU; + } } dsec->self_sid = dsec->sid; @@ -550,20 +565,36 @@ static int cf_check flask_domain_create(struct domain *d, uint32_t ssidref) struct domain_security_struct *dsec = d->ssid; static int dom0_created = 0; - if ( is_idle_domain(current->domain) && !dom0_created ) + /* + * If the null label is passed, then use the label from security context + * allocation. NB: if the label from the allocated security context is also + * null, the security server will use unlabeled_t for the domain. + */ + if ( ssidref == 0 ) + ssidref = dsec->sid; + + /* + * First check if the current domain is allowed to create the target domain + * type before making changes to the current state. + */ + rc = avc_current_has_perm(ssidref, SECCLASS_DOMAIN, DOMAIN__CREATE, NULL); + if ( rc ) + return rc; + + /* + * The dom0_t label is expressed as a singleton label in the base policy. + * This cannot be enforced by the security server, therefore it will be + * enforced here. + */ + if ( ssidref == SECINITSID_DOM0 ) { - dsec->sid = SECINITSID_DOM0; - dom0_created = 1; + if ( !dom0_created ) + dom0_created = 1; + else + return -EINVAL; } - else - { - rc = avc_current_has_perm(ssidref, SECCLASS_DOMAIN, - DOMAIN__CREATE, NULL); - if ( rc ) - return rc; - dsec->sid = ssidref; - } + dsec->sid = ssidref; dsec->self_sid = dsec->sid; rc = security_transition_sid(dsec->sid, dsec->sid, SECCLASS_DOMAIN, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 15 05:33:08 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 Sep 2022 05:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.407228.649652 (Exim 4.92) (envelope-from ) id 1oYhUl-0000T0-5A; Thu, 15 Sep 2022 05:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 407228.649652; Thu, 15 Sep 2022 05: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 1oYhUl-0000Sl-0r; Thu, 15 Sep 2022 05:33:03 +0000 Received: by outflank-mailman (input) for mailman id 407228; Thu, 15 Sep 2022 05:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oYhUj-0000Sf-Nw for xen-changelog@lists.xenproject.org; Thu, 15 Sep 2022 05:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oYhUj-0006SK-LP for xen-changelog@lists.xenproject.org; Thu, 15 Sep 2022 05:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oYhUj-0003Wp-KP for xen-changelog@lists.xenproject.org; Thu, 15 Sep 2022 05: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=qWZBYmmfhB9+/YH2dGG56KEgk5SzMNKOT/Yor9SbU6w=; b=md2pE+9RLsYrO3d0FXLX/9FLco x5WQLTTRuGbMk5SIUvcy0YWve164UlxWPe30NqDIN3dzOrQO0CPpVtBHq1Tl0f3FY22CVGd1Fpu4H 9wMBlsd4RBv7a6vSvBV0ozsq7MPEmOjrmlAvb6lfEAg5JSRgSRIC+VmXFKuTPNstbWbw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm/flask: correcting initial sid assignment on context allocation Message-Id: Date: Thu, 15 Sep 2022 05:33:01 +0000 commit 3007efadf74d6146a1c0ff1c2fbbae6b53ce7898 Author: Daniel P. Smith AuthorDate: Wed Sep 14 15:22:01 2022 +0200 Commit: Jan Beulich CommitDate: Wed Sep 14 15:22:01 2022 +0200 xsm/flask: correcting initial sid assignment on context allocation The current flow for initial SID assignment is that the function flask_domain_alloc_security() allocates the security context and assigns an initial SID based on the limited state information it can access. Specifically the initial SID is determined by the domid of the domain, where it would assign the label for one of the domains the hypervisor constructed with the exception of initial domain (dom0). In the case of the initial domain and all other domains it would use the unlabeled_t SID. When it came to the SID for the initial domain, its assignment was managed by flask_domain_create() where it would be switched from unlabeled_t to dom0_t. This logic worked under the assumption that the first call to flask_domain_create() would be the hypervisor constructing the initial domain. After which it would be the toolstack constructing the domain, for which it is expected to provide an appropriate SID or else unlabeled_t would be used. The issue is that the assumptions upon which the current flow is built were weak and are invalid for PV shim and dom0less. Under the current flow even though the initial domain for PV shim is not set as privileged, flask would label the domain as dom0_t. For dom0less, the situation is two-fold. First is that every domain after the first domain creation will fail as they will be labeled as unlabeled_t. The second is that if the dom0less configuration does not include a "dom0", the first domain created would be labeled as dom0_t. This commit only seeks to address the situation for PV shim, by including a check for xenboot_t context in flask_domain_alloc_security() to determine if the domain is being constructed at system boot. Then a check for is_privilged and pv_shim is added to differentiate between a "dom0" initial domain and a PV shim initial domain. The logic for flask_domain_create() was altered to allow the incoming SID to override the initial label. This allows a domain builder, whether it is a toolstack, dom0less, or hyperlaunch, to provide the correct label for the domain at construction. The base policy was adjusted to allow the idle domain under the xenboot_t context the ability to construct domains of both types, dom0_t and domu_t. This will enable a hypervisor resident domain builder to construct domains beyond the initial domain, Signed-off-by: Daniel P. Smith Reviewed-by: Jason Andryuk --- tools/flask/policy/modules/dom0.te | 3 +++ tools/flask/policy/modules/domU.te | 3 +++ xen/xsm/flask/hooks.c | 55 +++++++++++++++++++++++++++++--------- 3 files changed, 49 insertions(+), 12 deletions(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index 0a63ce15b6..f710ff9941 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -75,3 +75,6 @@ admin_device(dom0_t, ioport_t) admin_device(dom0_t, iomem_t) domain_comms(dom0_t, dom0_t) + +# Allow the hypervisor to build domains of type dom0_t +xen_build_domain(dom0_t) diff --git a/tools/flask/policy/modules/domU.te b/tools/flask/policy/modules/domU.te index b77df29d56..3f269018f9 100644 --- a/tools/flask/policy/modules/domU.te +++ b/tools/flask/policy/modules/domU.te @@ -13,6 +13,9 @@ domain_comms(domU_t, domU_t) migrate_domain_out(dom0_t, domU_t) domain_self_comms(domU_t) +# Allow the hypervisor to build domains of type domU_t +xen_build_domain(domU_t) + # Device model for domU_t. You can define distinct types for device models for # domains of other types, or add more make_device_model lines for this type. declare_domain(dm_dom_t) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 8bd56644ef..e7db7fe07a 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -38,6 +38,12 @@ #include #include "private.h" +#ifdef CONFIG_X86 +#include +#else +#define pv_shim false +#endif + static uint32_t domain_sid(const struct domain *dom) { struct domain_security_struct *dsec = dom->ssid; @@ -170,6 +176,9 @@ static int cf_check flask_domain_alloc_security(struct domain *d) if ( !dsec ) return -ENOMEM; + /* Set as unlabeled then change as appropriate. */ + dsec->sid = SECINITSID_UNLABELED; + switch ( d->domain_id ) { case DOMID_IDLE: @@ -182,7 +191,13 @@ static int cf_check flask_domain_alloc_security(struct domain *d) dsec->sid = SECINITSID_DOMIO; break; default: - dsec->sid = SECINITSID_UNLABELED; + if ( domain_sid(current->domain) == SECINITSID_XENBOOT ) + { + if ( d->is_privileged ) + dsec->sid = SECINITSID_DOM0; + else if ( pv_shim ) + dsec->sid = SECINITSID_DOMU; + } } dsec->self_sid = dsec->sid; @@ -550,20 +565,36 @@ static int cf_check flask_domain_create(struct domain *d, uint32_t ssidref) struct domain_security_struct *dsec = d->ssid; static int dom0_created = 0; - if ( is_idle_domain(current->domain) && !dom0_created ) + /* + * If the null label is passed, then use the label from security context + * allocation. NB: if the label from the allocated security context is also + * null, the security server will use unlabeled_t for the domain. + */ + if ( ssidref == 0 ) + ssidref = dsec->sid; + + /* + * First check if the current domain is allowed to create the target domain + * type before making changes to the current state. + */ + rc = avc_current_has_perm(ssidref, SECCLASS_DOMAIN, DOMAIN__CREATE, NULL); + if ( rc ) + return rc; + + /* + * The dom0_t label is expressed as a singleton label in the base policy. + * This cannot be enforced by the security server, therefore it will be + * enforced here. + */ + if ( ssidref == SECINITSID_DOM0 ) { - dsec->sid = SECINITSID_DOM0; - dom0_created = 1; + if ( !dom0_created ) + dom0_created = 1; + else + return -EINVAL; } - else - { - rc = avc_current_has_perm(ssidref, SECCLASS_DOMAIN, - DOMAIN__CREATE, NULL); - if ( rc ) - return rc; - dsec->sid = ssidref; - } + dsec->sid = ssidref; dsec->self_sid = dsec->sid; rc = security_transition_sid(dsec->sid, dsec->sid, SECCLASS_DOMAIN, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 09:22:10 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 09:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.411552.654504 (Exim 4.92) (envelope-from ) id 1ockJR-00060b-G9; Mon, 26 Sep 2022 09:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 411552.654504; Mon, 26 Sep 2022 09:22: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 1ockJR-00060T-DH; Mon, 26 Sep 2022 09:22:05 +0000 Received: by outflank-mailman (input) for mailman id 411552; Mon, 26 Sep 2022 09:22:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockJR-00060N-27 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockJQ-0004Zc-UW for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ockJQ-0003jp-Tj for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Sy0XyzGoKpXRJlgn3Goo3v9BYUcFj2/2Ldpq49mYDYY=; b=ono+IhRyiRZUyaykVMPw9ymX8h KXdjO+5/TPW8O3peB1ICMfNLanm2y8ainQWc2AAgkGMZEM0h+CabojoBP1Lsztya9Nt2vD0YfMACw oaWRmhtrqPQ3ynx7wSaY7jwFSWgrz5G2L7FcyyZ0fjqxcATYpDuti7AUFiGJslof6C48=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] build: correct cppcheck-misra make rule Message-Id: Date: Mon, 26 Sep 2022 09:22:04 +0000 commit c1db78cae105e5b166f41ecac7ccb8cbfd82693f Author: Jan Beulich AuthorDate: Mon Sep 26 11:07:48 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:07:48 2022 +0200 build: correct cppcheck-misra make rule Having cppcheck-misra.json depend on cppcheck-misra.txt does not properly address the multiple targets problem. If cppcheck-misra.json is deleted from the build tree but cppcheck-misra.txt is still there, nothing will re-generate cppcheck-misra.json. With GNU make 4.3 or newer we could use the &: grouped target separator, but since we support older make as well we need to use some other mechanism. Convert the rule to a pattern one (with "cppcheck" kind of arbitrarily chosen as the stem), thus making known to make that both files are created by a single command invocation. Since, as a result, the JSON file is now "intermediate" from make's perspective, prevent it being deleted again by making it a prereq of .PRECIOUS. Fixes: 57caa5375321 ("xen: Add MISRA support to cppcheck make rule") Signed-off-by: Jan Beulich Reviewed-by: Bertrand Marquis --- xen/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 106aff6a07..4e6e661261 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -746,11 +746,12 @@ cppcheck-version: # documentation file. Also generate a json file with the right arguments for # cppcheck in json format including the list of rules to ignore. # -cppcheck-misra.txt: $(XEN_ROOT)/docs/misra/rules.rst $(srctree)/tools/convert_misra_doc.py - $(Q)$(PYTHON) $(srctree)/tools/convert_misra_doc.py -i $< -o $@ -j $(@:.txt=.json) - -# convert_misra_doc is generating both files. -cppcheck-misra.json: cppcheck-misra.txt +# convert_misra_doc.py, producing both targets at the same time, should be +# executed only once. Utilize a pattern rule to achieve this effect, with the +# stem kind of arbitrarily chosen to be "cppcheck". +.PRECIOUS: %-misra.json +%-misra.txt %-misra.json: $(XEN_ROOT)/docs/misra/rules.rst $(srctree)/tools/convert_misra_doc.py + $(Q)$(PYTHON) $(srctree)/tools/convert_misra_doc.py -i $< -o $*-misra.txt -j $*-misra.json # Put this in generated headers this way it is cleaned by include/Makefile $(objtree)/include/generated/compiler-def.h: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 09:22:15 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 09:22:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.411553.654508 (Exim 4.92) (envelope-from ) id 1ockJb-00062q-HW; Mon, 26 Sep 2022 09:22:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 411553.654508; Mon, 26 Sep 2022 09:22: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 1ockJb-00062i-Eu; Mon, 26 Sep 2022 09:22:15 +0000 Received: by outflank-mailman (input) for mailman id 411553; Mon, 26 Sep 2022 09:22:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockJb-00062c-2H for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockJb-0004Zo-1Z for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ockJb-0003kG-0h for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22: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=ENfPnoV5W2koRxA7F482eDEWc+mzoz2fmhNwd4HaMN0=; b=wTqMxWJaW46i9d6706whhMgrYm ukKqdqszOu1yrknAEqeRo2laLRK8gwNJuEVY+2ehCOt9U/yq49ihz2MwSNzOkO0dQAA/7yL2twjeW qFIPJlYioecOg/mZ0yRuIXPwsYTjZWfxYZ2r8iCZyzRfxZrpWKP0BB/sUFit+HKP/lgQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] drivers/char: allow using both dbgp=xhci and dbgp=ehci Message-Id: Date: Mon, 26 Sep 2022 09:22:15 +0000 commit 022e40edd4dc00b9784e5e659dac7f9f92bedfa3 Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:09:19 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:09:19 2022 +0200 drivers/char: allow using both dbgp=xhci and dbgp=ehci This allows configuring EHCI and XHCI consoles separately, simultaneously, such that e.g. one can be used for the console and the other by the debugger. This changes string_param() to custom_param() in both ehci and xhci drivers. Both drivers parse only values applicable to them. Suggested-by: Jan Beulich Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 6 ++++-- xen/drivers/char/ehci-dbgp.c | 14 ++++++++++++-- xen/drivers/char/serial.c | 6 ++++++ xen/drivers/char/xhci-dbc.c | 27 +++++++++++++++++++-------- xen/include/xen/serial.h | 3 ++- 5 files changed, 43 insertions(+), 13 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 9a79385a37..c8b07042f5 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -409,7 +409,7 @@ The following are examples of correct specifications: Specify the size of the console ring buffer. ### console -> `= List of [ vga | com1[H,L] | com2[H,L] | pv | dbgp | none ]` +> `= List of [ vga | com1[H,L] | com2[H,L] | pv | dbgp | xhci | none ]` > Default: `console=com1,vga` @@ -428,7 +428,9 @@ cleared. This allows a single port to be shared by two subsystems `pv` indicates that Xen should use Xen's PV console. This option is only available when used together with `pv-in-pvh`. -`dbgp` indicates that Xen should use a USB debug port. +`dbgp` indicates that Xen should use a USB2 debug port. + +`xhci` indicates that Xen should use a USB3 debug port. `none` indicates that Xen should not use a console. This option only makes sense on its own. diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 92c588ec0a..8a0b958506 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1464,7 +1464,17 @@ static struct uart_driver __read_mostly ehci_dbgp_driver = { static struct ehci_dbgp ehci_dbgp = { .state = dbgp_unsafe, .phys_port = 1 }; static char __initdata opt_dbgp[30]; -string_param("dbgp", opt_dbgp); + +static int __init parse_ehci_dbgp(const char *opt) +{ + if ( strncmp(opt, "ehci", 4) ) + return 0; + + strlcpy(opt_dbgp, opt, sizeof(opt_dbgp)); + + return 0; +} +custom_param("dbgp", parse_ehci_dbgp); void __init ehci_dbgp_init(void) { @@ -1472,7 +1482,7 @@ void __init ehci_dbgp_init(void) u32 debug_port, offset, bar_val; const char *e; - if ( strncmp(opt_dbgp, "ehci", 4) ) + if ( !opt_dbgp[0] ) return; if ( isdigit(opt_dbgp[4]) || !opt_dbgp[4] ) diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 47899222ce..9d94450392 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -311,6 +311,12 @@ int __init serial_parse_handle(const char *conf) goto common; } + if ( !strncmp(conf, "xhci", 4) && (!conf[4] || conf[4] == ',') ) + { + handle = SERHND_XHCI; + goto common; + } + if ( !strncmp(conf, "dtuart", 6) ) { handle = SERHND_DTUART; diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index ca7d4a6213..4712faaabe 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -245,6 +245,7 @@ struct dbc { uint64_t xhc_dbc_offset; void __iomem *xhc_mmio; + bool enable; /* whether dbgp=xhci was set at all */ bool open; unsigned int xhc_num; /* look for n-th xhc */ }; @@ -1058,18 +1059,14 @@ static struct xhci_dbc_ctx ctx __aligned(16); static uint8_t out_wrk_buf[DBC_WORK_RING_CAP]; static struct xhci_string_descriptor str_buf[DBC_STRINGS_COUNT]; -static char __initdata opt_dbgp[30]; - -string_param("dbgp", opt_dbgp); - -void __init xhci_dbc_uart_init(void) +static int __init xhci_parse_dbgp(const char *opt_dbgp) { struct dbc_uart *uart = &dbc_uart; struct dbc *dbc = &uart->dbc; const char *e; if ( strncmp(opt_dbgp, "xhci", 4) ) - return; + return 0; memset(dbc, 0, sizeof(*dbc)); @@ -1087,12 +1084,26 @@ void __init xhci_dbc_uart_init(void) printk(XENLOG_ERR "Invalid dbgp= PCI device spec: '%s'\n", opt_dbgp + 8); - return; + return -EINVAL; } dbc->sbdf = PCI_SBDF(0, bus, slot, func); } + dbc->enable = true; + + return 0; +} +custom_param("dbgp", xhci_parse_dbgp); + +void __init xhci_dbc_uart_init(void) +{ + struct dbc_uart *uart = &dbc_uart; + struct dbc *dbc = &uart->dbc; + + if ( !dbc->enable ) + return; + dbc->dbc_ctx = &ctx; dbc->dbc_erst = &erst; dbc->dbc_ering.trb = evt_trb; @@ -1102,7 +1113,7 @@ void __init xhci_dbc_uart_init(void) dbc->dbc_str = str_buf; if ( dbc_open(dbc) ) - serial_register_uart(SERHND_DBGP, &dbc_uart_driver, &dbc_uart); + serial_register_uart(SERHND_XHCI, &dbc_uart_driver, &dbc_uart); } #ifdef DBC_DEBUG diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 4cd4ae5e6f..f0aff7ea76 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -91,10 +91,11 @@ struct uart_driver { }; /* 'Serial handles' are composed from the following fields. */ -#define SERHND_IDX (3<<0) /* COM1, COM2, DBGP, DTUART? */ +#define SERHND_IDX (3<<0) /* COM1, COM2, DBGP, XHCI, DTUART? */ # define SERHND_COM1 (0<<0) # define SERHND_COM2 (1<<0) # define SERHND_DBGP (2<<0) +# define SERHND_XHCI (3<<0) # define SERHND_DTUART (0<<0) /* Steal SERHND_COM1 value */ #define SERHND_HI (1<<2) /* Mux/demux each transferred char by MSB. */ #define SERHND_LO (1<<3) /* Ditto, except that the MSB is cleared. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 09:22:25 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 09:22:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.411554.654512 (Exim 4.92) (envelope-from ) id 1ockJl-00065r-JJ; Mon, 26 Sep 2022 09:22:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 411554.654512; Mon, 26 Sep 2022 09:22: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 1ockJl-00065j-GQ; Mon, 26 Sep 2022 09:22:25 +0000 Received: by outflank-mailman (input) for mailman id 411554; Mon, 26 Sep 2022 09:22:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockJl-00065b-5B for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockJl-0004a2-4P for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ockJl-0003kn-3e for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22: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=AjECvOQuD13Ygt9laPDJOpVxYHjOQn8DoDjuvWkVfuA=; b=mZylwORYw/x+p0NJ/zqVbFg18i +3yB2XTQzeQWmmwIMoLuJdsCA/18Lgo/kxupv2mZ5EP6tg28r/yftRYl4+wYrWiiwt+92qlcrWaeC obzey+LX+/nwCkcgazv8KfPc0OVP3/my6NZpyc6TMN4/6qN3jYSqPsvOiPMixYvy25gQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] IOMMU: add common API for device reserved memory Message-Id: Date: Mon, 26 Sep 2022 09:22:25 +0000 commit faccb3a08b454201fa4e4f1d2e08282f07627166 Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:10:31 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:10:31 2022 +0200 IOMMU: add common API for device reserved memory Add API similar to rmrr= and ivmd= arguments, but in a common code. This will allow drivers to register reserved memory regardless of the IOMMU vendor. The direct reason for this API is xhci-dbc console driver (aka xue), that needs to use DMA. But future change may unify command line arguments for user-supplied reserved memory, and it may be useful for other drivers in the future too. This commit just introduces an API, subsequent patches will plug it in appropriate places. The reserved memory ranges needs to be saved locally, because at the point when they are collected, Xen doesn't know yet which IOMMU driver will be used. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- xen/drivers/passthrough/iommu.c | 46 +++++++++++++++++++++++++++++++++++++++++ xen/include/xen/iommu.h | 14 +++++++++++++ 2 files changed, 60 insertions(+) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 134cdb47e0..5e2a720d29 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -669,6 +669,52 @@ bool_t iommu_has_feature(struct domain *d, enum iommu_feature feature) return is_iommu_enabled(d) && test_bit(feature, dom_iommu(d)->features); } +#define MAX_EXTRA_RESERVED_RANGES 20 +struct extra_reserved_range { + unsigned long start; + unsigned long nr; + pci_sbdf_t sbdf; +}; +static unsigned int __initdata nr_extra_reserved_ranges; +static struct extra_reserved_range __initdata + extra_reserved_ranges[MAX_EXTRA_RESERVED_RANGES]; + +int __init iommu_add_extra_reserved_device_memory(unsigned long start, + unsigned long nr, + pci_sbdf_t sbdf) +{ + unsigned int idx; + + if ( nr_extra_reserved_ranges >= MAX_EXTRA_RESERVED_RANGES ) + return -ENOMEM; + + idx = nr_extra_reserved_ranges++; + extra_reserved_ranges[idx].start = start; + extra_reserved_ranges[idx].nr = nr; + extra_reserved_ranges[idx].sbdf = sbdf; + + return 0; +} + +int __init iommu_get_extra_reserved_device_memory(iommu_grdm_t *func, + void *ctxt) +{ + unsigned int idx; + int ret; + + for ( idx = 0; idx < nr_extra_reserved_ranges; idx++ ) + { + ret = func(extra_reserved_ranges[idx].start, + extra_reserved_ranges[idx].nr, + extra_reserved_ranges[idx].sbdf.sbdf, + ctxt); + if ( ret < 0 ) + return ret; + } + + return 0; +} + /* * Local variables: * mode: C diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 1240d7762d..4f22fc1bed 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -304,6 +304,20 @@ struct iommu_ops { #endif }; +/* + * To be called by Xen internally, to register extra RMRR/IVMD ranges. + * Needs to be called before IOMMU initialization. + */ +extern int iommu_add_extra_reserved_device_memory(unsigned long start, + unsigned long nr, + pci_sbdf_t sbdf); +/* + * To be called by specific IOMMU driver during initialization, + * to fetch ranges registered with iommu_add_extra_reserved_device_memory(). + */ +extern int iommu_get_extra_reserved_device_memory(iommu_grdm_t *func, + void *ctxt); + #include #ifndef iommu_call -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 09:22:36 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 09:22:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.411555.654516 (Exim 4.92) (envelope-from ) id 1ockJw-00069I-Kb; Mon, 26 Sep 2022 09:22:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 411555.654516; Mon, 26 Sep 2022 09:22:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockJw-00069A-Hu; Mon, 26 Sep 2022 09:22:36 +0000 Received: by outflank-mailman (input) for mailman id 411555; Mon, 26 Sep 2022 09:22:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockJv-00068x-89 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockJv-0004aK-7N for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ockJv-0003lC-6a for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IlG+KH1sXMh3HvdZFI0SCdTBBRkRbmw6vVdNDLm1rLI=; b=X09Cdt0B6BwQjb5EJxdPlF8xva bBon2VyMOLbrz/YAKdQsTh4geeiSVzEGvxIZr3D9ZxRclnLQEU117KpTKhf+m9UpmrBzNJkTaw+t7 xs2LsaNgGu2q2auI/WevuxdyXGg4vArWl99fKqzx5V28JZb6sRNLZB4/+fUeVJXSxILk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] IOMMU/AMD: wire common device reserved memory API Message-Id: Date: Mon, 26 Sep 2022 09:22:35 +0000 commit 3fd9456f2daecaaa0026c51ac2b627dd771cc81a Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:11:07 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:11:07 2022 +0200 IOMMU/AMD: wire common device reserved memory API Register common device reserved memory similar to how ivmd= parameter is handled. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- xen/drivers/passthrough/amd/iommu_acpi.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index ac6835225b..3b577c9b39 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -1078,6 +1078,25 @@ static inline bool_t is_ivmd_block(u8 type) type == ACPI_IVRS_TYPE_MEMORY_IOMMU); } +static int __init cf_check add_one_extra_ivmd(unsigned long start, + unsigned long nr, + uint32_t id, void *ctxt) +{ + struct acpi_ivrs_memory ivmd = { + .header = { + .length = sizeof(ivmd), + .flags = ACPI_IVMD_UNITY | ACPI_IVMD_READ | ACPI_IVMD_WRITE, + .device_id = id, + .type = ACPI_IVRS_TYPE_MEMORY_ONE, + }, + }; + + ivmd.start_address = pfn_to_paddr(start); + ivmd.memory_length = pfn_to_paddr(nr); + + return parse_ivmd_block(&ivmd); +} + static int __init cf_check parse_ivrs_table(struct acpi_table_header *table) { const struct acpi_ivrs_header *ivrs_block; @@ -1121,6 +1140,8 @@ static int __init cf_check parse_ivrs_table(struct acpi_table_header *table) AMD_IOMMU_DEBUG("IVMD: %u command line provided entries\n", nr_ivmd); for ( i = 0; !error && i < nr_ivmd; ++i ) error = parse_ivmd_block(user_ivmds + i); + if ( !error ) + error = iommu_get_extra_reserved_device_memory(add_one_extra_ivmd, NULL); /* Each IO-APIC must have been mentioned in the table. */ for ( apic = 0; !error && iommu_intremap && apic < nr_ioapics; ++apic ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 09:22:46 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 09:22:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.411556.654520 (Exim 4.92) (envelope-from ) id 1ockK6-0006Cc-M3; Mon, 26 Sep 2022 09:22:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 411556.654520; Mon, 26 Sep 2022 09:22:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockK6-0006CU-JO; Mon, 26 Sep 2022 09:22:46 +0000 Received: by outflank-mailman (input) for mailman id 411556; Mon, 26 Sep 2022 09:22:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockK5-0006CA-B6 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockK5-0004aU-AO for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ockK5-0003lj-9V for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=taO7saVEhB9EoexJO1gzPHpZsCTyLrLoSS4chiomki4=; b=ISp2MlHF6vtk9bcAi2Geef4hK5 HrhRjDEPp1KV4T6HvW2/T3IbFE1q54E7sB6ujDIZIcNRNvp3je19dukRmwZhU/mQfmPXtjSxsot6h i8lq5P0PBLkKquSD/SAk6CTeZnLhv1E7Xj37AhP/twZKc/Qoxtqk4jIhSmM6eb1hrlpE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] drivers/char: mark DMA buffers as reserved for the XHCI Message-Id: Date: Mon, 26 Sep 2022 09:22:45 +0000 commit 3a1a7b809ffa4251a9673858a75b161c49c6c241 Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:11:33 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:11:33 2022 +0200 drivers/char: mark DMA buffers as reserved for the XHCI The important part is to include those buffers in IOMMU page table relevant for the USB controller. Otherwise, DbC will stop working as soon as IOMMU is enabled, regardless of to which domain device assigned (be it xen or dom0). If the device is passed through to dom0 or other domain (see later patches), that domain will effectively have access to those buffers too. It does give such domain yet another way to DoS the system (as is the case when having PCI device assigned already), but also possibly steal the console ring content. Thus, such domain should be a trusted one. In any case, prevent anything else being placed on those pages by adding artificial padding. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- xen/drivers/char/xhci-dbc.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index 4712faaabe..f55f73e382 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -20,6 +20,7 @@ */ #include +#include #include #include #include @@ -1051,13 +1052,21 @@ static struct uart_driver dbc_uart_driver = { }; /* Those are accessed via DMA. */ -static struct xhci_trb evt_trb[DBC_TRB_RING_CAP]; -static struct xhci_trb out_trb[DBC_TRB_RING_CAP]; -static struct xhci_trb in_trb[DBC_TRB_RING_CAP]; -static struct xhci_erst_segment erst __aligned(16); -static struct xhci_dbc_ctx ctx __aligned(16); -static uint8_t out_wrk_buf[DBC_WORK_RING_CAP]; -static struct xhci_string_descriptor str_buf[DBC_STRINGS_COUNT]; +struct dbc_dma_bufs { + struct xhci_trb evt_trb[DBC_TRB_RING_CAP]; + struct xhci_trb out_trb[DBC_TRB_RING_CAP]; + struct xhci_trb in_trb[DBC_TRB_RING_CAP]; + uint8_t out_wrk_buf[DBC_WORK_RING_CAP]; + struct xhci_erst_segment erst __aligned(16); + struct xhci_dbc_ctx ctx __aligned(16); + struct xhci_string_descriptor str_buf[DBC_STRINGS_COUNT]; + /* + * Don't place anything else on this page - it will be + * DMA-reachable by the USB controller. + */ +}; +static struct dbc_dma_bufs __section(".bss.page_aligned") __aligned(PAGE_SIZE) + dbc_dma_bufs; static int __init xhci_parse_dbgp(const char *opt_dbgp) { @@ -1104,16 +1113,22 @@ void __init xhci_dbc_uart_init(void) if ( !dbc->enable ) return; - dbc->dbc_ctx = &ctx; - dbc->dbc_erst = &erst; - dbc->dbc_ering.trb = evt_trb; - dbc->dbc_oring.trb = out_trb; - dbc->dbc_iring.trb = in_trb; - dbc->dbc_owork.buf = out_wrk_buf; - dbc->dbc_str = str_buf; + dbc->dbc_ctx = &dbc_dma_bufs.ctx; + dbc->dbc_erst = &dbc_dma_bufs.erst; + dbc->dbc_ering.trb = dbc_dma_bufs.evt_trb; + dbc->dbc_oring.trb = dbc_dma_bufs.out_trb; + dbc->dbc_iring.trb = dbc_dma_bufs.in_trb; + dbc->dbc_owork.buf = dbc_dma_bufs.out_wrk_buf; + dbc->dbc_str = dbc_dma_bufs.str_buf; if ( dbc_open(dbc) ) + { + iommu_add_extra_reserved_device_memory( + PFN_DOWN(virt_to_maddr(&dbc_dma_bufs)), + PFN_UP(sizeof(dbc_dma_bufs)), + uart->dbc.sbdf); serial_register_uart(SERHND_XHCI, &dbc_uart_driver, &dbc_uart); + } } #ifdef DBC_DEBUG -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 09:22:56 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 09:22:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.411558.654524 (Exim 4.92) (envelope-from ) id 1ockKG-0006FO-Ni; Mon, 26 Sep 2022 09:22:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 411558.654524; Mon, 26 Sep 2022 09:22:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockKG-0006FF-Kv; Mon, 26 Sep 2022 09:22:56 +0000 Received: by outflank-mailman (input) for mailman id 411558; Mon, 26 Sep 2022 09:22:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockKF-0006F7-EL for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockKF-0004b4-Da for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ockKF-0003mD-Cf for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:22:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DcnvXU7ZlI+IUvIIxybzSA2RKsI1glLlOa+JA9wiIEE=; b=lUnuGT200qlObk1K0V7Ivj21iR zzvzXGSo0SFmyxhK63IF/pDMVbSIuDL5GOnr5AryVOCLDKD31SklsUiOJk5datTOY968n4VZHdjpm OQRxAWGAWkjGy/21H8BhV95kGTaehyGhiKg1ZB8YLVdpeUEnfqVUSN2AOpHcsnGWyt3Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] drivers/char: add RX support to the XHCI driver Message-Id: Date: Mon, 26 Sep 2022 09:22:55 +0000 commit d88e2aa4eafcec282554042e49e2bac001c9bd6e Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:12:03 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:12:03 2022 +0200 drivers/char: add RX support to the XHCI driver Add another work ring buffer for received data, and point IN TRB at it. Ensure there is always at least one pending IN TRB, so the controller has a way to send incoming data to the driver. Note that both "success" and "short packet" completion codes are okay - in fact it will be "short packet" most of the time, as the TRB length is about maximum size, not required size. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 6 +- xen/drivers/char/xhci-dbc.c | 129 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index c8b07042f5..92d668afa0 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -728,9 +728,9 @@ Available alternatives, with their meaning, are: Specify the USB controller to use, either by instance number (when going over the PCI busses sequentially) or by PCI device (must be on segment 0). -Use `ehci` for EHCI debug port, use `xhci` for XHCI debug capability (output -only). XHCI driver will wait indefinitely for the debug host to connect - make -sure the cable is connected. +Use `ehci` for EHCI debug port, use `xhci` for XHCI debug capability. +XHCI driver will wait indefinitely for the debug host to connect - make sure +the cable is connected. ### debug_stack_lines > `= ` diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index f55f73e382..00ab4ae4a2 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -111,6 +111,7 @@ enum { enum { XHCI_TRB_CC_SUCCESS = 1, XHCI_TRB_CC_TRB_ERR = 5, + XHCI_TRB_CC_SHORT_PACKET = 13, }; /* DbC endpoint types */ @@ -239,6 +240,7 @@ struct dbc { struct xhci_trb_ring dbc_oring; struct xhci_trb_ring dbc_iring; struct dbc_work_ring dbc_owork; + struct dbc_work_ring dbc_iwork; struct xhci_string_descriptor *dbc_str; pci_sbdf_t sbdf; @@ -444,6 +446,16 @@ static void xhci_trb_norm_set_ioc(struct xhci_trb *trb) trb->ctrl |= 0x20; } +static uint64_t xhci_trb_norm_buf(const struct xhci_trb *trb) +{ + return trb->params; +} + +static uint32_t xhci_trb_norm_len(const struct xhci_trb *trb) +{ + return trb->status & 0x1FFFF; +} + /** * Fields for Transfer Event TRBs (see section 6.4.2.1). Note that event * TRBs are read-only from software @@ -453,6 +465,17 @@ static uint64_t xhci_trb_tfre_ptr(const struct xhci_trb *trb) return trb->params; } +static uint32_t xhci_trb_tfre_cc(const struct xhci_trb *trb) +{ + return trb->status >> 24; +} + +/* Amount of data _not_ transferred */ +static uint32_t xhci_trb_tfre_len(const struct xhci_trb *trb) +{ + return trb->status & 0x1FFFF; +} + /* Fields for link TRBs (section 6.4.4.1) */ static void xhci_trb_link_set_rsp(struct xhci_trb *trb, uint64_t rsp) { @@ -494,6 +517,14 @@ static bool xhci_trb_ring_full(const struct xhci_trb_ring *ring) return ((ring->enq + 1) & (DBC_TRB_RING_CAP - 1)) == ring->deq; } +static unsigned int xhci_trb_ring_size(const struct xhci_trb_ring *ring) +{ + if ( ring->enq >= ring->deq ) + return ring->enq - ring->deq; + + return DBC_TRB_RING_CAP - ring->deq + ring->enq; +} + static bool dbc_work_ring_full(const struct dbc_work_ring *ring) { return ((ring->enq + 1) & (DBC_WORK_RING_CAP - 1)) == ring->deq; @@ -507,6 +538,14 @@ static unsigned int dbc_work_ring_size(const struct dbc_work_ring *ring) return DBC_WORK_RING_CAP - ring->deq + ring->enq; } +static unsigned int dbc_work_ring_space_to_end(const struct dbc_work_ring *ring) +{ + if ( ring->enq >= ring->deq ) + return DBC_WORK_RING_CAP - ring->enq; + + return ring->deq - ring->enq; +} + static void dbc_push_trb(struct dbc *dbc, struct xhci_trb_ring *ring, uint64_t dma, uint64_t len) { @@ -567,6 +606,31 @@ static unsigned int dbc_push_work(struct dbc *dbc, struct dbc_work_ring *ring, return i; } +static void dbc_rx_trb(struct dbc *dbc, struct xhci_trb *trb, + uint64_t not_transferred) +{ + struct dbc_work_ring *ring = &dbc->dbc_iwork; + unsigned int rx_len; + unsigned int end, start = ring->enq; + + if ( xhci_trb_type(trb) != XHCI_TRB_NORM ) + /* Can be Link TRB for example. */ + return; + + ASSERT(xhci_trb_norm_buf(trb) == ring->dma + ring->enq); + ASSERT(xhci_trb_norm_len(trb) >= not_transferred); + rx_len = xhci_trb_norm_len(trb) - not_transferred; + + /* It can hit the ring end, but should not wrap around. */ + ASSERT(ring->enq + rx_len <= DBC_WORK_RING_CAP); + ring->enq = (ring->enq + rx_len) & (DBC_WORK_RING_CAP - 1); + + end = ring->enq; + + if ( end > start ) + cache_flush(&ring->buf[start], end - start); +} + /* * Note that if IN transfer support is added, then this * will need to be changed; it assumes an OUT transfer ring only @@ -576,6 +640,7 @@ static void dbc_pop_events(struct dbc *dbc) struct dbc_reg *reg = dbc->dbc_reg; struct xhci_trb_ring *er = &dbc->dbc_ering; struct xhci_trb_ring *tr = &dbc->dbc_oring; + struct xhci_trb_ring *ir = &dbc->dbc_iring; struct xhci_trb *event = &er->trb[er->deq]; uint64_t erdp = readq(®->erdp); uint32_t portsc; @@ -601,6 +666,14 @@ static void dbc_pop_events(struct dbc *dbc) trb_idx = (event_ptr - tr->dma) >> XHCI_TRB_SHIFT; tr->deq = (trb_idx + 1) & (DBC_TRB_RING_CAP - 1); } + else if ( event_ptr - ir->dma < DBC_TRB_RING_BYTES ) + { + trb_idx = (event_ptr - ir->dma) >> XHCI_TRB_SHIFT; + if ( xhci_trb_tfre_cc(event) == XHCI_TRB_CC_SUCCESS || + xhci_trb_tfre_cc(event) == XHCI_TRB_CC_SHORT_PACKET ) + dbc_rx_trb(dbc, &ir->trb[trb_idx], xhci_trb_tfre_len(event)); + ir->deq = (trb_idx + 1) & (DBC_TRB_RING_CAP - 1); + } else dbc_alert("event: TRB 0x%lx not found in any ring\n", event_ptr); @@ -871,6 +944,7 @@ static bool __init dbc_open(struct dbc *dbc) return false; dbc_init_work_ring(dbc, &dbc->dbc_owork); + dbc_init_work_ring(dbc, &dbc->dbc_iwork); dbc_enable_dbc(dbc); dbc->open = true; @@ -946,6 +1020,33 @@ static void dbc_flush(struct dbc *dbc, struct xhci_trb_ring *trb, writel(db, ®->db); } +/** + * Ensure DbC has a pending transfer TRB to receive data into. + * + * @param dbc the dbc to flush + * @param trb the ring for the TRBs to transfer + * @param wrk the work ring to receive data into + */ +static void dbc_enqueue_in(struct dbc *dbc, struct xhci_trb_ring *trb, + struct dbc_work_ring *wrk) +{ + struct dbc_reg *reg = dbc->dbc_reg; + uint32_t db = (readl(®->db) & 0xFFFF00FF) | (trb->db << 8); + + /* Check if there is already queued TRB */ + if ( xhci_trb_ring_size(trb) >= 1 ) + return; + + if ( dbc_work_ring_full(wrk) ) + return; + + dbc_push_trb(dbc, trb, wrk->dma + wrk->enq, + dbc_work_ring_space_to_end(wrk)); + + wmb(); + writel(db, ®->db); +} + /** * Queue a single character to the DbC. A transfer TRB will be created * if the character is a newline and the DbC will be notified that data is @@ -969,6 +1070,19 @@ static int64_t dbc_putc(struct dbc *dbc, char c) return 1; } +static int dbc_getc(struct dbc *dbc, char *c) +{ + struct dbc_work_ring *wrk = &dbc->dbc_iwork; + + if ( dbc_work_ring_size(wrk) == 0 ) + return 0; + + *c = wrk->buf[wrk->deq]; + wrk->deq = (wrk->deq + 1) & (DBC_WORK_RING_CAP - 1); + + return 1; +} + struct dbc_uart { struct dbc dbc; struct timer timer; @@ -987,10 +1101,16 @@ static void cf_check dbc_uart_poll(void *data) if ( spin_trylock_irqsave(&port->tx_lock, flags) ) { if ( dbc_ensure_running(dbc) ) + { dbc_flush(dbc, &dbc->dbc_oring, &dbc->dbc_owork); + dbc_enqueue_in(dbc, &dbc->dbc_iring, &dbc->dbc_iwork); + } spin_unlock_irqrestore(&port->tx_lock, flags); } + while ( dbc_work_ring_size(&dbc->dbc_iwork) ) + serial_rx_interrupt(port, guest_cpu_user_regs()); + serial_tx_interrupt(port, guest_cpu_user_regs()); set_timer(&uart->timer, NOW() + MICROSECS(DBC_POLL_INTERVAL)); } @@ -1029,6 +1149,12 @@ static void cf_check dbc_uart_putc(struct serial_port *port, char c) dbc_putc(&uart->dbc, c); } +static int cf_check dbc_uart_getc(struct serial_port *port, char *c) +{ + struct dbc_uart *uart = port->uart; + return dbc_getc(&uart->dbc, c); +} + static void cf_check dbc_uart_flush(struct serial_port *port) { s_time_t goal; @@ -1048,6 +1174,7 @@ static struct uart_driver dbc_uart_driver = { .init_postirq = dbc_uart_init_postirq, .tx_ready = dbc_uart_tx_ready, .putc = dbc_uart_putc, + .getc = dbc_uart_getc, .flush = dbc_uart_flush, }; @@ -1057,6 +1184,7 @@ struct dbc_dma_bufs { struct xhci_trb out_trb[DBC_TRB_RING_CAP]; struct xhci_trb in_trb[DBC_TRB_RING_CAP]; uint8_t out_wrk_buf[DBC_WORK_RING_CAP]; + uint8_t in_wrk_buf[DBC_WORK_RING_CAP]; struct xhci_erst_segment erst __aligned(16); struct xhci_dbc_ctx ctx __aligned(16); struct xhci_string_descriptor str_buf[DBC_STRINGS_COUNT]; @@ -1119,6 +1247,7 @@ void __init xhci_dbc_uart_init(void) dbc->dbc_oring.trb = dbc_dma_bufs.out_trb; dbc->dbc_iring.trb = dbc_dma_bufs.in_trb; dbc->dbc_owork.buf = dbc_dma_bufs.out_wrk_buf; + dbc->dbc_iwork.buf = dbc_dma_bufs.in_wrk_buf; dbc->dbc_str = dbc_dma_bufs.str_buf; if ( dbc_open(dbc) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 09:23:06 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 09:23:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.411559.654528 (Exim 4.92) (envelope-from ) id 1ockKQ-0006IY-Qk; Mon, 26 Sep 2022 09:23:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 411559.654528; Mon, 26 Sep 2022 09:23: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 1ockKQ-0006IQ-Nv; Mon, 26 Sep 2022 09:23:06 +0000 Received: by outflank-mailman (input) for mailman id 411559; Mon, 26 Sep 2022 09:23:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockKP-0006IH-HK for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockKP-0004bW-Gi for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ockKP-0003oS-Ft for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23: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=jGD/hsANEOGr5iOyE4lSLGTxd7ebYi23YQDKkKN5wmk=; b=3gyXdnQKVnm2QjwW0+scqFbFVW JCr0sXgl9hheenrSYsn26E8tNDye2KbQrwl3fmgTXTdDVE5GnB/EQr+uLh92xja0khlRR7IREdNFl tCkVHI3mtyVQkCFOJLiOGhASo+p36p8wDItNqR2ocY0IeACZbZMz9lQBm2gTdZC9cfGs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] drivers/char: fix handling cable re-plug in XHCI console driver Message-Id: Date: Mon, 26 Sep 2022 09:23:05 +0000 commit 7aadb75e286df576278c20257936e53a348d23ee Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:12:39 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:12:39 2022 +0200 drivers/char: fix handling cable re-plug in XHCI console driver When cable is unplugged, dbc_ensure_running() correctly detects this situation (DBC_CTRL_DCR flag is clear), and prevent sending data immediately to the device. It gets only queued in work ring buffers. When cable is plugged in again, subsequent dbc_flush() will send the buffered data. But there is a corner case, where no subsequent data was buffered in the work buffer, but a TRB was still pending. Ring the doorbell to let the controller re-send them. For console output it is rare corner case (TRB is pending for a very short time), but for console input it is very normal case (there is always one pending TRB for input). Extract doorbell ringing into separate function to avoid duplication. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- xen/drivers/char/xhci-dbc.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index 00ab4ae4a2..5f47733c18 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -546,6 +546,15 @@ static unsigned int dbc_work_ring_space_to_end(const struct dbc_work_ring *ring) return ring->deq - ring->enq; } +static void dbc_ring_doorbell(struct dbc *dbc, int doorbell) +{ + uint32_t __iomem *db_reg = &dbc->dbc_reg->db; + uint32_t db = (readl(db_reg) & ~DBC_DOORBELL_TARGET_MASK) | + (doorbell << DBC_DOORBELL_TARGET_SHIFT); + + writel(db, db_reg); +} + static void dbc_push_trb(struct dbc *dbc, struct xhci_trb_ring *ring, uint64_t dma, uint64_t len) { @@ -973,6 +982,8 @@ static bool dbc_ensure_running(struct dbc *dbc) writel(ctrl | (1U << DBC_CTRL_DRC), ®->ctrl); writel(readl(®->portsc) | (1U << DBC_PSC_PED), ®->portsc); wmb(); + dbc_ring_doorbell(dbc, dbc->dbc_iring.db); + dbc_ring_doorbell(dbc, dbc->dbc_oring.db); } return true; @@ -990,10 +1001,6 @@ static bool dbc_ensure_running(struct dbc *dbc) static void dbc_flush(struct dbc *dbc, struct xhci_trb_ring *trb, struct dbc_work_ring *wrk) { - struct dbc_reg *reg = dbc->dbc_reg; - uint32_t db = (readl(®->db) & ~DBC_DOORBELL_TARGET_MASK) | - (trb->db << DBC_DOORBELL_TARGET_SHIFT); - if ( xhci_trb_ring_full(trb) ) return; @@ -1017,7 +1024,7 @@ static void dbc_flush(struct dbc *dbc, struct xhci_trb_ring *trb, } wmb(); - writel(db, ®->db); + dbc_ring_doorbell(dbc, trb->db); } /** -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 09:23:16 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 09:23:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.411560.654532 (Exim 4.92) (envelope-from ) id 1ockKa-0006L4-SO; Mon, 26 Sep 2022 09:23:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 411560.654532; Mon, 26 Sep 2022 09:23: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 1ockKa-0006Kv-PT; Mon, 26 Sep 2022 09:23:16 +0000 Received: by outflank-mailman (input) for mailman id 411560; Mon, 26 Sep 2022 09:23:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockKZ-0006Kf-KY for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockKZ-0004bg-Jr for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ockKZ-0003p5-J2 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23: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=v23tkUvPFi1WYvV59EgtY/CtGfxGc53VxmsH7WV/MxQ=; b=deHDR9YRclvARCVc93vT4qvX2r A9Tdc3rJs3jDTooSuVUh+KUTLAf/xNBOWsFNvbu5N8gyMRDVfv0d8fF5z2o2Fv9Q4LvmTqgDL0TBz lujvLzuZSPWgw7gCyzgwd1JDYVe4BP+bklAl8JJKOMrooDMbw+5BEvg4PB8JYKjj4ulw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] drivers/char: allow driving the rest of XHCI by a domain while Xen uses DbC Message-Id: Date: Mon, 26 Sep 2022 09:23:15 +0000 commit 72cab2289ef7dd6b28f927628b4f9d2601b515ae Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:13:06 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:13:06 2022 +0200 drivers/char: allow driving the rest of XHCI by a domain while Xen uses DbC That's possible, because the capability was designed specifically to allow separate driver handle it, in parallel to unmodified xhci driver (separate set of registers, pretending the port is "disconnected" for the main xhci driver etc). It works with Linux dom0, although requires an awful hack - re-enabling bus mastering behind dom0's backs. Linux driver does similar thing - see drivers/usb/early/xhci-dbc.c:xdbc_handle_events(). When controller sharing is enabled in kconfig (option marked as experimental), dom0 is allowed to use the controller even if Xen uses it for debug console. Additionally, option `dbgp=xhci,share=` is available to either prevent even dom0 from using it (`no` value), or allow any domain using it (`any` value). In any case, to avoid Linux messing with the DbC, mark this MMIO area as read-only. This might cause issues for Linux's driver (if it tries to write something on the same page - like anoter xcap), but makes Xen's use safe. In practice, as of Linux 5.18, it seems to work without issues. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 14 ++++- xen/drivers/char/xhci-dbc.c | 129 +++++++++++++++++++++++++++++++++++--- 2 files changed, 134 insertions(+), 9 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 92d668afa0..bbb4652bbf 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -723,7 +723,7 @@ Available alternatives, with their meaning, are: ### dbgp > `= ehci[ | @pci:. ]` -> `= xhci[ | @pci:. ]` +> `= xhci[ | @pci:. ][,share=|hwdom]` Specify the USB controller to use, either by instance number (when going over the PCI busses sequentially) or by PCI device (must be on segment 0). @@ -731,6 +731,18 @@ over the PCI busses sequentially) or by PCI device (must be on segment 0). Use `ehci` for EHCI debug port, use `xhci` for XHCI debug capability. XHCI driver will wait indefinitely for the debug host to connect - make sure the cable is connected. +The `share` option for xhci controls who else can use the controller: +* `no`: use the controller exclusively for console, even hardware domain + (dom0) cannot use it +* `hwdom`: hardware domain may use the controller too, ports not used for debug + console will be available for normal devices; this is the default +* `yes`: the controller can be assigned to any domain; it is not safe to assign + the controller to untrusted domain + +Choosing `share=hwdom` (the default) or `share=yes` allows a domain to reset the +controller, which may cause small portion of the console output to be lost. + +The `share=yes` configuration is not security supported. ### debug_stack_lines > `= ` diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index 5f47733c18..5f92234a95 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -232,6 +233,12 @@ struct dbc_work_ring { uint64_t dma; }; +enum xhci_share { + XHCI_SHARE_HWDOM = 0, + XHCI_SHARE_NONE, + XHCI_SHARE_ANY +}; + struct dbc { struct dbc_reg __iomem *dbc_reg; struct xhci_dbc_ctx *dbc_ctx; @@ -250,6 +257,7 @@ struct dbc { bool enable; /* whether dbgp=xhci was set at all */ bool open; + enum xhci_share share; unsigned int xhc_num; /* look for n-th xhc */ }; @@ -961,13 +969,56 @@ static bool __init dbc_open(struct dbc *dbc) } /* - * Ensure DbC is still running, handle events, and possibly re-enable if cable - * was re-plugged. Returns true if DbC is operational. + * Ensure DbC is still running, handle events, and possibly + * re-enable/re-configure if cable was re-plugged or controller was reset. + * Returns true if DbC is operational. */ static bool dbc_ensure_running(struct dbc *dbc) { struct dbc_reg *reg = dbc->dbc_reg; uint32_t ctrl; + uint16_t cmd; + + if ( dbc->share != XHCI_SHARE_NONE ) + { + /* + * Re-enable memory decoding and later bus mastering, if dom0 (or + * other) disabled it in the meantime. + */ + cmd = pci_conf_read16(dbc->sbdf, PCI_COMMAND); + if ( !(cmd & PCI_COMMAND_MEMORY) ) + { + cmd |= PCI_COMMAND_MEMORY; + pci_conf_write16(dbc->sbdf, PCI_COMMAND, cmd); + } + + /* + * FIXME: Make Linux coordinate XHCI reset, so the DbC driver can + * prepare for it properly, instead of only detecting it after the + * fact. See EHCI driver for similar handling. + */ + if ( dbc->open && !(readl(®->ctrl) & (1U << DBC_CTRL_DCE)) ) + { + if ( !dbc_init_dbc(dbc) ) + return false; + + dbc_init_work_ring(dbc, &dbc->dbc_owork); + dbc_enable_dbc(dbc); + } + else + { + /* + * dbc_init_dbc() takes care about it, so check only if it wasn't + * called. + */ + cmd = pci_conf_read16(dbc->sbdf, PCI_COMMAND); + if ( !(cmd & PCI_COMMAND_MASTER) ) + { + cmd |= PCI_COMMAND_MASTER; + pci_conf_write16(dbc->sbdf, PCI_COMMAND, cmd); + } + } + } dbc_pop_events(dbc); @@ -1136,10 +1187,38 @@ static void __init cf_check dbc_uart_init_postirq(struct serial_port *port) init_timer(&uart->timer, dbc_uart_poll, port, 0); set_timer(&uart->timer, NOW() + MILLISECS(1)); - if ( pci_ro_device(0, uart->dbc.sbdf.bus, uart->dbc.sbdf.devfn) ) - printk(XENLOG_WARNING - "Failed to mark read-only %pp used for XHCI console\n", - &uart->dbc.sbdf); + switch ( uart->dbc.share ) + { + case XHCI_SHARE_NONE: + if ( pci_ro_device(0, uart->dbc.sbdf.bus, uart->dbc.sbdf.devfn) ) + printk(XENLOG_WARNING + "Failed to mark read-only %pp used for XHCI console\n", + &uart->dbc.sbdf); + break; + case XHCI_SHARE_HWDOM: + if ( pci_hide_device(0, uart->dbc.sbdf.bus, uart->dbc.sbdf.devfn) ) + printk(XENLOG_WARNING + "Failed to hide %pp used for XHCI console\n", + &uart->dbc.sbdf); + break; + case XHCI_SHARE_ANY: + /* Do not hide. */ + break; + } +#ifdef CONFIG_X86 + /* + * This marks the whole page as R/O, which may include other registers + * unrelated to DbC. Xen needs only DbC area protected, but it seems + * Linux's XHCI driver (as of 5.18) works without writting to the whole + * page, so keep it simple. + */ + if ( rangeset_add_range(mmio_ro_ranges, + PFN_DOWN(uart->dbc.xhc_mmio_phys + uart->dbc.xhc_dbc_offset), + PFN_UP(uart->dbc.xhc_mmio_phys + uart->dbc.xhc_dbc_offset + + sizeof(*uart->dbc.dbc_reg)) - 1) ) + printk(XENLOG_INFO + "Error while adding MMIO range of device to mmio_ro_ranges\n"); +#endif } static int cf_check dbc_uart_tx_ready(struct serial_port *port) @@ -1207,13 +1286,15 @@ static int __init xhci_parse_dbgp(const char *opt_dbgp) { struct dbc_uart *uart = &dbc_uart; struct dbc *dbc = &uart->dbc; - const char *e; + const char *e, *opt; + int val; if ( strncmp(opt_dbgp, "xhci", 4) ) return 0; memset(dbc, 0, sizeof(*dbc)); + e = &opt_dbgp[4]; if ( isdigit(opt_dbgp[4]) ) { dbc->xhc_num = simple_strtoul(opt_dbgp + 4, &e, 10); @@ -1223,7 +1304,7 @@ static int __init xhci_parse_dbgp(const char *opt_dbgp) unsigned int bus, slot, func; e = parse_pci(opt_dbgp + 8, NULL, &bus, &slot, &func); - if ( !e || *e ) + if ( !e || (*e && *e != ',') ) { printk(XENLOG_ERR "Invalid dbgp= PCI device spec: '%s'\n", @@ -1233,6 +1314,38 @@ static int __init xhci_parse_dbgp(const char *opt_dbgp) dbc->sbdf = PCI_SBDF(0, bus, slot, func); } + opt = e; + + /* other options */ + while ( *opt == ',' ) + { + opt++; + e = strchr(opt, ','); + if ( !e ) + e = strchr(opt, '\0'); + + if ( (val = parse_boolean("share", opt, e)) != -1 ) + { + if ( val == -2 && !cmdline_strcmp(opt + 6, "hwdom") ) + dbc->share = XHCI_SHARE_HWDOM; + else if ( val == 0 ) + dbc->share = XHCI_SHARE_NONE; + else if ( val == 1 ) + dbc->share = XHCI_SHARE_ANY; + else + break; + } + else + break; + + opt = e; + } + + if ( *opt ) + { + printk(XENLOG_ERR "Invalid dbgp= parameters: '%s'\n", opt); + return -EINVAL; + } dbc->enable = true; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 09:23:26 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 09:23:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.411561.654536 (Exim 4.92) (envelope-from ) id 1ockKk-0006Nd-Tp; Mon, 26 Sep 2022 09:23:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 411561.654536; Mon, 26 Sep 2022 09:23: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 1ockKk-0006NV-R3; Mon, 26 Sep 2022 09:23:26 +0000 Received: by outflank-mailman (input) for mailman id 411561; Mon, 26 Sep 2022 09:23:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockKj-0006NM-NU for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockKj-0004bv-Mr for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ockKj-0003pq-M7 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23: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=OKf0TpvHUOtN7QeUyy0uRD2yWtKekgt+GuicCta5VeA=; b=Navo/nYpeMh0D1Qpdrm1j2esZr bR5S7SRrlZgnCwBxVLeYs2xGFQUA0O3TLpMnQ+2n3l+ctWMwXXsWo4nli0T3SXhHEbGdfYC9uzOwm RK4YZnS7s0nbrf33CWzKVZXhcK/mxSKKLw67Jtcow3wYcRSsjwM/q/7oYwv0p0q0UEsg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] drivers/char: add console=ehci as an alias for console=dbgp Message-Id: Date: Mon, 26 Sep 2022 09:23:25 +0000 commit bebaf7c296518bf9cec24773c8da1e6823fff5fc Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:13:31 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:13:31 2022 +0200 drivers/char: add console=ehci as an alias for console=dbgp Make it consistent with console=xhci. Suggested-by: Jan Beulich Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 4 ++-- xen/drivers/char/serial.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index bbb4652bbf..68389843b2 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -409,7 +409,7 @@ The following are examples of correct specifications: Specify the size of the console ring buffer. ### console -> `= List of [ vga | com1[H,L] | com2[H,L] | pv | dbgp | xhci | none ]` +> `= List of [ vga | com1[H,L] | com2[H,L] | pv | dbgp | ehci | xhci | none ]` > Default: `console=com1,vga` @@ -428,7 +428,7 @@ cleared. This allows a single port to be shared by two subsystems `pv` indicates that Xen should use Xen's PV console. This option is only available when used together with `pv-in-pvh`. -`dbgp` indicates that Xen should use a USB2 debug port. +`dbgp` or `ehci` indicates that Xen should use a USB2 debug port. `xhci` indicates that Xen should use a USB3 debug port. diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 9d94450392..00efe69574 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -311,6 +311,12 @@ int __init serial_parse_handle(const char *conf) goto common; } + if ( !strncmp(conf, "ehci", 4) && (!conf[4] || conf[4] == ',') ) + { + handle = SERHND_DBGP; + goto common; + } + if ( !strncmp(conf, "xhci", 4) && (!conf[4] || conf[4] == ',') ) { handle = SERHND_XHCI; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 09:23:37 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 09:23:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.411562.654540 (Exim 4.92) (envelope-from ) id 1ockKu-0006Qb-VC; Mon, 26 Sep 2022 09:23:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 411562.654540; Mon, 26 Sep 2022 09:23: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 1ockKu-0006QT-SW; Mon, 26 Sep 2022 09:23:36 +0000 Received: by outflank-mailman (input) for mailman id 411562; Mon, 26 Sep 2022 09:23:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockKt-0006QM-QR for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockKt-0004c5-Pm for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ockKt-0003qQ-P4 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23: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=2nQEZKAErAKoPFw/CgSLFv0mkVPinIQ8AQS/zNtGwv4=; b=OeT/OL9sQ4hRzbnhpblAtjzOTL hmt8TAdLql+eDZ8fJgOclhzZly2ZeOWkJ9dfU72j4c3aThEGcm7731Z4WLXU3m+rfRcdbzkkhZQ6L Uwo++QUuyYvc9ibtfhmJ57CUVL/RIrcf/KGZMP3ine+KYukjrUB09Nrk6SXzovgvc7Gs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xsm/flask: adjust print messages to use %pd Message-Id: Date: Mon, 26 Sep 2022 09:23:35 +0000 commit 6cecffc7a66b04742fcbaeca995f5b64b69ba55f Author: Daniel P. Smith AuthorDate: Mon Sep 26 11:14:19 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:14:19 2022 +0200 xsm/flask: adjust print messages to use %pd Print messages from flask use an inconsistent format when printing the domain id. When referencing system domains, the domain id is printed which is not immediately identifiable. The %pd conversion specifier provides a consistent and clear way to format for the domain id. In addition this will assist in aligning FLASK with current hypervisor code practices. While addressing the domain id formating, two related issues were addressed. The first being that avc_printk() was not applying any conversion specifier validation. To address this, the printf annotation was added to avc_printk() to help ensure the correct types are passed to each conversion specifier. The second was concern that source and target domains were being appropriately reported for an AVC. This was addressed by simplifying the conditional logic. Signed-off-by: Daniel P. Smith Reviewed-by: Henry Wang Reviewed-by: Jason Andryuk --- xen/xsm/flask/avc.c | 16 ++++++++-------- xen/xsm/flask/hooks.c | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c index 4a75ec97e2..3d39e55cae 100644 --- a/xen/xsm/flask/avc.c +++ b/xen/xsm/flask/avc.c @@ -113,7 +113,8 @@ struct avc_dump_buf { u32 free; }; -static void avc_printk(struct avc_dump_buf *buf, const char *fmt, ...) +static void __attribute__ ((format (printf, 2, 3))) + avc_printk(struct avc_dump_buf *buf, const char *fmt, ...) { int i; va_list args; @@ -565,15 +566,14 @@ void avc_audit(u32 ssid, u32 tsid, u16 tclass, u32 requested, if ( a && (a->sdom || a->tdom) ) { - if ( a->sdom && a->tdom && a->sdom != a->tdom ) - avc_printk(&buf, "domid=%d target=%d ", a->sdom->domain_id, a->tdom->domain_id); - else if ( a->sdom ) - avc_printk(&buf, "domid=%d ", a->sdom->domain_id); - else - avc_printk(&buf, "target=%d ", a->tdom->domain_id); + if ( a->sdom ) + avc_printk(&buf, "source=%pd ", a->sdom); + if ( a->tdom && a->tdom != a->sdom ) + avc_printk(&buf, "target=%pd ", a->tdom); } else if ( cdom ) - avc_printk(&buf, "domid=%d ", cdom->domain_id); + avc_printk(&buf, "current=%pd ", cdom); + switch ( a ? a->type : 0 ) { case AVC_AUDIT_DATA_DEV: avc_printk(&buf, "device=%#lx ", a->device); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index e7db7fe07a..391aec4dc2 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -296,8 +296,7 @@ static int cf_check flask_evtchn_interdomain( rc = security_transition_sid(sid1, sid2, SECCLASS_EVENT, &newsid); if ( rc ) { - printk("security_transition_sid failed, rc=%d, Dom%d\n", - -rc, d2->domain_id); + printk("security_transition_sid failed, rc=%d, %pd\n", -rc, d2); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 09:23:47 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 09:23:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.411563.654545 (Exim 4.92) (envelope-from ) id 1ockL5-0006TE-14; Mon, 26 Sep 2022 09:23:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 411563.654545; Mon, 26 Sep 2022 09:23: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 1ockL4-0006T4-U8; Mon, 26 Sep 2022 09:23:46 +0000 Received: by outflank-mailman (input) for mailman id 411563; Mon, 26 Sep 2022 09:23:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockL3-0006Sv-TK for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ockL3-0004cF-Sg for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ockL3-0003qp-Rv for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 09:23: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=m6AnY13X83heeC1j0x8QGHYvJLfkWz316piHCMNWj0I=; b=JzbAtgYqYdD3byDvE/EPf+Wjo0 ZJaWVkW4gbuYdj9fknHttdgRyRwVe/kLoimtLUguvRINd+XGF9S/zYP/o8DKwf1VtxS9diEl+nuXg nJf+JFwTtaDS4306E+b5W/pVjT02o9QxXgTjIecGOkz7WYc8GgmU5cWrJHY/aEiRckds=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] build: fix x86 out-of-tree build without EFI Message-Id: Date: Mon, 26 Sep 2022 09:23:45 +0000 commit bfd3e9945d1bc551ad11272c7fa752ff3d060149 Author: Anthony PERARD AuthorDate: Mon Sep 26 11:16:04 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:16:04 2022 +0200 build: fix x86 out-of-tree build without EFI We can't have a source file with the same name that exist in both the common code and in the arch specific code for efi/. This can lead to confusion in make and it can pick up the wrong source file. This issue lead to a failure to build a pv-shim for x86 out-of-tree, as this is one example of an x86 build using the efi/stub.c. The issue is that in out-of-tree, make might find x86/efi/stub.c via VPATH, but as the target needs to be rebuilt due to FORCE, make actually avoid changing the source tree and rebuilt the target with VPATH ignored, so $@ lead to the build tree where "stub.c" doesn't exist yet so a link is made to "common/stub.c". Rework the new common/stub.c file to have a different name than the already existing one, by renaming the existing one. We can hide the compat aliases that x86 uses behind CONFIG_COMPAT so a Arm build will not have them. Also revert the change to the rule that creates symbolic links it's better to just recreate the link in cases where an existing file exist or the link goes to the wrong file. Avoid using $(EFIOBJ-y) as an alias for $(clean-files), add "stub.c" directly to $(clean-files). Also update .gitignore as this was also missing from the original patch. Fixes: 7f96859b0d00 ("xen: reuse x86 EFI stub functions for Arm") Reported-by: Andrew Cooper Signed-off-by: Anthony PERARD --- .gitignore | 1 + xen/arch/arm/efi/Makefile | 6 +----- xen/arch/x86/efi/Makefile | 2 +- xen/arch/x86/efi/stub.c | 7 ------- xen/common/efi/common-stub.c | 42 ++++++++++++++++++++++++++++++++++++++++++ xen/common/efi/efi-common.mk | 4 ++-- xen/common/efi/stub.c | 32 -------------------------------- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index af9bf749c4..418bdfaebf 100644 --- a/.gitignore +++ b/.gitignore @@ -275,6 +275,7 @@ xen/arch/x86/efi/mkreloc xen/arch/x86/include/asm/asm-macros.h xen/arch/*/xen.lds xen/arch/*/efi/boot.c +xen/arch/*/efi/common-stub.c xen/arch/*/efi/compat.c xen/arch/*/efi/ebmalloc.c xen/arch/*/efi/efi.h diff --git a/xen/arch/arm/efi/Makefile b/xen/arch/arm/efi/Makefile index bd954a3b2d..2459cbae3a 100644 --- a/xen/arch/arm/efi/Makefile +++ b/xen/arch/arm/efi/Makefile @@ -4,11 +4,7 @@ ifeq ($(CONFIG_ARM_EFI),y) obj-y += $(EFIOBJ-y) obj-$(CONFIG_ACPI) += efi-dom0.init.o else -# Add stub.o to EFIOBJ-y to re-use the clean-files in -# efi-common.mk. Otherwise the link of stub.c in arm/efi -# will not be cleaned in "make clean". -EFIOBJ-y += stub.o -obj-y += stub.o +obj-y += common-stub.o $(obj)/stub.o: CFLAGS-y += -fno-short-wchar diff --git a/xen/arch/x86/efi/Makefile b/xen/arch/x86/efi/Makefile index 034ec87895..24dfecfad1 100644 --- a/xen/arch/x86/efi/Makefile +++ b/xen/arch/x86/efi/Makefile @@ -11,7 +11,7 @@ $(obj)/boot.init.o: $(obj)/buildid.o $(call cc-option-add,cflags-stack-boundary,CC,-mpreferred-stack-boundary=4) $(addprefix $(obj)/,$(EFIOBJ-y)): CFLAGS_stack_boundary := $(cflags-stack-boundary) -obj-y := stub.o +obj-y := common-stub.o stub.o obj-$(XEN_BUILD_EFI) := $(filter-out %.init.o,$(EFIOBJ-y)) obj-bin-$(XEN_BUILD_EFI) := $(filter %.init.o,$(EFIOBJ-y)) extra-$(XEN_BUILD_EFI) += buildid.o relocs-dummy.o diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index f2365bc041..2cd5c8d4dc 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -8,7 +8,6 @@ #include #include #include -#include "../../../common/efi/stub.c" /* * Here we are in EFI stub. EFI calls are not supported due to lack @@ -55,9 +54,3 @@ bool efi_boot_mem_unused(unsigned long *start, unsigned long *end) } void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } - -int efi_compat_get_info(uint32_t idx, union compat_pf_efi_info *) - __attribute__((__alias__("efi_get_info"))); - -int efi_compat_runtime_call(struct compat_pf_efi_runtime_call *) - __attribute__((__alias__("efi_runtime_call"))); diff --git a/xen/common/efi/common-stub.c b/xen/common/efi/common-stub.c new file mode 100644 index 0000000000..5a91fe28cc --- /dev/null +++ b/xen/common/efi/common-stub.c @@ -0,0 +1,42 @@ +#include +#include +#include + +bool efi_enabled(unsigned int feature) +{ + return false; +} + +bool efi_rs_using_pgtables(void) +{ + return false; +} + +unsigned long efi_get_time(void) +{ + BUG(); + return 0; +} + +void efi_halt_system(void) { } +void efi_reset_system(bool warm) { } + +int efi_get_info(uint32_t idx, union xenpf_efi_info *info) +{ + return -ENOSYS; +} + +int efi_runtime_call(struct xenpf_efi_runtime_call *op) +{ + return -ENOSYS; +} + +#ifdef CONFIG_COMPAT + +int efi_compat_get_info(uint32_t idx, union compat_pf_efi_info *) + __attribute__((__alias__("efi_get_info"))); + +int efi_compat_runtime_call(struct compat_pf_efi_runtime_call *) + __attribute__((__alias__("efi_runtime_call"))); + +#endif diff --git a/xen/common/efi/efi-common.mk b/xen/common/efi/efi-common.mk index ec2c34f198..53fdb81583 100644 --- a/xen/common/efi/efi-common.mk +++ b/xen/common/efi/efi-common.mk @@ -9,9 +9,9 @@ CFLAGS-y += -iquote $(srcdir) # e.g.: It transforms "dir/foo/bar" into successively # "dir foo bar", ".. .. ..", "../../.." $(obj)/%.c: $(srctree)/common/efi/%.c FORCE - $(Q)test -f $@ || \ - ln -nfs $(subst $(space),/,$(patsubst %,..,$(subst /, ,$(obj))))/source/common/efi/$( -#include -#include - -bool efi_enabled(unsigned int feature) -{ - return false; -} - -bool efi_rs_using_pgtables(void) -{ - return false; -} - -unsigned long efi_get_time(void) -{ - BUG(); - return 0; -} - -void efi_halt_system(void) { } -void efi_reset_system(bool warm) { } - -int efi_get_info(uint32_t idx, union xenpf_efi_info *info) -{ - return -ENOSYS; -} - -int efi_runtime_call(struct xenpf_efi_runtime_call *op) -{ - return -ENOSYS; -} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 18:55:08 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 18:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412049.655204 (Exim 4.92) (envelope-from ) id 1octFv-0004yT-QO; Mon, 26 Sep 2022 18:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412049.655204; Mon, 26 Sep 2022 18: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 1octFv-0004yL-Na; Mon, 26 Sep 2022 18:55:03 +0000 Received: by outflank-mailman (input) for mailman id 412049; Mon, 26 Sep 2022 18:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octFu-0004yF-FI for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octFu-0007V9-C0 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1octFu-0001bd-Ar for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18: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=dyOi7ydDXCH91vfWCsb8/kq2tSTc8Rx1EJbveBhVtN8=; b=A/I8rQ3gVzlsr9k8jKsiyZxLQz 5C2KwnpDuJzzUuB6DsOhUKS1ZghZcojrzVUwHCOu8agWV0yhDmI989cLMJaZ929B4BsaVL7/nptUq bKRf3fbYBYdfI/a1mYL0oW0UB02iLhCqf2n7F9JmvS/AQA/q5/59D0bkN0WGjdJiwt70=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: correct cppcheck-misra make rule Message-Id: Date: Mon, 26 Sep 2022 18:55:02 +0000 commit c1db78cae105e5b166f41ecac7ccb8cbfd82693f Author: Jan Beulich AuthorDate: Mon Sep 26 11:07:48 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:07:48 2022 +0200 build: correct cppcheck-misra make rule Having cppcheck-misra.json depend on cppcheck-misra.txt does not properly address the multiple targets problem. If cppcheck-misra.json is deleted from the build tree but cppcheck-misra.txt is still there, nothing will re-generate cppcheck-misra.json. With GNU make 4.3 or newer we could use the &: grouped target separator, but since we support older make as well we need to use some other mechanism. Convert the rule to a pattern one (with "cppcheck" kind of arbitrarily chosen as the stem), thus making known to make that both files are created by a single command invocation. Since, as a result, the JSON file is now "intermediate" from make's perspective, prevent it being deleted again by making it a prereq of .PRECIOUS. Fixes: 57caa5375321 ("xen: Add MISRA support to cppcheck make rule") Signed-off-by: Jan Beulich Reviewed-by: Bertrand Marquis --- xen/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 106aff6a07..4e6e661261 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -746,11 +746,12 @@ cppcheck-version: # documentation file. Also generate a json file with the right arguments for # cppcheck in json format including the list of rules to ignore. # -cppcheck-misra.txt: $(XEN_ROOT)/docs/misra/rules.rst $(srctree)/tools/convert_misra_doc.py - $(Q)$(PYTHON) $(srctree)/tools/convert_misra_doc.py -i $< -o $@ -j $(@:.txt=.json) - -# convert_misra_doc is generating both files. -cppcheck-misra.json: cppcheck-misra.txt +# convert_misra_doc.py, producing both targets at the same time, should be +# executed only once. Utilize a pattern rule to achieve this effect, with the +# stem kind of arbitrarily chosen to be "cppcheck". +.PRECIOUS: %-misra.json +%-misra.txt %-misra.json: $(XEN_ROOT)/docs/misra/rules.rst $(srctree)/tools/convert_misra_doc.py + $(Q)$(PYTHON) $(srctree)/tools/convert_misra_doc.py -i $< -o $*-misra.txt -j $*-misra.json # Put this in generated headers this way it is cleaned by include/Makefile $(objtree)/include/generated/compiler-def.h: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 18:55:13 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 18:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412050.655209 (Exim 4.92) (envelope-from ) id 1octG5-00050Q-RZ; Mon, 26 Sep 2022 18:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412050.655209; Mon, 26 Sep 2022 18: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 1octG5-00050J-P6; Mon, 26 Sep 2022 18:55:13 +0000 Received: by outflank-mailman (input) for mailman id 412050; Mon, 26 Sep 2022 18:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octG4-000504-GD for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octG4-0007VE-FP for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1octG4-0001cS-EP for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18: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=s6N+CrpvPQB4T9MhisJUdFmr+D8xft+w0qi0dacCj1Y=; b=GxjZxR84feE+eBRrkC6RsyFOb1 26tyrJ6ilYuQOiIjRAZKjVqnwk3b3lHGrac/j0jgYxez13pIJLLS5WxnrNU4aP9mki9X1dPzW0bj/ xgbSm/BXQJEQLoR72nb+v3K8VqxCVxFrZCb94mAO8pC3xy/GUXBWN6FBhmjw+G+VIEjs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] drivers/char: allow using both dbgp=xhci and dbgp=ehci Message-Id: Date: Mon, 26 Sep 2022 18:55:12 +0000 commit 022e40edd4dc00b9784e5e659dac7f9f92bedfa3 Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:09:19 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:09:19 2022 +0200 drivers/char: allow using both dbgp=xhci and dbgp=ehci This allows configuring EHCI and XHCI consoles separately, simultaneously, such that e.g. one can be used for the console and the other by the debugger. This changes string_param() to custom_param() in both ehci and xhci drivers. Both drivers parse only values applicable to them. Suggested-by: Jan Beulich Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 6 ++++-- xen/drivers/char/ehci-dbgp.c | 14 ++++++++++++-- xen/drivers/char/serial.c | 6 ++++++ xen/drivers/char/xhci-dbc.c | 27 +++++++++++++++++++-------- xen/include/xen/serial.h | 3 ++- 5 files changed, 43 insertions(+), 13 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 9a79385a37..c8b07042f5 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -409,7 +409,7 @@ The following are examples of correct specifications: Specify the size of the console ring buffer. ### console -> `= List of [ vga | com1[H,L] | com2[H,L] | pv | dbgp | none ]` +> `= List of [ vga | com1[H,L] | com2[H,L] | pv | dbgp | xhci | none ]` > Default: `console=com1,vga` @@ -428,7 +428,9 @@ cleared. This allows a single port to be shared by two subsystems `pv` indicates that Xen should use Xen's PV console. This option is only available when used together with `pv-in-pvh`. -`dbgp` indicates that Xen should use a USB debug port. +`dbgp` indicates that Xen should use a USB2 debug port. + +`xhci` indicates that Xen should use a USB3 debug port. `none` indicates that Xen should not use a console. This option only makes sense on its own. diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 92c588ec0a..8a0b958506 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1464,7 +1464,17 @@ static struct uart_driver __read_mostly ehci_dbgp_driver = { static struct ehci_dbgp ehci_dbgp = { .state = dbgp_unsafe, .phys_port = 1 }; static char __initdata opt_dbgp[30]; -string_param("dbgp", opt_dbgp); + +static int __init parse_ehci_dbgp(const char *opt) +{ + if ( strncmp(opt, "ehci", 4) ) + return 0; + + strlcpy(opt_dbgp, opt, sizeof(opt_dbgp)); + + return 0; +} +custom_param("dbgp", parse_ehci_dbgp); void __init ehci_dbgp_init(void) { @@ -1472,7 +1482,7 @@ void __init ehci_dbgp_init(void) u32 debug_port, offset, bar_val; const char *e; - if ( strncmp(opt_dbgp, "ehci", 4) ) + if ( !opt_dbgp[0] ) return; if ( isdigit(opt_dbgp[4]) || !opt_dbgp[4] ) diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 47899222ce..9d94450392 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -311,6 +311,12 @@ int __init serial_parse_handle(const char *conf) goto common; } + if ( !strncmp(conf, "xhci", 4) && (!conf[4] || conf[4] == ',') ) + { + handle = SERHND_XHCI; + goto common; + } + if ( !strncmp(conf, "dtuart", 6) ) { handle = SERHND_DTUART; diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index ca7d4a6213..4712faaabe 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -245,6 +245,7 @@ struct dbc { uint64_t xhc_dbc_offset; void __iomem *xhc_mmio; + bool enable; /* whether dbgp=xhci was set at all */ bool open; unsigned int xhc_num; /* look for n-th xhc */ }; @@ -1058,18 +1059,14 @@ static struct xhci_dbc_ctx ctx __aligned(16); static uint8_t out_wrk_buf[DBC_WORK_RING_CAP]; static struct xhci_string_descriptor str_buf[DBC_STRINGS_COUNT]; -static char __initdata opt_dbgp[30]; - -string_param("dbgp", opt_dbgp); - -void __init xhci_dbc_uart_init(void) +static int __init xhci_parse_dbgp(const char *opt_dbgp) { struct dbc_uart *uart = &dbc_uart; struct dbc *dbc = &uart->dbc; const char *e; if ( strncmp(opt_dbgp, "xhci", 4) ) - return; + return 0; memset(dbc, 0, sizeof(*dbc)); @@ -1087,12 +1084,26 @@ void __init xhci_dbc_uart_init(void) printk(XENLOG_ERR "Invalid dbgp= PCI device spec: '%s'\n", opt_dbgp + 8); - return; + return -EINVAL; } dbc->sbdf = PCI_SBDF(0, bus, slot, func); } + dbc->enable = true; + + return 0; +} +custom_param("dbgp", xhci_parse_dbgp); + +void __init xhci_dbc_uart_init(void) +{ + struct dbc_uart *uart = &dbc_uart; + struct dbc *dbc = &uart->dbc; + + if ( !dbc->enable ) + return; + dbc->dbc_ctx = &ctx; dbc->dbc_erst = &erst; dbc->dbc_ering.trb = evt_trb; @@ -1102,7 +1113,7 @@ void __init xhci_dbc_uart_init(void) dbc->dbc_str = str_buf; if ( dbc_open(dbc) ) - serial_register_uart(SERHND_DBGP, &dbc_uart_driver, &dbc_uart); + serial_register_uart(SERHND_XHCI, &dbc_uart_driver, &dbc_uart); } #ifdef DBC_DEBUG diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 4cd4ae5e6f..f0aff7ea76 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -91,10 +91,11 @@ struct uart_driver { }; /* 'Serial handles' are composed from the following fields. */ -#define SERHND_IDX (3<<0) /* COM1, COM2, DBGP, DTUART? */ +#define SERHND_IDX (3<<0) /* COM1, COM2, DBGP, XHCI, DTUART? */ # define SERHND_COM1 (0<<0) # define SERHND_COM2 (1<<0) # define SERHND_DBGP (2<<0) +# define SERHND_XHCI (3<<0) # define SERHND_DTUART (0<<0) /* Steal SERHND_COM1 value */ #define SERHND_HI (1<<2) /* Mux/demux each transferred char by MSB. */ #define SERHND_LO (1<<3) /* Ditto, except that the MSB is cleared. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 18:55:23 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 18:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412051.655213 (Exim 4.92) (envelope-from ) id 1octGF-00053G-TD; Mon, 26 Sep 2022 18:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412051.655213; Mon, 26 Sep 2022 18: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 1octGF-000538-Qg; Mon, 26 Sep 2022 18:55:23 +0000 Received: by outflank-mailman (input) for mailman id 412051; Mon, 26 Sep 2022 18:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octGE-000530-Ix for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octGE-0007VV-ID for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1octGE-0001cr-HW for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18: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=/8As9UksZgsPnL3pUpxCADcRVe2t6Dd8WAraRPUn+j4=; b=gy4FxU0QeeCwrPq8XhJ4HXzlZ4 ZlNF1Pjpcc+u/1emUq/n9UByp1nqfLe9Qa6qjA8FOE7mlb2lXJEhLQwx122IU3mpA7+2BfbAaYYBb 4oLsH6IVeNN0FwWMImRVdJgmDWiBsAa/VABuQiFYYWIZE0lnU97zYkRxIjSiQDBBDMjE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] IOMMU: add common API for device reserved memory Message-Id: Date: Mon, 26 Sep 2022 18:55:22 +0000 commit faccb3a08b454201fa4e4f1d2e08282f07627166 Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:10:31 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:10:31 2022 +0200 IOMMU: add common API for device reserved memory Add API similar to rmrr= and ivmd= arguments, but in a common code. This will allow drivers to register reserved memory regardless of the IOMMU vendor. The direct reason for this API is xhci-dbc console driver (aka xue), that needs to use DMA. But future change may unify command line arguments for user-supplied reserved memory, and it may be useful for other drivers in the future too. This commit just introduces an API, subsequent patches will plug it in appropriate places. The reserved memory ranges needs to be saved locally, because at the point when they are collected, Xen doesn't know yet which IOMMU driver will be used. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- xen/drivers/passthrough/iommu.c | 46 +++++++++++++++++++++++++++++++++++++++++ xen/include/xen/iommu.h | 14 +++++++++++++ 2 files changed, 60 insertions(+) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 134cdb47e0..5e2a720d29 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -669,6 +669,52 @@ bool_t iommu_has_feature(struct domain *d, enum iommu_feature feature) return is_iommu_enabled(d) && test_bit(feature, dom_iommu(d)->features); } +#define MAX_EXTRA_RESERVED_RANGES 20 +struct extra_reserved_range { + unsigned long start; + unsigned long nr; + pci_sbdf_t sbdf; +}; +static unsigned int __initdata nr_extra_reserved_ranges; +static struct extra_reserved_range __initdata + extra_reserved_ranges[MAX_EXTRA_RESERVED_RANGES]; + +int __init iommu_add_extra_reserved_device_memory(unsigned long start, + unsigned long nr, + pci_sbdf_t sbdf) +{ + unsigned int idx; + + if ( nr_extra_reserved_ranges >= MAX_EXTRA_RESERVED_RANGES ) + return -ENOMEM; + + idx = nr_extra_reserved_ranges++; + extra_reserved_ranges[idx].start = start; + extra_reserved_ranges[idx].nr = nr; + extra_reserved_ranges[idx].sbdf = sbdf; + + return 0; +} + +int __init iommu_get_extra_reserved_device_memory(iommu_grdm_t *func, + void *ctxt) +{ + unsigned int idx; + int ret; + + for ( idx = 0; idx < nr_extra_reserved_ranges; idx++ ) + { + ret = func(extra_reserved_ranges[idx].start, + extra_reserved_ranges[idx].nr, + extra_reserved_ranges[idx].sbdf.sbdf, + ctxt); + if ( ret < 0 ) + return ret; + } + + return 0; +} + /* * Local variables: * mode: C diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 1240d7762d..4f22fc1bed 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -304,6 +304,20 @@ struct iommu_ops { #endif }; +/* + * To be called by Xen internally, to register extra RMRR/IVMD ranges. + * Needs to be called before IOMMU initialization. + */ +extern int iommu_add_extra_reserved_device_memory(unsigned long start, + unsigned long nr, + pci_sbdf_t sbdf); +/* + * To be called by specific IOMMU driver during initialization, + * to fetch ranges registered with iommu_add_extra_reserved_device_memory(). + */ +extern int iommu_get_extra_reserved_device_memory(iommu_grdm_t *func, + void *ctxt); + #include #ifndef iommu_call -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 18:55:33 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 18:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412052.655217 (Exim 4.92) (envelope-from ) id 1octGP-00055k-Uf; Mon, 26 Sep 2022 18:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412052.655217; Mon, 26 Sep 2022 18: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 1octGP-00055d-S7; Mon, 26 Sep 2022 18:55:33 +0000 Received: by outflank-mailman (input) for mailman id 412052; Mon, 26 Sep 2022 18:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octGO-00055V-Lq for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octGO-0007XD-L8 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1octGO-0001dK-KJ for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18: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=yV1B7Qcs3copBhONRMz3deNrTYC17ripEfDPFVkoGRI=; b=djEgmMrtzRC+Sa3A16avLUL/Da leQ1gUbbXIZZpalfWzh7lMmKhdClBNTIb8G07mjdFXWeITpQklWXSBpGeYSpncCJn7Zvlzq4R+7T+ bD34DZdlVqXGEOQ6/Mlc0w9P6mO22BX99AspOcZvG39Mo0sxGhaiaFwSkmL493J9yZAc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] IOMMU/AMD: wire common device reserved memory API Message-Id: Date: Mon, 26 Sep 2022 18:55:32 +0000 commit 3fd9456f2daecaaa0026c51ac2b627dd771cc81a Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:11:07 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:11:07 2022 +0200 IOMMU/AMD: wire common device reserved memory API Register common device reserved memory similar to how ivmd= parameter is handled. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- xen/drivers/passthrough/amd/iommu_acpi.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index ac6835225b..3b577c9b39 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -1078,6 +1078,25 @@ static inline bool_t is_ivmd_block(u8 type) type == ACPI_IVRS_TYPE_MEMORY_IOMMU); } +static int __init cf_check add_one_extra_ivmd(unsigned long start, + unsigned long nr, + uint32_t id, void *ctxt) +{ + struct acpi_ivrs_memory ivmd = { + .header = { + .length = sizeof(ivmd), + .flags = ACPI_IVMD_UNITY | ACPI_IVMD_READ | ACPI_IVMD_WRITE, + .device_id = id, + .type = ACPI_IVRS_TYPE_MEMORY_ONE, + }, + }; + + ivmd.start_address = pfn_to_paddr(start); + ivmd.memory_length = pfn_to_paddr(nr); + + return parse_ivmd_block(&ivmd); +} + static int __init cf_check parse_ivrs_table(struct acpi_table_header *table) { const struct acpi_ivrs_header *ivrs_block; @@ -1121,6 +1140,8 @@ static int __init cf_check parse_ivrs_table(struct acpi_table_header *table) AMD_IOMMU_DEBUG("IVMD: %u command line provided entries\n", nr_ivmd); for ( i = 0; !error && i < nr_ivmd; ++i ) error = parse_ivmd_block(user_ivmds + i); + if ( !error ) + error = iommu_get_extra_reserved_device_memory(add_one_extra_ivmd, NULL); /* Each IO-APIC must have been mentioned in the table. */ for ( apic = 0; !error && iommu_intremap && apic < nr_ioapics; ++apic ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 18:55:44 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 18:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412053.655221 (Exim 4.92) (envelope-from ) id 1octGa-00058Z-04; Mon, 26 Sep 2022 18:55:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412053.655221; Mon, 26 Sep 2022 18: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 1octGZ-00058R-Tb; Mon, 26 Sep 2022 18:55:43 +0000 Received: by outflank-mailman (input) for mailman id 412053; Mon, 26 Sep 2022 18:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octGY-00058H-Oh for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octGY-0007XP-O6 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1octGY-0001dp-NF for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18: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=1w1aKnmeBYTBi0K9uT9snVr4CuKmBItjbFRXnIXtqoA=; b=IWBY8Lq4gl21AZ2sVuaKB1Sls8 0SEuPZwHM1JzbqfickXag26329BugEkgCwd4QttPr75YSxmTuuekhUrsIAMmBKuAQkcjGYjQojm/B hkAStGOKvc2t06bGcpM7oxNKfo60qx8iCAsnzH3XQiYWenokR5zg9rTFTWKbkv7Qh6Xw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] drivers/char: mark DMA buffers as reserved for the XHCI Message-Id: Date: Mon, 26 Sep 2022 18:55:42 +0000 commit 3a1a7b809ffa4251a9673858a75b161c49c6c241 Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:11:33 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:11:33 2022 +0200 drivers/char: mark DMA buffers as reserved for the XHCI The important part is to include those buffers in IOMMU page table relevant for the USB controller. Otherwise, DbC will stop working as soon as IOMMU is enabled, regardless of to which domain device assigned (be it xen or dom0). If the device is passed through to dom0 or other domain (see later patches), that domain will effectively have access to those buffers too. It does give such domain yet another way to DoS the system (as is the case when having PCI device assigned already), but also possibly steal the console ring content. Thus, such domain should be a trusted one. In any case, prevent anything else being placed on those pages by adding artificial padding. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- xen/drivers/char/xhci-dbc.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index 4712faaabe..f55f73e382 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -20,6 +20,7 @@ */ #include +#include #include #include #include @@ -1051,13 +1052,21 @@ static struct uart_driver dbc_uart_driver = { }; /* Those are accessed via DMA. */ -static struct xhci_trb evt_trb[DBC_TRB_RING_CAP]; -static struct xhci_trb out_trb[DBC_TRB_RING_CAP]; -static struct xhci_trb in_trb[DBC_TRB_RING_CAP]; -static struct xhci_erst_segment erst __aligned(16); -static struct xhci_dbc_ctx ctx __aligned(16); -static uint8_t out_wrk_buf[DBC_WORK_RING_CAP]; -static struct xhci_string_descriptor str_buf[DBC_STRINGS_COUNT]; +struct dbc_dma_bufs { + struct xhci_trb evt_trb[DBC_TRB_RING_CAP]; + struct xhci_trb out_trb[DBC_TRB_RING_CAP]; + struct xhci_trb in_trb[DBC_TRB_RING_CAP]; + uint8_t out_wrk_buf[DBC_WORK_RING_CAP]; + struct xhci_erst_segment erst __aligned(16); + struct xhci_dbc_ctx ctx __aligned(16); + struct xhci_string_descriptor str_buf[DBC_STRINGS_COUNT]; + /* + * Don't place anything else on this page - it will be + * DMA-reachable by the USB controller. + */ +}; +static struct dbc_dma_bufs __section(".bss.page_aligned") __aligned(PAGE_SIZE) + dbc_dma_bufs; static int __init xhci_parse_dbgp(const char *opt_dbgp) { @@ -1104,16 +1113,22 @@ void __init xhci_dbc_uart_init(void) if ( !dbc->enable ) return; - dbc->dbc_ctx = &ctx; - dbc->dbc_erst = &erst; - dbc->dbc_ering.trb = evt_trb; - dbc->dbc_oring.trb = out_trb; - dbc->dbc_iring.trb = in_trb; - dbc->dbc_owork.buf = out_wrk_buf; - dbc->dbc_str = str_buf; + dbc->dbc_ctx = &dbc_dma_bufs.ctx; + dbc->dbc_erst = &dbc_dma_bufs.erst; + dbc->dbc_ering.trb = dbc_dma_bufs.evt_trb; + dbc->dbc_oring.trb = dbc_dma_bufs.out_trb; + dbc->dbc_iring.trb = dbc_dma_bufs.in_trb; + dbc->dbc_owork.buf = dbc_dma_bufs.out_wrk_buf; + dbc->dbc_str = dbc_dma_bufs.str_buf; if ( dbc_open(dbc) ) + { + iommu_add_extra_reserved_device_memory( + PFN_DOWN(virt_to_maddr(&dbc_dma_bufs)), + PFN_UP(sizeof(dbc_dma_bufs)), + uart->dbc.sbdf); serial_register_uart(SERHND_XHCI, &dbc_uart_driver, &dbc_uart); + } } #ifdef DBC_DEBUG -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 18:55:54 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 18:55:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412054.655225 (Exim 4.92) (envelope-from ) id 1octGk-0005CV-1w; Mon, 26 Sep 2022 18:55:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412054.655225; Mon, 26 Sep 2022 18: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 1octGj-0005CL-VA; Mon, 26 Sep 2022 18:55:53 +0000 Received: by outflank-mailman (input) for mailman id 412054; Mon, 26 Sep 2022 18:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octGi-0005CA-S3 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octGi-0007XZ-RI for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1octGi-0001eE-QS for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18: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=nzFDiL4VnrVzTOg9Z40sNs8tk4OcncKYgt4DaO637W4=; b=pPfzdMjxIUFMRcAsNxz/kib0jt MRN/n+jCwSPwV52UstSGsLSctiMw/1Uupuy7L6TKi9xwZndWG4VqtI+Rs/y1YK/ZuGEVxYEJYSUgO w810XhviWEqQ4QhGw4pchDWBk0zlw2Mo9LVCCz7xiN0nIj3JZa5ie293yMcjcbncSY+s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] drivers/char: add RX support to the XHCI driver Message-Id: Date: Mon, 26 Sep 2022 18:55:52 +0000 commit d88e2aa4eafcec282554042e49e2bac001c9bd6e Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:12:03 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:12:03 2022 +0200 drivers/char: add RX support to the XHCI driver Add another work ring buffer for received data, and point IN TRB at it. Ensure there is always at least one pending IN TRB, so the controller has a way to send incoming data to the driver. Note that both "success" and "short packet" completion codes are okay - in fact it will be "short packet" most of the time, as the TRB length is about maximum size, not required size. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 6 +- xen/drivers/char/xhci-dbc.c | 129 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index c8b07042f5..92d668afa0 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -728,9 +728,9 @@ Available alternatives, with their meaning, are: Specify the USB controller to use, either by instance number (when going over the PCI busses sequentially) or by PCI device (must be on segment 0). -Use `ehci` for EHCI debug port, use `xhci` for XHCI debug capability (output -only). XHCI driver will wait indefinitely for the debug host to connect - make -sure the cable is connected. +Use `ehci` for EHCI debug port, use `xhci` for XHCI debug capability. +XHCI driver will wait indefinitely for the debug host to connect - make sure +the cable is connected. ### debug_stack_lines > `= ` diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index f55f73e382..00ab4ae4a2 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -111,6 +111,7 @@ enum { enum { XHCI_TRB_CC_SUCCESS = 1, XHCI_TRB_CC_TRB_ERR = 5, + XHCI_TRB_CC_SHORT_PACKET = 13, }; /* DbC endpoint types */ @@ -239,6 +240,7 @@ struct dbc { struct xhci_trb_ring dbc_oring; struct xhci_trb_ring dbc_iring; struct dbc_work_ring dbc_owork; + struct dbc_work_ring dbc_iwork; struct xhci_string_descriptor *dbc_str; pci_sbdf_t sbdf; @@ -444,6 +446,16 @@ static void xhci_trb_norm_set_ioc(struct xhci_trb *trb) trb->ctrl |= 0x20; } +static uint64_t xhci_trb_norm_buf(const struct xhci_trb *trb) +{ + return trb->params; +} + +static uint32_t xhci_trb_norm_len(const struct xhci_trb *trb) +{ + return trb->status & 0x1FFFF; +} + /** * Fields for Transfer Event TRBs (see section 6.4.2.1). Note that event * TRBs are read-only from software @@ -453,6 +465,17 @@ static uint64_t xhci_trb_tfre_ptr(const struct xhci_trb *trb) return trb->params; } +static uint32_t xhci_trb_tfre_cc(const struct xhci_trb *trb) +{ + return trb->status >> 24; +} + +/* Amount of data _not_ transferred */ +static uint32_t xhci_trb_tfre_len(const struct xhci_trb *trb) +{ + return trb->status & 0x1FFFF; +} + /* Fields for link TRBs (section 6.4.4.1) */ static void xhci_trb_link_set_rsp(struct xhci_trb *trb, uint64_t rsp) { @@ -494,6 +517,14 @@ static bool xhci_trb_ring_full(const struct xhci_trb_ring *ring) return ((ring->enq + 1) & (DBC_TRB_RING_CAP - 1)) == ring->deq; } +static unsigned int xhci_trb_ring_size(const struct xhci_trb_ring *ring) +{ + if ( ring->enq >= ring->deq ) + return ring->enq - ring->deq; + + return DBC_TRB_RING_CAP - ring->deq + ring->enq; +} + static bool dbc_work_ring_full(const struct dbc_work_ring *ring) { return ((ring->enq + 1) & (DBC_WORK_RING_CAP - 1)) == ring->deq; @@ -507,6 +538,14 @@ static unsigned int dbc_work_ring_size(const struct dbc_work_ring *ring) return DBC_WORK_RING_CAP - ring->deq + ring->enq; } +static unsigned int dbc_work_ring_space_to_end(const struct dbc_work_ring *ring) +{ + if ( ring->enq >= ring->deq ) + return DBC_WORK_RING_CAP - ring->enq; + + return ring->deq - ring->enq; +} + static void dbc_push_trb(struct dbc *dbc, struct xhci_trb_ring *ring, uint64_t dma, uint64_t len) { @@ -567,6 +606,31 @@ static unsigned int dbc_push_work(struct dbc *dbc, struct dbc_work_ring *ring, return i; } +static void dbc_rx_trb(struct dbc *dbc, struct xhci_trb *trb, + uint64_t not_transferred) +{ + struct dbc_work_ring *ring = &dbc->dbc_iwork; + unsigned int rx_len; + unsigned int end, start = ring->enq; + + if ( xhci_trb_type(trb) != XHCI_TRB_NORM ) + /* Can be Link TRB for example. */ + return; + + ASSERT(xhci_trb_norm_buf(trb) == ring->dma + ring->enq); + ASSERT(xhci_trb_norm_len(trb) >= not_transferred); + rx_len = xhci_trb_norm_len(trb) - not_transferred; + + /* It can hit the ring end, but should not wrap around. */ + ASSERT(ring->enq + rx_len <= DBC_WORK_RING_CAP); + ring->enq = (ring->enq + rx_len) & (DBC_WORK_RING_CAP - 1); + + end = ring->enq; + + if ( end > start ) + cache_flush(&ring->buf[start], end - start); +} + /* * Note that if IN transfer support is added, then this * will need to be changed; it assumes an OUT transfer ring only @@ -576,6 +640,7 @@ static void dbc_pop_events(struct dbc *dbc) struct dbc_reg *reg = dbc->dbc_reg; struct xhci_trb_ring *er = &dbc->dbc_ering; struct xhci_trb_ring *tr = &dbc->dbc_oring; + struct xhci_trb_ring *ir = &dbc->dbc_iring; struct xhci_trb *event = &er->trb[er->deq]; uint64_t erdp = readq(®->erdp); uint32_t portsc; @@ -601,6 +666,14 @@ static void dbc_pop_events(struct dbc *dbc) trb_idx = (event_ptr - tr->dma) >> XHCI_TRB_SHIFT; tr->deq = (trb_idx + 1) & (DBC_TRB_RING_CAP - 1); } + else if ( event_ptr - ir->dma < DBC_TRB_RING_BYTES ) + { + trb_idx = (event_ptr - ir->dma) >> XHCI_TRB_SHIFT; + if ( xhci_trb_tfre_cc(event) == XHCI_TRB_CC_SUCCESS || + xhci_trb_tfre_cc(event) == XHCI_TRB_CC_SHORT_PACKET ) + dbc_rx_trb(dbc, &ir->trb[trb_idx], xhci_trb_tfre_len(event)); + ir->deq = (trb_idx + 1) & (DBC_TRB_RING_CAP - 1); + } else dbc_alert("event: TRB 0x%lx not found in any ring\n", event_ptr); @@ -871,6 +944,7 @@ static bool __init dbc_open(struct dbc *dbc) return false; dbc_init_work_ring(dbc, &dbc->dbc_owork); + dbc_init_work_ring(dbc, &dbc->dbc_iwork); dbc_enable_dbc(dbc); dbc->open = true; @@ -946,6 +1020,33 @@ static void dbc_flush(struct dbc *dbc, struct xhci_trb_ring *trb, writel(db, ®->db); } +/** + * Ensure DbC has a pending transfer TRB to receive data into. + * + * @param dbc the dbc to flush + * @param trb the ring for the TRBs to transfer + * @param wrk the work ring to receive data into + */ +static void dbc_enqueue_in(struct dbc *dbc, struct xhci_trb_ring *trb, + struct dbc_work_ring *wrk) +{ + struct dbc_reg *reg = dbc->dbc_reg; + uint32_t db = (readl(®->db) & 0xFFFF00FF) | (trb->db << 8); + + /* Check if there is already queued TRB */ + if ( xhci_trb_ring_size(trb) >= 1 ) + return; + + if ( dbc_work_ring_full(wrk) ) + return; + + dbc_push_trb(dbc, trb, wrk->dma + wrk->enq, + dbc_work_ring_space_to_end(wrk)); + + wmb(); + writel(db, ®->db); +} + /** * Queue a single character to the DbC. A transfer TRB will be created * if the character is a newline and the DbC will be notified that data is @@ -969,6 +1070,19 @@ static int64_t dbc_putc(struct dbc *dbc, char c) return 1; } +static int dbc_getc(struct dbc *dbc, char *c) +{ + struct dbc_work_ring *wrk = &dbc->dbc_iwork; + + if ( dbc_work_ring_size(wrk) == 0 ) + return 0; + + *c = wrk->buf[wrk->deq]; + wrk->deq = (wrk->deq + 1) & (DBC_WORK_RING_CAP - 1); + + return 1; +} + struct dbc_uart { struct dbc dbc; struct timer timer; @@ -987,10 +1101,16 @@ static void cf_check dbc_uart_poll(void *data) if ( spin_trylock_irqsave(&port->tx_lock, flags) ) { if ( dbc_ensure_running(dbc) ) + { dbc_flush(dbc, &dbc->dbc_oring, &dbc->dbc_owork); + dbc_enqueue_in(dbc, &dbc->dbc_iring, &dbc->dbc_iwork); + } spin_unlock_irqrestore(&port->tx_lock, flags); } + while ( dbc_work_ring_size(&dbc->dbc_iwork) ) + serial_rx_interrupt(port, guest_cpu_user_regs()); + serial_tx_interrupt(port, guest_cpu_user_regs()); set_timer(&uart->timer, NOW() + MICROSECS(DBC_POLL_INTERVAL)); } @@ -1029,6 +1149,12 @@ static void cf_check dbc_uart_putc(struct serial_port *port, char c) dbc_putc(&uart->dbc, c); } +static int cf_check dbc_uart_getc(struct serial_port *port, char *c) +{ + struct dbc_uart *uart = port->uart; + return dbc_getc(&uart->dbc, c); +} + static void cf_check dbc_uart_flush(struct serial_port *port) { s_time_t goal; @@ -1048,6 +1174,7 @@ static struct uart_driver dbc_uart_driver = { .init_postirq = dbc_uart_init_postirq, .tx_ready = dbc_uart_tx_ready, .putc = dbc_uart_putc, + .getc = dbc_uart_getc, .flush = dbc_uart_flush, }; @@ -1057,6 +1184,7 @@ struct dbc_dma_bufs { struct xhci_trb out_trb[DBC_TRB_RING_CAP]; struct xhci_trb in_trb[DBC_TRB_RING_CAP]; uint8_t out_wrk_buf[DBC_WORK_RING_CAP]; + uint8_t in_wrk_buf[DBC_WORK_RING_CAP]; struct xhci_erst_segment erst __aligned(16); struct xhci_dbc_ctx ctx __aligned(16); struct xhci_string_descriptor str_buf[DBC_STRINGS_COUNT]; @@ -1119,6 +1247,7 @@ void __init xhci_dbc_uart_init(void) dbc->dbc_oring.trb = dbc_dma_bufs.out_trb; dbc->dbc_iring.trb = dbc_dma_bufs.in_trb; dbc->dbc_owork.buf = dbc_dma_bufs.out_wrk_buf; + dbc->dbc_iwork.buf = dbc_dma_bufs.in_wrk_buf; dbc->dbc_str = dbc_dma_bufs.str_buf; if ( dbc_open(dbc) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 18:56:04 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 18:56:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412055.655229 (Exim 4.92) (envelope-from ) id 1octGu-0005FH-5g; Mon, 26 Sep 2022 18:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412055.655229; Mon, 26 Sep 2022 18: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 1octGu-0005F9-2q; Mon, 26 Sep 2022 18:56:04 +0000 Received: by outflank-mailman (input) for mailman id 412055; Mon, 26 Sep 2022 18:56:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octGs-0005F1-Vh for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octGs-0007YC-V0 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1octGs-0001fY-Tk for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18: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=XVViUhGTbaASqjv89UKFWqY6h7u5AUVP4MuURr6NKf4=; b=KtL7oHxqe1VmoeAncTmpzUSBfj 0iosJ+LslVovL1DMwMTEnyWrwSJUKrjgxieF6AXUWcrm3RWHaw3Fqee67giFCI5RSzSqqgTebzbIb wmh2lpBkNjqpzJ+XQIY0hKUyuNwxhTAQuilweOWymOccwqwv/GtE/Tau1ScOX813obWY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] drivers/char: fix handling cable re-plug in XHCI console driver Message-Id: Date: Mon, 26 Sep 2022 18:56:02 +0000 commit 7aadb75e286df576278c20257936e53a348d23ee Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:12:39 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:12:39 2022 +0200 drivers/char: fix handling cable re-plug in XHCI console driver When cable is unplugged, dbc_ensure_running() correctly detects this situation (DBC_CTRL_DCR flag is clear), and prevent sending data immediately to the device. It gets only queued in work ring buffers. When cable is plugged in again, subsequent dbc_flush() will send the buffered data. But there is a corner case, where no subsequent data was buffered in the work buffer, but a TRB was still pending. Ring the doorbell to let the controller re-send them. For console output it is rare corner case (TRB is pending for a very short time), but for console input it is very normal case (there is always one pending TRB for input). Extract doorbell ringing into separate function to avoid duplication. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- xen/drivers/char/xhci-dbc.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index 00ab4ae4a2..5f47733c18 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -546,6 +546,15 @@ static unsigned int dbc_work_ring_space_to_end(const struct dbc_work_ring *ring) return ring->deq - ring->enq; } +static void dbc_ring_doorbell(struct dbc *dbc, int doorbell) +{ + uint32_t __iomem *db_reg = &dbc->dbc_reg->db; + uint32_t db = (readl(db_reg) & ~DBC_DOORBELL_TARGET_MASK) | + (doorbell << DBC_DOORBELL_TARGET_SHIFT); + + writel(db, db_reg); +} + static void dbc_push_trb(struct dbc *dbc, struct xhci_trb_ring *ring, uint64_t dma, uint64_t len) { @@ -973,6 +982,8 @@ static bool dbc_ensure_running(struct dbc *dbc) writel(ctrl | (1U << DBC_CTRL_DRC), ®->ctrl); writel(readl(®->portsc) | (1U << DBC_PSC_PED), ®->portsc); wmb(); + dbc_ring_doorbell(dbc, dbc->dbc_iring.db); + dbc_ring_doorbell(dbc, dbc->dbc_oring.db); } return true; @@ -990,10 +1001,6 @@ static bool dbc_ensure_running(struct dbc *dbc) static void dbc_flush(struct dbc *dbc, struct xhci_trb_ring *trb, struct dbc_work_ring *wrk) { - struct dbc_reg *reg = dbc->dbc_reg; - uint32_t db = (readl(®->db) & ~DBC_DOORBELL_TARGET_MASK) | - (trb->db << DBC_DOORBELL_TARGET_SHIFT); - if ( xhci_trb_ring_full(trb) ) return; @@ -1017,7 +1024,7 @@ static void dbc_flush(struct dbc *dbc, struct xhci_trb_ring *trb, } wmb(); - writel(db, ®->db); + dbc_ring_doorbell(dbc, trb->db); } /** -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 18:56:15 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 18:56:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412056.655233 (Exim 4.92) (envelope-from ) id 1octH5-0005Hj-71; Mon, 26 Sep 2022 18:56:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412056.655233; Mon, 26 Sep 2022 18:56: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 1octH5-0005Hb-4Q; Mon, 26 Sep 2022 18:56:15 +0000 Received: by outflank-mailman (input) for mailman id 412056; Mon, 26 Sep 2022 18:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octH3-0005HU-2W for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octH3-0007YR-1n for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:56:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1octH3-0001gJ-1C for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:56: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=hmQj6XO1XqyOd9qHDzG8zcPoJPK2RaL88nXzqy5QUYo=; b=dsQ3Pgqxo7jsUfpoWPS5UpEFqr JCiVWmYZvTTN36LnHNwXMkhtm0Kw2AfbH29mKqkC8wiKJfyjw8lPqt9yw3nIeHrzzqYsTaZNSRWQ0 bXdMVBkHVyEsab6Ks/TzNi1I3rBfl8p3cMV5b0uoC2NnysQoY0fN3v3Y4R0A8DMemgJ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] drivers/char: allow driving the rest of XHCI by a domain while Xen uses DbC Message-Id: Date: Mon, 26 Sep 2022 18:56:13 +0000 commit 72cab2289ef7dd6b28f927628b4f9d2601b515ae Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:13:06 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:13:06 2022 +0200 drivers/char: allow driving the rest of XHCI by a domain while Xen uses DbC That's possible, because the capability was designed specifically to allow separate driver handle it, in parallel to unmodified xhci driver (separate set of registers, pretending the port is "disconnected" for the main xhci driver etc). It works with Linux dom0, although requires an awful hack - re-enabling bus mastering behind dom0's backs. Linux driver does similar thing - see drivers/usb/early/xhci-dbc.c:xdbc_handle_events(). When controller sharing is enabled in kconfig (option marked as experimental), dom0 is allowed to use the controller even if Xen uses it for debug console. Additionally, option `dbgp=xhci,share=` is available to either prevent even dom0 from using it (`no` value), or allow any domain using it (`any` value). In any case, to avoid Linux messing with the DbC, mark this MMIO area as read-only. This might cause issues for Linux's driver (if it tries to write something on the same page - like anoter xcap), but makes Xen's use safe. In practice, as of Linux 5.18, it seems to work without issues. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 14 ++++- xen/drivers/char/xhci-dbc.c | 129 +++++++++++++++++++++++++++++++++++--- 2 files changed, 134 insertions(+), 9 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 92d668afa0..bbb4652bbf 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -723,7 +723,7 @@ Available alternatives, with their meaning, are: ### dbgp > `= ehci[ | @pci:. ]` -> `= xhci[ | @pci:. ]` +> `= xhci[ | @pci:. ][,share=|hwdom]` Specify the USB controller to use, either by instance number (when going over the PCI busses sequentially) or by PCI device (must be on segment 0). @@ -731,6 +731,18 @@ over the PCI busses sequentially) or by PCI device (must be on segment 0). Use `ehci` for EHCI debug port, use `xhci` for XHCI debug capability. XHCI driver will wait indefinitely for the debug host to connect - make sure the cable is connected. +The `share` option for xhci controls who else can use the controller: +* `no`: use the controller exclusively for console, even hardware domain + (dom0) cannot use it +* `hwdom`: hardware domain may use the controller too, ports not used for debug + console will be available for normal devices; this is the default +* `yes`: the controller can be assigned to any domain; it is not safe to assign + the controller to untrusted domain + +Choosing `share=hwdom` (the default) or `share=yes` allows a domain to reset the +controller, which may cause small portion of the console output to be lost. + +The `share=yes` configuration is not security supported. ### debug_stack_lines > `= ` diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index 5f47733c18..5f92234a95 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -232,6 +233,12 @@ struct dbc_work_ring { uint64_t dma; }; +enum xhci_share { + XHCI_SHARE_HWDOM = 0, + XHCI_SHARE_NONE, + XHCI_SHARE_ANY +}; + struct dbc { struct dbc_reg __iomem *dbc_reg; struct xhci_dbc_ctx *dbc_ctx; @@ -250,6 +257,7 @@ struct dbc { bool enable; /* whether dbgp=xhci was set at all */ bool open; + enum xhci_share share; unsigned int xhc_num; /* look for n-th xhc */ }; @@ -961,13 +969,56 @@ static bool __init dbc_open(struct dbc *dbc) } /* - * Ensure DbC is still running, handle events, and possibly re-enable if cable - * was re-plugged. Returns true if DbC is operational. + * Ensure DbC is still running, handle events, and possibly + * re-enable/re-configure if cable was re-plugged or controller was reset. + * Returns true if DbC is operational. */ static bool dbc_ensure_running(struct dbc *dbc) { struct dbc_reg *reg = dbc->dbc_reg; uint32_t ctrl; + uint16_t cmd; + + if ( dbc->share != XHCI_SHARE_NONE ) + { + /* + * Re-enable memory decoding and later bus mastering, if dom0 (or + * other) disabled it in the meantime. + */ + cmd = pci_conf_read16(dbc->sbdf, PCI_COMMAND); + if ( !(cmd & PCI_COMMAND_MEMORY) ) + { + cmd |= PCI_COMMAND_MEMORY; + pci_conf_write16(dbc->sbdf, PCI_COMMAND, cmd); + } + + /* + * FIXME: Make Linux coordinate XHCI reset, so the DbC driver can + * prepare for it properly, instead of only detecting it after the + * fact. See EHCI driver for similar handling. + */ + if ( dbc->open && !(readl(®->ctrl) & (1U << DBC_CTRL_DCE)) ) + { + if ( !dbc_init_dbc(dbc) ) + return false; + + dbc_init_work_ring(dbc, &dbc->dbc_owork); + dbc_enable_dbc(dbc); + } + else + { + /* + * dbc_init_dbc() takes care about it, so check only if it wasn't + * called. + */ + cmd = pci_conf_read16(dbc->sbdf, PCI_COMMAND); + if ( !(cmd & PCI_COMMAND_MASTER) ) + { + cmd |= PCI_COMMAND_MASTER; + pci_conf_write16(dbc->sbdf, PCI_COMMAND, cmd); + } + } + } dbc_pop_events(dbc); @@ -1136,10 +1187,38 @@ static void __init cf_check dbc_uart_init_postirq(struct serial_port *port) init_timer(&uart->timer, dbc_uart_poll, port, 0); set_timer(&uart->timer, NOW() + MILLISECS(1)); - if ( pci_ro_device(0, uart->dbc.sbdf.bus, uart->dbc.sbdf.devfn) ) - printk(XENLOG_WARNING - "Failed to mark read-only %pp used for XHCI console\n", - &uart->dbc.sbdf); + switch ( uart->dbc.share ) + { + case XHCI_SHARE_NONE: + if ( pci_ro_device(0, uart->dbc.sbdf.bus, uart->dbc.sbdf.devfn) ) + printk(XENLOG_WARNING + "Failed to mark read-only %pp used for XHCI console\n", + &uart->dbc.sbdf); + break; + case XHCI_SHARE_HWDOM: + if ( pci_hide_device(0, uart->dbc.sbdf.bus, uart->dbc.sbdf.devfn) ) + printk(XENLOG_WARNING + "Failed to hide %pp used for XHCI console\n", + &uart->dbc.sbdf); + break; + case XHCI_SHARE_ANY: + /* Do not hide. */ + break; + } +#ifdef CONFIG_X86 + /* + * This marks the whole page as R/O, which may include other registers + * unrelated to DbC. Xen needs only DbC area protected, but it seems + * Linux's XHCI driver (as of 5.18) works without writting to the whole + * page, so keep it simple. + */ + if ( rangeset_add_range(mmio_ro_ranges, + PFN_DOWN(uart->dbc.xhc_mmio_phys + uart->dbc.xhc_dbc_offset), + PFN_UP(uart->dbc.xhc_mmio_phys + uart->dbc.xhc_dbc_offset + + sizeof(*uart->dbc.dbc_reg)) - 1) ) + printk(XENLOG_INFO + "Error while adding MMIO range of device to mmio_ro_ranges\n"); +#endif } static int cf_check dbc_uart_tx_ready(struct serial_port *port) @@ -1207,13 +1286,15 @@ static int __init xhci_parse_dbgp(const char *opt_dbgp) { struct dbc_uart *uart = &dbc_uart; struct dbc *dbc = &uart->dbc; - const char *e; + const char *e, *opt; + int val; if ( strncmp(opt_dbgp, "xhci", 4) ) return 0; memset(dbc, 0, sizeof(*dbc)); + e = &opt_dbgp[4]; if ( isdigit(opt_dbgp[4]) ) { dbc->xhc_num = simple_strtoul(opt_dbgp + 4, &e, 10); @@ -1223,7 +1304,7 @@ static int __init xhci_parse_dbgp(const char *opt_dbgp) unsigned int bus, slot, func; e = parse_pci(opt_dbgp + 8, NULL, &bus, &slot, &func); - if ( !e || *e ) + if ( !e || (*e && *e != ',') ) { printk(XENLOG_ERR "Invalid dbgp= PCI device spec: '%s'\n", @@ -1233,6 +1314,38 @@ static int __init xhci_parse_dbgp(const char *opt_dbgp) dbc->sbdf = PCI_SBDF(0, bus, slot, func); } + opt = e; + + /* other options */ + while ( *opt == ',' ) + { + opt++; + e = strchr(opt, ','); + if ( !e ) + e = strchr(opt, '\0'); + + if ( (val = parse_boolean("share", opt, e)) != -1 ) + { + if ( val == -2 && !cmdline_strcmp(opt + 6, "hwdom") ) + dbc->share = XHCI_SHARE_HWDOM; + else if ( val == 0 ) + dbc->share = XHCI_SHARE_NONE; + else if ( val == 1 ) + dbc->share = XHCI_SHARE_ANY; + else + break; + } + else + break; + + opt = e; + } + + if ( *opt ) + { + printk(XENLOG_ERR "Invalid dbgp= parameters: '%s'\n", opt); + return -EINVAL; + } dbc->enable = true; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 18:56:25 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 18:56:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412057.655236 (Exim 4.92) (envelope-from ) id 1octHF-0005K2-8S; Mon, 26 Sep 2022 18:56:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412057.655236; Mon, 26 Sep 2022 18:56: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 1octHF-0005Jv-5w; Mon, 26 Sep 2022 18:56:25 +0000 Received: by outflank-mailman (input) for mailman id 412057; Mon, 26 Sep 2022 18:56:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octHD-0005Jj-5l for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:56:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octHD-0007YV-52 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:56:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1octHD-0001h5-4F for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18: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=nvHcPhXJ0HFLgN8Ixd4ja2I6lRg5dwq4W39NgQScVD0=; b=mSt/+IWh8gbx6Z0Tj5fGARU/Qm bHNl9oVfiL83y+viCtz+bx91tZP88KevMbXqVg+MswznNt2z2W7OTTQZJ5vTNYTEMnIEdpZXBbhbh 0mXkFhbfsc7x6uh+g3Wqcb37HfZQNboa70BJxM5C5nXdk+FoKu7lBtIQJuVvxCqL7RR4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] drivers/char: add console=ehci as an alias for console=dbgp Message-Id: Date: Mon, 26 Sep 2022 18:56:23 +0000 commit bebaf7c296518bf9cec24773c8da1e6823fff5fc Author: Marek Marczykowski-Górecki AuthorDate: Mon Sep 26 11:13:31 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:13:31 2022 +0200 drivers/char: add console=ehci as an alias for console=dbgp Make it consistent with console=xhci. Suggested-by: Jan Beulich Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 4 ++-- xen/drivers/char/serial.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index bbb4652bbf..68389843b2 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -409,7 +409,7 @@ The following are examples of correct specifications: Specify the size of the console ring buffer. ### console -> `= List of [ vga | com1[H,L] | com2[H,L] | pv | dbgp | xhci | none ]` +> `= List of [ vga | com1[H,L] | com2[H,L] | pv | dbgp | ehci | xhci | none ]` > Default: `console=com1,vga` @@ -428,7 +428,7 @@ cleared. This allows a single port to be shared by two subsystems `pv` indicates that Xen should use Xen's PV console. This option is only available when used together with `pv-in-pvh`. -`dbgp` indicates that Xen should use a USB2 debug port. +`dbgp` or `ehci` indicates that Xen should use a USB2 debug port. `xhci` indicates that Xen should use a USB3 debug port. diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 9d94450392..00efe69574 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -311,6 +311,12 @@ int __init serial_parse_handle(const char *conf) goto common; } + if ( !strncmp(conf, "ehci", 4) && (!conf[4] || conf[4] == ',') ) + { + handle = SERHND_DBGP; + goto common; + } + if ( !strncmp(conf, "xhci", 4) && (!conf[4] || conf[4] == ',') ) { handle = SERHND_XHCI; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 18:56:35 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 18:56:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412058.655241 (Exim 4.92) (envelope-from ) id 1octHP-0005Mh-AL; Mon, 26 Sep 2022 18:56:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412058.655241; Mon, 26 Sep 2022 18:56: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 1octHP-0005MZ-7Z; Mon, 26 Sep 2022 18:56:35 +0000 Received: by outflank-mailman (input) for mailman id 412058; Mon, 26 Sep 2022 18:56:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octHN-0005MC-8X for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:56:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octHN-0007YZ-7q for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:56:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1octHN-0001hn-7D for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18: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=rb1XaHiqRx9eZjY28N/zHzhVp72naDEEuOkVQkNgXo4=; b=aQqYVlOAcxXu9msKvNUM3tvdf8 WjuRsADGX6IDE1xSvjBYxPxxaNOah1REV5DE1J5MaEyea5w3uYagprJ5ZSw2hfdlzf+5IzQpokSiB t3CmECb0VAiADQB7rgdjHLuFJ23FfsOEZ8L8R89wc3xvEUn2VRlubg/p4f6mmVA6+nMQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm/flask: adjust print messages to use %pd Message-Id: Date: Mon, 26 Sep 2022 18:56:33 +0000 commit 6cecffc7a66b04742fcbaeca995f5b64b69ba55f Author: Daniel P. Smith AuthorDate: Mon Sep 26 11:14:19 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:14:19 2022 +0200 xsm/flask: adjust print messages to use %pd Print messages from flask use an inconsistent format when printing the domain id. When referencing system domains, the domain id is printed which is not immediately identifiable. The %pd conversion specifier provides a consistent and clear way to format for the domain id. In addition this will assist in aligning FLASK with current hypervisor code practices. While addressing the domain id formating, two related issues were addressed. The first being that avc_printk() was not applying any conversion specifier validation. To address this, the printf annotation was added to avc_printk() to help ensure the correct types are passed to each conversion specifier. The second was concern that source and target domains were being appropriately reported for an AVC. This was addressed by simplifying the conditional logic. Signed-off-by: Daniel P. Smith Reviewed-by: Henry Wang Reviewed-by: Jason Andryuk --- xen/xsm/flask/avc.c | 16 ++++++++-------- xen/xsm/flask/hooks.c | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c index 4a75ec97e2..3d39e55cae 100644 --- a/xen/xsm/flask/avc.c +++ b/xen/xsm/flask/avc.c @@ -113,7 +113,8 @@ struct avc_dump_buf { u32 free; }; -static void avc_printk(struct avc_dump_buf *buf, const char *fmt, ...) +static void __attribute__ ((format (printf, 2, 3))) + avc_printk(struct avc_dump_buf *buf, const char *fmt, ...) { int i; va_list args; @@ -565,15 +566,14 @@ void avc_audit(u32 ssid, u32 tsid, u16 tclass, u32 requested, if ( a && (a->sdom || a->tdom) ) { - if ( a->sdom && a->tdom && a->sdom != a->tdom ) - avc_printk(&buf, "domid=%d target=%d ", a->sdom->domain_id, a->tdom->domain_id); - else if ( a->sdom ) - avc_printk(&buf, "domid=%d ", a->sdom->domain_id); - else - avc_printk(&buf, "target=%d ", a->tdom->domain_id); + if ( a->sdom ) + avc_printk(&buf, "source=%pd ", a->sdom); + if ( a->tdom && a->tdom != a->sdom ) + avc_printk(&buf, "target=%pd ", a->tdom); } else if ( cdom ) - avc_printk(&buf, "domid=%d ", cdom->domain_id); + avc_printk(&buf, "current=%pd ", cdom); + switch ( a ? a->type : 0 ) { case AVC_AUDIT_DATA_DEV: avc_printk(&buf, "device=%#lx ", a->device); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index e7db7fe07a..391aec4dc2 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -296,8 +296,7 @@ static int cf_check flask_evtchn_interdomain( rc = security_transition_sid(sid1, sid2, SECCLASS_EVENT, &newsid); if ( rc ) { - printk("security_transition_sid failed, rc=%d, Dom%d\n", - -rc, d2->domain_id); + printk("security_transition_sid failed, rc=%d, %pd\n", -rc, d2); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 18:56:45 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 18:56:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412059.655245 (Exim 4.92) (envelope-from ) id 1octHZ-0005Pf-CE; Mon, 26 Sep 2022 18:56:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412059.655245; Mon, 26 Sep 2022 18:56: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 1octHZ-0005PX-91; Mon, 26 Sep 2022 18:56:45 +0000 Received: by outflank-mailman (input) for mailman id 412059; Mon, 26 Sep 2022 18:56:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octHX-0005PO-DW for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:56:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1octHX-0007Yg-Am for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18:56:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1octHX-0001iN-A1 for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 18: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=eyjlLKw8I+EdeBIZB+X/qnpluuCmDLNAClRVpug2hu8=; b=5bdWN7bSp/bQi1Nz2epMSEox/A r9xrcDUvFlGLOiZk3zOt0Mq2eZmkiAVl1C2lcIRzAd78J7Z7SV2uIvAZ94rgskzCvUnXPiH+wlZfd tQo4dhQz0+bdYa8Rkdk/QlVrSYWXrG+8f/oWWM4Q9v5XZzrNiwhxF08IoUC04Z9yL3bU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: fix x86 out-of-tree build without EFI Message-Id: Date: Mon, 26 Sep 2022 18:56:43 +0000 commit bfd3e9945d1bc551ad11272c7fa752ff3d060149 Author: Anthony PERARD AuthorDate: Mon Sep 26 11:16:04 2022 +0200 Commit: Jan Beulich CommitDate: Mon Sep 26 11:16:04 2022 +0200 build: fix x86 out-of-tree build without EFI We can't have a source file with the same name that exist in both the common code and in the arch specific code for efi/. This can lead to confusion in make and it can pick up the wrong source file. This issue lead to a failure to build a pv-shim for x86 out-of-tree, as this is one example of an x86 build using the efi/stub.c. The issue is that in out-of-tree, make might find x86/efi/stub.c via VPATH, but as the target needs to be rebuilt due to FORCE, make actually avoid changing the source tree and rebuilt the target with VPATH ignored, so $@ lead to the build tree where "stub.c" doesn't exist yet so a link is made to "common/stub.c". Rework the new common/stub.c file to have a different name than the already existing one, by renaming the existing one. We can hide the compat aliases that x86 uses behind CONFIG_COMPAT so a Arm build will not have them. Also revert the change to the rule that creates symbolic links it's better to just recreate the link in cases where an existing file exist or the link goes to the wrong file. Avoid using $(EFIOBJ-y) as an alias for $(clean-files), add "stub.c" directly to $(clean-files). Also update .gitignore as this was also missing from the original patch. Fixes: 7f96859b0d00 ("xen: reuse x86 EFI stub functions for Arm") Reported-by: Andrew Cooper Signed-off-by: Anthony PERARD --- .gitignore | 1 + xen/arch/arm/efi/Makefile | 6 +----- xen/arch/x86/efi/Makefile | 2 +- xen/arch/x86/efi/stub.c | 7 ------- xen/common/efi/common-stub.c | 42 ++++++++++++++++++++++++++++++++++++++++++ xen/common/efi/efi-common.mk | 4 ++-- xen/common/efi/stub.c | 32 -------------------------------- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index af9bf749c4..418bdfaebf 100644 --- a/.gitignore +++ b/.gitignore @@ -275,6 +275,7 @@ xen/arch/x86/efi/mkreloc xen/arch/x86/include/asm/asm-macros.h xen/arch/*/xen.lds xen/arch/*/efi/boot.c +xen/arch/*/efi/common-stub.c xen/arch/*/efi/compat.c xen/arch/*/efi/ebmalloc.c xen/arch/*/efi/efi.h diff --git a/xen/arch/arm/efi/Makefile b/xen/arch/arm/efi/Makefile index bd954a3b2d..2459cbae3a 100644 --- a/xen/arch/arm/efi/Makefile +++ b/xen/arch/arm/efi/Makefile @@ -4,11 +4,7 @@ ifeq ($(CONFIG_ARM_EFI),y) obj-y += $(EFIOBJ-y) obj-$(CONFIG_ACPI) += efi-dom0.init.o else -# Add stub.o to EFIOBJ-y to re-use the clean-files in -# efi-common.mk. Otherwise the link of stub.c in arm/efi -# will not be cleaned in "make clean". -EFIOBJ-y += stub.o -obj-y += stub.o +obj-y += common-stub.o $(obj)/stub.o: CFLAGS-y += -fno-short-wchar diff --git a/xen/arch/x86/efi/Makefile b/xen/arch/x86/efi/Makefile index 034ec87895..24dfecfad1 100644 --- a/xen/arch/x86/efi/Makefile +++ b/xen/arch/x86/efi/Makefile @@ -11,7 +11,7 @@ $(obj)/boot.init.o: $(obj)/buildid.o $(call cc-option-add,cflags-stack-boundary,CC,-mpreferred-stack-boundary=4) $(addprefix $(obj)/,$(EFIOBJ-y)): CFLAGS_stack_boundary := $(cflags-stack-boundary) -obj-y := stub.o +obj-y := common-stub.o stub.o obj-$(XEN_BUILD_EFI) := $(filter-out %.init.o,$(EFIOBJ-y)) obj-bin-$(XEN_BUILD_EFI) := $(filter %.init.o,$(EFIOBJ-y)) extra-$(XEN_BUILD_EFI) += buildid.o relocs-dummy.o diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index f2365bc041..2cd5c8d4dc 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -8,7 +8,6 @@ #include #include #include -#include "../../../common/efi/stub.c" /* * Here we are in EFI stub. EFI calls are not supported due to lack @@ -55,9 +54,3 @@ bool efi_boot_mem_unused(unsigned long *start, unsigned long *end) } void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } - -int efi_compat_get_info(uint32_t idx, union compat_pf_efi_info *) - __attribute__((__alias__("efi_get_info"))); - -int efi_compat_runtime_call(struct compat_pf_efi_runtime_call *) - __attribute__((__alias__("efi_runtime_call"))); diff --git a/xen/common/efi/common-stub.c b/xen/common/efi/common-stub.c new file mode 100644 index 0000000000..5a91fe28cc --- /dev/null +++ b/xen/common/efi/common-stub.c @@ -0,0 +1,42 @@ +#include +#include +#include + +bool efi_enabled(unsigned int feature) +{ + return false; +} + +bool efi_rs_using_pgtables(void) +{ + return false; +} + +unsigned long efi_get_time(void) +{ + BUG(); + return 0; +} + +void efi_halt_system(void) { } +void efi_reset_system(bool warm) { } + +int efi_get_info(uint32_t idx, union xenpf_efi_info *info) +{ + return -ENOSYS; +} + +int efi_runtime_call(struct xenpf_efi_runtime_call *op) +{ + return -ENOSYS; +} + +#ifdef CONFIG_COMPAT + +int efi_compat_get_info(uint32_t idx, union compat_pf_efi_info *) + __attribute__((__alias__("efi_get_info"))); + +int efi_compat_runtime_call(struct compat_pf_efi_runtime_call *) + __attribute__((__alias__("efi_runtime_call"))); + +#endif diff --git a/xen/common/efi/efi-common.mk b/xen/common/efi/efi-common.mk index ec2c34f198..53fdb81583 100644 --- a/xen/common/efi/efi-common.mk +++ b/xen/common/efi/efi-common.mk @@ -9,9 +9,9 @@ CFLAGS-y += -iquote $(srcdir) # e.g.: It transforms "dir/foo/bar" into successively # "dir foo bar", ".. .. ..", "../../.." $(obj)/%.c: $(srctree)/common/efi/%.c FORCE - $(Q)test -f $@ || \ - ln -nfs $(subst $(space),/,$(patsubst %,..,$(subst /, ,$(obj))))/source/common/efi/$( -#include -#include - -bool efi_enabled(unsigned int feature) -{ - return false; -} - -bool efi_rs_using_pgtables(void) -{ - return false; -} - -unsigned long efi_get_time(void) -{ - BUG(); - return 0; -} - -void efi_halt_system(void) { } -void efi_reset_system(bool warm) { } - -int efi_get_info(uint32_t idx, union xenpf_efi_info *info) -{ - return -ENOSYS; -} - -int efi_runtime_call(struct xenpf_efi_runtime_call *op) -{ - return -ENOSYS; -} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Sep 26 23:00:11 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Sep 2022 23:00:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412150.655348 (Exim 4.92) (envelope-from ) id 1ocx54-0001dB-EW; Mon, 26 Sep 2022 23:00:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412150.655348; Mon, 26 Sep 2022 23:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ocx54-0001d1-B7; Mon, 26 Sep 2022 23:00:06 +0000 Received: by outflank-mailman (input) for mailman id 412150; Mon, 26 Sep 2022 23:00:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ocx52-0001HC-9S for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 23:00:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ocx52-0003Wr-8g for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 23:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ocx52-0004zp-7X for xen-changelog@lists.xenproject.org; Mon, 26 Sep 2022 23:00: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=Dw6YZwXwvcNnr7sOkyaEpKb4g8PGcmpiXWibkm6iK8M=; b=6sTXiVTkdQcsnpvHMuQyAMlzJ4 MhDvQss1BSVv0LW9SAa1T/grUnF0ivgTndfxVuSb1bmCnxjyEHMY0L3f5sMib1XKDcV3SihB8NowU /WzxfoA8J0ftgWp2M3o4V6E1r/rLDV/E4D/XtK9KDPG5PyIBwFxkAnOd0gksAqMNYw+U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: Use custom build jobs when extra config options are needed Message-Id: Date: Mon, 26 Sep 2022 23:00:04 +0000 commit bd68a5f397537eb7ba6223546c1f4d47f078d3b2 Author: Michal Orzel AuthorDate: Mon Sep 26 13:04:14 2022 +0200 Commit: Stefano Stabellini CommitDate: Mon Sep 26 15:36:22 2022 -0700 automation: Use custom build jobs when extra config options are needed Currently, all the arm64 defconfig build jobs, regardless of the container used, end up building Xen with the extra config options specified in the main build script (e.g. CONFIG_EXPERT, CONFIG_STATIC_MEMORY). Because these options are only needed for specific test jobs, the current behavior of the CI is incorrect as we add the extra options to all the defconfig builds. This means that on arm64 there is not a single job performing proper defconfig build. To fix this issue, add custom build jobs each time there is a need for building Xen with additional config options. Introduce EXTRA_XEN_CONFIG variable to be used by these jobs to store the required options. This variable will be then read by the main build script to modify the .config file. This will also help users to understand what is needed to run specific test. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- automation/gitlab-ci/build.yaml | 15 +++++++++++++++ automation/gitlab-ci/test.yaml | 4 ++-- automation/scripts/build | 8 ++------ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 720ce6e07b..a39ed72aac 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -566,6 +566,21 @@ alpine-3.12-gcc-debug-arm64: variables: CONTAINER: alpine:3.12-arm64v8 +alpine-3.12-gcc-arm64-staticmem: + extends: .gcc-arm64-build + variables: + CONTAINER: alpine:3.12-arm64v8 + EXTRA_XEN_CONFIG: | + CONFIG_EXPERT=y + CONFIG_UNSUPPORTED=y + CONFIG_STATIC_MEMORY=y + +alpine-3.12-gcc-arm64-boot-cpupools: + extends: .gcc-arm64-build + variables: + CONTAINER: alpine:3.12-arm64v8 + EXTRA_XEN_CONFIG: | + CONFIG_BOOT_TIME_CPUPOOLS=y ## Test artifacts common diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index d899b3bdbf..4f96e6e322 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -88,7 +88,7 @@ qemu-smoke-arm64-gcc-staticmem: script: - ./automation/scripts/qemu-smoke-arm64.sh static-mem 2>&1 | tee qemu-smoke-arm64.log needs: - - alpine-3.12-gcc-arm64 + - alpine-3.12-gcc-arm64-staticmem - alpine-3.12-arm64-rootfs-export - kernel-5.19-arm64-export - qemu-system-aarch64-6.0.0-arm64-export @@ -107,7 +107,7 @@ qemu-smoke-arm64-gcc-boot-cpupools: script: - ./automation/scripts/qemu-smoke-arm64.sh boot-cpupools 2>&1 | tee qemu-smoke-arm64.log needs: - - alpine-3.12-gcc-arm64 + - alpine-3.12-gcc-arm64-boot-cpupools - alpine-3.12-arm64-rootfs-export - kernel-5.19-arm64-export - qemu-system-aarch64-6.0.0-arm64-export diff --git a/automation/scripts/build b/automation/scripts/build index 2f15ab3198..bcfa6838f0 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -15,12 +15,8 @@ if [[ "${RANDCONFIG}" == "y" ]]; then make -j$(nproc) -C xen KCONFIG_ALLCONFIG=tools/kconfig/allrandom.config randconfig hypervisor_only="y" else - if [[ "${XEN_TARGET_ARCH}" = "arm64" ]]; then - echo " -CONFIG_EXPERT=y -CONFIG_UNSUPPORTED=y -CONFIG_STATIC_MEMORY=y -CONFIG_BOOT_TIME_CPUPOOLS=y" > xen/.config + if [[ -n "${EXTRA_XEN_CONFIG}" ]]; then + echo "${EXTRA_XEN_CONFIG}" > xen/.config make -j$(nproc) -C xen olddefconfig else make -j$(nproc) -C xen defconfig -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 27 12:55:11 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 Sep 2022 12:55:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412560.655935 (Exim 4.92) (envelope-from ) id 1odA77-0005cM-R4; Tue, 27 Sep 2022 12:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412560.655935; Tue, 27 Sep 2022 12:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odA77-0005cE-OU; Tue, 27 Sep 2022 12:55:05 +0000 Received: by outflank-mailman (input) for mailman id 412560; Tue, 27 Sep 2022 12:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odA75-0005c8-Vw for xen-changelog@lists.xenproject.org; Tue, 27 Sep 2022 12:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odA75-0002Lp-Up for xen-changelog@lists.xenproject.org; Tue, 27 Sep 2022 12:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odA75-0004Ya-U2 for xen-changelog@lists.xenproject.org; Tue, 27 Sep 2022 12:55: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=kXbW+AG//+HffWllzMw69fWxA8Yn8rF3AHoXaljfM80=; b=dc/bUShJtQRx7UtRGA6xLuIGYv 36Nf7co7u8n2LWBQews/6MsLQBCZnt9dW8zFU3HpuRZwV2pKNA+kj2SkvSAqBa/GPmNLmdf+G0Q+G 7Q4SH1pHU8W3fnvucecY1bAa/a0AEmkjVggHpkx8XRdGf0EYo4i0vBfoljH6n/UJIwrU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] drivers/char: Fix build when CET-IBT is enabled Message-Id: Date: Tue, 27 Sep 2022 12:55:03 +0000 commit 5e936d11b171793c174686268c9c1df8a4fa974c Author: Andrew Cooper AuthorDate: Mon Sep 26 11:46:15 2022 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 27 13:32:35 2022 +0100 drivers/char: Fix build when CET-IBT is enabled https://gitlab.com/xen-project/xen/-/jobs/3083068950#L1763 Signed-off-by: Andrew Cooper Fixes: 022e40edd4dc ("drivers/char: allow using both dbgp=xhci and dbgp=ehci") Reviewed-by: Jan Beulich Release-acked-by: Henry Wang --- xen/drivers/char/ehci-dbgp.c | 2 +- xen/drivers/char/xhci-dbc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 8a0b958506..bb9d3198d9 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1465,7 +1465,7 @@ static struct ehci_dbgp ehci_dbgp = { .state = dbgp_unsafe, .phys_port = 1 }; static char __initdata opt_dbgp[30]; -static int __init parse_ehci_dbgp(const char *opt) +static int __init cf_check parse_ehci_dbgp(const char *opt) { if ( strncmp(opt, "ehci", 4) ) return 0; diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index 5f92234a95..43ed64a004 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -1282,7 +1282,7 @@ struct dbc_dma_bufs { static struct dbc_dma_bufs __section(".bss.page_aligned") __aligned(PAGE_SIZE) dbc_dma_bufs; -static int __init xhci_parse_dbgp(const char *opt_dbgp) +static int __init cf_check xhci_parse_dbgp(const char *opt_dbgp) { struct dbc_uart *uart = &dbc_uart; struct dbc *dbc = &uart->dbc; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 27 18:11:06 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 27 Sep 2022 18:11:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.412911.656380 (Exim 4.92) (envelope-from ) id 1odF2s-0000gI-Ka; Tue, 27 Sep 2022 18:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 412911.656380; Tue, 27 Sep 2022 18:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odF2s-0000gA-Hr; Tue, 27 Sep 2022 18:11:02 +0000 Received: by outflank-mailman (input) for mailman id 412911; Tue, 27 Sep 2022 18:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odF2r-0000g4-JG for xen-changelog@lists.xenproject.org; Tue, 27 Sep 2022 18:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odF2r-0000Z8-H6 for xen-changelog@lists.xenproject.org; Tue, 27 Sep 2022 18:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odF2r-0005wp-Fg for xen-changelog@lists.xenproject.org; Tue, 27 Sep 2022 18:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=y276boYnAHCrEQbQYANwOV8U2Cr0LWGRVcfOxY4Xjvo=; b=mI9UTLfZR+gSTTGF35/cV8DhRr zI8t7hJgu0wwZKxiLMnW2fWCt5K3Qu7LxB/fCXSdzhDcjlJWjX5j+OaKD6nht1342PoPi+CikwBo3 pHs6TMh4JC1toK4UQC8NqM5FTxeIEhH3O28TStSPMYR06eQuqnOI9AkHtfLfEOp9dZC0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Use custom build jobs when extra config options are needed Message-Id: Date: Tue, 27 Sep 2022 18:11:01 +0000 commit bd68a5f397537eb7ba6223546c1f4d47f078d3b2 Author: Michal Orzel AuthorDate: Mon Sep 26 13:04:14 2022 +0200 Commit: Stefano Stabellini CommitDate: Mon Sep 26 15:36:22 2022 -0700 automation: Use custom build jobs when extra config options are needed Currently, all the arm64 defconfig build jobs, regardless of the container used, end up building Xen with the extra config options specified in the main build script (e.g. CONFIG_EXPERT, CONFIG_STATIC_MEMORY). Because these options are only needed for specific test jobs, the current behavior of the CI is incorrect as we add the extra options to all the defconfig builds. This means that on arm64 there is not a single job performing proper defconfig build. To fix this issue, add custom build jobs each time there is a need for building Xen with additional config options. Introduce EXTRA_XEN_CONFIG variable to be used by these jobs to store the required options. This variable will be then read by the main build script to modify the .config file. This will also help users to understand what is needed to run specific test. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- automation/gitlab-ci/build.yaml | 15 +++++++++++++++ automation/gitlab-ci/test.yaml | 4 ++-- automation/scripts/build | 8 ++------ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 720ce6e07b..a39ed72aac 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -566,6 +566,21 @@ alpine-3.12-gcc-debug-arm64: variables: CONTAINER: alpine:3.12-arm64v8 +alpine-3.12-gcc-arm64-staticmem: + extends: .gcc-arm64-build + variables: + CONTAINER: alpine:3.12-arm64v8 + EXTRA_XEN_CONFIG: | + CONFIG_EXPERT=y + CONFIG_UNSUPPORTED=y + CONFIG_STATIC_MEMORY=y + +alpine-3.12-gcc-arm64-boot-cpupools: + extends: .gcc-arm64-build + variables: + CONTAINER: alpine:3.12-arm64v8 + EXTRA_XEN_CONFIG: | + CONFIG_BOOT_TIME_CPUPOOLS=y ## Test artifacts common diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index d899b3bdbf..4f96e6e322 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -88,7 +88,7 @@ qemu-smoke-arm64-gcc-staticmem: script: - ./automation/scripts/qemu-smoke-arm64.sh static-mem 2>&1 | tee qemu-smoke-arm64.log needs: - - alpine-3.12-gcc-arm64 + - alpine-3.12-gcc-arm64-staticmem - alpine-3.12-arm64-rootfs-export - kernel-5.19-arm64-export - qemu-system-aarch64-6.0.0-arm64-export @@ -107,7 +107,7 @@ qemu-smoke-arm64-gcc-boot-cpupools: script: - ./automation/scripts/qemu-smoke-arm64.sh boot-cpupools 2>&1 | tee qemu-smoke-arm64.log needs: - - alpine-3.12-gcc-arm64 + - alpine-3.12-gcc-arm64-boot-cpupools - alpine-3.12-arm64-rootfs-export - kernel-5.19-arm64-export - qemu-system-aarch64-6.0.0-arm64-export diff --git a/automation/scripts/build b/automation/scripts/build index 2f15ab3198..bcfa6838f0 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -15,12 +15,8 @@ if [[ "${RANDCONFIG}" == "y" ]]; then make -j$(nproc) -C xen KCONFIG_ALLCONFIG=tools/kconfig/allrandom.config randconfig hypervisor_only="y" else - if [[ "${XEN_TARGET_ARCH}" = "arm64" ]]; then - echo " -CONFIG_EXPERT=y -CONFIG_UNSUPPORTED=y -CONFIG_STATIC_MEMORY=y -CONFIG_BOOT_TIME_CPUPOOLS=y" > xen/.config + if [[ -n "${EXTRA_XEN_CONFIG}" ]]; then + echo "${EXTRA_XEN_CONFIG}" > xen/.config make -j$(nproc) -C xen olddefconfig else make -j$(nproc) -C xen defconfig -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 28 00:33:09 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 Sep 2022 00:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413093.656585 (Exim 4.92) (envelope-from ) id 1odL0c-0005hk-BK; Wed, 28 Sep 2022 00:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413093.656585; Wed, 28 Sep 2022 00:33:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odL0c-0005hc-89; Wed, 28 Sep 2022 00:33:06 +0000 Received: by outflank-mailman (input) for mailman id 413093; Wed, 28 Sep 2022 00:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odL0a-0005hS-6B for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 00:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odL0a-0008DH-4T for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 00:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odL0a-0006wp-3c for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 00:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dY3b+8oDf6Js1i669z2olFT/10EyS9u9bAgU3KTjTDE=; b=OyEXTEC9N+V3CtRExYx4CBOTXs n5Tds8FooWiDaaI8CkZSfdaup+1NfnYKp90a2GL7+KaOXnoxBiFu+b/t/1niKGhI2QM58GA1agfFJ 5RMQRJt1IuXXHiTjygsxUuy8B2j3uWNzOuQ3gm222kvnhKWhTKhANCiqIqZ78s45eGVY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Build: Drop -no-pie from EMBEDDED_EXTRA_CFLAGS Message-Id: Date: Wed, 28 Sep 2022 00:33:04 +0000 commit 13a7c0074ac8fb31f6c0485429b7a20a1946cb22 Author: Andrew Cooper AuthorDate: Tue Sep 27 16:47:08 2022 +0100 Commit: Stefano Stabellini CommitDate: Tue Sep 27 15:40:42 2022 -0700 Build: Drop -no-pie from EMBEDDED_EXTRA_CFLAGS This breaks all Clang builds, as demostrated by Gitlab CI. Contrary to the description in ecd6b9759919, -no-pie is not even an option passed to the linker. GCC's actual behaviour is to inhibit the passing of -pie to the linker, as well as selecting different cr0 artefacts to be linked. EMBEDDED_EXTRA_CFLAGS is not used for $(CC)-doing-linking, and not liable to gain such a usecase. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Tested-by: Stefano Stabellini Fixes: ecd6b9759919 ("Config.mk: correct PIE-related option(s) in EMBEDDED_EXTRA_CFLAGS") --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index 000e57e57b..69af1e60d4 100644 --- a/Config.mk +++ b/Config.mk @@ -188,7 +188,7 @@ endif APPEND_LDFLAGS += $(foreach i, $(APPEND_LIB), -L$(i)) APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i)) -EMBEDDED_EXTRA_CFLAGS := -fno-pie -no-pie -fno-stack-protector -fno-stack-protector-all +EMBEDDED_EXTRA_CFLAGS := -fno-pie -fno-stack-protector -fno-stack-protector-all EMBEDDED_EXTRA_CFLAGS += -fno-exceptions -fno-asynchronous-unwind-tables XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Sep 28 00:33:16 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 Sep 2022 00:33:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413094.656589 (Exim 4.92) (envelope-from ) id 1odL0m-0005kL-Ch; Wed, 28 Sep 2022 00:33:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413094.656589; Wed, 28 Sep 2022 00:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odL0m-0005kD-9u; Wed, 28 Sep 2022 00:33:16 +0000 Received: by outflank-mailman (input) for mailman id 413094; Wed, 28 Sep 2022 00:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odL0k-0005js-8B for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 00:33:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odL0k-0008Dg-7T for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 00:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odL0k-0006xJ-6b for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 00:33:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SRTE703VUKu7SQNQpFtT9IaEEa8m64QCfnY1QZmBmqw=; b=Y3+D2khTDiY+I9mmxxvUSLLUQr s0aJ+OeT0dT49HK6w8QUr1ET8ZoORc5pu2i854IhKPYtyBii7T1+/7cNUoMMCsxmv5KrmcdI2CFLv WivxvHtWhER/Iy7nbym/qcjsFMhpTs1wOsuVcxeSHilQsg9L/wXeMeKfXo8QWjapwQ6A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: qemu-smoke-arm{32/64}.sh: Fix typo in DEBIAN_FRONTENT Message-Id: Date: Wed, 28 Sep 2022 00:33:14 +0000 commit 1686272d5297b2f6ebad7dcf6586d17c55b84c81 Author: Michal Orzel AuthorDate: Tue Sep 27 11:47:18 2022 +0200 Commit: Stefano Stabellini CommitDate: Tue Sep 27 16:48:50 2022 -0700 automation: qemu-smoke-arm{32/64}.sh: Fix typo in DEBIAN_FRONTENT The correct variable name is DEBIAN_FRONTEND and not DEBIAN_FRONTENT. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- automation/scripts/qemu-smoke-arm32.sh | 2 +- automation/scripts/qemu-smoke-arm64.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/scripts/qemu-smoke-arm32.sh b/automation/scripts/qemu-smoke-arm32.sh index 530f3892fd..c8ae0bfb9b 100755 --- a/automation/scripts/qemu-smoke-arm32.sh +++ b/automation/scripts/qemu-smoke-arm32.sh @@ -2,7 +2,7 @@ set -ex -export DEBIAN_FRONTENT=noninteractive +export DEBIAN_FRONTEND=noninteractive apt-get -qy update apt-get -qy install --no-install-recommends device-tree-compiler \ curl \ diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index f803835779..5b566072f7 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -38,7 +38,7 @@ fi " fi -export DEBIAN_FRONTENT=noninteractive +export DEBIAN_FRONTEND=noninteractive apt-get -qy update apt-get -qy install --no-install-recommends u-boot-qemu \ u-boot-tools \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Sep 28 00:33:26 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 Sep 2022 00:33:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413095.656592 (Exim 4.92) (envelope-from ) id 1odL0w-0005nU-EI; Wed, 28 Sep 2022 00:33:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413095.656592; Wed, 28 Sep 2022 00:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odL0w-0005nM-BO; Wed, 28 Sep 2022 00:33:26 +0000 Received: by outflank-mailman (input) for mailman id 413095; Wed, 28 Sep 2022 00:33:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odL0u-0005n5-BB for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 00:33:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odL0u-0008Dk-AR for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 00:33:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odL0u-0006xm-9f for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 00:33:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=daBV4x7zWHCK5wkgUwpMl6JFwASNxwEk6IvF73tQR90=; b=y/enBmgyCpIlz6F0ckpiwAr8lL mUzni8tZJDcjjojkck4Rx5Z7oTnRM55r6dZbaMEOyq9fNnYDdjJhiEE/taIOGUbfCnsDojc3jkApM RVJmjSJPRW8TtNtmeltQuOUSdy+caqKvj6hjeQuBOshiKy+4Et6iOaHgILxdwsz9RKNg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Force CONFIG_XEN_IBT in the buster-gcc-ibt test Message-Id: Date: Wed, 28 Sep 2022 00:33:24 +0000 commit 211d8419ef8d8a237ff914fd8304b8fefc3ff2cc Author: Andrew Cooper AuthorDate: Mon Sep 26 14:02:13 2022 +0100 Commit: Stefano Stabellini CommitDate: Tue Sep 27 16:51:19 2022 -0700 CI: Force CONFIG_XEN_IBT in the buster-gcc-ibt test buster-gcc-ibt is a dedicated test to run a not-yet-upstreamed compiler patch which is relevant to CONFIG_XEN_IBT in 4.17 and later. Force it on, rather than having 50% of the jobs not testing what they're supposed to be testing. Fixes: 5d59421815d5 ("x86: Use control flow typechecking where possible") Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini [stefano: minor code style improvement] Signed-off-by: Stefano Stabellini --- automation/gitlab-ci/build.yaml | 2 ++ automation/scripts/build | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index a39ed72aac..ddc2234faf 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -299,6 +299,8 @@ debian-buster-gcc-ibt: variables: CONTAINER: debian:buster-gcc-ibt RANDCONFIG: y + EXTRA_FIXED_RANDCONFIG: | + CONFIG_XEN_IBT=y debian-unstable-clang: extends: .clang-x86-64-build diff --git a/automation/scripts/build b/automation/scripts/build index bcfa6838f0..8c0882f3aa 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -12,6 +12,12 @@ cc-ver() # random config or default config if [[ "${RANDCONFIG}" == "y" ]]; then + + # Append job-specific fixed configuration + if [[ -n "${EXTRA_FIXED_RANDCONFIG}" ]]; then + echo "${EXTRA_FIXED_RANDCONFIG}" >> xen/tools/kconfig/allrandom.config + fi + make -j$(nproc) -C xen KCONFIG_ALLCONFIG=tools/kconfig/allrandom.config randconfig hypervisor_only="y" else -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Sep 28 17:00:08 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 Sep 2022 17:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413438.657075 (Exim 4.92) (envelope-from ) id 1odaPj-0006w9-6M; Wed, 28 Sep 2022 17:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413438.657075; Wed, 28 Sep 2022 17:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odaPj-0006vd-3X; Wed, 28 Sep 2022 17:00:03 +0000 Received: by outflank-mailman (input) for mailman id 413438; Wed, 28 Sep 2022 17:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odaPi-0006iT-0j for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 17:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odaPh-0002km-Tl for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 17:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odaPh-0007yl-Si for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 17:00:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=44mu1Sg4sTO3RTPdPCSEnq2sncbB8ENSzct0B3jqUXc=; b=xjCRLRjQZyclTaTKtuBMgEra9z JJ6B5TWQu9eXdqLme/F9X4cEEXH3SzlzC7F/PQeiV1rYETeub1O9sLbvgIw9275Qtiy0IHL5B+hRJ WRD5rbez3fmGZRQcvSjG5KCCl1XPNDkcbtzNVEEnCYhWOJU/uExZhtE3P1K6cGY2XDMY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] drivers/char: Fix build when CET-IBT is enabled Message-Id: Date: Wed, 28 Sep 2022 17:00:01 +0000 commit 5e936d11b171793c174686268c9c1df8a4fa974c Author: Andrew Cooper AuthorDate: Mon Sep 26 11:46:15 2022 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 27 13:32:35 2022 +0100 drivers/char: Fix build when CET-IBT is enabled https://gitlab.com/xen-project/xen/-/jobs/3083068950#L1763 Signed-off-by: Andrew Cooper Fixes: 022e40edd4dc ("drivers/char: allow using both dbgp=xhci and dbgp=ehci") Reviewed-by: Jan Beulich Release-acked-by: Henry Wang --- xen/drivers/char/ehci-dbgp.c | 2 +- xen/drivers/char/xhci-dbc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 8a0b958506..bb9d3198d9 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1465,7 +1465,7 @@ static struct ehci_dbgp ehci_dbgp = { .state = dbgp_unsafe, .phys_port = 1 }; static char __initdata opt_dbgp[30]; -static int __init parse_ehci_dbgp(const char *opt) +static int __init cf_check parse_ehci_dbgp(const char *opt) { if ( strncmp(opt, "ehci", 4) ) return 0; diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index 5f92234a95..43ed64a004 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -1282,7 +1282,7 @@ struct dbc_dma_bufs { static struct dbc_dma_bufs __section(".bss.page_aligned") __aligned(PAGE_SIZE) dbc_dma_bufs; -static int __init xhci_parse_dbgp(const char *opt_dbgp) +static int __init cf_check xhci_parse_dbgp(const char *opt_dbgp) { struct dbc_uart *uart = &dbc_uart; struct dbc *dbc = &uart->dbc; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 28 23:22:12 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 Sep 2022 23:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413455.657101 (Exim 4.92) (envelope-from ) id 1odgNO-0002zV-7D; Wed, 28 Sep 2022 23:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413455.657101; Wed, 28 Sep 2022 23: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 1odgNO-0002zO-4J; Wed, 28 Sep 2022 23:22:02 +0000 Received: by outflank-mailman (input) for mailman id 413455; Wed, 28 Sep 2022 23:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odgNN-0002zI-Ns for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 23:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odgNN-0001Cd-MF for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 23:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odgNN-0000Y1-Kc for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 23: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=gEnPw9JqzyPFLNNq2p/dNLzdnVSJPvfbrGkKhuoMtk0=; b=SJCWhGBae0ZimCEdkbJy9J2wkn VLF3iZC6/h+mSYDXzwNbYnNOwEIejl7ubpMYTTtAjUivHBn2vtbUoJ/lQIW9FxfstC5jZn1H/XUZq YdC27OQ4CVDiHIXS7+T6lDOiQ0tNm+bruuRexnhnPlGQ5Uy7cY4EihHLxBtgj5+Rygko=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Build: Drop -no-pie from EMBEDDED_EXTRA_CFLAGS Message-Id: Date: Wed, 28 Sep 2022 23:22:01 +0000 commit 13a7c0074ac8fb31f6c0485429b7a20a1946cb22 Author: Andrew Cooper AuthorDate: Tue Sep 27 16:47:08 2022 +0100 Commit: Stefano Stabellini CommitDate: Tue Sep 27 15:40:42 2022 -0700 Build: Drop -no-pie from EMBEDDED_EXTRA_CFLAGS This breaks all Clang builds, as demostrated by Gitlab CI. Contrary to the description in ecd6b9759919, -no-pie is not even an option passed to the linker. GCC's actual behaviour is to inhibit the passing of -pie to the linker, as well as selecting different cr0 artefacts to be linked. EMBEDDED_EXTRA_CFLAGS is not used for $(CC)-doing-linking, and not liable to gain such a usecase. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Tested-by: Stefano Stabellini Fixes: ecd6b9759919 ("Config.mk: correct PIE-related option(s) in EMBEDDED_EXTRA_CFLAGS") --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index 000e57e57b..69af1e60d4 100644 --- a/Config.mk +++ b/Config.mk @@ -188,7 +188,7 @@ endif APPEND_LDFLAGS += $(foreach i, $(APPEND_LIB), -L$(i)) APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i)) -EMBEDDED_EXTRA_CFLAGS := -fno-pie -no-pie -fno-stack-protector -fno-stack-protector-all +EMBEDDED_EXTRA_CFLAGS := -fno-pie -fno-stack-protector -fno-stack-protector-all EMBEDDED_EXTRA_CFLAGS += -fno-exceptions -fno-asynchronous-unwind-tables XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 28 23:22:12 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 Sep 2022 23:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413456.657105 (Exim 4.92) (envelope-from ) id 1odgNY-00031G-8Y; Wed, 28 Sep 2022 23:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413456.657105; Wed, 28 Sep 2022 23: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 1odgNY-000319-5z; Wed, 28 Sep 2022 23:22:12 +0000 Received: by outflank-mailman (input) for mailman id 413456; Wed, 28 Sep 2022 23:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odgNX-00030t-Pz for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 23:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odgNX-0001Cv-PF for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 23:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odgNX-0000YQ-OH for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 23: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=0HZFJK+aKe4zrW0PswVnIsLH4A3R7ABvtTL+BAoTbcY=; b=mk939ZpkDOtpiwa5IiDN+D0Ywp jm5nf0UUEjmhevg6wNa2HgwhhqfVMryBqfioLMO+GKKfMr9qoFTE/TWohJA2an3xdrx/b20cpXCdC B0Bx/uYxKl6eKfemUxaxiosy6qKSwGE3oiZ0bnJ+JVvCEhizOxGTZZpSVGBxXGG5oGqo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: qemu-smoke-arm{32/64}.sh: Fix typo in DEBIAN_FRONTENT Message-Id: Date: Wed, 28 Sep 2022 23:22:11 +0000 commit 1686272d5297b2f6ebad7dcf6586d17c55b84c81 Author: Michal Orzel AuthorDate: Tue Sep 27 11:47:18 2022 +0200 Commit: Stefano Stabellini CommitDate: Tue Sep 27 16:48:50 2022 -0700 automation: qemu-smoke-arm{32/64}.sh: Fix typo in DEBIAN_FRONTENT The correct variable name is DEBIAN_FRONTEND and not DEBIAN_FRONTENT. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- automation/scripts/qemu-smoke-arm32.sh | 2 +- automation/scripts/qemu-smoke-arm64.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/scripts/qemu-smoke-arm32.sh b/automation/scripts/qemu-smoke-arm32.sh index 530f3892fd..c8ae0bfb9b 100755 --- a/automation/scripts/qemu-smoke-arm32.sh +++ b/automation/scripts/qemu-smoke-arm32.sh @@ -2,7 +2,7 @@ set -ex -export DEBIAN_FRONTENT=noninteractive +export DEBIAN_FRONTEND=noninteractive apt-get -qy update apt-get -qy install --no-install-recommends device-tree-compiler \ curl \ diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index f803835779..5b566072f7 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -38,7 +38,7 @@ fi " fi -export DEBIAN_FRONTENT=noninteractive +export DEBIAN_FRONTEND=noninteractive apt-get -qy update apt-get -qy install --no-install-recommends u-boot-qemu \ u-boot-tools \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 28 23:22:23 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 28 Sep 2022 23:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413457.657110 (Exim 4.92) (envelope-from ) id 1odgNj-00033v-AM; Wed, 28 Sep 2022 23:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413457.657110; Wed, 28 Sep 2022 23: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 1odgNj-00033n-7i; Wed, 28 Sep 2022 23:22:23 +0000 Received: by outflank-mailman (input) for mailman id 413457; Wed, 28 Sep 2022 23:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odgNh-00033d-Sg for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 23:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odgNh-0001DD-S3 for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 23:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odgNh-0000Ys-RH for xen-changelog@lists.xenproject.org; Wed, 28 Sep 2022 23: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=eR4murF0uUwHd4jDwwOPsE/3ODwj2dskcJc3Gyc50yg=; b=dMHMbKQp6196xOL9J4vT4Z5RXn DsCvQED3ruwbp1WKShDzHETO//A67p2htALfCLIGHnJaS9PGm2bDuDqu2tZOhCW4vQtA+FgA92co9 aotkfeUgoNreHKRTWr9jiLonv7RFQR6jiru+tejy4ywzAaERRqIDqoYjq484tIe2jzmw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Force CONFIG_XEN_IBT in the buster-gcc-ibt test Message-Id: Date: Wed, 28 Sep 2022 23:22:21 +0000 commit 211d8419ef8d8a237ff914fd8304b8fefc3ff2cc Author: Andrew Cooper AuthorDate: Mon Sep 26 14:02:13 2022 +0100 Commit: Stefano Stabellini CommitDate: Tue Sep 27 16:51:19 2022 -0700 CI: Force CONFIG_XEN_IBT in the buster-gcc-ibt test buster-gcc-ibt is a dedicated test to run a not-yet-upstreamed compiler patch which is relevant to CONFIG_XEN_IBT in 4.17 and later. Force it on, rather than having 50% of the jobs not testing what they're supposed to be testing. Fixes: 5d59421815d5 ("x86: Use control flow typechecking where possible") Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini [stefano: minor code style improvement] Signed-off-by: Stefano Stabellini --- automation/gitlab-ci/build.yaml | 2 ++ automation/scripts/build | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index a39ed72aac..ddc2234faf 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -299,6 +299,8 @@ debian-buster-gcc-ibt: variables: CONTAINER: debian:buster-gcc-ibt RANDCONFIG: y + EXTRA_FIXED_RANDCONFIG: | + CONFIG_XEN_IBT=y debian-unstable-clang: extends: .clang-x86-64-build diff --git a/automation/scripts/build b/automation/scripts/build index bcfa6838f0..8c0882f3aa 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -12,6 +12,12 @@ cc-ver() # random config or default config if [[ "${RANDCONFIG}" == "y" ]]; then + + # Append job-specific fixed configuration + if [[ -n "${EXTRA_FIXED_RANDCONFIG}" ]]; then + echo "${EXTRA_FIXED_RANDCONFIG}" >> xen/tools/kconfig/allrandom.config + fi + make -j$(nproc) -C xen KCONFIG_ALLCONFIG=tools/kconfig/allrandom.config randconfig hypervisor_only="y" else -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Sep 29 12:55:10 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Sep 2022 12:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413751.657598 (Exim 4.92) (envelope-from ) id 1odt4D-0006eL-Oi; Thu, 29 Sep 2022 12:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413751.657598; Thu, 29 Sep 2022 12:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt4D-0006eC-Lw; Thu, 29 Sep 2022 12:55:05 +0000 Received: by outflank-mailman (input) for mailman id 413751; Thu, 29 Sep 2022 12:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt4C-0006e6-IV for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt4C-0007qs-G6 for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odt4C-0005VS-FL for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=usImveMzDsTJH18z1ettE9+ZDDMuaC7uCHnbKIaz7Hg=; b=Ue9B2bMAS5Lz+MpUkPA6BKNDa6 +fcL8KA+72aSOSOnT8UZUgQl9LlsnwCkzGKA7f9tmLRS/sfwK5x8XFsXKEWSS5bdtJIKgM5sWNJkR oE+AOaavOBP9C0k7l/qm9i5kuX5j6vEbDvbGbCKsxRwV5gkrzma0Y0/6LonWZqCmse8Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: remove xenstore entries on vchan server closure Message-Id: Date: Thu, 29 Sep 2022 12:55:04 +0000 commit 3ab6ea992b0e5e1a332bdbc8ae56d72f1b66fcbd Author: Oleksandr Andrushchenko AuthorDate: Thu Sep 29 14:38:02 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 29 14:38:02 2022 +0200 tools: remove xenstore entries on vchan server closure vchan server creates XenStore entries to advertise its event channel and ring, but those are not removed after the server quits. Add additional cleanup step, so those are removed, so clients do not try to connect to a non-existing server. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Dmytro Semenets Reviewed-by: Juergen Gross Acked-by: Anthony PERARD --- tools/include/libxenvchan.h | 5 +++++ tools/libs/vchan/init.c | 24 ++++++++++++++++++++++++ tools/libs/vchan/io.c | 4 ++++ tools/libs/vchan/vchan.h | 31 +++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+) diff --git a/tools/include/libxenvchan.h b/tools/include/libxenvchan.h index d6010b145d..30cc73cf97 100644 --- a/tools/include/libxenvchan.h +++ b/tools/include/libxenvchan.h @@ -86,6 +86,11 @@ struct libxenvchan { int blocking:1; /* communication rings */ struct libxenvchan_ring read, write; + /** + * Base xenstore path for storing ring/event data used by the server + * during cleanup. + * */ + char *xs_path; }; /** diff --git a/tools/libs/vchan/init.c b/tools/libs/vchan/init.c index c8510e6ce9..9195bd3b98 100644 --- a/tools/libs/vchan/init.c +++ b/tools/libs/vchan/init.c @@ -46,6 +46,8 @@ #include #include +#include "vchan.h" + #ifndef PAGE_SHIFT #define PAGE_SHIFT 12 #endif @@ -251,6 +253,12 @@ static int init_xs_srv(struct libxenvchan *ctrl, int domain, const char* xs_base char ref[16]; char* domid_str = NULL; xs_transaction_t xs_trans = XBT_NULL; + + /* store the base path so we can clean up on server closure */ + ctrl->xs_path = strdup(xs_base); + if (!ctrl->xs_path) + return -1; + xs = xs_open(0); if (!xs) goto fail; @@ -298,6 +306,22 @@ retry_transaction: return ret; } +void close_xs_srv(struct libxenvchan *ctrl) +{ + struct xs_handle *xs; + + if (!ctrl->xs_path) + return; + + xs = xs_open(0); + if (xs) { + xs_rm(xs, XBT_NULL, ctrl->xs_path); + xs_close(xs); + } + + free(ctrl->xs_path); +} + static int min_order(size_t siz) { int rv = PAGE_SHIFT; diff --git a/tools/libs/vchan/io.c b/tools/libs/vchan/io.c index da303fbc01..1f201ad554 100644 --- a/tools/libs/vchan/io.c +++ b/tools/libs/vchan/io.c @@ -40,6 +40,8 @@ #include #include +#include "vchan.h" + #ifndef PAGE_SHIFT #define PAGE_SHIFT 12 #endif @@ -384,5 +386,7 @@ void libxenvchan_close(struct libxenvchan *ctrl) if (ctrl->gnttab) xengnttab_close(ctrl->gnttab); } + if (ctrl->is_server) + close_xs_srv(ctrl); free(ctrl); } diff --git a/tools/libs/vchan/vchan.h b/tools/libs/vchan/vchan.h new file mode 100644 index 0000000000..621016ef42 --- /dev/null +++ b/tools/libs/vchan/vchan.h @@ -0,0 +1,31 @@ +/** + * @file + * @section AUTHORS + * + * Copyright (C) 2021 EPAM Systems Inc. + * + * @section LICENSE + * + * 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 . + * + * @section DESCRIPTION + * + * This file contains common libxenvchan declarations. + */ +#ifndef LIBVCHAN_H +#define LIBVCHAN_H + +void close_xs_srv(struct libxenvchan *ctrl); + +#endif /* LIBVCHAN_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 29 12:55:15 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Sep 2022 12:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413752.657602 (Exim 4.92) (envelope-from ) id 1odt4N-0006gl-QF; Thu, 29 Sep 2022 12:55:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413752.657602; Thu, 29 Sep 2022 12:55: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 1odt4N-0006gd-NW; Thu, 29 Sep 2022 12:55:15 +0000 Received: by outflank-mailman (input) for mailman id 413752; Thu, 29 Sep 2022 12:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt4M-0006gP-Jp for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt4M-0007r0-JA for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odt4M-0005W4-IE for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Hy1qFxwKbcBtMWWh5m79wcrLyRU6Ptqo7aU2YeBFDog=; b=Srl/nkhd9MDFDPisoRHKB1yrJs jI661gm2eEviZjhLYw/oP7sz7bfketlF86ZILZbH5h3vZmnmp0jgrtjEjlOfz16JKKw+qbALY95RE SXDnRiRhebMiriN552cq2wM3P3xTF7P3fj0lh+9ca5HPbxFzserLQP5MSh2ReSfVIAVk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] MAINTAINERS: ARINC 653 scheduler maintainer updates Message-Id: Date: Thu, 29 Sep 2022 12:55:14 +0000 commit e1de23b7c1bfa02447a79733e64184b3635e0587 Author: Stewart Hildebrand AuthorDate: Thu Sep 29 14:38:22 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 29 14:38:22 2022 +0200 MAINTAINERS: ARINC 653 scheduler maintainer updates Add Nathan Studer as co-maintainer. I am departing DornerWorks. I will still be working with Xen in my next role, and I still have an interest in co-maintaining the ARINC 653 scheduler, so change to my personal email address. Signed-off-by: Stewart Hildebrand Acked-by: Nathan Studer --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index e12c499a28..816656950a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -221,7 +221,8 @@ F: xen/include/xen/argo.h F: xen/common/argo.c ARINC653 SCHEDULER -M: Stewart Hildebrand +M: Nathan Studer +M: Stewart Hildebrand S: Supported L: xen-devel@dornerworks.com F: xen/common/sched/arinc653.c -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 29 12:55:25 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Sep 2022 12:55:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413753.657607 (Exim 4.92) (envelope-from ) id 1odt4X-0006jo-SI; Thu, 29 Sep 2022 12:55:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413753.657607; Thu, 29 Sep 2022 12:55: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 1odt4X-0006jg-P5; Thu, 29 Sep 2022 12:55:25 +0000 Received: by outflank-mailman (input) for mailman id 413753; Thu, 29 Sep 2022 12:55:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt4W-0006jV-OB for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt4W-0007rE-Mg for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odt4W-0005We-LP for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55: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=mnuOmBNho3Srhfqd5qL0sRfLrLpSYMf8u0gE1tpc2Mg=; b=hsDH+AOBhlQxP439mVYh+/ib1l 7NQmCxiMD9DgeYL7e0vTvLcsCyhS5FTFt7P4pZocf0I5Gmr/r/7u20vY25/6Ic7/kW3trKzNak8cD g5iVsGI2IyxFB1b/Kpv25vPdbUy4VrmEzVIasv/PM95dXpzbViabPwYZIrCjHco/JQ68=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/NUMA: correct memnode_shift calculation for single node system Message-Id: Date: Thu, 29 Sep 2022 12:55:24 +0000 commit 0db195c1a9947240b354abbefd2afac6c73ad6a8 Author: Jan Beulich AuthorDate: Thu Sep 29 14:39:52 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 29 14:39:52 2022 +0200 x86/NUMA: correct memnode_shift calculation for single node system SRAT may describe even a single node system (including such with multiple nodes, but only one having any memory) using multiple ranges. Hence simply counting the number of ranges (note that function parameters are mis-named) is not an indication of the number of nodes in use. Since we only care about knowing whether we're on a single node system, accounting for this is easy: Increment the local variable only when adjacent ranges are for different nodes. That way the count may still end up larger than the number of nodes in use, but it won't be larger than 1 when only a single node has any memory. To compensate populate_memnodemap() now needs to be prepared to find the correct node ID already in place for a range. (This could of course also happen when there's more than one node with memory, while at least one node has multiple adjacent ranges, provided extract_lsb_from_nodes() would also know to recognize this case.) Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/numa.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 627ae8aa95..1bc82c60aa 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -78,7 +78,8 @@ static int __init populate_memnodemap(const struct node *nodes, if ( (epdx >> shift) >= memnodemapsize ) return 0; do { - if ( memnodemap[spdx >> shift] != NUMA_NO_NODE ) + if ( memnodemap[spdx >> shift] != NUMA_NO_NODE && + (!nodeids || memnodemap[spdx >> shift] != nodeids[i]) ) return -1; if ( !nodeids ) @@ -114,7 +115,7 @@ static int __init allocate_cachealigned_memnodemap(void) * maximum possible shift. */ static int __init extract_lsb_from_nodes(const struct node *nodes, - int numnodes) + int numnodes, const nodeid_t *nodeids) { int i, nodes_used = 0; unsigned long spdx, epdx; @@ -127,7 +128,8 @@ static int __init extract_lsb_from_nodes(const struct node *nodes, if ( spdx >= epdx ) continue; bitfield |= spdx; - nodes_used++; + if ( !i || !nodeids || nodeids[i - 1] != nodeids[i] ) + nodes_used++; if ( epdx > memtop ) memtop = epdx; } @@ -144,7 +146,7 @@ int __init compute_hash_shift(struct node *nodes, int numnodes, { int shift; - shift = extract_lsb_from_nodes(nodes, numnodes); + shift = extract_lsb_from_nodes(nodes, numnodes, nodeids); if ( memnodemapsize <= ARRAY_SIZE(_memnodemap) ) memnodemap = _memnodemap; else if ( allocate_cachealigned_memnodemap() ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 29 12:55:35 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Sep 2022 12:55:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413754.657611 (Exim 4.92) (envelope-from ) id 1odt4h-0006mP-TW; Thu, 29 Sep 2022 12:55:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413754.657611; Thu, 29 Sep 2022 12:55: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 1odt4h-0006mH-Qc; Thu, 29 Sep 2022 12:55:35 +0000 Received: by outflank-mailman (input) for mailman id 413754; Thu, 29 Sep 2022 12:55:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt4g-0006ly-RS for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt4g-0007sy-Qp for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odt4g-0005XO-Pb for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55: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=8ZSV8i1+pZK8n7qYjhcg3dg7CYEfnHu68WVxODFqkXs=; b=mdxDMHTFyHjfeuTpQA/UtEHJ+T YcYID+bkwL8FwbTEVszmCjtjOdKCOdfvnrlBxkJ7GwmjoI4uNZV1mc3UPQDWXgKtc/U3m0De6n2mx v7qWFIA0NRGZ3/jbN4xm6ktqdA0RQCvbzm5hOD3JwG+/qIOMZ/UG8RbTRtK+Wo7eUrpY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/vgic: drop const attribute from gic_iomem_deny_access() Message-Id: Date: Thu, 29 Sep 2022 12:55:34 +0000 commit 9982fe275ba4ee1a749b6dde5602a5a79e42b543 Author: Roger Pau Monné AuthorDate: Thu Sep 29 14:41:13 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 29 14:41:13 2022 +0200 arm/vgic: drop const attribute from gic_iomem_deny_access() While correct from a code point of view, the usage of the const attribute for the domain parameter of gic_iomem_deny_access() is at least partially bogus. Contents of the domain structure (the iomem rangeset) is modified by the function. Such modifications succeed because right now the iomem rangeset is allocated separately from struct domain, and hence is not subject to the constness of struct domain. Amend this by dropping the const attribute from the function parameter. This is required by further changes that will convert iomem_{permit,deny}_access into a function. Signed-off-by: Roger Pau Monné Reviewed-by: Bertrand Marquis --- xen/arch/arm/gic-v2.c | 2 +- xen/arch/arm/gic-v3.c | 2 +- xen/arch/arm/gic.c | 2 +- xen/arch/arm/include/asm/gic.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index bd773bcc67..ae5bd8e95f 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -1083,7 +1083,7 @@ static void __init gicv2_dt_init(void) gicv2_extension_dt_init(node); } -static int gicv2_iomem_deny_access(const struct domain *d) +static int gicv2_iomem_deny_access(struct domain *d) { int rc; unsigned long mfn, nr; diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 64b36cec25..018fa0dfa0 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -1424,7 +1424,7 @@ static void __init gicv3_dt_init(void) &vbase, &vsize); } -static int gicv3_iomem_deny_access(const struct domain *d) +static int gicv3_iomem_deny_access(struct domain *d) { int rc, i; unsigned long mfn, nr; diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 3b0331b538..9b82325442 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -462,7 +462,7 @@ unsigned long gic_get_hwdom_madt_size(const struct domain *d) } #endif -int gic_iomem_deny_access(const struct domain *d) +int gic_iomem_deny_access(struct domain *d) { return gic_hw_ops->iomem_deny_access(d); } diff --git a/xen/arch/arm/include/asm/gic.h b/xen/arch/arm/include/asm/gic.h index 3692fae393..76e3fa5dc4 100644 --- a/xen/arch/arm/include/asm/gic.h +++ b/xen/arch/arm/include/asm/gic.h @@ -392,7 +392,7 @@ struct gic_hw_operations { /* Map extra GIC MMIO, irqs and other hw stuffs to the hardware domain. */ int (*map_hwdom_extra_mappings)(struct domain *d); /* Deny access to GIC regions */ - int (*iomem_deny_access)(const struct domain *d); + int (*iomem_deny_access)(struct domain *d); /* Handle LPIs, which require special handling */ void (*do_LPI)(unsigned int lpi); }; @@ -449,7 +449,7 @@ unsigned long gic_get_hwdom_madt_size(const struct domain *d); #endif int gic_map_hwdom_extra_mappings(struct domain *d); -int gic_iomem_deny_access(const struct domain *d); +int gic_iomem_deny_access(struct domain *d); #endif /* __ASSEMBLY__ */ #endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 29 12:55:45 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Sep 2022 12:55:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413755.657615 (Exim 4.92) (envelope-from ) id 1odt4r-0006oq-VE; Thu, 29 Sep 2022 12:55:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413755.657615; Thu, 29 Sep 2022 12:55: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 1odt4r-0006oi-SE; Thu, 29 Sep 2022 12:55:45 +0000 Received: by outflank-mailman (input) for mailman id 413755; Thu, 29 Sep 2022 12:55:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt4q-0006oZ-Vk for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt4q-0007tV-V1 for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odt4q-0005Xw-UD for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55: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=B0ooCyBLQ9ElcrUQOemplccNO5bjRZeZ+oBVg46YK2Q=; b=NYs11q/1sYfe1XbxkGQyCpoLdt XRPzlybxO9F7iRAcHZJa9ZyA+WyDUMlj3QbjkgoWTp1Y/Gn8PMowX1Mtp2Vx3p9BLXzG4BYyM25tk 334TKmF4z1Lh/XPjsVF2e63L6qPMvLF8LHyh2+YJ740f+qVS9T0veH0JsZAY16EoLDRQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/ept: limit calls to memory_type_changed() Message-Id: Date: Thu, 29 Sep 2022 12:55:44 +0000 commit c4e5cc2ccc5b8274d02f7855c4769839989bb349 Author: Roger Pau Monné AuthorDate: Thu Sep 29 14:44:10 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 29 14:44:10 2022 +0200 x86/ept: limit calls to memory_type_changed() memory_type_changed() is currently only implemented for Intel EPT, and results in the invalidation of EMT attributes on all the entries in the EPT page tables. Such invalidation causes EPT_MISCONFIG vmexits when the guest tries to access any gfns for the first time, which results in the recalculation of the EMT for the accessed page. The vmexit and the recalculations are expensive, and as such should be avoided when possible. Remove the call to memory_type_changed() from XEN_DOMCTL_memory_mapping: there are no modifications of the iomem_caps ranges anymore that could alter the return of cache_flush_permitted() from that domctl. Encapsulate calls to memory_type_changed() resulting from changes to the domain iomem_caps or ioport_caps ranges in the helpers themselves (io{ports,mem}_{permit,deny}_access()), and add a note in epte_get_entry_emt() to remind that changes to the logic there likely need to be propagaed to the IO capabilities helpers. Note changes to the IO ports or memory ranges are not very common during guest runtime, but Citrix Hypervisor has an use case for them related to device passthrough. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/domctl.c | 4 ---- xen/arch/x86/include/asm/iocap.h | 34 ++++++++++++++++++++++++++++++---- xen/arch/x86/mm/p2m-ept.c | 4 ++++ xen/common/domctl.c | 4 ---- xen/include/xen/iocap.h | 39 +++++++++++++++++++++++++++++++++++---- 5 files changed, 69 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 020df615bd..e9bfbc57a7 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -232,8 +232,6 @@ long arch_do_domctl( ret = ioports_permit_access(d, fp, fp + np - 1); else ret = ioports_deny_access(d, fp, fp + np - 1); - if ( !ret ) - memory_type_changed(d); break; } @@ -666,8 +664,6 @@ long arch_do_domctl( "ioport_map: error %ld denying dom%d access to [%x,%x]\n", ret, d->domain_id, fmp, fmp + np - 1); } - if ( !ret ) - memory_type_changed(d); break; } diff --git a/xen/arch/x86/include/asm/iocap.h b/xen/arch/x86/include/asm/iocap.h index eee47228d4..53d87ae8a3 100644 --- a/xen/arch/x86/include/asm/iocap.h +++ b/xen/arch/x86/include/asm/iocap.h @@ -7,10 +7,11 @@ #ifndef __X86_IOCAP_H__ #define __X86_IOCAP_H__ -#define ioports_permit_access(d, s, e) \ - rangeset_add_range((d)->arch.ioport_caps, s, e) -#define ioports_deny_access(d, s, e) \ - rangeset_remove_range((d)->arch.ioport_caps, s, e) +#include +#include + +#include + #define ioports_access_permitted(d, s, e) \ rangeset_contains_range((d)->arch.ioport_caps, s, e) @@ -18,4 +19,29 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) +static inline int ioports_permit_access(struct domain *d, unsigned long s, + unsigned long e) +{ + bool flush = cache_flush_permitted(d); + int ret = rangeset_add_range(d->arch.ioport_caps, s, e); + + if ( !ret && !is_iommu_enabled(d) && !flush ) + /* See comment in iomem_permit_access(). */ + memory_type_changed(d); + + return ret; +} + +static inline int ioports_deny_access(struct domain *d, unsigned long s, + unsigned long e) +{ + int ret = rangeset_remove_range(d->arch.ioport_caps, s, e); + + if ( !ret && !is_iommu_enabled(d) && !cache_flush_permitted(d) ) + /* See comment in iomem_deny_access(). */ + memory_type_changed(d); + + return ret; +} + #endif /* __X86_IOCAP_H__ */ diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index b4919bad51..d61d66c20e 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -518,6 +518,10 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, return MTRR_TYPE_UNCACHABLE; } + /* + * Conditional must be kept in sync with the code in + * {iomem,ioports}_{permit,deny}_access(). + */ if ( type != p2m_mmio_direct && !is_iommu_enabled(d) && !cache_flush_permitted(d) ) { diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 452266710a..69fb9abd34 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -716,8 +716,6 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) ret = iomem_permit_access(d, mfn, mfn + nr_mfns - 1); else ret = iomem_deny_access(d, mfn, mfn + nr_mfns - 1); - if ( !ret ) - memory_type_changed(d); break; } @@ -778,8 +776,6 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) "memory_map: error %ld removing dom%d access to [%lx,%lx]\n", ret, d->domain_id, mfn, mfn_end); } - /* Do this unconditionally to cover errors on above failure paths. */ - memory_type_changed(d); break; } diff --git a/xen/include/xen/iocap.h b/xen/include/xen/iocap.h index 1ca3858fc0..ffbc48b60f 100644 --- a/xen/include/xen/iocap.h +++ b/xen/include/xen/iocap.h @@ -7,13 +7,44 @@ #ifndef __XEN_IOCAP_H__ #define __XEN_IOCAP_H__ +#include #include #include +#include + +static inline int iomem_permit_access(struct domain *d, unsigned long s, + unsigned long e) +{ + bool flush = cache_flush_permitted(d); + int ret = rangeset_add_range(d->iomem_caps, s, e); + + if ( !ret && !is_iommu_enabled(d) && !flush ) + /* + * Only flush if the range(s) are empty before this addition and + * IOMMU is not enabled for the domain, otherwise it makes no + * difference for effective cache attribute calculation purposes. + */ + memory_type_changed(d); + + return ret; +} + +static inline int iomem_deny_access(struct domain *d, unsigned long s, + unsigned long e) +{ + int ret = rangeset_remove_range(d->iomem_caps, s, e); + + if ( !ret && !is_iommu_enabled(d) && !cache_flush_permitted(d) ) + /* + * Only flush if the range(s) are empty after this removal and + * IOMMU is not enabled for the domain, otherwise it makes no + * difference for effective cache attribute calculation purposes. + */ + memory_type_changed(d); + + return ret; +} -#define iomem_permit_access(d, s, e) \ - rangeset_add_range((d)->iomem_caps, s, e) -#define iomem_deny_access(d, s, e) \ - rangeset_remove_range((d)->iomem_caps, s, e) #define iomem_access_permitted(d, s, e) \ rangeset_contains_range((d)->iomem_caps, s, e) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 29 12:55:56 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Sep 2022 12:55:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413756.657619 (Exim 4.92) (envelope-from ) id 1odt52-0006t5-0u; Thu, 29 Sep 2022 12:55:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413756.657619; Thu, 29 Sep 2022 12:55: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 1odt51-0006sx-TX; Thu, 29 Sep 2022 12:55:55 +0000 Received: by outflank-mailman (input) for mailman id 413756; Thu, 29 Sep 2022 12:55:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt51-0006sl-2T for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt51-0007tf-1m for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odt51-0005YU-0x for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:55:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=d5fU30i/YJo4O2ilT/s1zeOKQqgoKqs1bSEXF1FK9uY=; b=HLlL/J+8fgzr6rQ2Bo12cXC3Ye 9obmMm9qAhj9309ak2zkgOBhcD99knJxk2hO5dznFI3o78Avv3y9Bilz8W8s9Fml0IaOMYZh9TUDb NuGbAOCrs3cYLG/vV+WWgwfnDaiFs9ss/V0YCIWGkimaBx0jDXNziZ7J5It6wpRWBsDY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: re-connect VCPUOP_send_nmi for 32-bit guests Message-Id: Date: Thu, 29 Sep 2022 12:55:55 +0000 commit 9214da34a3cb017ff0417900250bd6d18ca89e15 Author: Jan Beulich AuthorDate: Thu Sep 29 14:46:50 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 29 14:46:50 2022 +0200 x86: re-connect VCPUOP_send_nmi for 32-bit guests With the "inversion" of VCPUOP handling, processing arch-specific ones first, the forwarding of this sub-op from the (common) compat handler to (common) non-compat one did no longer have the intended effect. It now needs forwarding between the arch-specific handlers. Fixes: 8a96c0ea7999 ("xen: move do_vcpu_op() to arch specific code") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Release-acked-by: Henry Wang --- xen/arch/x86/x86_64/domain.c | 1 + xen/common/compat/domain.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/x86_64/domain.c b/xen/arch/x86/x86_64/domain.c index 62fe51ee74..9b2f7a7d7a 100644 --- a/xen/arch/x86/x86_64/domain.c +++ b/xen/arch/x86/x86_64/domain.c @@ -58,6 +58,7 @@ compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) break; } + case VCPUOP_send_nmi: case VCPUOP_get_physid: rc = do_vcpu_op(cmd, vcpuid, arg); break; diff --git a/xen/common/compat/domain.c b/xen/common/compat/domain.c index 1119534679..c425490535 100644 --- a/xen/common/compat/domain.c +++ b/xen/common/compat/domain.c @@ -99,7 +99,6 @@ int compat_common_vcpu_op(int cmd, struct vcpu *v, case VCPUOP_stop_periodic_timer: case VCPUOP_stop_singleshot_timer: case VCPUOP_register_vcpu_info: - case VCPUOP_send_nmi: rc = common_vcpu_op(cmd, v, arg); break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 29 12:56:06 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Sep 2022 12:56:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413757.657621 (Exim 4.92) (envelope-from ) id 1odt5C-0006wg-4G; Thu, 29 Sep 2022 12:56:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413757.657621; Thu, 29 Sep 2022 12:56: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 1odt5C-0006wZ-1T; Thu, 29 Sep 2022 12:56:06 +0000 Received: by outflank-mailman (input) for mailman id 413757; Thu, 29 Sep 2022 12:56:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt5B-0006wG-5M for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:56:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odt5B-0007u2-4n for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:56:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odt5B-0005Z8-3t for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 12:56: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=WEsaqqrVwAk+GuHrXJe8z80XMmTKzzjUqDswiLI+OZE=; b=FRuCy0PUEWaj7D7IwNi5KU+Dx0 U+I/pW95tyyHkaFTRrze7MNqucFRIZWVgqgdeZWS6Kmn806PMZvkSnhYNzlqd+ZuCGYteWFnLYuGK 4ZfuFDcUye/7etVjFdWHODNTCq2xPiUB9hCtAKgvu1PWjlFfy35fmhsY6gpJC6AVx8fI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: wire up VCPUOP_register_vcpu_time_memory_area for 32-bit guests Message-Id: Date: Thu, 29 Sep 2022 12:56:05 +0000 commit b726541d94bd0a80b5864d17a2cd2e6d73a3fe0a Author: Jan Beulich AuthorDate: Thu Sep 29 14:47:45 2022 +0200 Commit: Jan Beulich CommitDate: Thu Sep 29 14:47:45 2022 +0200 x86: wire up VCPUOP_register_vcpu_time_memory_area for 32-bit guests Forever sinced its introduction VCPUOP_register_vcpu_time_memory_area was available only to native domains. Linux, for example, would attempt to use it irrespective of guest bitness (including in its so called PVHVM mode) as long as it finds XEN_PVCLOCK_TSC_STABLE_BIT set (which we set only for clocksource=tsc, which in turn needs engaging via command line option). Fixes: a5d39947cb89 ("Allow guests to register secondary vcpu_time_info") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Release-acked-by: Henry Wang --- xen/arch/x86/x86_64/domain.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/xen/arch/x86/x86_64/domain.c b/xen/arch/x86/x86_64/domain.c index 9b2f7a7d7a..bfaea17fe7 100644 --- a/xen/arch/x86/x86_64/domain.c +++ b/xen/arch/x86/x86_64/domain.c @@ -58,6 +58,26 @@ compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) break; } + case VCPUOP_register_vcpu_time_memory_area: + { + struct compat_vcpu_register_time_memory_area area = { .addr.p = 0 }; + + rc = -EFAULT; + if ( copy_from_guest(&area.addr.h, arg, 1) ) + break; + + if ( area.addr.h.c != area.addr.p || + !compat_handle_okay(area.addr.h, 1) ) + break; + + rc = 0; + guest_from_compat_handle(v->arch.time_info_guest, area.addr.h); + + force_update_vcpu_system_time(v); + + break; + } + case VCPUOP_send_nmi: case VCPUOP_get_physid: rc = do_vcpu_op(cmd, vcpuid, arg); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 29 15:55:09 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Sep 2022 15:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413857.657788 (Exim 4.92) (envelope-from ) id 1odvsP-0008Bd-JM; Thu, 29 Sep 2022 15:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413857.657788; Thu, 29 Sep 2022 15:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odvsP-0008BW-Gl; Thu, 29 Sep 2022 15:55:05 +0000 Received: by outflank-mailman (input) for mailman id 413857; Thu, 29 Sep 2022 15:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odvsO-0008BO-BI for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 15:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odvsO-0002qC-8o for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 15:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odvsO-0007T3-81 for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 15:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6XKQ2d6liz9jpGQrhTmQGnVe4RBqdeHCpc2AMfcuM6Y=; b=yLx/TNDF1CtO+3FHrSpiZycUdP lvzorQ+AlUdMtLtxdVh658JYkEbu+Ow7psWF5mM8PapWBhpAbuQAm9sAmKIyVJK9cV8zItyF6Gf8a jyCzcyf/r0YjGVGlOVz8q+/KHMlHcoIycxpc/KV3yt9Hs9WUAv4V4DNkeAIcZB65aMJw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: domain_build: Always print the static shared memory region Message-Id: Date: Thu, 29 Sep 2022 15:55:04 +0000 commit a210e94af38a957fcc99db01d2cfcc3039859445 Author: Michal Orzel AuthorDate: Mon Sep 19 20:37:37 2022 +0200 Commit: Stefano Stabellini CommitDate: Thu Sep 29 08:52:56 2022 -0700 xen/arm: domain_build: Always print the static shared memory region At the moment, the information about allocating static shared memory region is only printed during the debug build. This information can also be helpful for the end user (which may not be the same as the person building the package), so switch to printk(). Also drop XENLOG_INFO to be consistent with other printk() used to print the domain information. Signed-off-by: Michal Orzel Acked-by: Stefano Stabellini Release-acked-by: Henry Wang --- xen/arch/arm/domain_build.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 01c2aaccd8..40e3c2e119 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -844,9 +844,8 @@ static int __init assign_shared_memory(struct domain *d, unsigned long nr_pages, nr_borrowers, i; struct page_info *page; - dprintk(XENLOG_INFO, - "%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpaddr".\n", - d, pbase, pbase + psize); + printk("%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpaddr".\n", + d, pbase, pbase + psize); smfn = acquire_shared_memory_bank(d, pbase, psize); if ( mfn_eq(smfn, INVALID_MFN) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Sep 29 15:55:16 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Sep 2022 15:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.413859.657793 (Exim 4.92) (envelope-from ) id 1odvsZ-0008JT-LY; Thu, 29 Sep 2022 15:55:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 413859.657793; Thu, 29 Sep 2022 15:55: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 1odvsZ-0008JL-IP; Thu, 29 Sep 2022 15:55:15 +0000 Received: by outflank-mailman (input) for mailman id 413859; Thu, 29 Sep 2022 15:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odvsY-0008J7-D4 for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 15:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1odvsY-0002qH-CM for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 15:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1odvsY-0007Td-B1 for xen-changelog@lists.xenproject.org; Thu, 29 Sep 2022 15:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=emhaFxT3IBefOejsFsQKDQGmbgODlJXFX8S6a6lc600=; b=gqdeyb527UZeQkDgxQO3YCvLT+ uJYN6JpVdRSt3M7fLeAx2SXNrXaWf0TKDUE1aRZqUcLjB/nbaovOzPvA9mRvlu6HQ7pOtBR9v0AWS TUzt/3sWI9dohg4uw8HMHdvZO4vL7iZMoBZakKmjKR1/NfT7qcft1NpgiJf2U+qw3smI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: Information about running containers for a different arch Message-Id: Date: Thu, 29 Sep 2022 15:55:14 +0000 commit fb7485788fd7db3b95f4e7fc9bfdfe9ef38e383f Author: Anthony PERARD AuthorDate: Thu Sep 29 10:51:31 2022 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 29 08:53:58 2022 -0700 automation: Information about running containers for a different arch Adding pointer to 'qemu-user-static'. Signed-off-by: Anthony PERARD Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini Release-acked-by: Henry Wang --- automation/build/README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/automation/build/README.md b/automation/build/README.md index 00305eed03..4cc1acb6b4 100644 --- a/automation/build/README.md +++ b/automation/build/README.md @@ -102,3 +102,16 @@ make -C automation/build suse/opensuse-tumbleweed PUSH=1 [registry]: https://gitlab.com/xen-project/xen/container_registry [registry help]: https://gitlab.com/help/user/project/container_registry + + +Building/Running container for a different architecture +------------------------------------------------------- + +On a x86 host, it is possible to build and run containers for other arch (like +running a container made for Arm) with docker taking care of running the +appropriate software to emulate that arch. For this, simply install the package +`qemu-user-static`, and that's it. Then you can start an Arm container on x86 +host like you would start an x86 container. + +If that doesn't work, you might find some information on +[multiarch/qemu-user-static](https://github.com/multiarch/qemu-user-static). -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 30 08:00:11 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Sep 2022 08:00:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.414067.658134 (Exim 4.92) (envelope-from ) id 1oeAwI-0003QX-Jn; Fri, 30 Sep 2022 08:00:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 414067.658134; Fri, 30 Sep 2022 08:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oeAwI-0003Q6-GK; Fri, 30 Sep 2022 08:00:06 +0000 Received: by outflank-mailman (input) for mailman id 414067; Fri, 30 Sep 2022 08:00:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oeAwH-0003AD-2U for xen-changelog@lists.xenproject.org; Fri, 30 Sep 2022 08:00:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oeAwH-0003qW-0H for xen-changelog@lists.xenproject.org; Fri, 30 Sep 2022 08:00:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oeAwG-0006Ku-Ug for xen-changelog@lists.xenproject.org; Fri, 30 Sep 2022 08:00: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=+dH7zeHwSM6BliLobO8/KdqdG7vXXMGVHZ5qpRZ4EzE=; b=UnMKVyggmM/oWNh6R2DRT3c5H8 ReaBuJYnKdqWDvtA5VfgrKB0k51ys9qkUBhAKFNDuuW4CwKd9EP/nOl2XJgW0zmAMhOYgOLseDx5o SnrOGtnlAYTDyBegUQYr46Ifu+wdWFY9vysx1nEVsQxIsPCme/xFa5MlcUBvABmxVE+k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vpmu: Fix race-condition in vpmu_load Message-Id: Date: Fri, 30 Sep 2022 08:00:04 +0000 commit defa4e51d20a143bdd4395a075bf0933bb38a9a4 Author: Tamas K Lengyel AuthorDate: Fri Sep 30 09:53:49 2022 +0200 Commit: Jan Beulich CommitDate: Fri Sep 30 09:53:49 2022 +0200 x86/vpmu: Fix race-condition in vpmu_load The vPMU code-bases attempts to perform an optimization on saving/reloading the PMU context by keeping track of what vCPU ran on each pCPU. When a pCPU is getting scheduled, checks if the previous vCPU isn't the current one. If so, attempts a call to vpmu_save_force. Unfortunately if the previous vCPU is already getting scheduled to run on another pCPU its state will be already runnable, which results in an ASSERT failure. Fix this by always performing a pmu context save in vpmu_save when called from vpmu_switch_from, and do a vpmu_load when called from vpmu_switch_to. While this presents a minimal overhead in case the same vCPU is getting rescheduled on the same pCPU, the ASSERT failure is avoided and the code is a lot easier to reason about. Signed-off-by: Tamas K Lengyel Acked-by: Jan Beulich --- xen/arch/x86/cpu/vpmu.c | 43 +++++-------------------------------------- 1 file changed, 5 insertions(+), 38 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index cacc24a30f..64cdbfc48c 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -376,57 +376,24 @@ void vpmu_save(struct vcpu *v) vpmu->last_pcpu = pcpu; per_cpu(last_vcpu, pcpu) = v; + vpmu_set(vpmu, VPMU_CONTEXT_SAVE); + if ( alternative_call(vpmu_ops.arch_vpmu_save, v, 0) ) vpmu_reset(vpmu, VPMU_CONTEXT_LOADED); + vpmu_reset(vpmu, VPMU_CONTEXT_SAVE); + apic_write(APIC_LVTPC, PMU_APIC_VECTOR | APIC_LVT_MASKED); } int vpmu_load(struct vcpu *v, bool_t from_guest) { struct vpmu_struct *vpmu = vcpu_vpmu(v); - int pcpu = smp_processor_id(), ret; - struct vcpu *prev = NULL; + int ret; if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) return 0; - /* First time this VCPU is running here */ - if ( vpmu->last_pcpu != pcpu ) - { - /* - * Get the context from last pcpu that we ran on. Note that if another - * VCPU is running there it must have saved this VPCU's context before - * startig to run (see below). - * There should be no race since remote pcpu will disable interrupts - * before saving the context. - */ - if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) ) - { - on_selected_cpus(cpumask_of(vpmu->last_pcpu), - vpmu_save_force, (void *)v, 1); - vpmu_reset(vpmu, VPMU_CONTEXT_LOADED); - } - } - - /* Prevent forced context save from remote CPU */ - local_irq_disable(); - - prev = per_cpu(last_vcpu, pcpu); - - if ( prev != v && prev ) - { - vpmu = vcpu_vpmu(prev); - - /* Someone ran here before us */ - vpmu_save_force(prev); - vpmu_reset(vpmu, VPMU_CONTEXT_LOADED); - - vpmu = vcpu_vpmu(v); - } - - local_irq_enable(); - /* Only when PMU is counting, we load PMU context immediately. */ if ( !vpmu_is_set(vpmu, VPMU_RUNNING) || (!has_vlapic(vpmu_vcpu(vpmu)->domain) && -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 30 08:00:16 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Sep 2022 08:00:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.414068.658138 (Exim 4.92) (envelope-from ) id 1oeAwS-0003XF-L3; Fri, 30 Sep 2022 08:00:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 414068.658138; Fri, 30 Sep 2022 08:00:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oeAwS-0003X7-I7; Fri, 30 Sep 2022 08:00:16 +0000 Received: by outflank-mailman (input) for mailman id 414068; Fri, 30 Sep 2022 08:00:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oeAwR-0003Wn-4g for xen-changelog@lists.xenproject.org; Fri, 30 Sep 2022 08:00:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oeAwR-0003vh-3t for xen-changelog@lists.xenproject.org; Fri, 30 Sep 2022 08:00:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oeAwR-0006MB-2W for xen-changelog@lists.xenproject.org; Fri, 30 Sep 2022 08:00:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TQT79etf5Gkfu79PEwOZRWODoEwGHmwHb5NWxNAzH0c=; b=SqdISpF/spzImdEljon5gAG+XQ Rn4vIRTyB7RLc7oJWaUzDYdnGbTTg7EeRxmlM+tw4tepNOxG2MdeDmxDnwocBvqMGDfKq9FJdilSB P8gmdGxeJI10RrAylX/hBoeelNlK0vy8thITONX+EATWdUIDjuoYe/sPYJDGH4JUbZ3k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/NUMA: correct off-by-1 in node map size calculation Message-Id: Date: Fri, 30 Sep 2022 08:00:15 +0000 commit b1f4b45d02cac2bf704c2fcc61c70c3567cfaa5b Author: Jan Beulich AuthorDate: Fri Sep 30 09:55:34 2022 +0200 Commit: Jan Beulich CommitDate: Fri Sep 30 09:55:34 2022 +0200 x86/NUMA: correct off-by-1 in node map size calculation extract_lsb_from_nodes() accumulates "memtop" from all PDXes one past the covered ranges. Hence the maximum address which can validly by used to index the node map is one below this value, and we may currently set up a node map with an unused (and never initialized) trailing entry. In boundary cases this may also mean we dynamically allocate a page when the static (64-entry) map would suffice. While there also correct the comment ahead of the function, for it to match the actual code: Linux commit 54413927f022 ("x86-64: x86_64-make-the-numa-hash-function-nodemap-allocation fix fix") removed the ORing in of the end address before we actually cloned their code. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Reviewed-by: Wei Chen --- xen/arch/x86/numa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 1bc82c60aa..4f742414b0 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -111,7 +111,7 @@ static int __init allocate_cachealigned_memnodemap(void) } /* - * The LSB of all start and end addresses in the node map is the value of the + * The LSB of all start addresses in the node map is the value of the * maximum possible shift. */ static int __init extract_lsb_from_nodes(const struct node *nodes, @@ -137,7 +137,7 @@ static int __init extract_lsb_from_nodes(const struct node *nodes, i = BITS_PER_LONG - 1; else i = find_first_bit(&bitfield, sizeof(unsigned long)*8); - memnodemapsize = (memtop >> i) + 1; + memnodemapsize = ((memtop - 1) >> i) + 1; return i; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 30 08:00:26 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Sep 2022 08:00:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.414069.658142 (Exim 4.92) (envelope-from ) id 1oeAwc-0003hn-MW; Fri, 30 Sep 2022 08:00:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 414069.658142; Fri, 30 Sep 2022 08:00:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oeAwc-0003hd-Ja; Fri, 30 Sep 2022 08:00:26 +0000 Received: by outflank-mailman (input) for mailman id 414069; Fri, 30 Sep 2022 08:00:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oeAwb-0003hP-8x for xen-changelog@lists.xenproject.org; Fri, 30 Sep 2022 08:00:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oeAwb-0003vx-7a for xen-changelog@lists.xenproject.org; Fri, 30 Sep 2022 08:00:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oeAwb-0006NK-68 for xen-changelog@lists.xenproject.org; Fri, 30 Sep 2022 08:00:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lynMc1qBhWvG33K62HWUp3fhGQCLVAoB9v1osZUWuEM=; b=xqAx0TqHA2GeT+dSWUayfOdcHP Qx9VhkEetJGCvXFiiCo3RoGBSAQeE9sIhKARhTJtOaUSjXfE16bnqJGZ4r7IrZop0M8KuwH7owF8w s1Psctj4Log0e4iczZAu0gevIZWPZKByH4Wo8hNJ+H1XkHHA7eDrlsQaJHsdFrw55DQM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Arm/vGIC: adjust gicv3_its_deny_access() to fit other gic*_iomem_deny_access( Message-Id: Date: Fri, 30 Sep 2022 08:00:25 +0000 commit 38e1276db4c5457cd6e7811b4e168aa85c8a0b06 Author: Jan Beulich AuthorDate: Fri Sep 30 09:56:27 2022 +0200 Commit: Jan Beulich CommitDate: Fri Sep 30 09:56:27 2022 +0200 Arm/vGIC: adjust gicv3_its_deny_access() to fit other gic*_iomem_deny_access( While an oversight in 9982fe275ba4 ("arm/vgic: drop const attribute from gic_iomem_deny_access()"), the issue really became apparent only when iomem_deny_access() was switched to have a non-const first parameter. Fixes: c4e5cc2ccc5b ("x86/ept: limit calls to memory_type_changed()") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Michal Orzel Tested-by: Michal Orzel Reviewed-by: Bertrand Marquis --- xen/arch/arm/gic-v3-its.c | 2 +- xen/arch/arm/include/asm/gic_v3_its.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-v3-its.c b/xen/arch/arm/gic-v3-its.c index 9558bad96a..e217c21bf8 100644 --- a/xen/arch/arm/gic-v3-its.c +++ b/xen/arch/arm/gic-v3-its.c @@ -892,7 +892,7 @@ struct pending_irq *gicv3_assign_guest_event(struct domain *d, return pirq; } -int gicv3_its_deny_access(const struct domain *d) +int gicv3_its_deny_access(struct domain *d) { int rc = 0; unsigned long mfn, nr; diff --git a/xen/arch/arm/include/asm/gic_v3_its.h b/xen/arch/arm/include/asm/gic_v3_its.h index 168617097f..fae3f6ecef 100644 --- a/xen/arch/arm/include/asm/gic_v3_its.h +++ b/xen/arch/arm/include/asm/gic_v3_its.h @@ -139,7 +139,7 @@ unsigned long gicv3_its_make_hwdom_madt(const struct domain *d, #endif /* Deny iomem access for its */ -int gicv3_its_deny_access(const struct domain *d); +int gicv3_its_deny_access(struct domain *d); bool gicv3_its_host_has_its(void); @@ -206,7 +206,7 @@ static inline unsigned long gicv3_its_make_hwdom_madt(const struct domain *d, } #endif -static inline int gicv3_its_deny_access(const struct domain *d) +static inline int gicv3_its_deny_access(struct domain *d) { return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 30 13:22:11 2022 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Sep 2022 13:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.414239.658409 (Exim 4.92) (envelope-from ) id 1oeFxu-0000xp-4D; Fri, 30 Sep 2022 13:22:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 414239.658409; Fri, 30 Sep 2022 13:22:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oeFxu-0000xh-1T; Fri, 30 Sep 2022 13:22:06 +0000 Received: by outflank-mailman (input) for mailman id 414239; Fri, 30 Sep 2022 13:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oeFxs-0000xa-NQ for xen-changelog@lists.xenproject.org; Fri, 30 Sep 2022 13:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oeFxs-0001SV-Ks for xen-changelog@lists.xenproject.org; Fri, 30 Sep 2022 13:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1oeFxs-0004oR-Jo for xen-changelog@lists.xenproject.org; Fri, 30 Sep 2022 13:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vIXLHvE5NkuKbyCrvvaQueAA7D/TszkStYN/5Zlyd20=; b=0S83+1pMImfEqrgJGeHjoxJgOT y62Os/Pq7y/wgAxcUvoT472j8F0SR/zXZvlooY5jhQ0zRI51CsP6kg8IzSevNIUagTbRInCp2jaGT Jse6hDfWaBUz0X2DHOOnUhnG61tBl7NWAWER57eF/8ub5zljh3g6tKCAVasUAqbqlLa4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/NUMA: improve memnode_shift calculation for multi node system Message-Id: Date: Fri, 30 Sep 2022 13:22:04 +0000 commit 1666086b00442b23e4fd70f4971e3bcf1a16b124 Author: Jan Beulich AuthorDate: Fri Sep 30 15:16:22 2022 +0200 Commit: Jan Beulich CommitDate: Fri Sep 30 15:16:22 2022 +0200 x86/NUMA: improve memnode_shift calculation for multi node system SRAT may describe individual nodes using multiple ranges. When they're adjacent (with or without a gap in between), only the start of the first such range actually needs accounting for. Furthermore the very first range doesn't need considering of its start address at all, as it's fine to associate all lower addresses (with no memory) with that same node. For this to work, the array of ranges needs to be sorted by address - adjust logic accordingly in acpi_numa_memory_affinity_init(). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/numa.c | 3 ++- xen/arch/x86/srat.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 4f742414b0..2c3c1c15fe 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -127,7 +127,8 @@ static int __init extract_lsb_from_nodes(const struct node *nodes, epdx = paddr_to_pdx(nodes[i].end - 1) + 1; if ( spdx >= epdx ) continue; - bitfield |= spdx; + if ( i && (!nodeids || nodeids[i - 1] != nodeids[i]) ) + bitfield |= spdx; if ( !i || !nodeids || nodeids[i - 1] != nodeids[i] ) nodes_used++; if ( epdx > memtop ) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index b62a152911..fbcd8749c4 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -312,6 +312,7 @@ acpi_numa_memory_affinity_init(const struct acpi_srat_mem_affinity *ma) unsigned pxm; nodeid_t node; unsigned int i; + bool next = false; if (srat_disabled()) return; @@ -413,14 +414,37 @@ acpi_numa_memory_affinity_init(const struct acpi_srat_mem_affinity *ma) node, pxm, start, end - 1, ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE ? " (hotplug)" : ""); - node_memblk_range[num_node_memblks].start = start; - node_memblk_range[num_node_memblks].end = end; - memblk_nodeid[num_node_memblks] = node; + /* Keep node_memblk_range[] sorted by address. */ + for (i = 0; i < num_node_memblks; ++i) + if (node_memblk_range[i].start > start || + (node_memblk_range[i].start == start && + node_memblk_range[i].end > end)) + break; + + memmove(&node_memblk_range[i + 1], &node_memblk_range[i], + (num_node_memblks - i) * sizeof(*node_memblk_range)); + node_memblk_range[i].start = start; + node_memblk_range[i].end = end; + + memmove(&memblk_nodeid[i + 1], &memblk_nodeid[i], + (num_node_memblks - i) * sizeof(*memblk_nodeid)); + memblk_nodeid[i] = node; + if (ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) { - __set_bit(num_node_memblks, memblk_hotplug); + next = true; if (end > mem_hotplug) mem_hotplug = end; } + for (; i <= num_node_memblks; ++i) { + bool prev = next; + + next = test_bit(i, memblk_hotplug); + if (prev) + __set_bit(i, memblk_hotplug); + else + __clear_bit(i, memblk_hotplug); + } + num_node_memblks++; } -- generated by git-patchbot for /home/xen/git/xen.git#staging