From xen-changelog-bounces@lists.xenproject.org Fri Jan 01 06:55:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Jan 2021 06:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.60662.106464 (Exim 4.92) (envelope-from ) id 1kvEL2-0004j3-05; Fri, 01 Jan 2021 06:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 60662.106464; Fri, 01 Jan 2021 06:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kvEL1-0004iu-Sx; Fri, 01 Jan 2021 06:55:03 +0000 Received: by outflank-mailman (input) for mailman id 60662; Fri, 01 Jan 2021 06:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kvEL0-0004in-Hl for xen-changelog@lists.xenproject.org; Fri, 01 Jan 2021 06:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kvEL0-0003pz-GL for xen-changelog@lists.xenproject.org; Fri, 01 Jan 2021 06:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kvEL0-0003ak-FT for xen-changelog@lists.xenproject.org; Fri, 01 Jan 2021 06:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WIZJ408WEh+OC3iqQe1dGxzz1SKYlNXB8M255WRzXqs=; b=rL6l76qBEduf0pqfPif6JNcdEM S9Z7f932nc/8Y/Wsiozb+k2RTKaTFyRmQ2Dy6t5ZSU/gNffEJpv76dkkJg/B2EBhLXZBYvbSOab/E oXLJBUg9QgpQuXDB6pRbBnsBsI0bOxDJLHyPrpt1jd7Eqeg36aT7EcMMJ/+uMsZc1vHk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hpet: Fix return value of hpet_setup() Message-Id: Date: Fri, 01 Jan 2021 06:55:02 +0000 commit 83736c567d6b64dbce98f251ca72e7870f556421 Author: Andrew Cooper AuthorDate: Tue Dec 29 17:51:23 2020 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 31 16:19:00 2020 +0000 x86/hpet: Fix return value of hpet_setup() hpet_setup() is idempotent if the rate has already been calculated, and returns the cached value. However, this only works correctly when the return statements are identical. Use a sensibly named local variable, rather than a dead one with a bad name. Fixes: a60bb68219 ("x86/time: reduce rounding errors in calculations") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/hpet.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index a55e68e6f7..e6fab8acd8 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -759,7 +759,7 @@ u64 __init hpet_setup(void) { static u64 __initdata hpet_rate; u32 hpet_id, hpet_period; - unsigned int last; + unsigned int last, rem; if ( hpet_rate ) return hpet_rate; @@ -789,9 +789,11 @@ u64 __init hpet_setup(void) hpet_resume(hpet_boot_cfg); hpet_rate = 1000000000000000ULL; /* 10^15 */ - last = do_div(hpet_rate, hpet_period); + rem = do_div(hpet_rate, hpet_period); + if ( (rem * 2) > hpet_period ) + hpet_rate++; - return hpet_rate + (last * 2 > hpet_period); + return hpet_rate; } void hpet_resume(u32 *boot_cfg) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jan 01 06:55:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Jan 2021 06:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.60663.106468 (Exim 4.92) (envelope-from ) id 1kvELC-0004k6-1X; Fri, 01 Jan 2021 06:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 60663.106468; Fri, 01 Jan 2021 06:55: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 1kvELB-0004jx-Uh; Fri, 01 Jan 2021 06:55:13 +0000 Received: by outflank-mailman (input) for mailman id 60663; Fri, 01 Jan 2021 06:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kvELA-0004jl-MC for xen-changelog@lists.xenproject.org; Fri, 01 Jan 2021 06:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kvELA-0003q4-Kb for xen-changelog@lists.xenproject.org; Fri, 01 Jan 2021 06:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kvELA-0003bQ-Ik for xen-changelog@lists.xenproject.org; Fri, 01 Jan 2021 06:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=T8DjjSuavAr3kbL7FF/pnlATZ0QKquZ8YOlWJ028eHk=; b=M+coJZq39bdK9RU6ajztPH6Rvg TIrfRQGnF1ykpeV+zTf0Rs9yMWiWldNOCp+qoPnGqg57EcPLSTeN49JCKfmnGqzaOw+YYvJhhh2QA AN80DbeegOajbl74PpOc6Hui97uA3mrO5SNrOjfw47WG88Wj+hR8Ak8bd+5F3cS44PwA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/svm: Clean up MSR_K8_VM_CR definitions Message-Id: Date: Fri, 01 Jan 2021 06:55:12 +0000 commit 8cefa4b8de4113df58783081d201490ac83a19de Author: Andrew Cooper AuthorDate: Wed Dec 30 19:26:14 2020 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 31 16:19:00 2020 +0000 x86/svm: Clean up MSR_K8_VM_CR definitions Drop the unused shift number, and reposition the constants into the cleaned-up section. Rename VM_CR_SVM_DISABLE to be closer to its APM definition. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/include/asm-x86/msr-index.h | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 0854fcfc14..b819897a4a 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1586,7 +1586,7 @@ static int _svm_cpu_up(bool bsp) /* Check whether SVM feature is disabled in BIOS */ rdmsrl(MSR_K8_VM_CR, msr_content); - if ( msr_content & K8_VMCR_SVME_DISABLE ) + if ( msr_content & VM_CR_SVM_DISABLE ) { printk("CPU%d: AMD SVM Extension is disabled in BIOS.\n", cpu); return -EINVAL; diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 3e0c6c8476..ff583cf0ed 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -116,6 +116,9 @@ #define PASID_PASID_MASK 0x000fffff #define PASID_VALID (_AC(1, ULL) << 31) +#define MSR_K8_VM_CR 0xc0010114 +#define VM_CR_SVM_DISABLE (_AC(1, ULL) << 4) + /* * Legacy MSR constants in need of cleanup. No new MSRs below this comment. */ @@ -297,7 +300,6 @@ #define MSR_K8_PSTATE6 0xc001006A #define MSR_K8_PSTATE7 0xc001006B #define MSR_K8_ENABLE_C1E 0xc0010055 -#define MSR_K8_VM_CR 0xc0010114 #define MSR_K8_VM_HSAVE_PA 0xc0010117 #define MSR_AMD_FAM15H_EVNTSEL0 0xc0010200 @@ -318,10 +320,6 @@ #define MSR_K8_FEATURE_MASK 0xc0011004 #define MSR_K8_EXT_FEATURE_MASK 0xc0011005 -/* MSR_K8_VM_CR bits: */ -#define _K8_VMCR_SVME_DISABLE 4 -#define K8_VMCR_SVME_DISABLE (1 << _K8_VMCR_SVME_DISABLE) - /* AMD64 MSRs */ #define MSR_AMD64_NB_CFG 0xc001001f #define AMD64_NB_CFG_CF8_EXT_ENABLE_BIT 46 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jan 01 06:55:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Jan 2021 06:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.60665.106473 (Exim 4.92) (envelope-from ) id 1kvELM-0004le-4I; Fri, 01 Jan 2021 06:55:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 60665.106473; Fri, 01 Jan 2021 06:55: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 1kvELM-0004lU-05; Fri, 01 Jan 2021 06:55:24 +0000 Received: by outflank-mailman (input) for mailman id 60665; Fri, 01 Jan 2021 06:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kvELK-0004lI-Oj for xen-changelog@lists.xenproject.org; Fri, 01 Jan 2021 06:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kvELK-0003qH-Na for xen-changelog@lists.xenproject.org; Fri, 01 Jan 2021 06:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kvELK-0003cL-MZ for xen-changelog@lists.xenproject.org; Fri, 01 Jan 2021 06:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dAXQXZ2YNWNO6bxGM/SxI5g5giNAvOCHR3EFDihiQlE=; b=BsCgMY9J5OZbrGtgAG3Xr1j2wf WpIgQDXrZCL66LdVpjgW/bHBHR362f+DL3nDq2xhj09JATA8KKLFs9dqXzJPAmvJpAOHod/69S5pN ZfCCk/ZITGFm/hyo2gA3UfYFucGY8EB4uKgVZVozw4psm6Y/u8faTkoALvov3t2oWkPo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: remove the usage of the P ar option Message-Id: Date: Fri, 01 Jan 2021 06:55:22 +0000 commit 1516ecd6f55fe3608f374f4f2548491472d1c9a1 Author: Roger Pau Monne AuthorDate: Wed Dec 30 18:34:46 2020 +0100 Commit: Andrew Cooper CommitDate: Thu Dec 31 16:19:00 2020 +0000 xen: remove the usage of the P ar option It's not part of the POSIX standard [0] and as such non GNU ar implementations don't usually have it. It's not relevant for the use case here anyway, as the archive file is recreated every time due to the rm invocation before the ar call. No file name matching should happen so matching using the full path name or a relative one should yield the same result. This fixes the build on FreeBSD. While there also drop the s option, as ar will already generate a symbol table by default when creating the archive. [0] https://pubs.opengroup.org/onlinepubs/9699919799/utilities/ar.html Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/Rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index aba6ca2a90..ceb3d204b8 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -71,7 +71,7 @@ cmd_ld = $(LD) $(XEN_LDFLAGS) -r -o $@ $(filter-out %.a,$(real-prereqs)) \ # --------------------------------------------------------------------------- quiet_cmd_ar = AR $@ -cmd_ar = rm -f $@; $(AR) cPrs $@ $(real-prereqs) +cmd_ar = rm -f $@; $(AR) cr $@ $(real-prereqs) # Objcopy # --------------------------------------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jan 04 10:55:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Jan 2021 10:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61120.107273 (Exim 4.92) (envelope-from ) id 1kwNVy-0003pc-EP; Mon, 04 Jan 2021 10:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61120.107273; Mon, 04 Jan 2021 10: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 1kwNVy-0003pU-BS; Mon, 04 Jan 2021 10:55:06 +0000 Received: by outflank-mailman (input) for mailman id 61120; Mon, 04 Jan 2021 10:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwNVw-0003pN-Fn for xen-changelog@lists.xenproject.org; Mon, 04 Jan 2021 10:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwNVw-0007lG-Ex for xen-changelog@lists.xenproject.org; Mon, 04 Jan 2021 10:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwNVw-0008Ea-DA for xen-changelog@lists.xenproject.org; Mon, 04 Jan 2021 10: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=Krw56yIMwBhgjcV9LOn07kDmv85iIIFd2iN0LdWpIIw=; b=5pp5ZQGK54HGuG6chCwPlfOs5Y Fx4mq9K9jBapMFbQXJFSnOugAsfVUvPJiQq8jnwwFDnuxTGLON3xW++6WQ+XQ/85As5i4uWMYZGba FLPFk9WCxGtVGJHQW2tvrdV46x2EAvsUKSkIg6o54cZvaYGTOP7FXkt8wmfzSastqTqU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/p2m: fix p2m_add_foreign error path Message-Id: Date: Mon, 04 Jan 2021 10:55:04 +0000 commit 62dde2c1eff6d4e5d45883b78bdae5447e7d2d9c Author: Roger Pau Monné AuthorDate: Mon Jan 4 10:03:23 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 4 10:41:59 2021 +0000 x86/p2m: fix p2m_add_foreign error path One of the error paths in p2m_add_foreign could call put_page with a NULL page, thus triggering a fault. Split the checks into two different if statements, so the appropriate error path can be taken. Fixes: 173ae325026bd ('x86/p2m: tidy p2m_add_foreign() a little') Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/mm/p2m.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 487959b121..a4ebfc9b21 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -2601,8 +2601,13 @@ static int p2m_add_foreign(struct domain *tdom, unsigned long fgfn, * ram_rw | ram_logdirty | ram_ro | paging_out. */ page = get_page_from_gfn(fdom, fgfn, &p2mt, P2M_ALLOC); - if ( !page || - !p2m_is_ram(p2mt) || p2m_is_shared(p2mt) || p2m_is_hole(p2mt) ) + if ( !page ) + { + rc = -EINVAL; + goto out; + } + + if ( !p2m_is_ram(p2mt) || p2m_is_shared(p2mt) || p2m_is_hole(p2mt) ) { rc = -EINVAL; goto put_one; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 04 13:55:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Jan 2021 13:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61226.107534 (Exim 4.92) (envelope-from ) id 1kwQK9-00048k-5L; Mon, 04 Jan 2021 13:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61226.107534; Mon, 04 Jan 2021 13: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 1kwQK9-00048c-1y; Mon, 04 Jan 2021 13:55:05 +0000 Received: by outflank-mailman (input) for mailman id 61226; Mon, 04 Jan 2021 13:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwQK8-00048X-EU for xen-changelog@lists.xenproject.org; Mon, 04 Jan 2021 13:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwQK8-0002Jt-CA for xen-changelog@lists.xenproject.org; Mon, 04 Jan 2021 13:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwQK8-0004t7-AQ for xen-changelog@lists.xenproject.org; Mon, 04 Jan 2021 13: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=rY7oc3ETekZplmEgw7mBWy46PmQSd9gazLzMqj99NWI=; b=pE+X9Q4a3B7HNYVncfxLAseKsm OAZ4CcAbQKQYcOJ17W3ZE1/F5fSkTv1XhHAz7nlgxKDI5KEYAZRB+0h1uNUGexgcnbEFWQ9/lpsQd YDnKhY3vXo+nHB5EzSNEPB3k167xXW7Nc5LJDkHuS6z2a3cf1SKNd1dmeplUiMwxefww=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/p2m: Fix paging_gva_to_gfn() for nested virt Message-Id: Date: Mon, 04 Jan 2021 13:55:04 +0000 commit 7ba2ab495be54f608cb47440e1497b2795bd301a Author: Andrew Cooper AuthorDate: Thu Dec 31 16:55:20 2020 +0000 Commit: Andrew Cooper CommitDate: Mon Jan 4 13:19:51 2021 +0000 x86/p2m: Fix paging_gva_to_gfn() for nested virt nestedhap_walk_L1_p2m() takes guest physical addresses, not frame numbers. This means the l2 input is off-by-PAGE_SHIFT, as is the l1 value eventually returned to the caller. Delete the misleading comment as well. Fixes: bab2bd8e222de ("xen/nested_p2m: Don't walk EPT tables with a regular PT walker") Reported-by: Tamas K Lengyel Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Tested-by: Tamas K Lengyel --- xen/arch/x86/mm/p2m.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index a4ebfc9b21..ad4bb94514 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1784,6 +1784,7 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, if ( is_hvm_vcpu(v) && paging_mode_hap(v->domain) && nestedhvm_is_n2(v) ) { unsigned long l2_gfn, l1_gfn; + paddr_t l1_gpa; struct p2m_domain *p2m; const struct paging_mode *mode; uint8_t l1_p2ma; @@ -1798,8 +1799,8 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, if ( l2_gfn == gfn_x(INVALID_GFN) ) return gfn_x(INVALID_GFN); - /* translate l2 guest gfn into l1 guest gfn */ - rv = nestedhap_walk_L1_p2m(v, l2_gfn, &l1_gfn, &l1_page_order, &l1_p2ma, + rv = nestedhap_walk_L1_p2m(v, pfn_to_paddr(l2_gfn), &l1_gpa, + &l1_page_order, &l1_p2ma, 1, !!(*pfec & PFEC_write_access), !!(*pfec & PFEC_insn_fetch)); @@ -1807,6 +1808,8 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, if ( rv != NESTEDHVM_PAGEFAULT_DONE ) return gfn_x(INVALID_GFN); + l1_gfn = paddr_to_pfn(l1_gpa); + /* * Sanity check that l1_gfn can be used properly as a 4K mapping, even * if it mapped by a nested superpage. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 01:11:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 01:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61680.108583 (Exim 4.92) (envelope-from ) id 1kwasM-0005UG-Jx; Tue, 05 Jan 2021 01:11:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61680.108583; Tue, 05 Jan 2021 01: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 1kwasM-0005U8-Gs; Tue, 05 Jan 2021 01:11:06 +0000 Received: by outflank-mailman (input) for mailman id 61680; Tue, 05 Jan 2021 01:11:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwasL-0005U3-Lt for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwasL-0004OK-Ig for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwasL-0001eD-Fn for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vWQuNzTb3InHFHLDE7orAHNpHhTtjmXLA9EpoFUtn7g=; b=pLt6FXc2e0IL3JNejdbMMBl8QY vxbfg3zxDfkPK1CATpGS0K0vB4qOQ4tJ/amm1FAFw4zN+GxCTmNlhrB/83PiQ7poyL/6Cj9WVyPu3 oB7ZzSN5YHZ/dmNE3LZf7+wNj0acmpw0cHU3ytUDrgbf2O1qx2wGNxjOabOKrWTeMRgw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Use READ_SYSREG instead of 32/64 versions Message-Id: Date: Tue, 05 Jan 2021 01:11:05 +0000 commit a9f1f03b2710f5ce84f69c1c4516349531053fac Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:01 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:22:49 2021 -0800 xen/arm: Use READ_SYSREG instead of 32/64 versions Modify identify_cpu function to use READ_SYSREG instead of READ_SYSREG32 or READ_SYSREG64. All aarch32 specific registers (for example ID_PFR0_EL1) are 64bit when accessed from aarch64 with upper bits read as 0, so it is right to access them as 64bit registers on a 64bit platform. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/cpufeature.c | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 44126dbf07..115e1b164d 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -99,44 +99,44 @@ int enable_nonboot_cpu_caps(const struct arm_cpu_capabilities *caps) void identify_cpu(struct cpuinfo_arm *c) { - c->midr.bits = READ_SYSREG32(MIDR_EL1); + c->midr.bits = READ_SYSREG(MIDR_EL1); c->mpidr.bits = READ_SYSREG(MPIDR_EL1); #ifdef CONFIG_ARM_64 - c->pfr64.bits[0] = READ_SYSREG64(ID_AA64PFR0_EL1); - c->pfr64.bits[1] = READ_SYSREG64(ID_AA64PFR1_EL1); + c->pfr64.bits[0] = READ_SYSREG(ID_AA64PFR0_EL1); + c->pfr64.bits[1] = READ_SYSREG(ID_AA64PFR1_EL1); - c->dbg64.bits[0] = READ_SYSREG64(ID_AA64DFR0_EL1); - c->dbg64.bits[1] = READ_SYSREG64(ID_AA64DFR1_EL1); + c->dbg64.bits[0] = READ_SYSREG(ID_AA64DFR0_EL1); + c->dbg64.bits[1] = READ_SYSREG(ID_AA64DFR1_EL1); - c->aux64.bits[0] = READ_SYSREG64(ID_AA64AFR0_EL1); - c->aux64.bits[1] = READ_SYSREG64(ID_AA64AFR1_EL1); + c->aux64.bits[0] = READ_SYSREG(ID_AA64AFR0_EL1); + c->aux64.bits[1] = READ_SYSREG(ID_AA64AFR1_EL1); - c->mm64.bits[0] = READ_SYSREG64(ID_AA64MMFR0_EL1); - c->mm64.bits[1] = READ_SYSREG64(ID_AA64MMFR1_EL1); + c->mm64.bits[0] = READ_SYSREG(ID_AA64MMFR0_EL1); + c->mm64.bits[1] = READ_SYSREG(ID_AA64MMFR1_EL1); - c->isa64.bits[0] = READ_SYSREG64(ID_AA64ISAR0_EL1); - c->isa64.bits[1] = READ_SYSREG64(ID_AA64ISAR1_EL1); + c->isa64.bits[0] = READ_SYSREG(ID_AA64ISAR0_EL1); + c->isa64.bits[1] = READ_SYSREG(ID_AA64ISAR1_EL1); #endif - c->pfr32.bits[0] = READ_SYSREG32(ID_PFR0_EL1); - c->pfr32.bits[1] = READ_SYSREG32(ID_PFR1_EL1); + c->pfr32.bits[0] = READ_SYSREG(ID_PFR0_EL1); + c->pfr32.bits[1] = READ_SYSREG(ID_PFR1_EL1); - c->dbg32.bits[0] = READ_SYSREG32(ID_DFR0_EL1); + c->dbg32.bits[0] = READ_SYSREG(ID_DFR0_EL1); - c->aux32.bits[0] = READ_SYSREG32(ID_AFR0_EL1); + c->aux32.bits[0] = READ_SYSREG(ID_AFR0_EL1); - c->mm32.bits[0] = READ_SYSREG32(ID_MMFR0_EL1); - c->mm32.bits[1] = READ_SYSREG32(ID_MMFR1_EL1); - c->mm32.bits[2] = READ_SYSREG32(ID_MMFR2_EL1); - c->mm32.bits[3] = READ_SYSREG32(ID_MMFR3_EL1); + c->mm32.bits[0] = READ_SYSREG(ID_MMFR0_EL1); + c->mm32.bits[1] = READ_SYSREG(ID_MMFR1_EL1); + c->mm32.bits[2] = READ_SYSREG(ID_MMFR2_EL1); + c->mm32.bits[3] = READ_SYSREG(ID_MMFR3_EL1); - c->isa32.bits[0] = READ_SYSREG32(ID_ISAR0_EL1); - c->isa32.bits[1] = READ_SYSREG32(ID_ISAR1_EL1); - c->isa32.bits[2] = READ_SYSREG32(ID_ISAR2_EL1); - c->isa32.bits[3] = READ_SYSREG32(ID_ISAR3_EL1); - c->isa32.bits[4] = READ_SYSREG32(ID_ISAR4_EL1); - c->isa32.bits[5] = READ_SYSREG32(ID_ISAR5_EL1); + c->isa32.bits[0] = READ_SYSREG(ID_ISAR0_EL1); + c->isa32.bits[1] = READ_SYSREG(ID_ISAR1_EL1); + c->isa32.bits[2] = READ_SYSREG(ID_ISAR2_EL1); + c->isa32.bits[3] = READ_SYSREG(ID_ISAR3_EL1); + c->isa32.bits[4] = READ_SYSREG(ID_ISAR4_EL1); + c->isa32.bits[5] = READ_SYSREG(ID_ISAR5_EL1); } /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 01:11:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 01:11:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61681.108586 (Exim 4.92) (envelope-from ) id 1kwasX-0005V4-Le; Tue, 05 Jan 2021 01:11:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61681.108586; Tue, 05 Jan 2021 01:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwasX-0005Uw-Ib; Tue, 05 Jan 2021 01:11:17 +0000 Received: by outflank-mailman (input) for mailman id 61681; Tue, 05 Jan 2021 01:11:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwasV-0005Uj-PF for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwasV-0004ON-NC for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwasV-0001et-L5 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=estSAdEL5DceqVoxSyOSk9dfkWR39z0xHhXvbuf74Vo=; b=dsJUcMwzIQmRIRT9LCDZuUNnNx bTgS8ynABfNuOK16LpYKmpGPaPRp1vSn1kuTqC543mwjNJMDmXmAsm0W/mmWYyoByQluMWSXSoD3n DNcobLTX/FyEkOdrcbF7S+cQ2AArjzwqEIOGyvn3zfI5wY97lDKPKQFdVjjnw3uHU0Ho=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add ID registers and complete cpuinfo Message-Id: Date: Tue, 05 Jan 2021 01:11:15 +0000 commit 9cfdb489af810f71acb7dcdb87075dc7b3b313a0 Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:02 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:23:19 2021 -0800 xen/arm: Add ID registers and complete cpuinfo Add definition and entries in cpuinfo for ID registers introduced in newer Arm Architecture reference manual: - ID_PFR2: processor feature register 2 - ID_DFR1: debug feature register 1 - ID_MMFR4 and ID_MMFR5: Memory model feature registers 4 and 5 - ID_ISA6: ISA Feature register 6 Add more bitfield definitions in PFR fields of cpuinfo. Add MVFR2 register definition for aarch32. Add MVFRx_EL1 defines for aarch32. Add mvfr values in cpuinfo. Add some registers definition for arm64 in sysregs as some are not always know by compilers. Initialize the new values added in cpuinfo in identify_cpu during init. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/cpufeature.c | 12 ++++++++ xen/include/asm-arm/arm64/sysregs.h | 28 +++++++++++++++++++ xen/include/asm-arm/cpregs.h | 15 ++++++++++ xen/include/asm-arm/cpufeature.h | 56 +++++++++++++++++++++++++++++++------ 4 files changed, 102 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 115e1b164d..86b99ee960 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -114,15 +114,20 @@ void identify_cpu(struct cpuinfo_arm *c) c->mm64.bits[0] = READ_SYSREG(ID_AA64MMFR0_EL1); c->mm64.bits[1] = READ_SYSREG(ID_AA64MMFR1_EL1); + c->mm64.bits[2] = READ_SYSREG(ID_AA64MMFR2_EL1); c->isa64.bits[0] = READ_SYSREG(ID_AA64ISAR0_EL1); c->isa64.bits[1] = READ_SYSREG(ID_AA64ISAR1_EL1); + + c->zfr64.bits[0] = READ_SYSREG(ID_AA64ZFR0_EL1); #endif c->pfr32.bits[0] = READ_SYSREG(ID_PFR0_EL1); c->pfr32.bits[1] = READ_SYSREG(ID_PFR1_EL1); + c->pfr32.bits[2] = READ_SYSREG(ID_PFR2_EL1); c->dbg32.bits[0] = READ_SYSREG(ID_DFR0_EL1); + c->dbg32.bits[1] = READ_SYSREG(ID_DFR1_EL1); c->aux32.bits[0] = READ_SYSREG(ID_AFR0_EL1); @@ -130,6 +135,8 @@ void identify_cpu(struct cpuinfo_arm *c) c->mm32.bits[1] = READ_SYSREG(ID_MMFR1_EL1); c->mm32.bits[2] = READ_SYSREG(ID_MMFR2_EL1); c->mm32.bits[3] = READ_SYSREG(ID_MMFR3_EL1); + c->mm32.bits[4] = READ_SYSREG(ID_MMFR4_EL1); + c->mm32.bits[5] = READ_SYSREG(ID_MMFR5_EL1); c->isa32.bits[0] = READ_SYSREG(ID_ISAR0_EL1); c->isa32.bits[1] = READ_SYSREG(ID_ISAR1_EL1); @@ -137,6 +144,11 @@ void identify_cpu(struct cpuinfo_arm *c) c->isa32.bits[3] = READ_SYSREG(ID_ISAR3_EL1); c->isa32.bits[4] = READ_SYSREG(ID_ISAR4_EL1); c->isa32.bits[5] = READ_SYSREG(ID_ISAR5_EL1); + c->isa32.bits[6] = READ_SYSREG(ID_ISAR6_EL1); + + c->mvfr.bits[0] = READ_SYSREG(MVFR0_EL1); + c->mvfr.bits[1] = READ_SYSREG(MVFR1_EL1); + c->mvfr.bits[2] = READ_SYSREG(MVFR2_EL1); } /* diff --git a/xen/include/asm-arm/arm64/sysregs.h b/xen/include/asm-arm/arm64/sysregs.h index c60029d38f..077fd95fb7 100644 --- a/xen/include/asm-arm/arm64/sysregs.h +++ b/xen/include/asm-arm/arm64/sysregs.h @@ -57,6 +57,34 @@ #define ICH_AP1R2_EL2 __AP1Rx_EL2(2) #define ICH_AP1R3_EL2 __AP1Rx_EL2(3) +/* + * Define ID coprocessor registers if they are not + * already defined by the compiler. + * + * Values picked from linux kernel + */ +#ifndef ID_AA64MMFR2_EL1 +#define ID_AA64MMFR2_EL1 S3_0_C0_C7_2 +#endif +#ifndef ID_PFR2_EL1 +#define ID_PFR2_EL1 S3_0_C0_C3_4 +#endif +#ifndef ID_MMFR4_EL1 +#define ID_MMFR4_EL1 S3_0_C0_C2_6 +#endif +#ifndef ID_MMFR5_EL1 +#define ID_MMFR5_EL1 S3_0_C0_C3_6 +#endif +#ifndef ID_ISAR6_EL1 +#define ID_ISAR6_EL1 S3_0_C0_C2_7 +#endif +#ifndef ID_AA64ZFR0_EL1 +#define ID_AA64ZFR0_EL1 S3_0_C0_C4_4 +#endif +#ifndef ID_DFR1_EL1 +#define ID_DFR1_EL1 S3_0_C0_C3_5 +#endif + /* Access to system registers */ #define READ_SYSREG32(name) ((uint32_t)READ_SYSREG64(name)) diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index 8fd344146e..6daf2b1a30 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -63,6 +63,8 @@ #define FPSID p10,7,c0,c0,0 /* Floating-Point System ID Register */ #define FPSCR p10,7,c1,c0,0 /* Floating-Point Status and Control Register */ #define MVFR0 p10,7,c7,c0,0 /* Media and VFP Feature Register 0 */ +#define MVFR1 p10,7,c6,c0,0 /* Media and VFP Feature Register 1 */ +#define MVFR2 p10,7,c5,c0,0 /* Media and VFP Feature Register 2 */ #define FPEXC p10,7,c8,c0,0 /* Floating-Point Exception Control Register */ #define FPINST p10,7,c9,c0,0 /* Floating-Point Instruction Register */ #define FPINST2 p10,7,c10,c0,0 /* Floating-point Instruction Register 2 */ @@ -108,18 +110,23 @@ #define MPIDR p15,0,c0,c0,5 /* Multiprocessor Affinity Register */ #define ID_PFR0 p15,0,c0,c1,0 /* Processor Feature Register 0 */ #define ID_PFR1 p15,0,c0,c1,1 /* Processor Feature Register 1 */ +#define ID_PFR2 p15,0,c0,c3,4 /* Processor Feature Register 2 */ #define ID_DFR0 p15,0,c0,c1,2 /* Debug Feature Register 0 */ +#define ID_DFR1 p15,0,c0,c3,5 /* Debug Feature Register 1 */ #define ID_AFR0 p15,0,c0,c1,3 /* Auxiliary Feature Register 0 */ #define ID_MMFR0 p15,0,c0,c1,4 /* Memory Model Feature Register 0 */ #define ID_MMFR1 p15,0,c0,c1,5 /* Memory Model Feature Register 1 */ #define ID_MMFR2 p15,0,c0,c1,6 /* Memory Model Feature Register 2 */ #define ID_MMFR3 p15,0,c0,c1,7 /* Memory Model Feature Register 3 */ +#define ID_MMFR4 p15,0,c0,c2,6 /* Memory Model Feature Register 4 */ +#define ID_MMFR5 p15,0,c0,c3,6 /* Memory Model Feature Register 5 */ #define ID_ISAR0 p15,0,c0,c2,0 /* ISA Feature Register 0 */ #define ID_ISAR1 p15,0,c0,c2,1 /* ISA Feature Register 1 */ #define ID_ISAR2 p15,0,c0,c2,2 /* ISA Feature Register 2 */ #define ID_ISAR3 p15,0,c0,c2,3 /* ISA Feature Register 3 */ #define ID_ISAR4 p15,0,c0,c2,4 /* ISA Feature Register 4 */ #define ID_ISAR5 p15,0,c0,c2,5 /* ISA Feature Register 5 */ +#define ID_ISAR6 p15,0,c0,c2,7 /* ISA Feature Register 6 */ #define CCSIDR p15,1,c0,c0,0 /* Cache Size ID Registers */ #define CLIDR p15,1,c0,c0,1 /* Cache Level ID Register */ #define CSSELR p15,2,c0,c0,0 /* Cache Size Selection Register */ @@ -312,18 +319,23 @@ #define HSTR_EL2 HSTR #define ID_AFR0_EL1 ID_AFR0 #define ID_DFR0_EL1 ID_DFR0 +#define ID_DFR1_EL1 ID_DFR1 #define ID_ISAR0_EL1 ID_ISAR0 #define ID_ISAR1_EL1 ID_ISAR1 #define ID_ISAR2_EL1 ID_ISAR2 #define ID_ISAR3_EL1 ID_ISAR3 #define ID_ISAR4_EL1 ID_ISAR4 #define ID_ISAR5_EL1 ID_ISAR5 +#define ID_ISAR6_EL1 ID_ISAR6 #define ID_MMFR0_EL1 ID_MMFR0 #define ID_MMFR1_EL1 ID_MMFR1 #define ID_MMFR2_EL1 ID_MMFR2 #define ID_MMFR3_EL1 ID_MMFR3 +#define ID_MMFR4_EL1 ID_MMFR4 +#define ID_MMFR5_EL1 ID_MMFR5 #define ID_PFR0_EL1 ID_PFR0 #define ID_PFR1_EL1 ID_PFR1 +#define ID_PFR2_EL1 ID_PFR2 #define IFSR32_EL2 IFSR #define MDCR_EL2 HDCR #define MIDR_EL1 MIDR @@ -347,6 +359,9 @@ #define VPIDR_EL2 VPIDR #define VTCR_EL2 VTCR #define VTTBR_EL2 VTTBR +#define MVFR0_EL1 MVFR0 +#define MVFR1_EL1 MVFR1 +#define MVFR2_EL1 MVFR2 #endif #endif diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index c7b5052992..74139be1cc 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -148,6 +148,7 @@ struct cpuinfo_arm { union { uint64_t bits[2]; struct { + /* PFR0 */ unsigned long el0:4; unsigned long el1:4; unsigned long el2:4; @@ -155,9 +156,23 @@ struct cpuinfo_arm { unsigned long fp:4; /* Floating Point */ unsigned long simd:4; /* Advanced SIMD */ unsigned long gic:4; /* GIC support */ - unsigned long __res0:28; + unsigned long ras:4; + unsigned long sve:4; + unsigned long sel2:4; + unsigned long mpam:4; + unsigned long amu:4; + unsigned long dit:4; + unsigned long __res0:4; unsigned long csv2:4; - unsigned long __res1:4; + unsigned long cvs3:4; + + /* PFR1 */ + unsigned long bt:4; + unsigned long ssbs:4; + unsigned long mte:4; + unsigned long ras_frac:4; + unsigned long mpam_frac:4; + unsigned long __res1:44; }; } pfr64; @@ -170,7 +185,7 @@ struct cpuinfo_arm { } aux64; union { - uint64_t bits[2]; + uint64_t bits[3]; struct { unsigned long pa_range:4; unsigned long asid_bits:4; @@ -190,6 +205,8 @@ struct cpuinfo_arm { unsigned long pan:4; unsigned long __res1:8; unsigned long __res2:32; + + unsigned long __res3:64; }; } mm64; @@ -197,6 +214,10 @@ struct cpuinfo_arm { uint64_t bits[2]; } isa64; + struct { + register_t bits[1]; + } zfr64; + #endif /* @@ -204,25 +225,38 @@ struct cpuinfo_arm { * when running in 32-bit mode. */ union { - uint32_t bits[2]; + uint32_t bits[3]; struct { + /* PFR0 */ unsigned long arm:4; unsigned long thumb:4; unsigned long jazelle:4; unsigned long thumbee:4; - unsigned long __res0:16; + unsigned long csv2:4; + unsigned long amu:4; + unsigned long dit:4; + unsigned long ras:4; + /* PFR1 */ unsigned long progmodel:4; unsigned long security:4; unsigned long mprofile:4; unsigned long virt:4; unsigned long gentimer:4; - unsigned long __res1:12; + unsigned long sec_frac:4; + unsigned long virt_frac:4; + unsigned long gic:4; + + /* PFR2 */ + unsigned long csv3:4; + unsigned long ssbs:4; + unsigned long ras_frac:4; + unsigned long __res2:20; }; } pfr32; struct { - uint32_t bits[1]; + uint32_t bits[2]; } dbg32; struct { @@ -230,12 +264,16 @@ struct cpuinfo_arm { } aux32; struct { - uint32_t bits[4]; + uint32_t bits[6]; } mm32; struct { - uint32_t bits[6]; + uint32_t bits[7]; } isa32; + + struct { + register_t bits[3]; + } mvfr; }; extern struct cpuinfo_arm boot_cpu_data; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 01:11:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 01:11:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61682.108591 (Exim 4.92) (envelope-from ) id 1kwash-0005WU-NB; Tue, 05 Jan 2021 01:11:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61682.108591; Tue, 05 Jan 2021 01:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwash-0005WM-K8; Tue, 05 Jan 2021 01:11:27 +0000 Received: by outflank-mailman (input) for mailman id 61682; Tue, 05 Jan 2021 01:11:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwasf-0005W8-S3 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwasf-0004OZ-QO for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwasf-0001fj-PO for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01: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=DWgq+7qdus6vUiCWZvgRKA9GdPWVscnFBWlGefCa+hg=; b=iokxT8suqvyx3VGZ7QGLd3+jb/ oW0qSNXJS2vNjPWGvQvruYbOgWxdeOKZ/5YlL5FSWlh/E+LziG7oPKKjvQU6noqLsf2JA1jwl1xdd XmLr4jRqJEXeiPb6BBatGC5CagsMVn3Ao5AMKntPeKkN+CtpGgNiD9NOB5+yENoIcruQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add arm64 ID registers definitions Message-Id: Date: Tue, 05 Jan 2021 01:11:25 +0000 commit 2d66a1f095f716e4bf7e47d61e1d1de13e99167a Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:03 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:23:34 2021 -0800 xen/arm: Add arm64 ID registers definitions Add coprocessor registers definitions for all ID registers trapped through the TID3 bit of HSR. Those are the one that will be emulated in Xen to only publish to guests the features that are supported by Xen and that are accessible to guests. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/include/asm-arm/arm64/hsr.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/xen/include/asm-arm/arm64/hsr.h b/xen/include/asm-arm/arm64/hsr.h index ca931dd2fe..e691d41c17 100644 --- a/xen/include/asm-arm/arm64/hsr.h +++ b/xen/include/asm-arm/arm64/hsr.h @@ -110,6 +110,43 @@ #define HSR_SYSREG_CNTP_CTL_EL0 HSR_SYSREG(3,3,c14,c2,1) #define HSR_SYSREG_CNTP_CVAL_EL0 HSR_SYSREG(3,3,c14,c2,2) +/* Those registers are used when HCR_EL2.TID3 is set */ +#define HSR_SYSREG_ID_PFR0_EL1 HSR_SYSREG(3,0,c0,c1,0) +#define HSR_SYSREG_ID_PFR1_EL1 HSR_SYSREG(3,0,c0,c1,1) +#define HSR_SYSREG_ID_PFR2_EL1 HSR_SYSREG(3,0,c0,c3,4) +#define HSR_SYSREG_ID_DFR0_EL1 HSR_SYSREG(3,0,c0,c1,2) +#define HSR_SYSREG_ID_DFR1_EL1 HSR_SYSREG(3,0,c0,c3,5) +#define HSR_SYSREG_ID_AFR0_EL1 HSR_SYSREG(3,0,c0,c1,3) +#define HSR_SYSREG_ID_MMFR0_EL1 HSR_SYSREG(3,0,c0,c1,4) +#define HSR_SYSREG_ID_MMFR1_EL1 HSR_SYSREG(3,0,c0,c1,5) +#define HSR_SYSREG_ID_MMFR2_EL1 HSR_SYSREG(3,0,c0,c1,6) +#define HSR_SYSREG_ID_MMFR3_EL1 HSR_SYSREG(3,0,c0,c1,7) +#define HSR_SYSREG_ID_MMFR4_EL1 HSR_SYSREG(3,0,c0,c2,6) +#define HSR_SYSREG_ID_MMFR5_EL1 HSR_SYSREG(3,0,c0,c3,6) +#define HSR_SYSREG_ID_ISAR0_EL1 HSR_SYSREG(3,0,c0,c2,0) +#define HSR_SYSREG_ID_ISAR1_EL1 HSR_SYSREG(3,0,c0,c2,1) +#define HSR_SYSREG_ID_ISAR2_EL1 HSR_SYSREG(3,0,c0,c2,2) +#define HSR_SYSREG_ID_ISAR3_EL1 HSR_SYSREG(3,0,c0,c2,3) +#define HSR_SYSREG_ID_ISAR4_EL1 HSR_SYSREG(3,0,c0,c2,4) +#define HSR_SYSREG_ID_ISAR5_EL1 HSR_SYSREG(3,0,c0,c2,5) +#define HSR_SYSREG_ID_ISAR6_EL1 HSR_SYSREG(3,0,c0,c2,7) +#define HSR_SYSREG_MVFR0_EL1 HSR_SYSREG(3,0,c0,c3,0) +#define HSR_SYSREG_MVFR1_EL1 HSR_SYSREG(3,0,c0,c3,1) +#define HSR_SYSREG_MVFR2_EL1 HSR_SYSREG(3,0,c0,c3,2) + +#define HSR_SYSREG_ID_AA64PFR0_EL1 HSR_SYSREG(3,0,c0,c4,0) +#define HSR_SYSREG_ID_AA64PFR1_EL1 HSR_SYSREG(3,0,c0,c4,1) +#define HSR_SYSREG_ID_AA64DFR0_EL1 HSR_SYSREG(3,0,c0,c5,0) +#define HSR_SYSREG_ID_AA64DFR1_EL1 HSR_SYSREG(3,0,c0,c5,1) +#define HSR_SYSREG_ID_AA64ISAR0_EL1 HSR_SYSREG(3,0,c0,c6,0) +#define HSR_SYSREG_ID_AA64ISAR1_EL1 HSR_SYSREG(3,0,c0,c6,1) +#define HSR_SYSREG_ID_AA64MMFR0_EL1 HSR_SYSREG(3,0,c0,c7,0) +#define HSR_SYSREG_ID_AA64MMFR1_EL1 HSR_SYSREG(3,0,c0,c7,1) +#define HSR_SYSREG_ID_AA64MMFR2_EL1 HSR_SYSREG(3,0,c0,c7,2) +#define HSR_SYSREG_ID_AA64AFR0_EL1 HSR_SYSREG(3,0,c0,c5,4) +#define HSR_SYSREG_ID_AA64AFR1_EL1 HSR_SYSREG(3,0,c0,c5,5) +#define HSR_SYSREG_ID_AA64ZFR0_EL1 HSR_SYSREG(3,0,c0,c4,4) + #endif /* __ASM_ARM_ARM64_HSR_H */ /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 01:11:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 01:11:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61683.108595 (Exim 4.92) (envelope-from ) id 1kwasr-0005Xx-Os; Tue, 05 Jan 2021 01:11:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61683.108595; Tue, 05 Jan 2021 01:11: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 1kwasr-0005Xp-Lf; Tue, 05 Jan 2021 01:11:37 +0000 Received: by outflank-mailman (input) for mailman id 61683; Tue, 05 Jan 2021 01:11:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwasp-0005Xe-UF for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwasp-0004Oj-TN for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwasp-0001gT-SR for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01: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=+myZ1pt9JkqdSb6CmFcnLuEAm34CUhbvIbr7+h8cjss=; b=X/5NgGGUH547/7oCjC2dd+J6i8 UsYshSmJa1FRJc/8+pjlRdT71UOEa8CakWrIoS/0j0nCSJlnP/N6sdmLw75qtCDoAuNleGUK/sm1B bpQTezt+cOqg49g3Xy1UN2p0Zn8LFSTgkVW+duy1N5vQJ1HVL8a6/txzKBdXvcguYL1k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: create a cpuinfo structure for guest Message-Id: Date: Tue, 05 Jan 2021 01:11:35 +0000 commit 3669a1cb95983dc1c01be46e7df5dd9357d7b973 Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:04 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:25:03 2021 -0800 xen/arm: create a cpuinfo structure for guest Create a cpuinfo structure for guest and mask into it the features that we do not support in Xen or that we do not want to publish to guests. Modify some values in the cpuinfo structure for guests to mask some features which we do not want to allow to guests (like AMU) or we do not support (like SVE). Modify some values in the guest cpuinfo structure to guests to hide some processor features: - SVE as this is not supported by Xen and guest are not allowed to use this features (ZEN is set to 0 in CPTR_EL2). - AMU as HCPTR_TAM is set in CPTR_EL2 so AMU cannot be used by guests All other bits are left untouched. - RAS as this is not supported by Xen. The code is trying to group together registers modifications for the same feature to be able in the long term to easily enable/disable a feature depending on user parameters or add other registers modification in the same place (like enabling/disabling HCR bits). Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/cpufeature.c | 51 ++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/cpufeature.h | 2 ++ 2 files changed, 53 insertions(+) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 86b99ee960..1f6a85aafe 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -24,6 +24,8 @@ DECLARE_BITMAP(cpu_hwcaps, ARM_NCAPS); +struct cpuinfo_arm __read_mostly guest_cpuinfo; + void update_cpu_capabilities(const struct arm_cpu_capabilities *caps, const char *info) { @@ -151,6 +153,55 @@ void identify_cpu(struct cpuinfo_arm *c) c->mvfr.bits[2] = READ_SYSREG(MVFR2_EL1); } +/* + * This function is creating a cpuinfo structure with values modified to mask + * all cpu features that should not be published to guest. + * The created structure is then used to provide ID registers values to guests. + */ +static int __init create_guest_cpuinfo(void) +{ + /* + * TODO: The code is currently using only the features detected on the boot + * core. In the long term we should try to compute values containing only + * features supported by all cores. + */ + guest_cpuinfo = boot_cpu_data; + +#ifdef CONFIG_ARM_64 + /* Hide MPAM support as xen does not support it */ + guest_cpuinfo.pfr64.mpam = 0; + guest_cpuinfo.pfr64.mpam_frac = 0; + + /* Hide SVE as Xen does not support it */ + guest_cpuinfo.pfr64.sve = 0; + guest_cpuinfo.zfr64.bits[0] = 0; + + /* Hide MTE support as Xen does not support it */ + guest_cpuinfo.pfr64.mte = 0; +#endif + + /* Hide AMU support */ +#ifdef CONFIG_ARM_64 + guest_cpuinfo.pfr64.amu = 0; +#endif + guest_cpuinfo.pfr32.amu = 0; + + /* Hide RAS support as Xen does not support it */ +#ifdef CONFIG_ARM_64 + guest_cpuinfo.pfr64.ras = 0; + guest_cpuinfo.pfr64.ras_frac = 0; +#endif + guest_cpuinfo.pfr32.ras = 0; + guest_cpuinfo.pfr32.ras_frac = 0; + + return 0; +} +/* + * This function needs to be run after all smp are started to have + * cpuinfo structures for all cores. + */ +__initcall(create_guest_cpuinfo); + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 74139be1cc..6058744c18 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -283,6 +283,8 @@ extern void identify_cpu(struct cpuinfo_arm *); extern struct cpuinfo_arm cpu_data[]; #define current_cpu_data cpu_data[smp_processor_id()] +extern struct cpuinfo_arm guest_cpuinfo; + #endif /* __ASSEMBLY__ */ #endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 01:11:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 01:11:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61684.108599 (Exim 4.92) (envelope-from ) id 1kwat1-0005ZT-Rk; Tue, 05 Jan 2021 01:11:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61684.108599; Tue, 05 Jan 2021 01:11: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 1kwat1-0005ZK-Ol; Tue, 05 Jan 2021 01:11:47 +0000 Received: by outflank-mailman (input) for mailman id 61684; Tue, 05 Jan 2021 01:11:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwat0-0005Z8-2l for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwasz-0004Or-WD for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwasz-0001hB-VS for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01: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=MAVp3JhO6ZdMTIU9mF9R5YkB6GV7C5+kSG/34nxxWsU=; b=G+8oYxiapnedkOA2NKY/99I9st jNuzxbQkCiBCirJEziGP+Tsu/JpWvgToyXwG/antAtkG4wRC/Wzjs54t3OGUj8luebkIpv7NW2UIJ xpKhzUFwJew90RH2GunCz0ybmBz4Dsl54ZZkTabNvtkKW+pfWTRVuvUKeF61/XxGFwBc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add handler for ID registers on arm64 Message-Id: Date: Tue, 05 Jan 2021 01:11:45 +0000 commit 07b9acea116e8329d613004766b8606756986db5 Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:05 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:25:14 2021 -0800 xen/arm: Add handler for ID registers on arm64 Add vsysreg emulation for registers trapped when TID3 bit is activated in HSR. The emulation is returning the value stored in cpuinfo_guest structure for know registers and is handling reserved registers as RAZ. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/vsysreg.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/xen/arch/arm/arm64/vsysreg.c b/xen/arch/arm/arm64/vsysreg.c index 8a85507d9d..41f18612c6 100644 --- a/xen/arch/arm/arm64/vsysreg.c +++ b/xen/arch/arm/arm64/vsysreg.c @@ -69,6 +69,14 @@ TVM_REG(CONTEXTIDR_EL1) break; \ } +/* Macro to generate easily case for ID co-processor emulation */ +#define GENERATE_TID3_INFO(reg, field, offset) \ + case HSR_SYSREG_##reg: \ + { \ + return handle_ro_read_val(regs, regidx, hsr.sysreg.read, hsr, \ + 1, guest_cpuinfo.field.bits[offset]); \ + } + void do_sysreg(struct cpu_user_regs *regs, const union hsr hsr) { @@ -259,6 +267,80 @@ void do_sysreg(struct cpu_user_regs *regs, */ return handle_raz_wi(regs, regidx, hsr.sysreg.read, hsr, 1); + /* + * HCR_EL2.TID3 + * + * This is trapping most Identification registers used by a guest + * to identify the processor features + */ + GENERATE_TID3_INFO(ID_PFR0_EL1, pfr32, 0) + GENERATE_TID3_INFO(ID_PFR1_EL1, pfr32, 1) + GENERATE_TID3_INFO(ID_PFR2_EL1, pfr32, 2) + GENERATE_TID3_INFO(ID_DFR0_EL1, dbg32, 0) + GENERATE_TID3_INFO(ID_DFR1_EL1, dbg32, 1) + GENERATE_TID3_INFO(ID_AFR0_EL1, aux32, 0) + GENERATE_TID3_INFO(ID_MMFR0_EL1, mm32, 0) + GENERATE_TID3_INFO(ID_MMFR1_EL1, mm32, 1) + GENERATE_TID3_INFO(ID_MMFR2_EL1, mm32, 2) + GENERATE_TID3_INFO(ID_MMFR3_EL1, mm32, 3) + GENERATE_TID3_INFO(ID_MMFR4_EL1, mm32, 4) + GENERATE_TID3_INFO(ID_MMFR5_EL1, mm32, 5) + GENERATE_TID3_INFO(ID_ISAR0_EL1, isa32, 0) + GENERATE_TID3_INFO(ID_ISAR1_EL1, isa32, 1) + GENERATE_TID3_INFO(ID_ISAR2_EL1, isa32, 2) + GENERATE_TID3_INFO(ID_ISAR3_EL1, isa32, 3) + GENERATE_TID3_INFO(ID_ISAR4_EL1, isa32, 4) + GENERATE_TID3_INFO(ID_ISAR5_EL1, isa32, 5) + GENERATE_TID3_INFO(ID_ISAR6_EL1, isa32, 6) + GENERATE_TID3_INFO(MVFR0_EL1, mvfr, 0) + GENERATE_TID3_INFO(MVFR1_EL1, mvfr, 1) + GENERATE_TID3_INFO(MVFR2_EL1, mvfr, 2) + GENERATE_TID3_INFO(ID_AA64PFR0_EL1, pfr64, 0) + GENERATE_TID3_INFO(ID_AA64PFR1_EL1, pfr64, 1) + GENERATE_TID3_INFO(ID_AA64DFR0_EL1, dbg64, 0) + GENERATE_TID3_INFO(ID_AA64DFR1_EL1, dbg64, 1) + GENERATE_TID3_INFO(ID_AA64ISAR0_EL1, isa64, 0) + GENERATE_TID3_INFO(ID_AA64ISAR1_EL1, isa64, 1) + GENERATE_TID3_INFO(ID_AA64MMFR0_EL1, mm64, 0) + GENERATE_TID3_INFO(ID_AA64MMFR1_EL1, mm64, 1) + GENERATE_TID3_INFO(ID_AA64MMFR2_EL1, mm64, 2) + GENERATE_TID3_INFO(ID_AA64AFR0_EL1, aux64, 0) + GENERATE_TID3_INFO(ID_AA64AFR1_EL1, aux64, 1) + GENERATE_TID3_INFO(ID_AA64ZFR0_EL1, zfr64, 0) + + /* + * Those cases are catching all Reserved registers trapped by TID3 which + * currently have no assignment. + * HCR.TID3 is trapping all registers in the group 3: + * Op0 == 3, op1 == 0, CRn == c0,CRm == {c1-c7}, op2 == {0-7}. + * Those registers are defined as being RO in the Arm Architecture + * Reference manual Armv8 (Chapter D12.3.2 of issue F.c) so handle them + * as Read-only read as zero. + */ + case HSR_SYSREG(3,0,c0,c3,3): + case HSR_SYSREG(3,0,c0,c3,7): + case HSR_SYSREG(3,0,c0,c4,2): + case HSR_SYSREG(3,0,c0,c4,3): + case HSR_SYSREG(3,0,c0,c4,5): + case HSR_SYSREG(3,0,c0,c4,6): + case HSR_SYSREG(3,0,c0,c4,7): + case HSR_SYSREG(3,0,c0,c5,2): + case HSR_SYSREG(3,0,c0,c5,3): + case HSR_SYSREG(3,0,c0,c5,6): + case HSR_SYSREG(3,0,c0,c5,7): + case HSR_SYSREG(3,0,c0,c6,2): + case HSR_SYSREG(3,0,c0,c6,3): + case HSR_SYSREG(3,0,c0,c6,4): + case HSR_SYSREG(3,0,c0,c6,5): + case HSR_SYSREG(3,0,c0,c6,6): + case HSR_SYSREG(3,0,c0,c6,7): + case HSR_SYSREG(3,0,c0,c7,3): + case HSR_SYSREG(3,0,c0,c7,4): + case HSR_SYSREG(3,0,c0,c7,5): + case HSR_SYSREG(3,0,c0,c7,6): + case HSR_SYSREG(3,0,c0,c7,7): + return handle_ro_raz(regs, regidx, hsr.sysreg.read, hsr, 1); + /* * HCR_EL2.TIDCP * -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 01:11:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 01:11:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61685.108603 (Exim 4.92) (envelope-from ) id 1kwatB-0005cZ-TO; Tue, 05 Jan 2021 01:11:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61685.108603; Tue, 05 Jan 2021 01:11: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 1kwatB-0005cR-QN; Tue, 05 Jan 2021 01:11:57 +0000 Received: by outflank-mailman (input) for mailman id 61685; Tue, 05 Jan 2021 01:11:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwatA-0005bx-4S for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwatA-0004Ox-3e for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwatA-0001ho-1x for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:11:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=R8erzoFhGrXU/NtYe3xgusiPJvIrGL9/ZF19rdm3aKE=; b=RcLQALETrGFf7fgO4hKIOd4PSY UrwsGq7sn9Ktjaz6JnB/hGhOo+U1+LoWMknECS+KYeZtjZBdTlSc1Yde1wX085d9cqzg2Rbfdy6u6 aL9yxrtYHJm8h60lx7+oNFuqSHwi9r3eqvNsjGhv7ORMRHAXwIC4C6Q5g2zXfevZ8g2E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add handler for cp15 ID registers Message-Id: Date: Tue, 05 Jan 2021 01:11:56 +0000 commit 8f81064a07c64952931eafdd9a9a3017ed6ffd26 Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:06 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:26:41 2021 -0800 xen/arm: Add handler for cp15 ID registers Add support for emulation of cp15 based ID registers (on arm32 or when running a 32bit guest on arm64). The handlers are returning the values stored in the guest_cpuinfo structure for known registers and RAZ for all reserved registers. In the current status the MVFR registers are no supported. Signed-off-by: Bertrand Marquis [Stefano: fix code style] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini --- xen/arch/arm/vcpreg.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index cdc91cdf5b..cbab95b37a 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -155,6 +155,24 @@ TVM_REG32(CONTEXTIDR, CONTEXTIDR_EL1) break; \ } +/* Macro to generate easily case for ID co-processor emulation */ +#define GENERATE_TID3_INFO(reg, field, offset) \ + case HSR_CPREG32(reg): \ + { \ + return handle_ro_read_val(regs, regidx, cp32.read, hsr, 1, \ + guest_cpuinfo.field.bits[offset]);\ + } + +/* helper to define cases for all registers for one CRm value */ +#define HSR_CPREG32_TID3_CASES(REG) case HSR_CPREG32(p15,0,c0,REG,0): \ + case HSR_CPREG32(p15,0,c0,REG,1): \ + case HSR_CPREG32(p15,0,c0,REG,2): \ + case HSR_CPREG32(p15,0,c0,REG,3): \ + case HSR_CPREG32(p15,0,c0,REG,4): \ + case HSR_CPREG32(p15,0,c0,REG,5): \ + case HSR_CPREG32(p15,0,c0,REG,6): \ + case HSR_CPREG32(p15,0,c0,REG,7) + void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) { const struct hsr_cp32 cp32 = hsr.cp32; @@ -286,6 +304,53 @@ void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) */ return handle_raz_wi(regs, regidx, cp32.read, hsr, 1); + /* + * HCR_EL2.TID3 + * + * This is trapping most Identification registers used by a guest + * to identify the processor features + */ + GENERATE_TID3_INFO(ID_PFR0, pfr32, 0) + GENERATE_TID3_INFO(ID_PFR1, pfr32, 1) + GENERATE_TID3_INFO(ID_PFR2, pfr32, 2) + GENERATE_TID3_INFO(ID_DFR0, dbg32, 0) + GENERATE_TID3_INFO(ID_DFR1, dbg32, 1) + GENERATE_TID3_INFO(ID_AFR0, aux32, 0) + GENERATE_TID3_INFO(ID_MMFR0, mm32, 0) + GENERATE_TID3_INFO(ID_MMFR1, mm32, 1) + GENERATE_TID3_INFO(ID_MMFR2, mm32, 2) + GENERATE_TID3_INFO(ID_MMFR3, mm32, 3) + GENERATE_TID3_INFO(ID_MMFR4, mm32, 4) + GENERATE_TID3_INFO(ID_MMFR5, mm32, 5) + GENERATE_TID3_INFO(ID_ISAR0, isa32, 0) + GENERATE_TID3_INFO(ID_ISAR1, isa32, 1) + GENERATE_TID3_INFO(ID_ISAR2, isa32, 2) + GENERATE_TID3_INFO(ID_ISAR3, isa32, 3) + GENERATE_TID3_INFO(ID_ISAR4, isa32, 4) + GENERATE_TID3_INFO(ID_ISAR5, isa32, 5) + GENERATE_TID3_INFO(ID_ISAR6, isa32, 6) + /* MVFR registers are in cp10 not cp15 */ + + /* + * Those cases are catching all Reserved registers trapped by TID3 which + * currently have no assignment. + * HCR.TID3 is trapping all registers in the group 3: + * coproc == p15, opc1 == 0, CRn == c0, CRm == {c2-c7}, opc2 == {0-7}. + * Those registers are defined as being RO in the Arm Architecture + * Reference manual Armv8 (Chapter D12.3.2 of issue F.c) so handle them + * as Read-only read as zero. + */ + case HSR_CPREG32(p15,0,c0,c3,0): + case HSR_CPREG32(p15,0,c0,c3,1): + case HSR_CPREG32(p15,0,c0,c3,2): + case HSR_CPREG32(p15,0,c0,c3,3): + case HSR_CPREG32(p15,0,c0,c3,7): + HSR_CPREG32_TID3_CASES(c4): + HSR_CPREG32_TID3_CASES(c5): + HSR_CPREG32_TID3_CASES(c6): + HSR_CPREG32_TID3_CASES(c7): + return handle_ro_raz(regs, regidx, cp32.read, hsr, 1); + /* * HCR_EL2.TIDCP * -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 01:12:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 01:12:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61686.108607 (Exim 4.92) (envelope-from ) id 1kwatL-0005ds-Vk; Tue, 05 Jan 2021 01:12:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61686.108607; Tue, 05 Jan 2021 01:12: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 1kwatL-0005dk-S2; Tue, 05 Jan 2021 01:12:07 +0000 Received: by outflank-mailman (input) for mailman id 61686; Tue, 05 Jan 2021 01:12:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwatK-0005da-7p for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:12:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwatK-0004Pd-70 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:12:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwatK-0001ij-68 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:12:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eW9Yort62dyGIrqBTmJ2YtIVETWEjsk0r0yrQSZV1kw=; b=1NSDcC+0SVGnuAq/jpbly1ysod z/Rj+m8sW8SxuMXU1GFwXvllWYXjMarLDdE9hkR8YujZjYn52Kw5/oxa23W/jHsYubKHZqtULEMhr iHyxFXis3FDXg91+79BoCCm6OFUWuyAKkI+OjtjPz7vc9r+ZDpJa2yNmzL0WDjMXRTj0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add CP10 exception support to handle MVFR Message-Id: Date: Tue, 05 Jan 2021 01:12:06 +0000 commit 73ff36144014218f796f7e07c1224a1c580012d1 Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:07 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:27:21 2021 -0800 xen/arm: Add CP10 exception support to handle MVFR Add support for cp10 exceptions decoding to be able to emulate the values for MVFR0, MVFR1 and MVFR2 when TID3 bit of HSR is activated. This is required for aarch32 guests accessing MVFR registers using vmrs and vmsr instructions. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/traps.c | 5 +++++ xen/arch/arm/vcpreg.c | 37 +++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/perfc_defn.h | 1 + xen/include/asm-arm/traps.h | 1 + 4 files changed, 44 insertions(+) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 22bd1bd4c6..28d9d64558 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2097,6 +2097,11 @@ void do_trap_guest_sync(struct cpu_user_regs *regs) perfc_incr(trap_cp14_dbg); do_cp14_dbg(regs, hsr); break; + case HSR_EC_CP10: + GUEST_BUG_ON(!psr_mode_is_32bit(regs)); + perfc_incr(trap_cp10); + do_cp10(regs, hsr); + break; case HSR_EC_CP: GUEST_BUG_ON(!psr_mode_is_32bit(regs)); perfc_incr(trap_cp); diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index cbab95b37a..55351fc087 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -664,6 +664,43 @@ void do_cp14_dbg(struct cpu_user_regs *regs, const union hsr hsr) inject_undef_exception(regs, hsr); } +void do_cp10(struct cpu_user_regs *regs, const union hsr hsr) +{ + const struct hsr_cp32 cp32 = hsr.cp32; + int regidx = cp32.reg; + + if ( !check_conditional_instr(regs, hsr) ) + { + advance_pc(regs, hsr); + return; + } + + switch ( hsr.bits & HSR_CP32_REGS_MASK ) + { + /* + * HCR.TID3 is trapping access to MVFR register used to identify the + * VFP/Simd using VMRS/VMSR instructions. + * Exception encoding is using MRC/MCR standard with the reg field in Crn + * as are declared MVFR0 and MVFR1 in cpregs.h + */ + GENERATE_TID3_INFO(MVFR0, mvfr, 0) + GENERATE_TID3_INFO(MVFR1, mvfr, 1) + GENERATE_TID3_INFO(MVFR2, mvfr, 2) + + default: + gdprintk(XENLOG_ERR, + "%s p10, %d, r%d, cr%d, cr%d, %d @ 0x%"PRIregister"\n", + cp32.read ? "mrc" : "mcr", + cp32.op1, cp32.reg, cp32.crn, cp32.crm, cp32.op2, regs->pc); + gdprintk(XENLOG_ERR, "unhandled 32-bit CP10 access %#x\n", + hsr.bits & HSR_CP32_REGS_MASK); + inject_undef_exception(regs, hsr); + return; + } + + advance_pc(regs, hsr); +} + void do_cp(struct cpu_user_regs *regs, const union hsr hsr) { const struct hsr_cp cp = hsr.cp; diff --git a/xen/include/asm-arm/perfc_defn.h b/xen/include/asm-arm/perfc_defn.h index 6a83185163..31f071222b 100644 --- a/xen/include/asm-arm/perfc_defn.h +++ b/xen/include/asm-arm/perfc_defn.h @@ -11,6 +11,7 @@ PERFCOUNTER(trap_cp15_64, "trap: cp15 64-bit access") PERFCOUNTER(trap_cp14_32, "trap: cp14 32-bit access") PERFCOUNTER(trap_cp14_64, "trap: cp14 64-bit access") PERFCOUNTER(trap_cp14_dbg, "trap: cp14 dbg access") +PERFCOUNTER(trap_cp10, "trap: cp10 access") PERFCOUNTER(trap_cp, "trap: cp access") PERFCOUNTER(trap_smc32, "trap: 32-bit smc") PERFCOUNTER(trap_hvc32, "trap: 32-bit hvc") diff --git a/xen/include/asm-arm/traps.h b/xen/include/asm-arm/traps.h index 997c37884e..c4a3d0fb1b 100644 --- a/xen/include/asm-arm/traps.h +++ b/xen/include/asm-arm/traps.h @@ -62,6 +62,7 @@ void do_cp15_64(struct cpu_user_regs *regs, const union hsr hsr); void do_cp14_32(struct cpu_user_regs *regs, const union hsr hsr); void do_cp14_64(struct cpu_user_regs *regs, const union hsr hsr); void do_cp14_dbg(struct cpu_user_regs *regs, const union hsr hsr); +void do_cp10(struct cpu_user_regs *regs, const union hsr hsr); void do_cp(struct cpu_user_regs *regs, const union hsr hsr); /* SMCCC handling */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 01:12:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 01:12:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61687.108611 (Exim 4.92) (envelope-from ) id 1kwatW-0005f9-0U; Tue, 05 Jan 2021 01:12:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61687.108611; Tue, 05 Jan 2021 01:12: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 1kwatV-0005f1-Te; Tue, 05 Jan 2021 01:12:17 +0000 Received: by outflank-mailman (input) for mailman id 61687; Tue, 05 Jan 2021 01:12:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwatU-0005es-BF for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:12:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwatU-0004Pn-AM for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:12:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwatU-0001jR-9O for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 01:12:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=V0EooCfE8joRX2pRKs5OttOaTMyZKUmlrOWC9FkFdrI=; b=VJM5ts5+5WUHTXMKziGJZJZ1y4 I+geWTlwCtYX/R2eRKWZWTdr3X5sJFbUS4gr5IbZTEhpBx3FwZCoIciLj4eV0pbZs/W+VQY2dXFPt VA8SkxH0FtAU8sA50Gl3CpzddTvvL+/PoNZRJ+s4gFnGVyIrcn4/nkZe8yg13DVwvLKQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Activate TID3 in HCR_EL2 Message-Id: Date: Tue, 05 Jan 2021 01:12:16 +0000 commit 6ea3e32a5e0e6ba0f568aa5fd5a6b016c0c21ca0 Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:08 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:27:32 2021 -0800 xen/arm: Activate TID3 in HCR_EL2 Activate TID3 bit in HCR register when starting a guest. This will trap all coprecessor ID registers so that we can give to guest values corresponding to what they can actually use and mask some features to guests even though they would be supported by the underlying hardware (like SVE or MPAM). Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 28d9d64558..c1a9ad6056 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -98,7 +98,7 @@ register_t get_default_hcr_flags(void) { return (HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_FMO|HCR_VM| (vwfi != NATIVE ? (HCR_TWI|HCR_TWE) : 0) | - HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP|HCR_FB|HCR_TSW); + HCR_TID3|HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP|HCR_FB|HCR_TSW); } static enum { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 04:11:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 04:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61716.108678 (Exim 4.92) (envelope-from ) id 1kwdgW-0005dl-3w; Tue, 05 Jan 2021 04:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61716.108678; Tue, 05 Jan 2021 04:11: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 1kwdgW-0005dd-0u; Tue, 05 Jan 2021 04:11:04 +0000 Received: by outflank-mailman (input) for mailman id 61716; Tue, 05 Jan 2021 04:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwdgU-0005dY-IZ for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 04:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwdgU-0007oJ-FE for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 04:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwdgU-0004h7-CP for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 04: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=BOp/qXKms89XBHav/c7snrLWSBCyHZQwJDaRRN1oFfU=; b=wClQH5rKhTZLoGEds0G8QNyMXy CsR2R40YXFLbIJL0LeHuTTXakHnVcA6tLZtzNGkZ0MygrFXLPncoyZkPy/LFxbC9l1eDFcHMAiA1f 4RWrtoTMvUSaSQSg+BUKWpVYMfh6a8Rh5mELrxMWWXbqHmlyutUGR1EQu9UAn33AaTc4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/p2m: fix p2m_add_foreign error path Message-Id: Date: Tue, 05 Jan 2021 04:11:02 +0000 commit 62dde2c1eff6d4e5d45883b78bdae5447e7d2d9c Author: Roger Pau Monné AuthorDate: Mon Jan 4 10:03:23 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 4 10:41:59 2021 +0000 x86/p2m: fix p2m_add_foreign error path One of the error paths in p2m_add_foreign could call put_page with a NULL page, thus triggering a fault. Split the checks into two different if statements, so the appropriate error path can be taken. Fixes: 173ae325026bd ('x86/p2m: tidy p2m_add_foreign() a little') Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/mm/p2m.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 487959b121..a4ebfc9b21 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -2601,8 +2601,13 @@ static int p2m_add_foreign(struct domain *tdom, unsigned long fgfn, * ram_rw | ram_logdirty | ram_ro | paging_out. */ page = get_page_from_gfn(fdom, fgfn, &p2mt, P2M_ALLOC); - if ( !page || - !p2m_is_ram(p2mt) || p2m_is_shared(p2mt) || p2m_is_hole(p2mt) ) + if ( !page ) + { + rc = -EINVAL; + goto out; + } + + if ( !p2m_is_ram(p2mt) || p2m_is_shared(p2mt) || p2m_is_hole(p2mt) ) { rc = -EINVAL; goto put_one; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:33:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61863.109049 (Exim 4.92) (envelope-from ) id 1kwlWL-0003mB-Ty; Tue, 05 Jan 2021 12:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61863.109049; Tue, 05 Jan 2021 12: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 1kwlWL-0003m3-Qz; Tue, 05 Jan 2021 12:33:05 +0000 Received: by outflank-mailman (input) for mailman id 61863; Tue, 05 Jan 2021 12:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlWL-0003ly-E6 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlWL-0000GY-Ax for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlWL-0005sr-9b for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12: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=tIEpAadyVG7DOjOoWDmu/iMWwhy53rZQcqCvDNv2btE=; b=A4bR0jWJxf9uuvAR29Ea4dltd5 /sYcD8tbBpifDCo2BOpiPUhSKUZL9s3E6G3R0sevod7EVld/PNFzzUfERwTFYv7Zwn6KuLP3S0ofh 8L3Ije7VbnZsdOIVu+i+9aQ1uId15XebkkNiu7oWtjTnSofnwE9kqw1sVi1nlgtC3YNc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/ACPI: fix S3 wakeup vector mapping Message-Id: Date: Tue, 05 Jan 2021 12:33:05 +0000 commit 0f089bbf43ecce6f27576cb548ba4341d0ec46a8 Author: Jan Beulich AuthorDate: Tue Jan 5 13:09:55 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:09:55 2021 +0100 x86/ACPI: fix S3 wakeup vector mapping Use of __acpi_map_table() here was at least close to an abuse already before, but it will now consistently return NULL here. Drop the layering violation and use set_fixmap() directly. Re-use of the ACPI fixmap area is hopefully going to remain "fine" for the time being. Add checks to acpi_enter_sleep(): The vector now needs to be contained within a single page, but the ACPI spec requires 64-byte alignment of FACS anyway. Also bail if no wakeup vector was determined in the first place, in part as preparation for a subsequent relaxation change. Fixes: 1c4aa69ca1e1 ("xen/acpi: Rework acpi_os_map_memory() and acpi_os_unmap_memory()") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/acpi/boot.c | 5 +++++ xen/arch/x86/acpi/power.c | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index cecb414681..b34bd6a581 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -443,6 +443,11 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) "FACS is shorter than ACPI spec allow: %#x", facs->length); + if (facs_pa % 64) + printk(KERN_WARNING PREFIX + "FACS is not 64-byte aligned: %#lx", + facs_pa); + acpi_sinfo.wakeup_vector = facs_pa + offsetof(struct acpi_table_facs, firmware_waking_vector); acpi_sinfo.vector_width = 32; diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 7f162a4df9..ad9b8733f3 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -174,17 +174,20 @@ static void acpi_sleep_prepare(u32 state) if ( state != ACPI_STATE_S3 ) return; - wakeup_vector_va = __acpi_map_table( - acpi_sinfo.wakeup_vector, sizeof(uint64_t)); - /* TBoot will set resume vector itself (when it is safe to do so). */ if ( tboot_in_measured_env() ) return; + set_fixmap(FIX_ACPI_END, acpi_sinfo.wakeup_vector); + wakeup_vector_va = fix_to_virt(FIX_ACPI_END) + + PAGE_OFFSET(acpi_sinfo.wakeup_vector); + if ( acpi_sinfo.vector_width == 32 ) *(uint32_t *)wakeup_vector_va = bootsym_phys(wakeup_start); else *(uint64_t *)wakeup_vector_va = bootsym_phys(wakeup_start); + + clear_fixmap(FIX_ACPI_END); } static void acpi_sleep_post(u32 state) {} @@ -331,6 +334,12 @@ static long enter_state_helper(void *data) */ int acpi_enter_sleep(struct xenpf_enter_acpi_sleep *sleep) { + if ( sleep->sleep_state == ACPI_STATE_S3 && + (!acpi_sinfo.wakeup_vector || !acpi_sinfo.vector_width || + (PAGE_OFFSET(acpi_sinfo.wakeup_vector) > + PAGE_SIZE - acpi_sinfo.vector_width / 8)) ) + return -EOPNOTSUPP; + if ( sleep->flags & XENPF_ACPI_SLEEP_EXTENDED ) { if ( !acpi_sinfo.sleep_control.address || -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:33:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:33:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61864.109053 (Exim 4.92) (envelope-from ) id 1kwlWV-0003mz-VS; Tue, 05 Jan 2021 12:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61864.109053; Tue, 05 Jan 2021 12: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 1kwlWV-0003mr-SV; Tue, 05 Jan 2021 12:33:15 +0000 Received: by outflank-mailman (input) for mailman id 61864; Tue, 05 Jan 2021 12:33:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlWV-0003mm-GM for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlWV-0000H1-F8 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlWV-0005tT-D4 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12: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=/MeQtFIV5ShCQ1bSPTlKTolpHuZXNB9T6H/z8H+vhjY=; b=hT/IrlQtB34cFQwtvlxqRfHces +IyP0Hi6d61uO+BToEcGqJw4UIlBAd8Q+iyJRNG2YKYLNgxTSvPcL3AKqambT08KKVXlAYzVSnHrw XmmZFyv3t+Ta7LjKCR2kxh14pczNA8IPNgA5J7QqE3PJohkO5neu39xAe/k/pTgtxEmw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/ACPI: don't invalidate S5 data when S3 wakeup vector cannot be determined Message-Id: Date: Tue, 05 Jan 2021 12:33:15 +0000 commit 16ca5b3f873f17f4fbdaecf46c133e1aa3d623b2 Author: Jan Beulich AuthorDate: Tue Jan 5 13:11:04 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:11:04 2021 +0100 x86/ACPI: don't invalidate S5 data when S3 wakeup vector cannot be determined We can be more tolerant as long as the data collected from FACS is only needed to enter S3. A prior change already added suitable checking to acpi_enter_sleep(). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/acpi/boot.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index b34bd6a581..6345490f93 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -420,22 +420,22 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) facs_pa = (uint64_t)fadt->facs; } if (!facs_pa) - goto bad; + return; facs = acpi_os_map_memory(facs_pa, sizeof(*facs)); if (!facs) - goto bad; + return; if (strncmp(facs->signature, "FACS", 4)) { printk(KERN_ERR PREFIX "Invalid FACS signature %.4s\n", facs->signature); - goto bad; + goto done; } if (facs->length < 24) { printk(KERN_ERR PREFIX "Invalid FACS table length: %#x", facs->length); - goto bad; + goto done; } if (facs->length < 64) @@ -452,6 +452,7 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) offsetof(struct acpi_table_facs, firmware_waking_vector); acpi_sinfo.vector_width = 32; + done: acpi_os_unmap_memory(facs, sizeof(*facs)); printk(KERN_INFO PREFIX -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:33:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:33:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61865.109057 (Exim 4.92) (envelope-from ) id 1kwlWh-0003oV-13; Tue, 05 Jan 2021 12:33:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61865.109057; Tue, 05 Jan 2021 12:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlWg-0003oL-U9; Tue, 05 Jan 2021 12:33:26 +0000 Received: by outflank-mailman (input) for mailman id 61865; Tue, 05 Jan 2021 12:33:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlWf-0003oC-Jy for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlWf-0000HR-JA for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlWf-0005uC-HA for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12: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=iLind45atsNNnEzD+oJcU8DRj7k7fxjjoa8iuxgrfGg=; b=caBp0LaODt6hREgJ3btbcoxQwb BZx0JQbMH8lwvdCCTjEqrhUzT4RyTacJm61zrmDt8t2vNjPx5U89Ggz6fsXpN64mLBCI7LEVU43ek 7CrA5DdcvGsautIlaKTI/SV5EIh2di35l6KlVJUJCUf7nS9ydat25CH0FqlxHdVp9nes=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/build: limit rebuilding of asm-offsets.h Message-Id: Date: Tue, 05 Jan 2021 12:33:25 +0000 commit 7d2d7a43d0141de69d837854ce139bcd47a7b859 Author: Jan Beulich AuthorDate: Tue Jan 5 13:12:15 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:12:15 2021 +0100 x86/build: limit rebuilding of asm-offsets.h This file has a long dependencies list (through asm-offsets.[cs]) and a long list of dependents. IOW if any of the former changes, all of the latter will be rebuilt, even if there's no actual change to the generated file. This is the primary scenario we have the move-if-changed macro for. Since debug information may easily cause the file contents to change in benign ways, also avoid emitting this into the output file. Finally already before this change *.new files needed including in what gets removed by the "clean" target. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 863aed043f..7f4f5ed96f 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -241,7 +241,8 @@ efi/buildid.o efi/relocs-dummy.o: $(BASEDIR)/arch/x86/efi/built_in.o efi/buildid.o efi/relocs-dummy.o: ; asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c $(BASEDIR)/include/asm-x86/asm-macros.h - $(CC) $(filter-out -Wa$(comma)% -flto,$(c_flags)) -S -o $@ $< + $(CC) $(filter-out -Wa$(comma)% -flto,$(c_flags)) -S -g0 -o $@.new $< + $(call move-if-changed,$@.new,$@) asm-macros.i: CFLAGS-y += -D__ASSEMBLY__ -P @@ -268,7 +269,7 @@ efi/mkreloc: efi/mkreloc.c .PHONY: clean clean:: - rm -f asm-offsets.s *.lds boot/*.o boot/*~ boot/core boot/mkelf32 + rm -f asm-offsets.s *.lds *.new boot/*.o boot/*~ boot/core boot/mkelf32 rm -f asm-macros.i $(BASEDIR)/include/asm-x86/asm-macros.* rm -f $(BASEDIR)/.xen-syms.[0-9]* boot/.*.d $(BASEDIR)/.xen.elf32 rm -f $(BASEDIR)/.xen.efi.[0-9]* efi/*.efi efi/mkreloc -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:33:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:33:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61866.109062 (Exim 4.92) (envelope-from ) id 1kwlWr-0003pq-2u; Tue, 05 Jan 2021 12:33:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61866.109062; Tue, 05 Jan 2021 12:33:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlWq-0003pi-Vn; Tue, 05 Jan 2021 12:33:36 +0000 Received: by outflank-mailman (input) for mailman id 61866; Tue, 05 Jan 2021 12:33:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlWp-0003pa-My for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlWp-0000Hf-MA for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlWp-0005um-LF for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NIxa/RbOA8oG4AbHMal+tDT7Dyqb5wrdxsibqGhdSuA=; b=eIMdqPOOK03AGppAWyu4z94sFV +nCmN4snUmKB69yxKUIZ+gSvUeheGQ6ED8lYKiYlh4okWVT8WZiMCtcvTJqWQuC1bgxfSu12RK2DS BuNMvB3+O96XVB/im4mmywNu2kXSzBza2pUC7YwN2+ni+MEl3q+8iwI1nGwKGCMZwNTA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/build: limit #include-ing by asm-offsets.c Message-Id: Date: Tue, 05 Jan 2021 12:33:35 +0000 commit bb4ef1507d2d6fca8b52cd645c94112ac7924f4c Author: Jan Beulich AuthorDate: Tue Jan 5 13:12:37 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:12:37 2021 +0100 x86/build: limit #include-ing by asm-offsets.c This file has a long dependencies list and asm-offsets.h, generated from it, has a long list of dependents. IOW if any of the former changes, all of the latter will be rebuilt, even if there's no actual change to the generated file. Therefore avoid including headers we don't actually need (generally or configuration dependent). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/x86_64/asm-offsets.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 9f66a69be7..67ed86a648 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -5,11 +5,13 @@ */ #define COMPILE_OFFSETS +#ifdef CONFIG_PERF_COUNTERS #include +#endif #include -#include +#ifdef CONFIG_PV #include -#include +#endif #include #include #include @@ -101,7 +103,6 @@ void __dummy__(void) #ifdef CONFIG_PV OFFSET(DOMAIN_is_32bit_pv, struct domain, arch.pv.is_32bit); BLANK(); -#endif OFFSET(VCPUINFO_upcall_pending, struct vcpu_info, evtchn_upcall_pending); OFFSET(VCPUINFO_upcall_mask, struct vcpu_info, evtchn_upcall_mask); @@ -110,6 +111,7 @@ void __dummy__(void) OFFSET(COMPAT_VCPUINFO_upcall_pending, struct compat_vcpu_info, evtchn_upcall_pending); OFFSET(COMPAT_VCPUINFO_upcall_mask, struct compat_vcpu_info, evtchn_upcall_mask); BLANK(); +#endif OFFSET(CPUINFO_guest_cpu_user_regs, struct cpu_info, guest_cpu_user_regs); OFFSET(CPUINFO_verw_sel, struct cpu_info, verw_sel); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:33:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:33:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61867.109066 (Exim 4.92) (envelope-from ) id 1kwlX1-0003rD-4L; Tue, 05 Jan 2021 12:33:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61867.109066; Tue, 05 Jan 2021 12:33:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlX1-0003r0-0u; Tue, 05 Jan 2021 12:33:47 +0000 Received: by outflank-mailman (input) for mailman id 61867; Tue, 05 Jan 2021 12:33:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlWz-0003qs-Pp for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlWz-0000Ht-P0 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlWz-0005vW-OF for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sJG0+WyF4ZRVNX/JE/Uyg4+0F8T1gGH9xaGGOYcnCBQ=; b=lSejpyairV8sn0nvU9ZWinDkjn YiHfzSRpnEyQbZnj1VoAgNRofG6H1EpH+Vh+O6CuGl0iSnad30di8Ruzms6991hvIaqNbxsUwLa61 vOgLQM9qg2BJJiVae2t5aVm+sc5kyCBxLPO21K/1Ngy/jg4Ew7o2+hoAwb5dPvSjBX1c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/build: restrict contents of asm-offsets.h when !HVM / !PV Message-Id: Date: Tue, 05 Jan 2021 12:33:45 +0000 commit b1c014aa93bd48d7111271ce2dd1b892d98a92fd Author: Jan Beulich AuthorDate: Tue Jan 5 13:13:18 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:13:18 2021 +0100 x86/build: restrict contents of asm-offsets.h when !HVM / !PV This file has a long dependencies list (through asm-offsets.[cs]) and a long list of dependents. IOW if any of the former changes, all of the latter will be rebuilt, even if there's no actual change to the generated file. Therefore avoid producing symbols we don't actually need, depending on configuration. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/x86_64/asm-offsets.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 67ed86a648..ce030b124f 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -84,6 +84,7 @@ void __dummy__(void) DEFINE(_VGCF_syscall_disables_events, _VGCF_syscall_disables_events); BLANK(); +#ifdef CONFIG_HVM OFFSET(VCPU_svm_vmcb_pa, struct vcpu, arch.hvm.svm.vmcb_pa); OFFSET(VCPU_svm_vmcb, struct vcpu, arch.hvm.svm.vmcb); BLANK(); @@ -99,6 +100,7 @@ void __dummy__(void) OFFSET(VCPU_nhvm_p2m, struct vcpu, arch.hvm.nvcpu.nv_p2m); OFFSET(VCPU_nsvm_hap_enabled, struct vcpu, arch.hvm.nvcpu.u.nsvm.ns_hap_enabled); BLANK(); +#endif #ifdef CONFIG_PV OFFSET(DOMAIN_is_32bit_pv, struct domain, arch.pv.is_32bit); @@ -128,6 +130,7 @@ void __dummy__(void) DEFINE(CPUINFO_sizeof, sizeof(struct cpu_info)); BLANK(); +#ifdef CONFIG_PV OFFSET(TRAPINFO_eip, struct trap_info, address); OFFSET(TRAPINFO_cs, struct trap_info, cs); OFFSET(TRAPINFO_flags, struct trap_info, flags); @@ -139,6 +142,7 @@ void __dummy__(void) OFFSET(TRAPBOUNCE_cs, struct trap_bounce, cs); OFFSET(TRAPBOUNCE_eip, struct trap_bounce, eip); BLANK(); +#endif OFFSET(VCPUMSR_spec_ctrl_raw, struct vcpu_msrs, spec_ctrl.raw); BLANK(); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:33:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:33:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61868.109069 (Exim 4.92) (envelope-from ) id 1kwlXB-0003sU-5K; Tue, 05 Jan 2021 12:33:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61868.109069; Tue, 05 Jan 2021 12:33:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlXB-0003sL-2L; Tue, 05 Jan 2021 12:33:57 +0000 Received: by outflank-mailman (input) for mailman id 61868; Tue, 05 Jan 2021 12:33:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlX9-0003sB-St for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlX9-0000I0-S9 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:33:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlX9-0005wV-RK for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12: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=Azk+Otf5eaRiTiX9TiOtzJGoltUpy0815dSPpFP9lmk=; b=dGlF7vAk7rd9q6JgLZzhCA85/3 B4CdWrmbiau8+wcRy6M+roTsrRxsxh59pAVeY4MbFGPd8+LYi1BflmyYmC7ivyFplw1b/PumldnKm L7JTHGSk9nmGUT5NSvUBR2OBIlo500TCjyXbnPfnbi9LAQEEfZmz+ruZglestmQlQvPg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: hypercall vector is unused when !PV32 Message-Id: Date: Tue, 05 Jan 2021 12:33:55 +0000 commit b06ffca9e7c9a6088e98a8d72e905c03dc585225 Author: Jan Beulich AuthorDate: Tue Jan 5 13:17:02 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:17:02 2021 +0100 x86: hypercall vector is unused when !PV32 This vector can be used as an ordinary interrupt handling one in this case. To be sure no references are left, make the #define itself conditional. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/irq.c | 6 +++++- xen/arch/x86/pv/traps.c | 4 ++++ xen/arch/x86/x86_64/compat/entry.S | 4 ++++ xen/arch/x86/x86_64/entry.S | 4 +++- xen/include/asm-x86/mach-default/irq_vectors.h | 5 ++++- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 768a8fc7c9..e315fef4a6 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -443,8 +443,12 @@ int __init init_irq_data(void) irq_max_guests = 32; #ifdef CONFIG_PV - /* Never allocate the hypercall vector or Linux/BSD fast-trap vector. */ + /* Never allocate the Linux/BSD fast-trap vector. */ set_bit(LEGACY_SYSCALL_VECTOR, used_vectors); +#endif + +#ifdef CONFIG_PV32 + /* Never allocate the hypercall vector. */ set_bit(HYPERCALL_VECTOR, used_vectors); #endif diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index d97ebf7890..7439b76df8 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -30,6 +30,7 @@ #include #include +#ifdef CONFIG_PV32 void do_entry_int82(struct cpu_user_regs *regs) { if ( unlikely(untrusted_msi) ) @@ -37,6 +38,7 @@ void do_entry_int82(struct cpu_user_regs *regs) pv_hypercall(regs); } +#endif void pv_inject_event(const struct x86_event *event) { @@ -155,9 +157,11 @@ static void nmi_softirq(void) void __init pv_trap_init(void) { +#ifdef CONFIG_PV32 /* The 32-on-64 hypercall vector is only accessible from ring 1. */ _set_gate(idt_table + HYPERCALL_VECTOR, SYS_DESC_trap_gate, 1, entry_int82); +#endif /* Fast trap for int80 (faster than taking the #GP-fixup path). */ _set_gate(idt_table + LEGACY_SYSCALL_VECTOR, SYS_DESC_trap_gate, 3, diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 3b2136b272..16a2f439a7 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -11,6 +11,8 @@ #include #include +#ifdef CONFIG_PV32 + ENTRY(entry_int82) ASM_CLAC pushq $0 @@ -27,6 +29,8 @@ ENTRY(entry_int82) mov %rsp, %rdi call do_entry_int82 +#endif /* CONFIG_PV32 */ + /* %rbx: struct vcpu */ ENTRY(compat_test_all_events) ASSERT_NOT_IN_ATOMIC diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 526c388458..c16b3c90be 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -985,8 +985,10 @@ autogen_stubs: /* Automatically generated stubs. */ .rept X86_NR_VECTORS /* Common interrupts, heading towards do_IRQ(). */ -#ifdef CONFIG_PV +#if defined(CONFIG_PV32) .if vec >= FIRST_IRQ_VECTOR && vec != HYPERCALL_VECTOR && vec != LEGACY_SYSCALL_VECTOR +#elif defined(CONFIG_PV) + .if vec >= FIRST_IRQ_VECTOR && vec != LEGACY_SYSCALL_VECTOR #else .if vec >= FIRST_IRQ_VECTOR #endif diff --git a/xen/include/asm-x86/mach-default/irq_vectors.h b/xen/include/asm-x86/mach-default/irq_vectors.h index 3de1d96de9..f546aedd87 100644 --- a/xen/include/asm-x86/mach-default/irq_vectors.h +++ b/xen/include/asm-x86/mach-default/irq_vectors.h @@ -22,7 +22,10 @@ #define FIRST_LEGACY_VECTOR FIRST_DYNAMIC_VECTOR #define LAST_LEGACY_VECTOR (FIRST_LEGACY_VECTOR + 0xf) -#define HYPERCALL_VECTOR 0x82 +#ifdef CONFIG_PV32 +#define HYPERCALL_VECTOR 0x82 +#endif + #define LEGACY_SYSCALL_VECTOR 0x80 /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:34:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:34:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61869.109073 (Exim 4.92) (envelope-from ) id 1kwlXL-0003tx-6u; Tue, 05 Jan 2021 12:34:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61869.109073; Tue, 05 Jan 2021 12:34:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlXL-0003to-3p; Tue, 05 Jan 2021 12:34:07 +0000 Received: by outflank-mailman (input) for mailman id 61869; Tue, 05 Jan 2021 12:34:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlXJ-0003tf-Vn for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlXJ-0000IL-V4 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlXJ-0005xe-UH for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12: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=nEWdZgXnseE89An9zgYS8dvKG3COvs5xB6eJ3TWSkmM=; b=fxf+faBoNzt7HuGTbzLZAjcAc+ e9oyDsi6SxdctOcprjdkmTLy7MRerBvV97uqFrspnrPMVg3W/XLl/r8+SkJofFFoZ9Qq1sdIDWzKE 03nrPRry3+mhfmQMf796jubhyIJ50BafrFNFxMMXAMq2/chIFrXXuih8sHHcLvcwVn5A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vPCI: tolerate (un)masking a disabled MSI-X entry Message-Id: Date: Tue, 05 Jan 2021 12:34:05 +0000 commit 04b090366ca59e8a75837c822df261a8d0bd1a30 Author: Jan Beulich AuthorDate: Tue Jan 5 13:17:54 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:17:54 2021 +0100 x86/vPCI: tolerate (un)masking a disabled MSI-X entry None of the four reasons causing vpci_msix_arch_mask_entry() to get called (there's just a single call site) are impossible or illegal prior to an entry actually having got set up: - the entry may remain masked (in this case, however, a prior masked -> unmasked transition would already not have worked), - MSI-X may not be enabled, - the global mask bit may be set, - the entry may not otherwise have been updated. Hence the function asserting that the entry was previously set up was simply wrong. Since the caller tracks the masked state (and setting up of an entry would only be effected when that software bit is clear), it's okay to skip both masking and unmasking requests in this case. Fixes: d6281be9d0145 ('vpci/msix: add MSI-X handlers') Reported-by: Manuel Bouyer Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Tested-by: Manuel Bouyer --- xen/arch/x86/hvm/vmsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 7ca19353ab..ddcfc6c229 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -840,8 +840,8 @@ void vpci_msi_arch_print(const struct vpci_msi *msi) void vpci_msix_arch_mask_entry(struct vpci_msix_entry *entry, const struct pci_dev *pdev, bool mask) { - ASSERT(entry->arch.pirq != INVALID_PIRQ); - vpci_mask_pirq(pdev->domain, entry->arch.pirq, mask); + if ( entry->arch.pirq != INVALID_PIRQ ) + vpci_mask_pirq(pdev->domain, entry->arch.pirq, mask); } int vpci_msix_arch_enable_entry(struct vpci_msix_entry *entry, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:34:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:34:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61870.109077 (Exim 4.92) (envelope-from ) id 1kwlXV-0003vQ-9o; Tue, 05 Jan 2021 12:34:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61870.109077; Tue, 05 Jan 2021 12: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 1kwlXV-0003vH-6f; Tue, 05 Jan 2021 12:34:17 +0000 Received: by outflank-mailman (input) for mailman id 61870; Tue, 05 Jan 2021 12:34:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlXU-0003v6-3n for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlXU-0000Ij-2v for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlXU-0005yi-1F for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LZRyXuDuGhhCW2RdgbJaKlMraVkgJJnp62VICZz89Rc=; b=gZQpGdkPPbBYCFBsdXWZB/od5a r6hEalVp8WufgANbuEM+vd3yBkK43gz10JET/t8r8FQZiAngwourdlj3P5r/3MTXV4NHUm5Mhisv1 U+3rvwqXOVDCKJ0vUgj4kaj5AetFzusHz0PFJ6Pdq89m+buG6Ucv5qhWaU8wWXeQCRCY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vPCI: check address in vpci_msi_update() Message-Id: Date: Tue, 05 Jan 2021 12:34:16 +0000 commit 0f7bcaf19f7c67ee8c07d1674b2bbb70f16c2d11 Author: Jan Beulich AuthorDate: Tue Jan 5 13:18:26 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:18:26 2021 +0100 x86/vPCI: check address in vpci_msi_update() If the upper address bits don't match the interrupt delivery address space window, entirely different behavior would need to be implemented. Refuse such requests for the time being. Replace adjacent hard tabs while introducing MSI_ADDR_BASE_MASK. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/vmsi.c | 7 +++++++ xen/include/asm-x86/msi.h | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index ddcfc6c229..a2ac82c95c 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -682,6 +682,13 @@ static int vpci_msi_update(const struct pci_dev *pdev, uint32_t data, ASSERT(pcidevs_locked()); + if ( (address & MSI_ADDR_BASE_MASK) != MSI_ADDR_HEADER ) + { + gdprintk(XENLOG_ERR, "%pp: PIRQ %u: unsupported address %lx\n", + &pdev->sbdf, pirq, address); + return -EOPNOTSUPP; + } + for ( i = 0; i < vectors; i++ ) { uint8_t vector = MASK_EXTR(data, MSI_DATA_VECTOR_MASK); diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 18cf2de61e..e228b0f3f3 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -36,8 +36,9 @@ * Shift/mask fields for msi address */ -#define MSI_ADDR_BASE_HI 0 -#define MSI_ADDR_BASE_LO 0xfee00000 +#define MSI_ADDR_BASE_HI 0 +#define MSI_ADDR_BASE_LO 0xfee00000 +#define MSI_ADDR_BASE_MASK (~0xfffff) #define MSI_ADDR_HEADER MSI_ADDR_BASE_LO #define MSI_ADDR_DESTMODE_SHIFT 2 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:34:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:34:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61871.109081 (Exim 4.92) (envelope-from ) id 1kwlXf-0003we-B2; Tue, 05 Jan 2021 12:34:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61871.109081; Tue, 05 Jan 2021 12: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 1kwlXf-0003wW-89; Tue, 05 Jan 2021 12:34:27 +0000 Received: by outflank-mailman (input) for mailman id 61871; Tue, 05 Jan 2021 12:34:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlXe-0003wO-6w for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlXe-0000Ip-6E for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlXe-00060e-56 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34: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=wslPXbksgF6YjkeUn5spr7L5CIrhwiff8VjpHJk8DDk=; b=CbTCmRQNzkMToriQuOLf9stWEY FclbXhSRAx/wU4+aUCKENfXZEUXFWEEQ0KKb7WqjlryQYJYPEchz1eX7KCWznrgR5GJA8n7sTwW6F wvQBAHT9xTy75AIbH0B5PTp61p851wtMZVjrq74/X36PJOzKZnaHz3LQyDHTJaoTQ38U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vPCI/MSI-X: make use of xzalloc_flex_struct() Message-Id: Date: Tue, 05 Jan 2021 12:34:26 +0000 commit 4bac861340cf6551cfdac308621a984464701405 Author: Jan Beulich AuthorDate: Tue Jan 5 13:19:28 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:19:28 2021 +0100 vPCI/MSI-X: make use of xzalloc_flex_struct() ... instead of effectively open-coding it in a type-unsafe way. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/msix.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index 64dd0a929c..e008f92c1c 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -23,8 +23,6 @@ #include #include -#define VMSIX_SIZE(num) offsetof(struct vpci_msix, entries[num]) - #define VMSIX_ADDR_IN_RANGE(addr, vpci, nr) \ ((addr) >= vmsix_table_addr(vpci, nr) && \ (addr) < vmsix_table_addr(vpci, nr) + vmsix_table_size(vpci, nr)) @@ -455,7 +453,8 @@ static int init_msix(struct pci_dev *pdev) max_entries = msix_table_size(control); - pdev->vpci->msix = xzalloc_bytes(VMSIX_SIZE(max_entries)); + pdev->vpci->msix = xzalloc_flex_struct(struct vpci_msix, entries, + max_entries); if ( !pdev->vpci->msix ) return -ENOMEM; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:34:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:34:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61872.109085 (Exim 4.92) (envelope-from ) id 1kwlXp-0003xt-CY; Tue, 05 Jan 2021 12:34:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61872.109085; Tue, 05 Jan 2021 12: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 1kwlXp-0003xl-9d; Tue, 05 Jan 2021 12:34:37 +0000 Received: by outflank-mailman (input) for mailman id 61872; Tue, 05 Jan 2021 12:34:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlXo-0003xa-A3 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlXo-0000J6-9F for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlXo-00061o-8O for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34: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=O1XH0cPg/3LedxBnyL7ulPw/5RK/d78CL5AMlQxCbYw=; b=DdXIPdZnx6L4gWXzRY2kU1BE3T QbXJTqnAC6+PCdYnA25iLH359Y2shkHpUxB5YoMhDAFjjbXj69T4JzeDuKMV+jgZn2P1jHAAhHy5x 2FdSU5r8oB4YdHJuZ8GsJfhBSMhgRZn0S7fdWs8B/fqBw+wi8ppp53lhCM7iSZU6QFoA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vPCI/MSI-X: tidy init_msix() Message-Id: Date: Tue, 05 Jan 2021 12:34:36 +0000 commit 6fbb41258e9f733cd2b9254efae035c350d93920 Author: Jan Beulich AuthorDate: Tue Jan 5 13:20:13 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:20:13 2021 +0100 vPCI/MSI-X: tidy init_msix() First of all introduce a local variable for the to be allocated struct. The compiler can't CSE all the occurrences (I'm observing 80 bytes of code saved with gcc 10). Additionally, while the caller can cope and there was no memory leak, globally "announce" the struct only once done initializing it. This also removes the dependency of the function on the caller cleaning up after it in case of an error. Also prefer a local variable over using a structure field previously set from this very variable. Finally move the call to vpci_add_register() ahead of all further initialization of the struct, to bail early in case of error. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/msix.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index e008f92c1c..846a048a4a 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -442,6 +442,7 @@ static int init_msix(struct pci_dev *pdev) uint8_t slot = PCI_SLOT(pdev->devfn), func = PCI_FUNC(pdev->devfn); unsigned int msix_offset, i, max_entries; uint16_t control; + struct vpci_msix *msix; int rc; msix_offset = pci_find_cap_offset(pdev->seg, pdev->bus, slot, func, @@ -453,34 +454,37 @@ static int init_msix(struct pci_dev *pdev) max_entries = msix_table_size(control); - pdev->vpci->msix = xzalloc_flex_struct(struct vpci_msix, entries, - max_entries); - if ( !pdev->vpci->msix ) + msix = xzalloc_flex_struct(struct vpci_msix, entries, max_entries); + if ( !msix ) return -ENOMEM; - pdev->vpci->msix->max_entries = max_entries; - pdev->vpci->msix->pdev = pdev; + rc = vpci_add_register(pdev->vpci, control_read, control_write, + msix_control_reg(msix_offset), 2, msix); + if ( rc ) + { + xfree(msix); + return rc; + } + + msix->max_entries = max_entries; + msix->pdev = pdev; - pdev->vpci->msix->tables[VPCI_MSIX_TABLE] = + msix->tables[VPCI_MSIX_TABLE] = pci_conf_read32(pdev->sbdf, msix_table_offset_reg(msix_offset)); - pdev->vpci->msix->tables[VPCI_MSIX_PBA] = + msix->tables[VPCI_MSIX_PBA] = pci_conf_read32(pdev->sbdf, msix_pba_offset_reg(msix_offset)); - for ( i = 0; i < pdev->vpci->msix->max_entries; i++) + for ( i = 0; i < max_entries; i++) { - pdev->vpci->msix->entries[i].masked = true; - vpci_msix_arch_init_entry(&pdev->vpci->msix->entries[i]); + msix->entries[i].masked = true; + vpci_msix_arch_init_entry(&msix->entries[i]); } - rc = vpci_add_register(pdev->vpci, control_read, control_write, - msix_control_reg(msix_offset), 2, pdev->vpci->msix); - if ( rc ) - return rc; - if ( list_empty(&d->arch.hvm.msix_tables) ) register_mmio_handler(d, &vpci_msix_table_ops); - list_add(&pdev->vpci->msix->next, &d->arch.hvm.msix_tables); + pdev->vpci->msix = msix; + list_add(&msix->next, &d->arch.hvm.msix_tables); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:34:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:34:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61873.109090 (Exim 4.92) (envelope-from ) id 1kwlXz-0003zA-Ej; Tue, 05 Jan 2021 12:34:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61873.109090; Tue, 05 Jan 2021 12: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 1kwlXz-0003z2-B9; Tue, 05 Jan 2021 12:34:47 +0000 Received: by outflank-mailman (input) for mailman id 61873; Tue, 05 Jan 2021 12:34:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlXy-0003yt-Cu for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlXy-0000JK-C1 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlXy-00062t-BP for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:34:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=np1+ckIFqDTjvVrl9s/njyJ4eBO7o+zkqvJMjdBPE7Y=; b=tid2tpl9QjqJMlLWM12B0AhCnO AM8DhuRfoqt031DbcWs//7EXz+dB0OyngLU48u3RVS5gN8CZYIpzQHjyeQM79oAO/XUrZKXIbLag4 wdJkfnsR09DHsnwzJHKaWZ11oUVpZFbvhtdljUtLpzydpHzm78CX94QIxzLFcMpaszhY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] lib/sort: adjust types Message-Id: Date: Tue, 05 Jan 2021 12:34:46 +0000 commit fa679ef8b429cf2906318a845ba90f0568fa531d Author: Jan Beulich AuthorDate: Tue Jan 5 13:20:54 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:20:54 2021 +0100 lib/sort: adjust types First and foremost do away with the use of plain int for sizes or size- derived values. Use size_t, despite this requiring some adjustment to the logic. Also replace u32 by uint32_t. While not directly related also drop a leftover #ifdef from x86's swap_ex - this was needed only back when 32-bit Xen was still a thing. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/extable.c | 4 +--- xen/include/xen/sort.h | 2 +- xen/lib/sort.c | 22 ++++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 70972f1085..109ab7da98 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -37,8 +37,7 @@ static int init_or_livepatch cmp_ex(const void *a, const void *b) return 0; } -#ifndef swap_ex -static void init_or_livepatch swap_ex(void *a, void *b, int size) +static void init_or_livepatch swap_ex(void *a, void *b, size_t size) { struct exception_table_entry *l = a, *r = b, tmp; long delta = b - a; @@ -49,7 +48,6 @@ static void init_or_livepatch swap_ex(void *a, void *b, int size) r->addr = tmp.addr - delta; r->cont = tmp.cont - delta; } -#endif void init_or_livepatch sort_exception_table(struct exception_table_entry *start, const struct exception_table_entry *stop) diff --git a/xen/include/xen/sort.h b/xen/include/xen/sort.h index ec89c3aed4..a403652948 100644 --- a/xen/include/xen/sort.h +++ b/xen/include/xen/sort.h @@ -5,6 +5,6 @@ void sort(void *base, size_t num, size_t size, int (*cmp)(const void *, const void *), - void (*swap)(void *, void *, int)); + void (*swap)(void *, void *, size_t)); #endif /* __XEN_SORT_H__ */ diff --git a/xen/lib/sort.c b/xen/lib/sort.c index ee983d0bc3..35ce0d7abd 100644 --- a/xen/lib/sort.c +++ b/xen/lib/sort.c @@ -6,14 +6,15 @@ #include -static void u32_swap(void *a, void *b, int size) +static void u32_swap(void *a, void *b, size_t size) { - u32 t = *(u32 *)a; - *(u32 *)a = *(u32 *)b; - *(u32 *)b = t; + uint32_t t = *(uint32_t *)a; + + *(uint32_t *)a = *(uint32_t *)b; + *(uint32_t *)b = t; } -static void generic_swap(void *a, void *b, int size) +static void generic_swap(void *a, void *b, size_t size) { char t; @@ -43,18 +44,18 @@ static void generic_swap(void *a, void *b, int size) void sort(void *base, size_t num, size_t size, int (*cmp)(const void *, const void *), - void (*swap)(void *, void *, int size)) + void (*swap)(void *, void *, size_t size)) { /* pre-scale counters for performance */ - int i = (num / 2 - 1) * size, n = num * size, c, r; + size_t i = (num / 2) * size, n = num * size, c, r; if ( !swap ) swap = (size == 4 ? u32_swap : generic_swap); /* heapify */ - for ( ; i >= 0; i -= size ) + while ( i > 0 ) { - for ( r = i; r * 2 + size < n; r = c ) + for ( r = i -= size; r * 2 + size < n; r = c ) { c = r * 2 + size; if ( (c < n - size) && (cmp(base + c, base + c + size) < 0) ) @@ -66,8 +67,9 @@ void sort(void *base, size_t num, size_t size, } /* sort */ - for ( i = n - size; i >= 0; i -= size ) + for ( i = n; i > 0; ) { + i -= size; swap(base, base + i, size); for ( r = 0; r * 2 + size < i; r = c ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:44:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61894.109153 (Exim 4.92) (envelope-from ) id 1kwlh0-0005UM-Kt; Tue, 05 Jan 2021 12:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61894.109153; Tue, 05 Jan 2021 12:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlh0-0005UE-Hz; Tue, 05 Jan 2021 12:44:06 +0000 Received: by outflank-mailman (input) for mailman id 61894; Tue, 05 Jan 2021 12:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlgy-0005U8-RA for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlgy-0000UQ-On for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlgy-0006pr-N3 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=p/m2xodfAsGBf7PAZu6u2rNzIZTaNYd1narG22QIyS4=; b=bUHf44TdFjsTOhy07JLoBYvLJK BBrleLlLxWeGUb85s6NNW1rPDIlL4TOmIIJUJZx9+7QHzVB57bZMz81ip2Y7X4RN2IZAv61n/iWk0 kyQzMWza3Ui76uBNJjTf5uqsO6N8uQFF3Zjh2hTxyMAaFsEwT8q4BP1qILF5QoirXBXY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/foreignmemory: implement the missing functions on FreeBSD Message-Id: Date: Tue, 05 Jan 2021 12:44:04 +0000 commit 4f022a2de7a35dda6d05175b2b5fb6dafab7b6fc Author: Roger Pau Monne AuthorDate: Tue Jan 5 11:25:45 2021 +0100 Commit: Wei Liu CommitDate: Tue Jan 5 12:33:55 2021 +0000 libs/foreignmemory: implement the missing functions on FreeBSD Implement restrict, map resource and unmap resource helpers on FreeBSD. Signed-off-by: Roger Pau Monné Acked-by: Wei Liu --- tools/include/xen-sys/FreeBSD/privcmd.h | 14 +++++++++ tools/libs/foreignmemory/freebsd.c | 51 +++++++++++++++++++++++++++++++++ tools/libs/foreignmemory/private.h | 2 +- 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/tools/include/xen-sys/FreeBSD/privcmd.h b/tools/include/xen-sys/FreeBSD/privcmd.h index cf1241f039..603aad67d5 100644 --- a/tools/include/xen-sys/FreeBSD/privcmd.h +++ b/tools/include/xen-sys/FreeBSD/privcmd.h @@ -56,9 +56,23 @@ typedef struct privcmd_mmap_entry { unsigned long npages; } privcmd_mmap_entry_t; +struct ioctl_privcmd_mmapresource { + domid_t dom; /* target domain */ + unsigned int type; /* type of resource to map */ + unsigned int id; /* type-specific resource identifier */ + unsigned int idx; /* the index of the initial frame to be mapped */ + unsigned long num; /* number of frames of the resource to be mapped */ + unsigned long addr; /* physical address to map into */ +}; +typedef struct ioctl_privcmd_mmapresource privcmd_mmap_resource_t; + #define IOCTL_PRIVCMD_HYPERCALL \ _IOWR('E', 0, struct ioctl_privcmd_hypercall) #define IOCTL_PRIVCMD_MMAPBATCH \ _IOWR('E', 1, struct ioctl_privcmd_mmapbatch) +#define IOCTL_PRIVCMD_MMAP_RESOURCE \ + _IOW('E', 2, struct ioctl_privcmd_mmapresource) +#define IOCTL_PRIVCMD_RESTRICT \ + _IOW('E', 4, domid_t) #endif /* !__XEN_PRIVCMD_H__ */ diff --git a/tools/libs/foreignmemory/freebsd.c b/tools/libs/foreignmemory/freebsd.c index 6e6bc4b11f..3d403a7cd0 100644 --- a/tools/libs/foreignmemory/freebsd.c +++ b/tools/libs/foreignmemory/freebsd.c @@ -95,6 +95,57 @@ int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem, return munmap(addr, num << PAGE_SHIFT); } +int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem, + domid_t domid) +{ + return ioctl(fmem->fd, IOCTL_PRIVCMD_RESTRICT, &domid); +} + +int osdep_xenforeignmemory_unmap_resource(xenforeignmemory_handle *fmem, + xenforeignmemory_resource_handle *fres) +{ + return fres ? munmap(fres->addr, fres->nr_frames << PAGE_SHIFT) : 0; +} + +int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem, + xenforeignmemory_resource_handle *fres) +{ + privcmd_mmap_resource_t mr = { + .dom = fres->domid, + .type = fres->type, + .id = fres->id, + .idx = fres->frame, + .num = fres->nr_frames, + }; + int rc; + + fres->addr = mmap(fres->addr, fres->nr_frames << PAGE_SHIFT, + fres->prot, fres->flags | MAP_SHARED, fmem->fd, 0); + if ( fres->addr == MAP_FAILED ) + return -1; + + mr.addr = (uintptr_t)fres->addr; + + rc = ioctl(fmem->fd, IOCTL_PRIVCMD_MMAP_RESOURCE, &mr); + if ( rc ) + { + int saved_errno; + + if ( errno != ENOSYS ) + PERROR("mmap resource ioctl failed"); + else + errno = EOPNOTSUPP; + + saved_errno = errno; + osdep_xenforeignmemory_unmap_resource(fmem, fres); + errno = saved_errno; + + return -1; + } + + return 0; +} + /* * Local variables: * mode: C diff --git a/tools/libs/foreignmemory/private.h b/tools/libs/foreignmemory/private.h index 8f1bf081ed..ebd45c4785 100644 --- a/tools/libs/foreignmemory/private.h +++ b/tools/libs/foreignmemory/private.h @@ -54,7 +54,7 @@ struct xenforeignmemory_resource_handle { int flags; }; -#ifndef __linux__ +#if !defined(__linux__) && !defined(__FreeBSD__) static inline int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem, domid_t domid) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:44:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:44:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61895.109158 (Exim 4.92) (envelope-from ) id 1kwlhA-0005VT-NQ; Tue, 05 Jan 2021 12:44:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61895.109158; Tue, 05 Jan 2021 12:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlhA-0005VL-JX; Tue, 05 Jan 2021 12:44:16 +0000 Received: by outflank-mailman (input) for mailman id 61895; Tue, 05 Jan 2021 12:44:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlh8-0005VB-Uq for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlh8-0000Um-TC for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlh8-0006qx-R2 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12: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=Vvx76NLE/M+9xmxXccCdntJrHD2LWcVtQN9GEozVA70=; b=JRgZOeMRUkkgRHqO8zSRblvjXf PlZZYU7i7iaS3oDtnZhoDm+bFQFz5ef4utWDAqtBpud+7oEO8kY5qFrp68F/fi5WR824MosYX6cr6 8l1/Dmol165QxTp4yv2a5eWmSFde1YJTOJNpqdoB9dtlPrdWKXTyHmavxA2UQrTCZ8NM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/devicemodel: add dm_op support for FreeBSD Message-Id: Date: Tue, 05 Jan 2021 12:44:14 +0000 commit bbf71e99f01b883ebf1c60209b99953c1b95d8a0 Author: Roger Pau Monne AuthorDate: Tue Jan 5 11:25:46 2021 +0100 Commit: Wei Liu CommitDate: Tue Jan 5 12:33:55 2021 +0000 libs/devicemodel: add dm_op support for FreeBSD The FreeBSD ioctls have the same fields has the Linux ones, so the same file can be shared between both OSes. No functional change for OSes different than FreeBSD. Signed-off-by: Roger Pau Monné Acked-by: Wei Liu --- tools/include/xen-sys/FreeBSD/privcmd.h | 15 ++++ tools/libs/devicemodel/Makefile | 4 +- tools/libs/devicemodel/common.c | 138 ++++++++++++++++++++++++++++++++ tools/libs/devicemodel/linux.c | 138 -------------------------------- 4 files changed, 155 insertions(+), 140 deletions(-) diff --git a/tools/include/xen-sys/FreeBSD/privcmd.h b/tools/include/xen-sys/FreeBSD/privcmd.h index 603aad67d5..649ad443c7 100644 --- a/tools/include/xen-sys/FreeBSD/privcmd.h +++ b/tools/include/xen-sys/FreeBSD/privcmd.h @@ -66,12 +66,27 @@ struct ioctl_privcmd_mmapresource { }; typedef struct ioctl_privcmd_mmapresource privcmd_mmap_resource_t; +struct privcmd_dmop_buf { + void *uptr; /* pointer to memory (in calling process) */ + size_t size; /* size of the buffer */ +}; +typedef struct privcmd_dmop_buf privcmd_dm_op_buf_t; + +struct ioctl_privcmd_dmop { + domid_t dom; /* target domain */ + unsigned int num; /* num of buffers */ + const struct privcmd_dmop_buf *ubufs; /* array of buffers */ +}; +typedef struct ioctl_privcmd_dmop privcmd_dm_op_t; + #define IOCTL_PRIVCMD_HYPERCALL \ _IOWR('E', 0, struct ioctl_privcmd_hypercall) #define IOCTL_PRIVCMD_MMAPBATCH \ _IOWR('E', 1, struct ioctl_privcmd_mmapbatch) #define IOCTL_PRIVCMD_MMAP_RESOURCE \ _IOW('E', 2, struct ioctl_privcmd_mmapresource) +#define IOCTL_PRIVCMD_DM_OP \ + _IOW('E', 3, struct ioctl_privcmd_dmop) #define IOCTL_PRIVCMD_RESTRICT \ _IOW('E', 4, domid_t) diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile index b67fc0fac1..500de7adc5 100644 --- a/tools/libs/devicemodel/Makefile +++ b/tools/libs/devicemodel/Makefile @@ -5,8 +5,8 @@ MAJOR = 1 MINOR = 3 SRCS-y += core.c -SRCS-$(CONFIG_Linux) += linux.c -SRCS-$(CONFIG_FreeBSD) += compat.c +SRCS-$(CONFIG_Linux) += common.c +SRCS-$(CONFIG_FreeBSD) += common.c SRCS-$(CONFIG_SunOS) += compat.c SRCS-$(CONFIG_NetBSD) += compat.c SRCS-$(CONFIG_MiniOS) += compat.c diff --git a/tools/libs/devicemodel/common.c b/tools/libs/devicemodel/common.c new file mode 100644 index 0000000000..0fdc7121f1 --- /dev/null +++ b/tools/libs/devicemodel/common.c @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2017 Citrix Systems Inc. + * + * 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; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include "private.h" + +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + +int osdep_xendevicemodel_open(xendevicemodel_handle *dmod) +{ + int fd = open("/dev/xen/privcmd", O_RDWR | O_CLOEXEC); + privcmd_dm_op_t uop; + int rc; + + if (fd < 0) { + /* + * If the 'new' privcmd interface doesn't exist then don't treat + * this as an error, but an old privcmd clearly won't implement + * IOCTL_PRIVCMD_DM_OP so don't bother trying to open it. + */ + if (errno == ENOENT || errno == ENXIO || errno == ENODEV) + goto out; + + PERROR("Could not obtain handle on privileged command interface"); + return -1; + } + + /* + * Check to see if IOCTL_PRIVCMD_DM_OP is implemented as we want to + * use that in preference to libxencall. + */ + uop.dom = DOMID_INVALID; + uop.num = 0; + uop.ubufs = NULL; + + rc = ioctl(fd, IOCTL_PRIVCMD_DM_OP, &uop); + if (rc < 0) { + close(fd); + fd = -1; + } + +out: + dmod->fd = fd; + return 0; +} + +int osdep_xendevicemodel_close(xendevicemodel_handle *dmod) +{ + if (dmod->fd < 0) + return 0; + + return close(dmod->fd); +} + +int osdep_xendevicemodel_op(xendevicemodel_handle *dmod, + domid_t domid, unsigned int nr_bufs, + struct xendevicemodel_buf bufs[]) +{ + privcmd_dm_op_buf_t *ubufs; + privcmd_dm_op_t uop; + unsigned int i; + int rc; + + if (dmod->fd < 0) + return xendevicemodel_xcall(dmod, domid, nr_bufs, bufs); + + ubufs = calloc(nr_bufs, sizeof (*ubufs)); + if (!ubufs) + return -1; + + for (i = 0; i < nr_bufs; i++) { + ubufs[i].uptr = bufs[i].ptr; + ubufs[i].size = bufs[i].size; + } + + uop.dom = domid; + uop.num = nr_bufs; + uop.ubufs = ubufs; + + rc = ioctl(dmod->fd, IOCTL_PRIVCMD_DM_OP, &uop); + + free(ubufs); + + if (rc < 0) + return -1; + + return 0; +} + +int osdep_xendevicemodel_restrict(xendevicemodel_handle *dmod, + domid_t domid) +{ + if (dmod->fd < 0) { + errno = EOPNOTSUPP; + return -1; + } + + return ioctl(dmod->fd, IOCTL_PRIVCMD_RESTRICT, &domid); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libs/devicemodel/linux.c b/tools/libs/devicemodel/linux.c deleted file mode 100644 index 0fdc7121f1..0000000000 --- a/tools/libs/devicemodel/linux.c +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (c) 2017 Citrix Systems Inc. - * - * 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; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include "private.h" - -#ifndef O_CLOEXEC -#define O_CLOEXEC 0 -#endif - -int osdep_xendevicemodel_open(xendevicemodel_handle *dmod) -{ - int fd = open("/dev/xen/privcmd", O_RDWR | O_CLOEXEC); - privcmd_dm_op_t uop; - int rc; - - if (fd < 0) { - /* - * If the 'new' privcmd interface doesn't exist then don't treat - * this as an error, but an old privcmd clearly won't implement - * IOCTL_PRIVCMD_DM_OP so don't bother trying to open it. - */ - if (errno == ENOENT || errno == ENXIO || errno == ENODEV) - goto out; - - PERROR("Could not obtain handle on privileged command interface"); - return -1; - } - - /* - * Check to see if IOCTL_PRIVCMD_DM_OP is implemented as we want to - * use that in preference to libxencall. - */ - uop.dom = DOMID_INVALID; - uop.num = 0; - uop.ubufs = NULL; - - rc = ioctl(fd, IOCTL_PRIVCMD_DM_OP, &uop); - if (rc < 0) { - close(fd); - fd = -1; - } - -out: - dmod->fd = fd; - return 0; -} - -int osdep_xendevicemodel_close(xendevicemodel_handle *dmod) -{ - if (dmod->fd < 0) - return 0; - - return close(dmod->fd); -} - -int osdep_xendevicemodel_op(xendevicemodel_handle *dmod, - domid_t domid, unsigned int nr_bufs, - struct xendevicemodel_buf bufs[]) -{ - privcmd_dm_op_buf_t *ubufs; - privcmd_dm_op_t uop; - unsigned int i; - int rc; - - if (dmod->fd < 0) - return xendevicemodel_xcall(dmod, domid, nr_bufs, bufs); - - ubufs = calloc(nr_bufs, sizeof (*ubufs)); - if (!ubufs) - return -1; - - for (i = 0; i < nr_bufs; i++) { - ubufs[i].uptr = bufs[i].ptr; - ubufs[i].size = bufs[i].size; - } - - uop.dom = domid; - uop.num = nr_bufs; - uop.ubufs = ubufs; - - rc = ioctl(dmod->fd, IOCTL_PRIVCMD_DM_OP, &uop); - - free(ubufs); - - if (rc < 0) - return -1; - - return 0; -} - -int osdep_xendevicemodel_restrict(xendevicemodel_handle *dmod, - domid_t domid) -{ - if (dmod->fd < 0) { - errno = EOPNOTSUPP; - return -1; - } - - return ioctl(dmod->fd, IOCTL_PRIVCMD_RESTRICT, &domid); -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:44:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:44:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61896.109161 (Exim 4.92) (envelope-from ) id 1kwlhK-0005X4-Pl; Tue, 05 Jan 2021 12:44:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61896.109161; Tue, 05 Jan 2021 12:44:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlhK-0005Wv-Mm; Tue, 05 Jan 2021 12:44:26 +0000 Received: by outflank-mailman (input) for mailman id 61896; Tue, 05 Jan 2021 12:44:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlhJ-0005Wn-0o for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlhI-0000Ut-WE for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlhI-0006s9-VW for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=D6rhEZEAx5xEKVFqIBNbYFgtE+xvuHksN0Gogyg4lEo=; b=r9X0ozdW6ooY4QgXQIL1kz+aR6 pkln3JUrEwT4y4aCj/oldlOs8iOeMdCasg6P4YP7AfKuTpme3eVbntiOe7jN2OnFus5UPf7ZO/F93 +gQ4/UOSLcmSPyBOJq7A+crmmWdiMEjv3IcIRIXGsjmodV8wzSE2Swx8Xuo/HyTnFEpw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenguest: handle more than 16T in precopy_stats Message-Id: Date: Tue, 05 Jan 2021 12:44:24 +0000 commit 4e421ad0f4e4286c81aae839f9e99e73718a64ae Author: Olaf Hering AuthorDate: Tue Jan 5 09:30:48 2021 +0100 Commit: Wei Liu CommitDate: Tue Jan 5 12:33:55 2021 +0000 tools/libxenguest: handle more than 16T in precopy_stats total_written tracks the number of transferred dirty pages. Signed-off-by: Olaf Hering Acked-by: Wei Liu --- tools/include/xenguest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/include/xenguest.h b/tools/include/xenguest.h index a9984dbea5..775cf34c04 100644 --- a/tools/include/xenguest.h +++ b/tools/include/xenguest.h @@ -438,7 +438,7 @@ struct xenevtchn_handle; struct precopy_stats { unsigned int iteration; - unsigned int total_written; + unsigned long total_written; long dirty_count; /* -1 if unknown */ }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:44:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:44:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61897.109164 (Exim 4.92) (envelope-from ) id 1kwlhU-0005YJ-R8; Tue, 05 Jan 2021 12:44:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61897.109164; Tue, 05 Jan 2021 12:44:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlhU-0005YB-OH; Tue, 05 Jan 2021 12:44:36 +0000 Received: by outflank-mailman (input) for mailman id 61897; Tue, 05 Jan 2021 12:44:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlhT-0005Y1-3Q for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlhT-0000V6-2j for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlhT-0006t2-1y for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=AdyGxGv68ztUQmz+RuqIL64iMy9rO7gKX0VnywPDs2k=; b=n2Ve13X20gKBPCL+ShAttqDejX wuQWZJVqtMWk2i1Hu1aqKdupQR+jW64JYNCp49z8TwBG/DGedvueahclYwhsBUmORYpbLAXg+WRtg QHFvay8roO5ImKT0zdSGsMqk0xOOyUHhN5B9cJ1Yhu2uaDWzegRWGBIK5p/LrZYeu/6E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: ipxe: update for fixing build with GCC10 Message-Id: Date: Tue, 05 Jan 2021 12:44:35 +0000 commit c7115531ea8ede5c6ab27f972c1be6ecad388f55 Author: Olaf Hering AuthorDate: Mon Jan 4 12:52:23 2021 +0100 Commit: Wei Liu CommitDate: Tue Jan 5 12:33:55 2021 +0000 tools: ipxe: update for fixing build with GCC10 Update to v1.21.1 to fix build in Tumbleweed, which has been broken since months due to lack of new release. Signed-off-by: Olaf Hering Acked-by: Wei Liu --- tools/firmware/etherboot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile index 0de30599bf..ed9e11305f 100644 --- a/tools/firmware/etherboot/Makefile +++ b/tools/firmware/etherboot/Makefile @@ -10,7 +10,7 @@ else IPXE_GIT_URL ?= git://git.ipxe.org/ipxe.git endif -IPXE_GIT_TAG := 1dd56dbd11082fb622c2ed21cfaced4f47d798a6 +IPXE_GIT_TAG := 988d2c13cdf0f0b4140685af35ced70ac5b3283c IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 12:44:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 12:44:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.61898.109170 (Exim 4.92) (envelope-from ) id 1kwlhe-0005Zc-T3; Tue, 05 Jan 2021 12:44:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61898.109170; Tue, 05 Jan 2021 12:44:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlhe-0005ZS-Pk; Tue, 05 Jan 2021 12:44:46 +0000 Received: by outflank-mailman (input) for mailman id 61898; Tue, 05 Jan 2021 12:44:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlhd-0005ZJ-6G for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlhd-0000VK-5U for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwlhd-0006ti-4m for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 12:44:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z/ZAQOlSUOsX2spE0Jf8p+kG05jc/WpmMzIVsw6hqFY=; b=Y5RljwKvR650F/7FGPoRMlNrvg 2iTTmfy617RnrmYcOykUV+RZmXSW0ilksxmcaq7+OVjcgSrfEa5wrn73DR3hzOyERYHjzCTblyOvG e0k7ktseN5aaIMRAademtENCWqRHb86U/2RrAntTP55Jc5MVBRan45aEAMBG15YSpR1E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxl: cleanup remaining backend xs dirs after driver domain Message-Id: Date: Tue, 05 Jan 2021 12:44:45 +0000 commit c992efd06a4c092f6fb3b8ab10d4f8ca35d42bbd Author: Marek Marczykowski-Górecki AuthorDate: Sun Nov 8 15:59:42 2020 +0100 Commit: Wei Liu CommitDate: Tue Jan 5 12:33:55 2021 +0000 libxl: cleanup remaining backend xs dirs after driver domain When device is removed, backend domain (which may be a driver domain) is responsible for removing backend entries from xenstore. But in case of driver domain, it has no access to remove all of them - specifically the directory named after frontend-id remains. This may accumulate enough to exceed xenstore quote of the driver domain, breaking further devices. Fix this by calling libxl__xs_path_cleanup() on the backend path from libxl__device_destroy() in the toolstack domain too. Note libxl__device_destroy() is called when the driver domain already removed what it can (see device_destroy_be_watch_cb()->device_hotplug_done()). Signed-off-by: Marek Marczykowski-Górecki Acked-by: Wei Liu --- tools/libs/light/libxl_device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/libs/light/libxl_device.c b/tools/libs/light/libxl_device.c index ac173a043d..36c4e41e4d 100644 --- a/tools/libs/light/libxl_device.c +++ b/tools/libs/light/libxl_device.c @@ -763,6 +763,12 @@ int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) * from the backend path. */ libxl__xs_path_cleanup(gc, t, be_path); + } else if (domid == LIBXL_TOOLSTACK_DOMID && !libxl_only) { + /* + * Then, toolstack domain is in charge of removing the parent + * directory if empty already. + */ + libxl__xs_path_cleanup(gc, t, be_path); } rc = libxl__xs_transaction_commit(gc, &t); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 17:33:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 17:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62098.109734 (Exim 4.92) (envelope-from ) id 1kwqCf-0004DI-JO; Tue, 05 Jan 2021 17:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62098.109734; Tue, 05 Jan 2021 17: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 1kwqCf-0004D9-GG; Tue, 05 Jan 2021 17:33:05 +0000 Received: by outflank-mailman (input) for mailman id 62098; Tue, 05 Jan 2021 17:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwqCe-0004D4-IS for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 17:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwqCe-00063a-DS for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 17:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwqCe-0007TP-Be for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 17:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iAeSlKmz9EmKOQuEvKbx9Q5Tvvn3491vtB0IZyApX/U=; b=G1MCCnL49Bw+xoPceqEjll0WRo h10qsNMKEFrL+GNK9zyVwWZ87E5wjwYB9uTnq87t0LoVzdHqlYA/SuMHDBCuTcoghFs65axb4URB5 4jaIHAaLB/PmFFHJ3XHsKzIQkiryaJe0uMP+7mlN+0LUDcxncQuWPKTZyMjIVIZtlHWs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenguest: remove get_platform_info from xg_save_restore.h Message-Id: Date: Tue, 05 Jan 2021 17:33:04 +0000 commit 7a83d9d53d9e4a3c694d26968e2d3200835f5060 Author: Olaf Hering AuthorDate: Tue Jan 5 16:02:47 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Jan 5 17:10:23 2021 +0000 tools/libxenguest: remove get_platform_info from xg_save_restore.h Last user was removed with commit 4ddf474e2b7c045fadeaf765ac6157de745e84d6 Previously it was also used in migration code, which was removed with commit b15bc4345e772df92e5ffdbc4c1e9ae2a6206617 Signed-off-by: Olaf Hering Acked-by: Andrew Cooper --- tools/libs/guest/xg_domain.c | 2 +- tools/libs/guest/xg_save_restore.h | 60 -------------------------------------- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/tools/libs/guest/xg_domain.c b/tools/libs/guest/xg_domain.c index 58713cd35d..5019c84e0e 100644 --- a/tools/libs/guest/xg_domain.c +++ b/tools/libs/guest/xg_domain.c @@ -67,7 +67,7 @@ int xc_map_domain_meminfo(xc_interface *xch, uint32_t domid, } _di.guest_width = minfo->guest_width; - /* Get page table levels (see get_platform_info() in xg_save_restore.h */ + /* Get page table levels */ if ( xc_version(xch, XENVER_capabilities, &xen_caps) ) { PERROR("Could not get Xen capabilities (for page table levels)"); diff --git a/tools/libs/guest/xg_save_restore.h b/tools/libs/guest/xg_save_restore.h index 88120eb54b..e4fe747c4e 100644 --- a/tools/libs/guest/xg_save_restore.h +++ b/tools/libs/guest/xg_save_restore.h @@ -29,66 +29,6 @@ /* When pinning page tables at the end of restore, we also use batching. */ #define MAX_PIN_BATCH 1024 -/* -** Determine various platform information required for save/restore, in -** particular: -** -** - the maximum MFN on this machine, used to compute the size of -** the M2P table; -** -** - the starting virtual address of the the hypervisor; we use this -** to determine which parts of guest address space(s) do and don't -** require canonicalization during save/restore; and -** -** - the number of page-table levels for save/ restore. This should -** be a property of the domain, but for the moment we just read it -** from the hypervisor. -** -** - The width of a guest word (unsigned long), in bytes. -** -** Returns 1 on success, 0 on failure. -*/ -static inline int get_platform_info(xc_interface *xch, uint32_t dom, - /* OUT */ unsigned long *max_mfn, - /* OUT */ unsigned long *hvirt_start, - /* OUT */ unsigned int *pt_levels, - /* OUT */ unsigned int *guest_width) -{ - xen_capabilities_info_t xen_caps = ""; - xen_platform_parameters_t xen_params; - - if (xc_version(xch, XENVER_platform_parameters, &xen_params) != 0) - return 0; - - if (xc_version(xch, XENVER_capabilities, &xen_caps) != 0) - return 0; - - if (xc_maximum_ram_page(xch, max_mfn)) - return 0; - - *hvirt_start = xen_params.virt_start; - - if ( xc_domain_get_guest_width(xch, dom, guest_width) != 0) - return 0; - - /* 64-bit tools will see the 64-bit hvirt_start, but 32-bit guests - * will be using the compat one. */ - if ( *guest_width < sizeof (unsigned long) ) - /* XXX need to fix up a way of extracting this value from Xen if - * XXX it becomes variable for domU */ - *hvirt_start = 0xf5800000; - - if (strstr(xen_caps, "xen-3.0-x86_64")) - /* Depends on whether it's a compat 32-on-64 guest */ - *pt_levels = ( (*guest_width == 8) ? 4 : 3 ); - else if (strstr(xen_caps, "xen-3.0-x86_32p")) - *pt_levels = 3; - else - return 0; - - return 1; -} - /* ** Save/restore deal with the mfn_to_pfn (M2P) and pfn_to_mfn (P2M) tables. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 17:33:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 17:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62099.109738 (Exim 4.92) (envelope-from ) id 1kwqCp-0004EN-Ks; Tue, 05 Jan 2021 17:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62099.109738; Tue, 05 Jan 2021 17: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 1kwqCp-0004EF-Ho; Tue, 05 Jan 2021 17:33:15 +0000 Received: by outflank-mailman (input) for mailman id 62099; Tue, 05 Jan 2021 17:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwqCo-0004E8-J6 for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 17:33:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwqCo-00063w-HL for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 17:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwqCo-0007UA-Fr for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 17: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=aYyuuO1FCOF7OqEiKEeVNiAN9ODLixB1dwy3Oga6tIo=; b=llU4TNCCKhFgof1dD+RuPRwp6r j89AEMeP6gaJqeIp+fxDs9VfBAYMmidjB3kevgR+xcmmOWA1aZKmHQhCy0Fh/2vVRdBkI+n8CXNbo sv7c1S8oo/ZRKJOB4UBF6R8VMRHNMXmkaSJg6gyQb2lNYnprZGIIwQ+we00OL0JfPDNQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenguest: remove FOLD_CR3 from xg_save_restore.h Message-Id: Date: Tue, 05 Jan 2021 17:33:14 +0000 commit 22deecf9fef271246327bfe8d62d0205a29db64d Author: Olaf Hering AuthorDate: Tue Jan 5 16:05:36 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Jan 5 17:10:31 2021 +0000 tools/libxenguest: remove FOLD_CR3 from xg_save_restore.h The last user was removed with commit b15bc4345e772df92e5ffdbc4c1e9ae2a6206617 Signed-off-by: Olaf Hering Acked-by: Andrew Cooper --- tools/libs/guest/xg_save_restore.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tools/libs/guest/xg_save_restore.h b/tools/libs/guest/xg_save_restore.h index e4fe747c4e..a9c1a2dbe3 100644 --- a/tools/libs/guest/xg_save_restore.h +++ b/tools/libs/guest/xg_save_restore.h @@ -49,16 +49,6 @@ #define M2P_SIZE(_m) ROUNDUP(((_m) * sizeof(xen_pfn_t)), M2P_SHIFT) #define M2P_CHUNKS(_m) (M2P_SIZE((_m)) >> M2P_SHIFT) -#define UNFOLD_CR3(_c) \ - ((uint64_t)((dinfo->guest_width == 8) \ - ? ((_c) >> 12) \ - : (((uint32_t)(_c) >> 12) | ((uint32_t)(_c) << 20)))) - -#define FOLD_CR3(_c) \ - ((uint64_t)((dinfo->guest_width == 8) \ - ? ((uint64_t)(_c)) << 12 \ - : (((uint32_t)(_c) << 12) | ((uint32_t)(_c) >> 20)))) - #define MEMCPY_FIELD(_d, _s, _f, _w) do { \ if ((_w) == 8) \ memcpy(&(_d)->x64._f, &(_s)->x64._f,sizeof((_d)->x64._f)); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 17:33:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 17:33:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62100.109742 (Exim 4.92) (envelope-from ) id 1kwqD0-0004Fs-MU; Tue, 05 Jan 2021 17:33:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62100.109742; Tue, 05 Jan 2021 17: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 1kwqD0-0004Fk-JP; Tue, 05 Jan 2021 17:33:26 +0000 Received: by outflank-mailman (input) for mailman id 62100; Tue, 05 Jan 2021 17:33:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwqCy-0004Fa-Ng for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 17:33:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwqCy-00064C-Le for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 17:33:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwqCy-0007Ue-Jf for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 17: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=NunhCfF6+pfk5yhniR+jlwWnP8g7kcjBWUPvxC/1+00=; b=vS6GATQXq+0mguflkvQAhRiXW1 19UtDwqGbIZ67Qz8ukqcmBVAhYVT02jxaHaHdpC2OsYzEBihcGyM2/Dqj95/juq93diU+sD+E4T16 cabAvS4M2Hi7caUDFLp+kLjGx5fxI7NsQHYICH2BJGH3tkK2Ymr9OuGHeSvjmbr77pDc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenguest: move M2P macros to xg_private.h Message-Id: Date: Tue, 05 Jan 2021 17:33:24 +0000 commit edf5b22022aea0a76eaeb36cc060d984340e1e18 Author: Olaf Hering AuthorDate: Tue Jan 5 16:13:56 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Jan 5 17:11:43 2021 +0000 tools/libxenguest: move M2P macros to xg_private.h Just code movement as a preparatory change before xg_sr_* will be moved. Signed-off-by: Olaf Hering Acked-by: Andrew Cooper --- tools/libs/guest/xg_private.h | 10 ++++++++++ tools/libs/guest/xg_save_restore.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/libs/guest/xg_private.h b/tools/libs/guest/xg_private.h index fee3191cd4..c3ed8c1257 100644 --- a/tools/libs/guest/xg_private.h +++ b/tools/libs/guest/xg_private.h @@ -135,4 +135,14 @@ static inline xen_pfn_t xc_pfn_to_mfn(xen_pfn_t pfn, xen_pfn_t *p2m, int pin_table(xc_interface *xch, unsigned int type, unsigned long mfn, uint32_t dom); +/* + * The M2P is made up of some number of 'chunks' of at least 2MB in size. + * The below definitions and utility function(s) deal with mapping the M2P + * regarldess of the underlying machine memory size or architecture. + */ +#define M2P_SHIFT L2_PAGETABLE_SHIFT_PAE +#define M2P_CHUNK_SIZE (1 << M2P_SHIFT) +#define M2P_SIZE(_m) ROUNDUP(((_m) * sizeof(xen_pfn_t)), M2P_SHIFT) +#define M2P_CHUNKS(_m) (M2P_SIZE((_m)) >> M2P_SHIFT) + #endif /* XG_PRIVATE_H */ diff --git a/tools/libs/guest/xg_save_restore.h b/tools/libs/guest/xg_save_restore.h index a9c1a2dbe3..3dbbc8dcd2 100644 --- a/tools/libs/guest/xg_save_restore.h +++ b/tools/libs/guest/xg_save_restore.h @@ -39,16 +39,6 @@ #define PFN_TO_KB(_pfn) ((_pfn) << (PAGE_SHIFT - 10)) -/* -** The M2P is made up of some number of 'chunks' of at least 2MB in size. -** The below definitions and utility function(s) deal with mapping the M2P -** regarldess of the underlying machine memory size or architecture. -*/ -#define M2P_SHIFT L2_PAGETABLE_SHIFT_PAE -#define M2P_CHUNK_SIZE (1 << M2P_SHIFT) -#define M2P_SIZE(_m) ROUNDUP(((_m) * sizeof(xen_pfn_t)), M2P_SHIFT) -#define M2P_CHUNKS(_m) (M2P_SIZE((_m)) >> M2P_SHIFT) - #define MEMCPY_FIELD(_d, _s, _f, _w) do { \ if ((_w) == 8) \ memcpy(&(_d)->x64._f, &(_s)->x64._f,sizeof((_d)->x64._f)); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 05 17:44:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Jan 2021 17:44:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62107.109761 (Exim 4.92) (envelope-from ) id 1kwqNH-0005KD-0L; Tue, 05 Jan 2021 17:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62107.109761; Tue, 05 Jan 2021 17:44: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 1kwqNG-0005K5-Tf; Tue, 05 Jan 2021 17:44:02 +0000 Received: by outflank-mailman (input) for mailman id 62107; Tue, 05 Jan 2021 17:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwqNG-0005Jz-0G for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 17:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwqNF-0006EX-Pa for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 17:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kwqNF-0008AW-No for xen-changelog@lists.xenproject.org; Tue, 05 Jan 2021 17: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=wvgqI4yqc0bRE+WdLJ3HqzHj8fHk7QWxzmtdPqK3Eq8=; b=aTSi+VJ1mOOKtLYa6k/xxQGuSw cep8IDnNp8UMgv+RGiXVIt8Ij7oGxwxnramWJfri2lxW+3qQtzVztRcT2u0IoPGJAwLj7t/OFdt8U XW6dhzE7sLNVTJrx28u+Vnm/plXGuVAZcd1pG1b77osj7VosFK6sPGuWtHsTgAxhzSY0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/p2m: Fix paging_gva_to_gfn() for nested virt Message-Id: Date: Tue, 05 Jan 2021 17:44:01 +0000 commit 7ba2ab495be54f608cb47440e1497b2795bd301a Author: Andrew Cooper AuthorDate: Thu Dec 31 16:55:20 2020 +0000 Commit: Andrew Cooper CommitDate: Mon Jan 4 13:19:51 2021 +0000 x86/p2m: Fix paging_gva_to_gfn() for nested virt nestedhap_walk_L1_p2m() takes guest physical addresses, not frame numbers. This means the l2 input is off-by-PAGE_SHIFT, as is the l1 value eventually returned to the caller. Delete the misleading comment as well. Fixes: bab2bd8e222de ("xen/nested_p2m: Don't walk EPT tables with a regular PT walker") Reported-by: Tamas K Lengyel Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Tested-by: Tamas K Lengyel --- xen/arch/x86/mm/p2m.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index a4ebfc9b21..ad4bb94514 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1784,6 +1784,7 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, if ( is_hvm_vcpu(v) && paging_mode_hap(v->domain) && nestedhvm_is_n2(v) ) { unsigned long l2_gfn, l1_gfn; + paddr_t l1_gpa; struct p2m_domain *p2m; const struct paging_mode *mode; uint8_t l1_p2ma; @@ -1798,8 +1799,8 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, if ( l2_gfn == gfn_x(INVALID_GFN) ) return gfn_x(INVALID_GFN); - /* translate l2 guest gfn into l1 guest gfn */ - rv = nestedhap_walk_L1_p2m(v, l2_gfn, &l1_gfn, &l1_page_order, &l1_p2ma, + rv = nestedhap_walk_L1_p2m(v, pfn_to_paddr(l2_gfn), &l1_gpa, + &l1_page_order, &l1_p2ma, 1, !!(*pfec & PFEC_write_access), !!(*pfec & PFEC_insn_fetch)); @@ -1807,6 +1808,8 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, if ( rv != NESTEDHVM_PAGEFAULT_DONE ) return gfn_x(INVALID_GFN); + l1_gfn = paddr_to_pfn(l1_gpa); + /* * Sanity check that l1_gfn can be used properly as a 4K mapping, even * if it mapped by a nested superpage. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jan 06 17:44:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Jan 2021 17:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62630.110995 (Exim 4.92) (envelope-from ) id 1kxCqr-000232-R1; Wed, 06 Jan 2021 17:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62630.110995; Wed, 06 Jan 2021 17: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 1kxCqr-00022u-O1; Wed, 06 Jan 2021 17:44:05 +0000 Received: by outflank-mailman (input) for mailman id 62630; Wed, 06 Jan 2021 17:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxCqq-00022p-JC for xen-changelog@lists.xenproject.org; Wed, 06 Jan 2021 17:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxCqq-0005ls-HX for xen-changelog@lists.xenproject.org; Wed, 06 Jan 2021 17:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxCqq-0003SB-Fn for xen-changelog@lists.xenproject.org; Wed, 06 Jan 2021 17:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Spu4ZhGLsGjTO+7EEfCCxD5HR2yHXZNAT951Ogm2AGA=; b=UybPnyTomCEriJoMhyDP41DhIl bbR9x1C36L+0Wq+XbTFgWDGHOp5SUcajuMAG3EAGUnL7zxBfQ+Q9BOmdq2snIwlW7x+63p2+4RqAb kcW6oYwtE1lCWawW8Cmmkch0C2CKcPfllxZSeBfPV2tQtCPC613hJK4UkQiMJEVAil9Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mem_sharing: Copy CPUID and MSR configuration during vm forking Message-Id: Date: Wed, 06 Jan 2021 17:44:04 +0000 commit 2c5119d637d46a4af759213a4eba042ae278464d Author: Tamas K Lengyel AuthorDate: Tue Jan 5 13:58:23 2021 -0800 Commit: Andrew Cooper CommitDate: Tue Jan 5 23:00:27 2021 +0000 x86/mem_sharing: Copy CPUID and MSR configuration during vm forking Signed-off-by: Tamas K Lengyel Acked-by: Andrew Cooper --- xen/arch/x86/mm/mem_sharing.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index c428fd16ce..fc7b2a4102 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1764,6 +1764,8 @@ static int fork(struct domain *cd, struct domain *d) domain_pause(d); cd->max_pages = d->max_pages; + *cd->arch.cpuid = *d->arch.cpuid; + *cd->arch.msrs = *d->arch.msrs; cd->parent = d; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jan 06 17:44:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Jan 2021 17:44:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62631.110998 (Exim 4.92) (envelope-from ) id 1kxCr1-00023o-Sq; Wed, 06 Jan 2021 17:44:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62631.110998; Wed, 06 Jan 2021 17: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 1kxCr1-00023g-Pj; Wed, 06 Jan 2021 17:44:15 +0000 Received: by outflank-mailman (input) for mailman id 62631; Wed, 06 Jan 2021 17:44:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxCr0-00023Z-Nr for xen-changelog@lists.xenproject.org; Wed, 06 Jan 2021 17:44:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxCr0-0005lv-MC for xen-changelog@lists.xenproject.org; Wed, 06 Jan 2021 17:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxCr0-0003Sn-Jc for xen-changelog@lists.xenproject.org; Wed, 06 Jan 2021 17:44:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=86PuhDpspS919vFZcN0IKzdOKeFCB9FT9rVVQMnjsII=; b=uBWW0d3jLN0WRwFOjDlMxgnybY Lxh+9kLhkB6s6/aTThYqrJYh4ClXinCQwhl8SInYdL/5ajvG+aa0kxbnnQS5Fal+fLsXNMi9pake1 /VXtdmLltPMqXAXWs65l1ng1zTGrUPXyGjhtF5Fz/N1vbsZQQ3HFUiUa+8+9lk/GLW4Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vm_event: transfer nested p2m base info Message-Id: Date: Wed, 06 Jan 2021 17:44:14 +0000 commit d581cf8839417b73f02d8b6f79cf33e9903933db Author: Tamas K Lengyel AuthorDate: Sun Jan 3 11:41:17 2021 -0700 Commit: Andrew Cooper CommitDate: Tue Jan 5 23:00:27 2021 +0000 x86/vm_event: transfer nested p2m base info Required to introspect events originating from nested VMs. Signed-off-by: Tamas K Lengyel Acked-by: Andrew Cooper --- xen/arch/x86/hvm/monitor.c | 32 ++++++++++++++++++++++++++++++-- xen/include/public/vm_event.h | 17 ++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/monitor.c b/xen/arch/x86/hvm/monitor.c index e4a09964a0..b44a1e1dfe 100644 --- a/xen/arch/x86/hvm/monitor.c +++ b/xen/arch/x86/hvm/monitor.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -33,6 +34,15 @@ #include #include +static void set_npt_base(struct vcpu *v, vm_event_request_t *req) +{ + if ( nestedhvm_enabled(v->domain) && nestedhvm_vcpu_in_guestmode(v) ) + { + req->flags |= VM_EVENT_FLAG_NESTED_P2M; + req->data.regs.x86.npt_base = nhvm_vcpu_p2m_base(v); + } +} + bool hvm_monitor_cr(unsigned int index, unsigned long value, unsigned long old) { struct vcpu *curr = current; @@ -53,6 +63,8 @@ bool hvm_monitor_cr(unsigned int index, unsigned long value, unsigned long old) .u.write_ctrlreg.old_value = old }; + set_npt_base(curr, &req); + return monitor_traps(curr, sync, &req) >= 0 && curr->domain->arch.monitor.control_register_values; } @@ -73,6 +85,8 @@ bool hvm_monitor_emul_unimplemented(void) .vcpu_id = curr->vcpu_id, }; + set_npt_base(curr, &req); + return curr->domain->arch.monitor.emul_unimplemented_enabled && monitor_traps(curr, true, &req) == 1; } @@ -92,6 +106,8 @@ bool hvm_monitor_msr(unsigned int msr, uint64_t new_value, uint64_t old_value) .u.mov_to_msr.old_value = old_value }; + set_npt_base(curr, &req); + return monitor_traps(curr, 1, &req) >= 0 && curr->domain->arch.monitor.control_register_values; } @@ -103,6 +119,7 @@ void hvm_monitor_descriptor_access(uint64_t exit_info, uint64_t vmx_exit_qualification, uint8_t descriptor, bool is_write) { + struct vcpu *curr = current; vm_event_request_t req = { .reason = VM_EVENT_REASON_DESCRIPTOR_ACCESS, .u.desc_access.descriptor = descriptor, @@ -115,7 +132,9 @@ void hvm_monitor_descriptor_access(uint64_t exit_info, req.u.desc_access.arch.vmx.exit_qualification = vmx_exit_qualification; } - monitor_traps(current, true, &req); + set_npt_base(curr, &req); + + monitor_traps(curr, true, &req); } static inline unsigned long gfn_of_rip(unsigned long rip) @@ -189,6 +208,8 @@ int hvm_monitor_debug(unsigned long rip, enum hvm_monitor_debug_type type, return -EOPNOTSUPP; } + set_npt_base(curr, &req); + return monitor_traps(curr, sync, &req); } @@ -207,12 +228,15 @@ int hvm_monitor_cpuid(unsigned long insn_length, unsigned int leaf, req.u.cpuid.leaf = leaf; req.u.cpuid.subleaf = subleaf; + set_npt_base(curr, &req); + return monitor_traps(curr, 1, &req); } void hvm_monitor_interrupt(unsigned int vector, unsigned int type, unsigned int err, uint64_t cr2) { + struct vcpu *curr = current; vm_event_request_t req = { .reason = VM_EVENT_REASON_INTERRUPT, .u.interrupt.x86.vector = vector, @@ -221,7 +245,9 @@ void hvm_monitor_interrupt(unsigned int vector, unsigned int type, .u.interrupt.x86.cr2 = cr2, }; - monitor_traps(current, 1, &req); + set_npt_base(curr, &req); + + monitor_traps(curr, 1, &req); } /* @@ -297,6 +323,8 @@ bool hvm_monitor_check_p2m(unsigned long gla, gfn_t gfn, uint32_t pfec, req.u.mem_access.gla = gla; req.u.mem_access.offset = gpa & ~PAGE_MASK; + set_npt_base(curr, &req); + return monitor_traps(curr, true, &req) >= 0; } diff --git a/xen/include/public/vm_event.h b/xen/include/public/vm_event.h index fdd3ad8a30..141ea024a3 100644 --- a/xen/include/public/vm_event.h +++ b/xen/include/public/vm_event.h @@ -29,7 +29,7 @@ #include "xen.h" -#define VM_EVENT_INTERFACE_VERSION 0x00000006 +#define VM_EVENT_INTERFACE_VERSION 0x00000007 #if defined(__XEN__) || defined(__XEN_TOOLS__) @@ -119,6 +119,10 @@ * which singlestep gets automatically disabled. */ #define VM_EVENT_FLAG_FAST_SINGLESTEP (1 << 11) +/* + * Set if the event comes from a nested VM and thus npt_base is valid. + */ +#define VM_EVENT_FLAG_NESTED_P2M (1 << 12) /* * Reasons for the vm event request @@ -208,6 +212,17 @@ struct vm_event_regs_x86 { uint64_t msr_star; uint64_t msr_lstar; uint64_t gdtr_base; + + /* + * When VM_EVENT_FLAG_NESTED_P2M is set, this event comes from a nested + * VM. npt_base is the guest physical address of the L1 hypervisors + * EPT/NPT tables for the nested guest. + * + * All bits outside of architectural address ranges are reserved for + * future metadata. + */ + uint64_t npt_base; + uint32_t cs_base; uint32_t ss_base; uint32_t ds_base; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 07 14:22:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jan 2021 14:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62919.111615 (Exim 4.92) (envelope-from ) id 1kxWAx-0004ht-8p; Thu, 07 Jan 2021 14:22:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62919.111615; Thu, 07 Jan 2021 14:22: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 1kxWAx-0004hl-5e; Thu, 07 Jan 2021 14:22:07 +0000 Received: by outflank-mailman (input) for mailman id 62919; Thu, 07 Jan 2021 14:22:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWAv-0004hg-B1 for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWAv-0002FY-6j for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxWAv-0005pA-48 for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22: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=GQNh+UNdPjXkryRjJxXGPvdGwCN3ri3wrPePhS6wXdc=; b=FYX5LTUX1taRFDxaVLG1rq8Emq 90CjxkwaVfMhxjnT/Zo3F99DW6Z37q2jzRB3iTVfql7NVgdTwsjFd94nUmN8tF/2WNZ70KXehDhF4 s2Vajj5S7jKyI+s70Y1/3hXz8vuqG6fThlSEF+vE8XV/hDWIu5e5YaKKuWZfM8mTfkfo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vPCI/MSI-X: fold clearing of entry->updated Message-Id: Date: Thu, 07 Jan 2021 14:22:05 +0000 commit c58654c22ae0dc74c2613e5e1a922b2bbd217abb Author: Jan Beulich AuthorDate: Thu Jan 7 15:03:17 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:03:17 2021 +0100 vPCI/MSI-X: fold clearing of entry->updated Both call sites clear the flag after a successfull call to update_entry(). This can be simplified by moving the clearing into the function, onto its success path. As a result of neither caller caring about update_entry()'s return value anymore, the function gets switched to return void. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/msix.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index 846a048a4a..846f1b8d70 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -37,8 +37,8 @@ static uint32_t control_read(const struct pci_dev *pdev, unsigned int reg, (msix->masked ? PCI_MSIX_FLAGS_MASKALL : 0); } -static int update_entry(struct vpci_msix_entry *entry, - const struct pci_dev *pdev, unsigned int nr) +static void update_entry(struct vpci_msix_entry *entry, + const struct pci_dev *pdev, unsigned int nr) { int rc = vpci_msix_arch_disable_entry(entry, pdev); @@ -48,7 +48,7 @@ static int update_entry(struct vpci_msix_entry *entry, gprintk(XENLOG_WARNING, "%pp: unable to disable entry %u for update: %d\n", &pdev->sbdf, nr, rc); - return rc; + return; } rc = vpci_msix_arch_enable_entry(entry, pdev, @@ -59,10 +59,10 @@ static int update_entry(struct vpci_msix_entry *entry, gprintk(XENLOG_WARNING, "%pp: unable to enable entry %u: %d\n", &pdev->sbdf, nr, rc); /* Entry is likely not properly configured. */ - return rc; + return; } - return 0; + entry->updated = false; } static void control_write(const struct pci_dev *pdev, unsigned int reg, @@ -90,13 +90,8 @@ static void control_write(const struct pci_dev *pdev, unsigned int reg, if ( new_enabled && !new_masked && (!msix->enabled || msix->masked) ) { for ( i = 0; i < msix->max_entries; i++ ) - { - if ( msix->entries[i].masked || !msix->entries[i].updated || - update_entry(&msix->entries[i], pdev, i) ) - continue; - - msix->entries[i].updated = false; - } + if ( !msix->entries[i].masked && msix->entries[i].updated ) + update_entry(&msix->entries[i], pdev, i); } else if ( !new_enabled && msix->enabled ) { @@ -363,10 +358,7 @@ static int msix_write(struct vcpu *v, unsigned long addr, unsigned int len, * data fields Xen needs to disable and enable the entry in order * to pick up the changes. */ - if ( update_entry(entry, pdev, vmsix_entry_nr(msix, entry)) ) - break; - - entry->updated = false; + update_entry(entry, pdev, vmsix_entry_nr(msix, entry)); } else vpci_msix_arch_mask_entry(entry, pdev, entry->masked); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 07 14:22:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jan 2021 14:22:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62920.111619 (Exim 4.92) (envelope-from ) id 1kxWB7-0004ig-Ag; Thu, 07 Jan 2021 14:22:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62920.111619; Thu, 07 Jan 2021 14:22: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 1kxWB7-0004iY-7E; Thu, 07 Jan 2021 14:22:17 +0000 Received: by outflank-mailman (input) for mailman id 62920; Thu, 07 Jan 2021 14:22:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWB5-0004iS-C7 for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWB5-0002Fb-A0 for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxWB5-0005q1-92 for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14: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=ZIQH4deHGMdKwMFvCype9Y9HI6Dpi0XmmmA9hLSC0TQ=; b=QJHVMap1qE1SUwt211z+MbusTp OTrAAjDk8PaEnmJwFhWEfDa2hub0F8DqBJdkmvvXQSU0naHfGu1wRpOTLmk7Q1uER2mIR0TuH60ja 5xZvEi3bLR961/zpEvXwKXwBUmY64FpvCYdqb7y0Ga18oP93qaaKfvYUVOAsM2u10O58=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] common: don't (kind of) open-code rcu_lock_domain_by_any_id() Message-Id: Date: Thu, 07 Jan 2021 14:22:15 +0000 commit a625c335593ed8475367f91fa9746c82d927794f Author: Jan Beulich AuthorDate: Thu Jan 7 15:06:15 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:06:15 2021 +0100 common: don't (kind of) open-code rcu_lock_domain_by_any_id() Even more so when using rcu_lock_domain_by_id() in place of the more efficient rcu_lock_current_domain(). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/common/event_channel.c | 5 +---- xen/common/page_alloc.c | 8 +------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 4a48094356..3aa4189d7a 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -349,10 +349,7 @@ static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) domid_t rdom = bind->remote_dom; long rc; - if ( rdom == DOMID_SELF ) - rdom = current->domain->domain_id; - - if ( (rd = rcu_lock_domain_by_id(rdom)) == NULL ) + if ( (rd = rcu_lock_domain_by_any_id(rdom)) == NULL ) return -ESRCH; /* Avoid deadlock by first acquiring lock of domain with smaller id. */ diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 4e86d79935..fcb308d92f 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2568,12 +2568,6 @@ struct domain *get_pg_owner(domid_t domid) { struct domain *pg_owner = NULL, *curr = current->domain; - if ( likely(domid == DOMID_SELF) ) - { - pg_owner = rcu_lock_current_domain(); - goto out; - } - if ( unlikely(domid == curr->domain_id) ) { gdprintk(XENLOG_WARNING, "Cannot specify itself as foreign domain\n"); @@ -2591,7 +2585,7 @@ struct domain *get_pg_owner(domid_t domid) break; default: - if ( (pg_owner = rcu_lock_domain_by_id(domid)) == NULL ) + if ( (pg_owner = rcu_lock_domain_by_any_id(domid)) == NULL ) gdprintk(XENLOG_WARNING, "Unknown domain d%d\n", domid); break; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 07 14:22:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jan 2021 14:22:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62921.111622 (Exim 4.92) (envelope-from ) id 1kxWBH-0004k9-C5; Thu, 07 Jan 2021 14:22:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62921.111622; Thu, 07 Jan 2021 14:22: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 1kxWBH-0004k1-8x; Thu, 07 Jan 2021 14:22:27 +0000 Received: by outflank-mailman (input) for mailman id 62921; Thu, 07 Jan 2021 14:22:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWBF-0004jl-EA for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWBF-0002Fj-DE for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxWBF-0005qd-CF for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14: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=28T5BY2y9D8bSPHig5DEhCJcDhT+n63AJMTBLiK2qcU=; b=Ty8345TDdfWQ3EQjC0JCqqB3Jh KEpPI7ntYYGCVna3sUpOQPxkasK6wPrM2kwFKj46pRB/oX+XSSVrQCON4noGic3Wg1DccUSz2YQDl gMYHbL3NWnRkbdq3vXMCiHmdP/8zUREAIOtMPpCP40QTbEtNv9KNadqGwRq/dZRnFgKQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: don't pointlessly use get_domain_by_id() Message-Id: Date: Thu, 07 Jan 2021 14:22:25 +0000 commit 37c709a16f8b6ab145d4a6dce171464837bd72a7 Author: Jan Beulich AuthorDate: Thu Jan 7 15:08:51 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:08:51 2021 +0100 x86: don't pointlessly use get_domain_by_id() For short-lived references rcu_lock_domain_by_id() is the better (slightly cheaper) alternative. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mcaction.c | 7 ++++--- xen/arch/x86/cpu/mcheck/mce.c | 21 ++++++++++----------- xen/arch/x86/debug.c | 4 ++-- xen/arch/x86/irq.c | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mcaction.c b/xen/arch/x86/cpu/mcheck/mcaction.c index 69332fb84d..f4f265c1bc 100644 --- a/xen/arch/x86/cpu/mcheck/mcaction.c +++ b/xen/arch/x86/cpu/mcheck/mcaction.c @@ -87,7 +87,7 @@ mc_memerr_dhandler(struct mca_binfo *binfo, BUG_ON( bank->mc_domid == DOMID_COW ); if ( bank->mc_domid != DOMID_XEN ) { - d = get_domain_by_id(bank->mc_domid); + d = rcu_lock_domain_by_id(bank->mc_domid); ASSERT(d); gfn = get_gpfn_from_mfn((bank->mc_addr) >> PAGE_SHIFT); @@ -132,6 +132,8 @@ mc_memerr_dhandler(struct mca_binfo *binfo, goto vmce_failed; } + rcu_unlock_domain(d); + /* * Impacted domain go on with domain's recovery job * if the domain has its own MCA handler. @@ -139,12 +141,11 @@ mc_memerr_dhandler(struct mca_binfo *binfo, * its own recovery job. */ *result = MCER_RECOVERED; - put_domain(d); return; vmce_failed: - put_domain(d); domain_crash(d); + rcu_unlock_domain(d); } } } diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 0e84368ae2..3a92e9db4e 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1497,7 +1497,6 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) if ( mc_msrinject->mcinj_flags & MC_MSRINJ_F_GPADDR ) { - domid_t domid; struct domain *d; struct mcinfo_msr *msr; unsigned int i; @@ -1505,17 +1504,17 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) unsigned long gfn, mfn; p2m_type_t t; - domid = (mc_msrinject->mcinj_domid == DOMID_SELF) ? - current->domain->domain_id : mc_msrinject->mcinj_domid; - if ( domid >= DOMID_FIRST_RESERVED ) - return x86_mcerr("do_mca inject: incompatible flag " - "MC_MSRINJ_F_GPADDR with domain %d", - -EINVAL, domid); - - d = get_domain_by_id(domid); + d = rcu_lock_domain_by_any_id(mc_msrinject->mcinj_domid); if ( d == NULL ) + { + if ( mc_msrinject->mcinj_domid >= DOMID_FIRST_RESERVED ) + return x86_mcerr("do_mca inject: incompatible flag " + "MC_MSRINJ_F_GPADDR with domain %d", + -EINVAL, domid); + return x86_mcerr("do_mca inject: bad domain id %d", -EINVAL, domid); + } for ( i = 0, msr = &mc_msrinject->mcinj_msr[0]; i < mc_msrinject->mcinj_count; @@ -1528,7 +1527,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) if ( mfn == mfn_x(INVALID_MFN) ) { put_gfn(d, gfn); - put_domain(d); + rcu_unlock_domain(d); return x86_mcerr("do_mca inject: bad gfn %#lx of domain %d", -EINVAL, gfn, domid); } @@ -1538,7 +1537,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) put_gfn(d, gfn); } - put_domain(d); + rcu_unlock_domain(d); } if ( !x86_mc_msrinject_verify(mc_msrinject) ) diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index 5d8acdad71..4356039ed2 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -164,13 +164,13 @@ unsigned int dbg_rw_mem(void * __user addr, void * __user buf, unsigned int len, domid_t domid, bool toaddr, uint64_t pgd3) { - struct domain *d = get_domain_by_id(domid); + struct domain *d = rcu_lock_domain_by_id(domid); if ( d ) { if ( !d->is_dying ) len = dbg_rw_guest_mem(d, addr, buf, len, toaddr, pgd3); - put_domain(d); + rcu_unlock_domain(d); } return len; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index e315fef4a6..13b1af57f3 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -323,7 +323,7 @@ void destroy_irq(unsigned int irq) if ( desc->arch.creator_domid != DOMID_INVALID ) { - struct domain *d = get_domain_by_id(desc->arch.creator_domid); + struct domain *d = rcu_lock_domain_by_id(desc->arch.creator_domid); if ( d ) { @@ -334,7 +334,7 @@ void destroy_irq(unsigned int irq) "Could not revoke %pd access to IRQ%u (error %d)\n", d, irq, err); - put_domain(d); + rcu_unlock_domain(d); } desc->arch.creator_domid = DOMID_INVALID; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 07 14:22:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jan 2021 14:22:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62922.111627 (Exim 4.92) (envelope-from ) id 1kxWBR-0004m6-DT; Thu, 07 Jan 2021 14:22:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62922.111627; Thu, 07 Jan 2021 14:22: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 1kxWBR-0004ly-AS; Thu, 07 Jan 2021 14:22:37 +0000 Received: by outflank-mailman (input) for mailman id 62922; Thu, 07 Jan 2021 14:22:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWBP-0004lo-Gw for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWBP-0002Fv-G7 for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxWBP-0005r7-FO for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14: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=6gebYqPtQ92bh9FJi0jHzv6ZqVWElXqpT7fTlhcJ2z0=; b=37yFVaiZulmNDKGileACrANzRg v42QPqV/dCr0YfEnMoBt4IM8uZNpdfZP+2D1E1K8RVTEqzTkK41AEdkw5h4w4Mt9yycq+5R4bgWOt k0yMJI4AGNQyGLChRZrau88kYKuWx/8j2XDU4SvoTvpuiPcMQ/7lwz4WX+twBviBGPRE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mem-sharing: don't pointlessly use get_domain_by_id() Message-Id: Date: Thu, 07 Jan 2021 14:22:35 +0000 commit 1977cd74ff545e0b68540d21c19c7e9282689420 Author: Jan Beulich AuthorDate: Thu Jan 7 15:09:20 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:09:20 2021 +0100 x86/mem-sharing: don't pointlessly use get_domain_by_id() For short-lived references rcu_lock_domain_by_id() is the better (slightly cheaper) alternative. Signed-off-by: Jan Beulich Acked-by: Tamas K Lengyel Acked-by: Andrew Cooper --- xen/arch/x86/mm/mem_sharing.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index fc7b2a4102..ad9d495110 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -537,7 +537,7 @@ static int audit(void) p2m_type_t t; mfn_t o_mfn; - d = get_domain_by_id(g->domain); + d = rcu_lock_domain_by_id(g->domain); if ( d == NULL ) { gdprintk(XENLOG_ERR, @@ -562,7 +562,7 @@ static int audit(void) d, g->gfn, mfn_x(mfn), p2m_ram_shared, t); errors++; } - put_domain(d); + rcu_unlock_domain(d); nr_gfns++; } /* The type count has an extra ref because we have locked the page */ @@ -1043,10 +1043,10 @@ static int share_pages(struct domain *sd, gfn_t sgfn, shr_handle_t sh, rmap_del(gfn, cpage, 0); rmap_add(gfn, spage); put_count++; - d = get_domain_by_id(gfn->domain); + d = rcu_lock_domain_by_id(gfn->domain); BUG_ON(!d); BUG_ON(set_shared_p2m_entry(d, gfn->gfn, smfn)); - put_domain(d); + rcu_unlock_domain(d); } ASSERT(list_empty(&cpage->sharing->gfns)); BUG_ON(!put_count); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 07 14:22:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jan 2021 14:22:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62923.111631 (Exim 4.92) (envelope-from ) id 1kxWBa-0004nW-Ev; Thu, 07 Jan 2021 14:22:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62923.111631; Thu, 07 Jan 2021 14: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 1kxWBa-0004nO-Bx; Thu, 07 Jan 2021 14:22:46 +0000 Received: by outflank-mailman (input) for mailman id 62923; Thu, 07 Jan 2021 14:22:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWBZ-0004nH-LZ for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWBZ-0002GK-KG for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxWBZ-0005rv-IO for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14: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=qN/7HiLrP33+K3U1cuhWPLa1wIEKGCt5uxdnldTGZ0Y=; b=I1LneRYYWp1dtsFieBW8s42I6Q RTUyjpCeyIaZbYoPTbbvx0UlLTmLkcLC4/4gVRQFxJrXBd2bj5Eryxdk4gITLMK3FI2UD2PYcAfpO 6dLtNoCkUBA0lHxYia6ohhyQhQhzjOYX8aEfs3Zg1+lKC0dZtV3JKa5hAs/SpMN038jg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: drop use of E801 memory "map" (and alike) Message-Id: Date: Thu, 07 Jan 2021 14:22:45 +0000 commit 925fdb0870f7c211c00caabbe9e4dae35cc19a01 Author: Jan Beulich AuthorDate: Thu Jan 7 15:09:47 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:09:47 2021 +0100 x86: drop use of E801 memory "map" (and alike) ACPI mandates use of E820 (or newer, e.g. EFI), and in fact firmware has been observed to include E820_ACPI ranges in what E801 reports as available (really "configured") memory. Since all 64-bit systems ought to support ACPI, drop our use of older BIOS and boot loader interfaces. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/boot/mem.S | 45 ++++----------------------------------------- xen/arch/x86/setup.c | 22 ---------------------- xen/include/asm-x86/e820.h | 1 - 3 files changed, 4 insertions(+), 64 deletions(-) diff --git a/xen/arch/x86/boot/mem.S b/xen/arch/x86/boot/mem.S index 5b9ab5c1de..a2db7b5d4d 100644 --- a/xen/arch/x86/boot/mem.S +++ b/xen/arch/x86/boot/mem.S @@ -4,8 +4,6 @@ #define E820_BIOS_MAX 128 get_memory_map: - -.Lmeme820: xorl %ebx, %ebx # continuation counter movw $bootsym(bios_e820map), %di # point into the whitelist # so we can have the bios @@ -17,14 +15,14 @@ get_memory_map: pushw %ds # data record. popw %es int $0x15 - jc .Lmem88 + jc .Ldone cmpl $SMAP,%eax # check the return is `SMAP' - jne .Lmem88 + jne .Ldone incw bootsym(bios_e820nr) cmpw $E820_BIOS_MAX, bootsym(bios_e820nr) # up to this many entries - jae .Lmem88 + jae .Ldone movw %di,%ax addw $20,%ax @@ -32,38 +30,7 @@ get_memory_map: testl %ebx,%ebx # check to see if jnz 1b # %ebx is set to EOF -.Lmem88: - movb $0x88, %ah - int $0x15 - movw %ax,bootsym(highmem_kb) - -.Lmeme801: - stc # fix to work around buggy - xorw %cx,%cx # BIOSes which don't clear/set - xorw %dx,%dx # carry on pass/error of - # e801h memory size call - # or merely pass cx,dx though - # without changing them. - movw $0xe801, %ax - int $0x15 - jc .Lint12 - - testw %cx, %cx # Kludge to handle BIOSes - jnz 1f # which report their extended - testw %dx, %dx # memory in AX/BX rather than - jnz 1f # CX/DX. The spec I have read - movw %ax, %cx # seems to indicate AX/BX - movw %bx, %dx # are more reasonable anyway... -1: movzwl %dx, %edx - shll $6,%edx # and go from 64k to 1k chunks - movzwl %cx, %ecx - addl %ecx, %edx # add in lower memory - movl %edx,bootsym(highmem_kb) # store extended memory size - -.Lint12: - int $0x12 - movw %ax,bootsym(lowmem_kb) - +.Ldone: ret .align 4 @@ -71,7 +38,3 @@ GLOBAL(bios_e820map) .fill E820_BIOS_MAX*20,1,0 GLOBAL(bios_e820nr) .long 0 -GLOBAL(lowmem_kb) - .long 0 -GLOBAL(highmem_kb) - .long 0 diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 5cdb0f0f92..ad65167864 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1059,28 +1059,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) bytes += map->size + 4; } } - else if ( bootsym(lowmem_kb) ) - { - memmap_type = "Xen-e801"; - e820_raw.map[0].addr = 0; - e820_raw.map[0].size = bootsym(lowmem_kb) << 10; - e820_raw.map[0].type = E820_RAM; - e820_raw.map[1].addr = 0x100000; - e820_raw.map[1].size = bootsym(highmem_kb) << 10; - e820_raw.map[1].type = E820_RAM; - e820_raw.nr_map = 2; - } - else if ( mbi->flags & MBI_MEMLIMITS ) - { - memmap_type = "Multiboot-e801"; - e820_raw.map[0].addr = 0; - e820_raw.map[0].size = mbi->mem_lower << 10; - e820_raw.map[0].type = E820_RAM; - e820_raw.map[1].addr = 0x100000; - e820_raw.map[1].size = mbi->mem_upper << 10; - e820_raw.map[1].type = E820_RAM; - e820_raw.nr_map = 2; - } else panic("Bootloader provided no memory information\n"); diff --git a/xen/include/asm-x86/e820.h b/xen/include/asm-x86/e820.h index 52916fb75d..9d8f1ba960 100644 --- a/xen/include/asm-x86/e820.h +++ b/xen/include/asm-x86/e820.h @@ -36,7 +36,6 @@ extern struct e820map e820; extern struct e820map e820_raw; /* These symbols live in the boot trampoline. */ -extern unsigned int lowmem_kb, highmem_kb; extern struct e820map bios_e820map[]; extern unsigned int bios_e820nr; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 07 14:22:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jan 2021 14:22:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62924.111634 (Exim 4.92) (envelope-from ) id 1kxWBk-0004ot-Gd; Thu, 07 Jan 2021 14:22:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62924.111634; Thu, 07 Jan 2021 14: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 1kxWBk-0004ok-DX; Thu, 07 Jan 2021 14:22:56 +0000 Received: by outflank-mailman (input) for mailman id 62924; Thu, 07 Jan 2021 14:22:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWBj-0004od-OT for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWBj-0002GS-NV for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:22:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxWBj-0005sN-Mb for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14: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=OYjlkedWckRjfJpUPZ+ROel+Y479qGV6+SYyJ6ofP1s=; b=BsaMT3u3f50forTACS01VIj/U9 oPRzJGr6CSZqAevp+dnJiIh7FXHcnq2amMN5ojJEKaI3GHvsjnw/qYbz3Eb2g9x9JoscJKKPyJGzF jj//UTdt8tkZxs4lF3uRpzuZEwm8tNCM0mPZhOfFilFTiam6jBTsodPOC2TZBF0o0Uwg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/dpci: EOI interrupt regardless of its masking status Message-Id: Date: Thu, 07 Jan 2021 14:22:55 +0000 commit eb298f32fac5ac362eef30a66a9c9c42724d4ce6 Author: Roger Pau Monné AuthorDate: Thu Jan 7 15:10:29 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:10:29 2021 +0100 x86/dpci: EOI interrupt regardless of its masking status Modify hvm_pirq_eoi to always EOI the interrupt if required, instead of not doing such EOI if the interrupt is routed through the vIO-APIC and the entry is masked at the time the EOI is performed. Further unmask of the vIO-APIC pin won't EOI the interrupt, and thus the guest OS has to wait for the timeout to expire and the automatic EOI to be performed. This allows to simplify the helpers and drop the vioapic_redir_entry parameter from all of them. Fixes: ccfe4e08455 ('Intel vt-d specific changes in arch/x86/hvm/vmx/vtd.') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/vioapic.c | 2 +- xen/arch/x86/hvm/vpic.c | 3 +-- xen/drivers/passthrough/x86/hvm.c | 21 ++++++++------------- xen/include/asm-x86/hvm/io.h | 3 +-- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index 7c462a44d4..eb6c143f74 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -521,7 +521,7 @@ void vioapic_update_EOI(struct domain *d, u8 vector) if ( is_iommu_enabled(d) ) { spin_unlock(&d->arch.hvm.irq_lock); - hvm_dpci_eoi(d, vioapic->base_gsi + pin, ent); + hvm_dpci_eoi(d, vioapic->base_gsi + pin); spin_lock(&d->arch.hvm.irq_lock); } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 3cf12581e9..c1c1de7fd0 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -263,8 +263,7 @@ static void vpic_ioport_write( vpic_update_int_output(vpic); vpic_unlock(vpic); hvm_dpci_eoi(current->domain, - hvm_isa_irq_to_gsi((addr >> 7) ? (pin | 8) : pin), - NULL); + hvm_isa_irq_to_gsi((addr >> 7) ? (pin | 8) : pin)); return; /* bail immediately */ case 6: /* Set Priority */ vpic->priority_add = (val + 1) & 7; diff --git a/xen/drivers/passthrough/x86/hvm.c b/xen/drivers/passthrough/x86/hvm.c index 41cfa2e200..edc8059518 100644 --- a/xen/drivers/passthrough/x86/hvm.c +++ b/xen/drivers/passthrough/x86/hvm.c @@ -950,8 +950,7 @@ static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) spin_unlock(&d->event_lock); } -static void hvm_pirq_eoi(struct pirq *pirq, - const union vioapic_redir_entry *ent) +static void hvm_pirq_eoi(struct pirq *pirq) { struct hvm_pirq_dpci *pirq_dpci; @@ -968,7 +967,6 @@ static void hvm_pirq_eoi(struct pirq *pirq, * since interrupt is still not EOIed */ if ( --pirq_dpci->pending || - (ent && ent->fields.mask) || !pt_irq_need_timer(pirq_dpci->flags) ) return; @@ -977,19 +975,17 @@ static void hvm_pirq_eoi(struct pirq *pirq, } static void __hvm_dpci_eoi(struct domain *d, - const struct hvm_girq_dpci_mapping *girq, - const union vioapic_redir_entry *ent) + const struct hvm_girq_dpci_mapping *girq) { struct pirq *pirq = pirq_info(d, girq->machine_gsi); if ( !hvm_domain_use_pirq(d, pirq) ) hvm_pci_intx_deassert(d, girq->device, girq->intx); - hvm_pirq_eoi(pirq, ent); + hvm_pirq_eoi(pirq); } -static void hvm_gsi_eoi(struct domain *d, unsigned int gsi, - const union vioapic_redir_entry *ent) +static void hvm_gsi_eoi(struct domain *d, unsigned int gsi) { struct pirq *pirq = pirq_info(d, gsi); @@ -998,11 +994,10 @@ static void hvm_gsi_eoi(struct domain *d, unsigned int gsi, return; hvm_gsi_deassert(d, gsi); - hvm_pirq_eoi(pirq, ent); + hvm_pirq_eoi(pirq); } -void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, - const union vioapic_redir_entry *ent) +void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi) { const struct hvm_irq_dpci *hvm_irq_dpci; const struct hvm_girq_dpci_mapping *girq; @@ -1013,7 +1008,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, if ( is_hardware_domain(d) ) { spin_lock(&d->event_lock); - hvm_gsi_eoi(d, guest_gsi, ent); + hvm_gsi_eoi(d, guest_gsi); goto unlock; } @@ -1030,7 +1025,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, goto unlock; list_for_each_entry ( girq, &hvm_irq_dpci->girq[guest_gsi], list ) - __hvm_dpci_eoi(d, girq, ent); + __hvm_dpci_eoi(d, girq); unlock: spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 558426b772..9453b9b2b7 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -118,8 +118,7 @@ bool handle_mmio_with_translation(unsigned long gla, unsigned long gpfn, struct npfec); bool handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); -void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, - const union vioapic_redir_entry *ent); +void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq); void msix_write_completion(struct vcpu *); #ifdef CONFIG_HVM -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 07 14:23:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jan 2021 14:23:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.62925.111639 (Exim 4.92) (envelope-from ) id 1kxWBu-0004qR-K0; Thu, 07 Jan 2021 14:23:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 62925.111639; Thu, 07 Jan 2021 14: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 1kxWBu-0004qI-Gf; Thu, 07 Jan 2021 14:23:06 +0000 Received: by outflank-mailman (input) for mailman id 62925; Thu, 07 Jan 2021 14:23:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWBt-0004qA-Ry for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:23:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxWBt-0002Gw-RC for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14:23:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxWBt-0005t5-PZ for xen-changelog@lists.xenproject.org; Thu, 07 Jan 2021 14: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=dPvcmascFhlgHTMk9uyjrY0Uxouvo0MgUs5+ihQW3SE=; b=GQhwBUxPTFGNI8e/GAIaS6neji Smh/JkeRmp4/vdkm5UXGKJr468FQ5bETk0ulIAsg8uNmcHAoB5v9/uIA3WMHBigySmTEpvtgAX/dB 0Ov8C400bjy+H/KonyJUbTwunLR9KwQOqm0eXwVl+BBSIvpDTnXKX+qEwV8/UJtdLagQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xsm/dummy: harden against speculative abuse Message-Id: Date: Thu, 07 Jan 2021 14:23:05 +0000 commit 994f6478a48a60e3b407c7defc2d36a80f880b04 Author: Jan Beulich AuthorDate: Thu Jan 7 15:11:25 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:11:25 2021 +0100 xsm/dummy: harden against speculative abuse First of all don't open-code is_control_domain(), which is already suitably using evaluate_nospec(). Then also apply this construct to the other paths of xsm_default_action(). Also guard two paths not using this function. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu --- xen/include/xsm/dummy.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 7ae3c40eb5..fa40e880ba 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -76,20 +76,20 @@ static always_inline int xsm_default_action( case XSM_HOOK: return 0; case XSM_TARGET: - if ( src == target ) + if ( evaluate_nospec(src == target) ) { return 0; case XSM_XS_PRIV: - if ( is_xenstore_domain(src) ) + if ( evaluate_nospec(is_xenstore_domain(src)) ) return 0; } /* fall through */ case XSM_DM_PRIV: - if ( target && src->target == target ) + if ( target && evaluate_nospec(src->target == target) ) return 0; /* fall through */ case XSM_PRIV: - if ( src->is_privileged ) + if ( is_control_domain(src) ) return 0; return -EPERM; default: @@ -656,7 +656,7 @@ static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct do XSM_ASSERT_ACTION(XSM_TARGET); if ( f != dom_io ) rc = xsm_default_action(action, d, f); - if ( t && !rc ) + if ( evaluate_nospec(t) && !rc ) rc = xsm_default_action(action, d, t); return rc; } @@ -750,6 +750,7 @@ static XSM_INLINE int xsm_xen_version (XSM_DEFAULT_ARG uint32_t op) case XENVER_platform_parameters: case XENVER_get_features: /* These sub-ops ignore the permission checks and return data. */ + block_speculation(); return 0; case XENVER_extraversion: case XENVER_compile_info: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 08 10:33:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jan 2021 10:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.63306.112422 (Exim 4.92) (envelope-from ) id 1kxp4s-0004Lt-88; Fri, 08 Jan 2021 10:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 63306.112422; Fri, 08 Jan 2021 10: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 1kxp4s-0004Ll-5E; Fri, 08 Jan 2021 10:33:06 +0000 Received: by outflank-mailman (input) for mailman id 63306; Fri, 08 Jan 2021 10:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxp4q-0004Lg-R2 for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxp4q-0006BB-MS for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxp4q-0002jQ-Kt for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10: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=i7Ut0Wl1XnJ7Bxw5G4XPEt1tjurBWOvWHxMJaH4Dxq4=; b=H88nSiyrWZB2Q6FGVfoHekBIyp njn9aZ6xgTLfhAeTjx7b1ZyfETAAutZMutoHY8Zi0WorvuL7HuhubfR5BKkxYLWUMyo0x0wQ1iJAH /10lBk5yf2yD/YJxJ+W5i92YdOxXlKjUItuzx1Om2Or5OG7U5y5VhVcX2FXUc3NdWyDM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: optee: The function identifier is always 32-bit Message-Id: Date: Fri, 08 Jan 2021 10:33:04 +0000 commit ede2583fa1a28a969c5609b86aa82a7ba9f19a26 Author: Roman Skakun AuthorDate: Wed Jan 6 13:26:57 2021 +0200 Commit: Julien Grall CommitDate: Fri Jan 8 10:24:23 2021 +0000 xen/arm: optee: The function identifier is always 32-bit Per the SMCCC specification (see section 3.1 in ARM DEN 0028D), the function identifier is only stored in the least significant 32-bits. The most significant 32-bits should be ignored. Signed-off-by: Roman Skakun Acked-by: Volodymyr Babchyk [jgrall: Reword the commit message and comment] Acked-by: Julien Grall --- xen/arch/arm/tee/optee.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/tee/optee.c b/xen/arch/arm/tee/optee.c index ee85359742..9570dc6771 100644 --- a/xen/arch/arm/tee/optee.c +++ b/xen/arch/arm/tee/optee.c @@ -1643,7 +1643,11 @@ static bool optee_handle_call(struct cpu_user_regs *regs) if ( !ctx ) return false; - switch ( get_user_reg(regs, 0) ) + /* + * The function identifier is always stored in the least significant + * 32-bit (see section ARM DEN 0028D). + */ + switch ( (uint32_t)get_user_reg(regs, 0) ) { case OPTEE_SMC_CALLS_COUNT: set_user_reg(regs, 0, OPTEE_MEDIATOR_SMC_COUNT); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 08 10:55:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jan 2021 10:55:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.63319.112425 (Exim 4.92) (envelope-from ) id 1kxpQA-0006Ea-Sa; Fri, 08 Jan 2021 10:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 63319.112425; Fri, 08 Jan 2021 10: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 1kxpQA-0006ES-Pc; Fri, 08 Jan 2021 10:55:06 +0000 Received: by outflank-mailman (input) for mailman id 63319; Fri, 08 Jan 2021 10:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxpQ8-0006EN-Ph for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxpQ8-0006W4-Nw for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxpQ8-0004IT-Lx for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10: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=Pv9IL0q9zTuLYjn1p+pf99Gnx4eT88LqtKqIemY0y1I=; b=xuadI8+oPDhf9G0FGGpVG1AiQg 1jnyJxpJLZTqNmM/djGCHsTTwnOanYSOOhZcupCiEkX+HcVf5zIT4evVlsKsdB4K9caMisB/Mn80p MvMi8VgtH5YSDp02wk68VtmrTz21VztIOjije+kWoSaMh8LhNjchkRqdT1rBKRsT5orE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: replace __ASM_{CL,ST}AC Message-Id: Date: Fri, 08 Jan 2021 10:55:04 +0000 commit 6721f01ba1ccb7a32778e485d15e58d2eb6184f2 Author: Jan Beulich AuthorDate: Fri Jan 8 11:45:07 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 11:45:07 2021 +0100 x86: replace __ASM_{CL,ST}AC Introduce proper assembler macros instead, enabled only when the assembler itself doesn't support the insns. To avoid duplicating the macros for assembly and C files, have them processed into asm-macros.h. This in turn requires adding a multiple inclusion guard when generating that header. No change to generated code. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/Makefile | 3 +++ xen/arch/x86/arch.mk | 1 + xen/arch/x86/asm-macros.c | 1 + xen/include/asm-x86/asm-defns.h | 9 +++++++++ xen/include/asm-x86/asm_defns.h | 17 ++++++----------- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 7f4f5ed96f..7769bb40d7 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -250,7 +250,10 @@ $(BASEDIR)/include/asm-x86/asm-macros.h: asm-macros.i Makefile echo '#if 0' >$@.new echo '.if 0' >>$@.new echo '#endif' >>$@.new + echo '#ifndef __ASM_MACROS_H__' >>$@.new + echo '#define __ASM_MACROS_H__' >>$@.new echo 'asm ( ".include \"$@\"" );' >>$@.new + echo '#endif /* __ASM_MACROS_H__ */' >>$@.new echo '#if 0' >>$@.new echo '.endif' >>$@.new cat $< >>$@.new diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 04e967436b..ce0c1a0e7f 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -20,6 +20,7 @@ $(call as-option-add,CFLAGS,CC,"rdrand %eax",-DHAVE_AS_RDRAND) $(call as-option-add,CFLAGS,CC,"rdfsbase %rax",-DHAVE_AS_FSGSBASE) $(call as-option-add,CFLAGS,CC,"xsaveopt (%rax)",-DHAVE_AS_XSAVEOPT) $(call as-option-add,CFLAGS,CC,"rdseed %eax",-DHAVE_AS_RDSEED) +$(call as-option-add,CFLAGS,CC,"clac",-DHAVE_AS_CLAC_STAC) $(call as-option-add,CFLAGS,CC,"clwb (%rax)",-DHAVE_AS_CLWB) $(call as-option-add,CFLAGS,CC,".equ \"x\"$$(comma)1",-DHAVE_AS_QUOTED_SYM) $(call as-option-add,CFLAGS,CC,"invpcid (%rax)$$(comma)%rax",-DHAVE_AS_INVPCID) diff --git a/xen/arch/x86/asm-macros.c b/xen/arch/x86/asm-macros.c index b963d56a56..7e536b0d82 100644 --- a/xen/arch/x86/asm-macros.c +++ b/xen/arch/x86/asm-macros.c @@ -1 +1,2 @@ +#include #include diff --git a/xen/include/asm-x86/asm-defns.h b/xen/include/asm-x86/asm-defns.h new file mode 100644 index 0000000000..e070f3814f --- /dev/null +++ b/xen/include/asm-x86/asm-defns.h @@ -0,0 +1,9 @@ +#ifndef HAVE_AS_CLAC_STAC +.macro clac + .byte 0x0f, 0x01, 0xca +.endm + +.macro stac + .byte 0x0f, 0x01, 0xcb +.endm +#endif diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 774a294d15..901fb89cef 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -13,10 +13,12 @@ #include #ifdef __ASSEMBLY__ +#include #ifndef CONFIG_INDIRECT_THUNK .equ CONFIG_INDIRECT_THUNK, 0 #endif #else +#include asm ( "\t.equ CONFIG_INDIRECT_THUNK, " __stringify(IS_ENABLED(CONFIG_INDIRECT_THUNK)) ); #endif @@ -199,34 +201,27 @@ register unsigned long current_stack_pointer asm("rsp"); #endif -/* "Raw" instruction opcodes */ -#define __ASM_CLAC ".byte 0x0f,0x01,0xca" -#define __ASM_STAC ".byte 0x0f,0x01,0xcb" - #ifdef __ASSEMBLY__ .macro ASM_STAC - ALTERNATIVE "", __ASM_STAC, X86_FEATURE_XEN_SMAP + ALTERNATIVE "", stac, X86_FEATURE_XEN_SMAP .endm .macro ASM_CLAC - ALTERNATIVE "", __ASM_CLAC, X86_FEATURE_XEN_SMAP + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP .endm #else static always_inline void clac(void) { /* Note: a barrier is implicit in alternative() */ - alternative("", __ASM_CLAC, X86_FEATURE_XEN_SMAP); + alternative("", "clac", X86_FEATURE_XEN_SMAP); } static always_inline void stac(void) { /* Note: a barrier is implicit in alternative() */ - alternative("", __ASM_STAC, X86_FEATURE_XEN_SMAP); + alternative("", "stac", X86_FEATURE_XEN_SMAP); } #endif -#undef __ASM_STAC -#undef __ASM_CLAC - #ifdef __ASSEMBLY__ .macro SAVE_ALL op, compat=0 .ifeqs "\op", "CLAC" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 08 10:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jan 2021 10:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.63320.112430 (Exim 4.92) (envelope-from ) id 1kxpQK-0006FU-U3; Fri, 08 Jan 2021 10:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 63320.112430; Fri, 08 Jan 2021 10: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 1kxpQK-0006FM-R7; Fri, 08 Jan 2021 10:55:16 +0000 Received: by outflank-mailman (input) for mailman id 63320; Fri, 08 Jan 2021 10:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxpQI-0006FB-UF for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxpQI-0006W7-SZ for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxpQI-0004J9-QQ for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10: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=wHfbFfDd3oLRpK2OPuUc1OX5FaIZUsijMaWExYGhhnA=; b=z4bCqUSUUmBgRMupUC3IZSvFMF 29ZiPjo2/dTKnVuiy9unEaW/+a/zWQvpStZWOXaXPSQkZC8UDK/TCLb/ZoJOQNKnt3b2BfBtlBC8J YRP7He2UC8/YjcOGDKdLZMXJ/8hJCpotPh7YQwg66E3yEsTZvTEcPa9IVdrg+kN3hpPU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: drop ASM_{CL,ST}AC Message-Id: Date: Fri, 08 Jan 2021 10:55:14 +0000 commit 5fa9a14436af81c3263f9ac31b64972416a59307 Author: Jan Beulich AuthorDate: Fri Jan 8 11:48:09 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 11:48:09 2021 +0100 x86: drop ASM_{CL,ST}AC Use ALTERNATIVE directly, such that at the use sites it is visible that alternative code patching is in use. Similarly avoid hiding the fact in SAVE_ALL. No change to generated code. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/traps.c | 5 ++--- xen/arch/x86/x86_64/compat/entry.S | 8 ++++---- xen/arch/x86/x86_64/entry.S | 24 ++++++++++++++---------- xen/include/asm-x86/asm_defns.h | 23 +---------------------- 4 files changed, 21 insertions(+), 39 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0459cee9fb..4bd2cb6a1a 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2200,9 +2200,8 @@ void activate_debugregs(const struct vcpu *curr) void asm_domain_crash_synchronous(unsigned long addr) { /* - * We need clear AC bit here because in entry.S AC is set - * by ASM_STAC to temporarily allow accesses to user pages - * which is prevented by SMAP by default. + * We need to clear the AC bit here because the exception fixup logic + * may leave user accesses enabled. * * For some code paths, where this function is called, clac() * is not needed, but adding clac() here instead of each place diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 16a2f439a7..c2c73cc732 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -14,7 +14,7 @@ #ifdef CONFIG_PV32 ENTRY(entry_int82) - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP pushq $0 movl $HYPERCALL_VECTOR, 4(%rsp) SAVE_ALL compat=1 /* DPL1 gate, restricted to 32bit PV guests only. */ @@ -290,7 +290,7 @@ ENTRY(compat_int80_direct_trap) compat_create_bounce_frame: ASSERT_INTERRUPTS_ENABLED mov %fs,%edi - ASM_STAC + ALTERNATIVE "", stac, X86_FEATURE_XEN_SMAP testb $2,UREGS_cs+8(%rsp) jz 1f /* Push new frame at registered guest-OS stack base. */ @@ -337,7 +337,7 @@ compat_create_bounce_frame: movl TRAPBOUNCE_error_code(%rdx),%eax .Lft8: movl %eax,%fs:(%rsi) # ERROR CODE 1: - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP /* Rewrite our stack frame and return to guest-OS mode. */ /* IA32 Ref. Vol. 3: TF, VM, RF and NT flags are cleared on trap. */ andl $~(X86_EFLAGS_VM|X86_EFLAGS_RF|\ @@ -383,7 +383,7 @@ compat_crash_page_fault_4: addl $4,%esi compat_crash_page_fault: .Lft14: mov %edi,%fs - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP movl %esi,%edi call show_page_walk jmp dom_crash_sync_extable diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index c16b3c90be..7292ae8493 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -280,7 +280,7 @@ ENTRY(sysenter_entry) pushq $0 pushfq GLOBAL(sysenter_eflags_saved) - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP pushq $3 /* ring 3 null cs */ pushq $0 /* null rip */ pushq $0 @@ -333,7 +333,7 @@ UNLIKELY_END(sysenter_gpf) jmp .Lbounce_exception ENTRY(int80_direct_trap) - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP pushq $0 movl $0x80, 4(%rsp) SAVE_ALL @@ -452,7 +452,7 @@ __UNLIKELY_END(create_bounce_frame_bad_sp) subq $7*8,%rsi movq UREGS_ss+8(%rsp),%rax - ASM_STAC + ALTERNATIVE "", stac, X86_FEATURE_XEN_SMAP movq VCPU_domain(%rbx),%rdi STORE_GUEST_STACK(rax,6) # SS movq UREGS_rsp+8(%rsp),%rax @@ -490,7 +490,7 @@ __UNLIKELY_END(create_bounce_frame_bad_sp) STORE_GUEST_STACK(rax,1) # R11 movq UREGS_rcx+8(%rsp),%rax STORE_GUEST_STACK(rax,0) # RCX - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP #undef STORE_GUEST_STACK @@ -532,11 +532,11 @@ domain_crash_page_fault_2x8: domain_crash_page_fault_1x8: addq $8,%rsi domain_crash_page_fault_0x8: - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP movq %rsi,%rdi call show_page_walk ENTRY(dom_crash_sync_extable) - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP # Get out of the guest-save area of the stack. GET_STACK_END(ax) leaq STACK_CPUINFO_FIELD(guest_cpu_user_regs)(%rax),%rsp @@ -597,7 +597,8 @@ UNLIKELY_END(exit_cr3) iretq ENTRY(common_interrupt) - SAVE_ALL CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP + SAVE_ALL GET_STACK_END(14) @@ -629,7 +630,8 @@ ENTRY(page_fault) movl $TRAP_page_fault,4(%rsp) /* No special register assumptions. */ GLOBAL(handle_exception) - SAVE_ALL CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP + SAVE_ALL GET_STACK_END(14) @@ -834,7 +836,8 @@ ENTRY(entry_CP) ENTRY(double_fault) movl $TRAP_double_fault,4(%rsp) /* Set AC to reduce chance of further SMAP faults */ - SAVE_ALL STAC + ALTERNATIVE "", stac, X86_FEATURE_XEN_SMAP + SAVE_ALL GET_STACK_END(14) @@ -867,7 +870,8 @@ ENTRY(nmi) pushq $0 movl $TRAP_nmi,4(%rsp) handle_ist_exception: - SAVE_ALL CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP + SAVE_ALL GET_STACK_END(14) diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 901fb89cef..f8de679feb 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -199,16 +199,6 @@ register unsigned long current_stack_pointer asm("rsp"); UNLIKELY_END_SECTION "\n" \ ".Llikely." #tag ".%=:" -#endif - -#ifdef __ASSEMBLY__ -.macro ASM_STAC - ALTERNATIVE "", stac, X86_FEATURE_XEN_SMAP -.endm -.macro ASM_CLAC - ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP -.endm -#else static always_inline void clac(void) { /* Note: a barrier is implicit in alternative() */ @@ -223,18 +213,7 @@ static always_inline void stac(void) #endif #ifdef __ASSEMBLY__ -.macro SAVE_ALL op, compat=0 -.ifeqs "\op", "CLAC" - ASM_CLAC -.else -.ifeqs "\op", "STAC" - ASM_STAC -.else -.ifnb \op - .err -.endif -.endif -.endif +.macro SAVE_ALL compat=0 addq $-(UREGS_error_code-UREGS_r15), %rsp cld movq %rdi,UREGS_rdi(%rsp) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 08 10:55:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jan 2021 10:55:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.63321.112434 (Exim 4.92) (envelope-from ) id 1kxpQU-0006H2-Vh; Fri, 08 Jan 2021 10:55:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 63321.112434; Fri, 08 Jan 2021 10: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 1kxpQU-0006Gu-Sg; Fri, 08 Jan 2021 10:55:26 +0000 Received: by outflank-mailman (input) for mailman id 63321; Fri, 08 Jan 2021 10:55:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxpQT-0006Gk-1X for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxpQT-0006WD-0g for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxpQS-0004KB-V0 for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10: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=JEf3bCjs/ZoCDt31sHloOo8r1Wuv7CC78JznhbFubY8=; b=nUa1nS3zw8tTjTrtbYDjhdYqTp 6YDnreosKHrXy1Nti3E+GyNzD5JFTTxDLyPG3iqgwSn25VexGgY6+F63qk1eFBOac3Vyw7njrk1IR 5bfzqho8GcQOmwS9H2VQmD1IJ/kJntbMDqLgiC2sKCdDA7nGCpr3RLLAtbgj7rk5dzOg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: fold indirect_thunk_asm.h into asm-defns.h Message-Id: Date: Fri, 08 Jan 2021 10:55:24 +0000 commit 762c3890c89f70687fad1130e61ac99e671b2a6d Author: Jan Beulich AuthorDate: Fri Jan 8 11:50:32 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 11:50:32 2021 +0100 x86: fold indirect_thunk_asm.h into asm-defns.h There's little point in having two separate headers both getting included by asm_defns.h. This in particular reduces the number of instances of guarding asm(".include ...") suitably in such dual use headers. No change to generated code. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/Makefile | 2 +- xen/include/asm-x86/asm-defns.h | 37 ++++++++++++++++++++++ xen/include/asm-x86/asm_defns.h | 1 - xen/include/asm-x86/indirect_thunk_asm.h | 53 -------------------------------- 4 files changed, 38 insertions(+), 55 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 73bdc326c5..544cc0995d 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -139,7 +139,7 @@ ifeq ($(TARGET_ARCH),x86) t1 = $(call as-insn,$(CC),".L0: .L1: .skip (.L1 - .L0)",,-no-integrated-as) # Check whether clang asm()-s support .include. -t2 = $(call as-insn,$(CC) -I$(BASEDIR)/include,".include \"asm-x86/indirect_thunk_asm.h\"",,-no-integrated-as) +t2 = $(call as-insn,$(CC) -I$(BASEDIR)/include,".include \"asm-x86/asm-defns.h\"",,-no-integrated-as) # Check whether clang keeps .macro-s between asm()-s: # https://bugs.llvm.org/show_bug.cgi?id=36110 diff --git a/xen/include/asm-x86/asm-defns.h b/xen/include/asm-x86/asm-defns.h index e070f3814f..43f4868d40 100644 --- a/xen/include/asm-x86/asm-defns.h +++ b/xen/include/asm-x86/asm-defns.h @@ -7,3 +7,40 @@ .byte 0x0f, 0x01, 0xcb .endm #endif + +.macro INDIRECT_BRANCH insn:req arg:req +/* + * Create an indirect branch. insn is one of call/jmp, arg is a single + * register. + * + * With no compiler support, this degrades into a plain indirect call/jmp. + * With compiler support, dispatch to the correct __x86_indirect_thunk_* + */ + .if CONFIG_INDIRECT_THUNK == 1 + + $done = 0 + .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 + .ifeqs "\arg", "%r\reg" + \insn __x86_indirect_thunk_r\reg + $done = 1 + .exitm + .endif + .endr + + .if $done != 1 + .error "Bad register arg \arg" + .endif + + .else + \insn *\arg + .endif +.endm + +/* Convenience wrappers. */ +.macro INDIRECT_CALL arg:req + INDIRECT_BRANCH call \arg +.endm + +.macro INDIRECT_JMP arg:req + INDIRECT_BRANCH jmp \arg +.endm diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index f8de679feb..d480a4461b 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -22,7 +22,6 @@ asm ( "\t.equ CONFIG_INDIRECT_THUNK, " __stringify(IS_ENABLED(CONFIG_INDIRECT_THUNK)) ); #endif -#include #ifndef __ASSEMBLY__ diff --git a/xen/include/asm-x86/indirect_thunk_asm.h b/xen/include/asm-x86/indirect_thunk_asm.h deleted file mode 100644 index 71e6de5bf7..0000000000 --- a/xen/include/asm-x86/indirect_thunk_asm.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Trickery to allow this header to be included at the C level, to permit - * proper dependency tracking in .*.o.d files, while still having it contain - * assembler only macros. - */ -#ifndef __ASSEMBLY__ -# if 0 - .if 0 -# endif -asm ( "\t.include \"asm/indirect_thunk_asm.h\"" ); -# if 0 - .endif -# endif -#else - -.macro INDIRECT_BRANCH insn:req arg:req -/* - * Create an indirect branch. insn is one of call/jmp, arg is a single - * register. - * - * With no compiler support, this degrades into a plain indirect call/jmp. - * With compiler support, dispatch to the correct __x86_indirect_thunk_* - */ - .if CONFIG_INDIRECT_THUNK == 1 - - $done = 0 - .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 - .ifeqs "\arg", "%r\reg" - \insn __x86_indirect_thunk_r\reg - $done = 1 - .exitm - .endif - .endr - - .if $done != 1 - .error "Bad register arg \arg" - .endif - - .else - \insn *\arg - .endif -.endm - -/* Convenience wrappers. */ -.macro INDIRECT_CALL arg:req - INDIRECT_BRANCH call \arg -.endm - -.macro INDIRECT_JMP arg:req - INDIRECT_BRANCH jmp \arg -.endm - -#endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 08 10:55:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jan 2021 10:55:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.63322.112438 (Exim 4.92) (envelope-from ) id 1kxpQf-0006IK-1i; Fri, 08 Jan 2021 10:55:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 63322.112438; Fri, 08 Jan 2021 10:55:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxpQe-0006IC-UE; Fri, 08 Jan 2021 10:55:36 +0000 Received: by outflank-mailman (input) for mailman id 63322; Fri, 08 Jan 2021 10:55:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxpQd-0006I4-5Y for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10:55:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxpQd-0006WT-3l for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10:55:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxpQd-0004L3-2w for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 10: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=0QR7eLvi0XqTWeFX2P5KLTvoEUcxN5r1kjxtU7JiOX0=; b=ow0o3igVOJ0dGDUgMRj/Qn5Edj jse8L/7QIjQAK5AYUX8dhIqOkJt4VWwQRL3BEEazd+67WyHmGyFS7f8OAF26vMRQkUww9dtKOb3B4 Mqgj5MPBlvamUetTvkFr/HaWGaaTGP05Xg4uUsmA67nYxJbLqF5SgRRx3aGBYpDJUTGo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mem_sharing: resolve mm-lock order violations when forking VMs with nested p2m Message-Id: Date: Fri, 08 Jan 2021 10:55:35 +0000 commit 3e6c560ea1931ff579fc2c9504a6e46e5c4572c9 Author: Tamas K Lengyel AuthorDate: Fri Jan 8 11:51:36 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 11:51:36 2021 +0100 x86/mem_sharing: resolve mm-lock order violations when forking VMs with nested p2m Several lock-order violations have been encountered while attempting to fork VMs with nestedhvm=1 set. This patch resolves the issues. The order violations stems from a call to p2m_flush_nestedp2m being performed whenever the hostp2m changes. This functions always takes the p2m lock for the nested_p2m. However, with sharing the p2m locks always have to be taken before the sharing lock. To resolve this issue we avoid taking the sharing lock where possible (and was actually unecessary to begin with). But we also make p2m_flush_nestedp2m aware that the p2m lock may have already been taken and preemptively take all nested_p2m locks before unsharing a page where taking the sharing lock is necessary. Signed-off-by: Tamas K Lengyel Acked-by: Jan Beulich --- xen/arch/x86/mm/mem_sharing.c | 44 +++++++++++++++++++++++++++++-------------- xen/arch/x86/mm/p2m.c | 12 ++++++++++-- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index ad9d495110..a98a1709c2 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -893,13 +894,11 @@ static int nominate_page(struct domain *d, gfn_t gfn, goto out; /* - * Now that the page is validated, we can lock it. There is no - * race because we're holding the p2m entry, so no one else - * could be nominating this gfn. + * Now that the page is validated, we can make it shared. There is no race + * because we're holding the p2m entry, so no one else could be nominating + * this gfn & and it is evidently not yet shared with any other VM, thus we + * don't need to take the mem_sharing_page_lock here. */ - ret = -ENOENT; - if ( !mem_sharing_page_lock(page) ) - goto out; /* Initialize the shared state */ ret = -ENOMEM; @@ -935,7 +934,6 @@ static int nominate_page(struct domain *d, gfn_t gfn, *phandle = page->sharing->handle; audit_add_list(page); - mem_sharing_page_unlock(page); ret = 0; out: @@ -1214,7 +1212,8 @@ int __mem_sharing_unshare_page(struct domain *d, p2m_type_t p2mt; mfn_t mfn; struct page_info *page, *old_page; - int last_gfn; + bool last_gfn; + int rc = 0; gfn_info_t *gfn_info = NULL; mfn = get_gfn(d, gfn, &p2mt); @@ -1226,6 +1225,15 @@ int __mem_sharing_unshare_page(struct domain *d, return 0; } + /* lock nested p2ms to avoid lock-order violation with sharing lock */ + if ( unlikely(nestedhvm_enabled(d)) ) + { + unsigned int i; + + for ( i = 0; i < MAX_NESTEDP2M; i++ ) + p2m_lock(d->arch.nested_p2m[i]); + } + page = __grab_shared_page(mfn); if ( page == NULL ) { @@ -1276,9 +1284,7 @@ int __mem_sharing_unshare_page(struct domain *d, put_page_alloc_ref(page); put_page_and_type(page); - put_gfn(d, gfn); - - return 0; + goto out; } if ( last_gfn ) @@ -1295,12 +1301,12 @@ int __mem_sharing_unshare_page(struct domain *d, /* Undo dec of nr_saved_mfns, as the retry will decrease again. */ atomic_inc(&nr_saved_mfns); mem_sharing_page_unlock(old_page); - put_gfn(d, gfn); /* * Caller is responsible for placing an event * in the ring. */ - return -ENOMEM; + rc = -ENOMEM; + goto out; } copy_domain_page(page_to_mfn(page), page_to_mfn(old_page)); @@ -1327,8 +1333,18 @@ int __mem_sharing_unshare_page(struct domain *d, */ paging_mark_dirty(d, page_to_mfn(page)); /* We do not need to unlock a private page */ + + out: + if ( unlikely(nestedhvm_enabled(d)) ) + { + unsigned int i; + + for ( i = 0; i < MAX_NESTEDP2M; i++ ) + p2m_unlock(d->arch.nested_p2m[i]); + } + put_gfn(d, gfn); - return 0; + return rc; } int relinquish_shared_pages(struct domain *d) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index ad4bb94514..a32301c343 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1597,9 +1597,17 @@ p2m_flush(struct vcpu *v, struct p2m_domain *p2m) void p2m_flush_nestedp2m(struct domain *d) { - int i; + unsigned int i; + for ( i = 0; i < MAX_NESTEDP2M; i++ ) - p2m_flush_table(d->arch.nested_p2m[i]); + { + struct p2m_domain *p2m = d->arch.nested_p2m[i]; + + if ( p2m_locked_by_me(p2m) ) + p2m_flush_table_locked(p2m); + else + p2m_flush_table(p2m); + } } void np2m_flush_base(struct vcpu *v, unsigned long np2m_base) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 08 15:55:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jan 2021 15:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.63679.113024 (Exim 4.92) (envelope-from ) id 1kxu6U-0008EO-NH; Fri, 08 Jan 2021 15:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 63679.113024; Fri, 08 Jan 2021 15:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu6U-0008EE-K0; Fri, 08 Jan 2021 15:55:06 +0000 Received: by outflank-mailman (input) for mailman id 63679; Fri, 08 Jan 2021 15:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu6T-0008E9-6d for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu6T-0003RW-2z for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxu6T-0000zM-1c for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=z1klHxh93rKHFVgT2S4khdrmspE5Yv8FflQf9l+zKmU=; b=T0YjBr4htF1ig6D8b3X6xN3aIx h8bstyI2Dq0u1UQoHE9fMMBosug0HpjvVggSwQcJ7C9B5uIxts5ECysBRG5Sc3/OdsHaSe5CgbAVu EZi38+poBCFO0LRG1tZPyn52jwPQDuZUxbI7qdR5zp69MTVON6jiOvKI1qDNR4hM9UAk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/p2m: avoid unnecessary calls of write_p2m_entry_pre() hook Message-Id: Date: Fri, 08 Jan 2021 15:55:05 +0000 commit 570065b9d5a8a00c5c1aab9e13e9e1ad3e35ce7d Author: Jan Beulich AuthorDate: Fri Jan 8 16:49:23 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 16:49:23 2021 +0100 x86/p2m: avoid unnecessary calls of write_p2m_entry_pre() hook When shattering a large page, we first construct the new page table page and only then hook it up. The "pre" hook in this case does nothing, for the page starting out all blank. Avoid 512 calls into shadow code in this case by passing in INVALID_GFN, indicating the page being updated is (not yet) associated with any GFN. (The alternative to this change would be to actually pass in a correct GFN, which can't be all the same on every loop iteration.) Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/mm/p2m-pt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 5fa0d30ce7..848773e1cd 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -134,7 +134,7 @@ static int write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn, paging_lock(d); - if ( p2m->write_p2m_entry_pre ) + if ( p2m->write_p2m_entry_pre && gfn != gfn_x(INVALID_GFN) ) p2m->write_p2m_entry_pre(d, gfn, p, new, level); oflags = l1e_get_flags(*p); @@ -290,7 +290,8 @@ p2m_next_level(struct p2m_domain *p2m, void **table, { new_entry = l1e_from_pfn(pfn | (i << ((level - 1) * PAGETABLE_ORDER)), flags); - rc = write_p2m_entry(p2m, gfn, l1_entry + i, new_entry, level); + rc = write_p2m_entry(p2m, gfn_x(INVALID_GFN), l1_entry + i, + new_entry, level); if ( rc ) { unmap_domain_page(l1_entry); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 08 15:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jan 2021 15:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.63680.113028 (Exim 4.92) (envelope-from ) id 1kxu6e-0008FF-Oj; Fri, 08 Jan 2021 15:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 63680.113028; Fri, 08 Jan 2021 15:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu6e-0008F7-LY; Fri, 08 Jan 2021 15:55:16 +0000 Received: by outflank-mailman (input) for mailman id 63680; Fri, 08 Jan 2021 15:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu6d-0008Et-8o for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu6d-0003RZ-7E for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxu6d-00010a-5R for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/SBO52LpLurJewVjqu490PkgLM6OOJigkG/j89Vaxlg=; b=aCuW3Fh79JNialuRaC0lfYQxXi IQvuTHj7BNqvhkk45uxzHf0xaAagiP2L0azd7mmqafYTd5BMlko7QVj8AEGvzkSPgXL+QA2cWdKOp t6wyxa2sUUKfk1Nj7vKcO9y7SUIiz3gljVr1xtdxu+pZ+3nJk/X7CiF8T0uCqVesXosk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/p2m: pass old PTE directly to write_p2m_entry_pre() hook Message-Id: Date: Fri, 08 Jan 2021 15:55:15 +0000 commit 8511cc9eac78fa2d0f6ffc76ba80e55a06d02e78 Author: Jan Beulich AuthorDate: Fri Jan 8 16:50:11 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 16:50:11 2021 +0100 x86/p2m: pass old PTE directly to write_p2m_entry_pre() hook In no case is a pointer to non-const needed. Since no pointer arithmetic is done by the sole user of the hook, passing in the PTE itself is quite fine. While doing this adjustment also - drop the intermediate sh_write_p2m_entry_pre(): sh_unshadow_for_p2m_change() can itself be used as the hook function, moving the conditional into there, - introduce a local variable holding the flags of the old entry. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/p2m-pt.c | 2 +- xen/arch/x86/mm/shadow/common.c | 39 +++++++++++++++++++-------------------- xen/include/asm-x86/p2m.h | 2 +- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 848773e1cd..c43d5d0413 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -135,7 +135,7 @@ static int write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn, paging_lock(d); if ( p2m->write_p2m_entry_pre && gfn != gfn_x(INVALID_GFN) ) - p2m->write_p2m_entry_pre(d, gfn, p, new, level); + p2m->write_p2m_entry_pre(d, gfn, *p, new, level); oflags = l1e_get_flags(*p); omfn = l1e_get_mfn(*p); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 3298711972..e2ed049f14 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3086,19 +3086,28 @@ static int shadow_test_disable(struct domain *d) */ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, - l1_pgentry_t *p, l1_pgentry_t new, + l1_pgentry_t old, l1_pgentry_t new, unsigned int level) { + unsigned int oflags = l1e_get_flags(old); + + /* + * If there are any shadows, update them. But if shadow_teardown() + * has already been called then it's not safe to try. + */ + if ( unlikely(!d->arch.paging.shadow.total_pages) ) + return; + /* The following assertion is to make sure we don't step on 1GB host * page support of HVM guest. */ - ASSERT(!(level > 2 && (l1e_get_flags(*p) & _PAGE_PRESENT) && - (l1e_get_flags(*p) & _PAGE_PSE))); + ASSERT(!(level > 2 && (oflags & _PAGE_PRESENT) && (oflags & _PAGE_PSE))); /* If we're removing an MFN from the p2m, remove it from the shadows too */ if ( level == 1 ) { - mfn_t mfn = l1e_get_mfn(*p); - p2m_type_t p2mt = p2m_flags_to_type(l1e_get_flags(*p)); + mfn_t mfn = l1e_get_mfn(old); + p2m_type_t p2mt = p2m_flags_to_type(oflags); + if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(mfn) ) { sh_remove_all_shadows_and_parents(d, mfn); @@ -3110,15 +3119,15 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, /* If we're removing a superpage mapping from the p2m, we need to check * all the pages covered by it. If they're still there in the new * scheme, that's OK, but otherwise they must be unshadowed. */ - if ( level == 2 && (l1e_get_flags(*p) & _PAGE_PRESENT) && - (l1e_get_flags(*p) & _PAGE_PSE) ) + if ( level == 2 && (oflags & _PAGE_PRESENT) && (oflags & _PAGE_PSE) ) { unsigned int i; cpumask_t flushmask; - mfn_t omfn = l1e_get_mfn(*p); + mfn_t omfn = l1e_get_mfn(old); mfn_t nmfn = l1e_get_mfn(new); l1_pgentry_t *npte = NULL; - p2m_type_t p2mt = p2m_flags_to_type(l1e_get_flags(*p)); + p2m_type_t p2mt = p2m_flags_to_type(oflags); + if ( p2m_is_valid(p2mt) && mfn_valid(omfn) ) { cpumask_clear(&flushmask); @@ -3152,16 +3161,6 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, } } -static void -sh_write_p2m_entry_pre(struct domain *d, unsigned long gfn, l1_pgentry_t *p, - l1_pgentry_t new, unsigned int level) -{ - /* If there are any shadows, update them. But if shadow_teardown() - * has already been called then it's not safe to try. */ - if ( likely(d->arch.paging.shadow.total_pages != 0) ) - sh_unshadow_for_p2m_change(d, gfn, p, new, level); -} - #if (SHADOW_OPTIMIZATIONS & SHOPT_FAST_FAULT_PATH) static void sh_write_p2m_entry_post(struct p2m_domain *p2m, unsigned int oflags) @@ -3186,7 +3185,7 @@ sh_write_p2m_entry_post(struct p2m_domain *p2m, unsigned int oflags) void shadow_p2m_init(struct p2m_domain *p2m) { - p2m->write_p2m_entry_pre = sh_write_p2m_entry_pre; + p2m->write_p2m_entry_pre = sh_unshadow_for_p2m_change; p2m->write_p2m_entry_post = sh_write_p2m_entry_post; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 6447696bcd..6acbd1e390 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -274,7 +274,7 @@ struct p2m_domain { void (*memory_type_changed)(struct p2m_domain *p2m); void (*write_p2m_entry_pre)(struct domain *d, unsigned long gfn, - l1_pgentry_t *p, + l1_pgentry_t old, l1_pgentry_t new, unsigned int level); void (*write_p2m_entry_post)(struct p2m_domain *p2m, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 08 15:55:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jan 2021 15:55:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.63681.113032 (Exim 4.92) (envelope-from ) id 1kxu6o-0008Go-QE; Fri, 08 Jan 2021 15:55:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 63681.113032; Fri, 08 Jan 2021 15: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 1kxu6o-0008Gg-ND; Fri, 08 Jan 2021 15:55:26 +0000 Received: by outflank-mailman (input) for mailman id 63681; Fri, 08 Jan 2021 15:55:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu6n-0008GW-B2 for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu6n-0003Rf-AC for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxu6n-00011D-9N for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rAAMllhpuWz9Bbccw5TY1AOpsjamOReLiBrn/Hzvxp0=; b=xGB7EoTYzti1l5TvnObMAr+x0V uh+UxNZ3Hp5S9jUCiGZ7GKZHkpBc32Xz2Lw2McUDGugJN8lRTy4tdR+TKI88y1yp5qGK7QNmh1qmW oAJ6xl/ayUautm7PztqSrx0sjLa9fjxpZDUHrYPPZ7E4W8eosIx2sFjBNOxuSSZ/jRjE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/shadow: cosmetics to sh_unshadow_for_p2m_change() Message-Id: Date: Fri, 08 Jan 2021 15:55:25 +0000 commit 1806d0875daebe600061fc94451401b19f5b6f2a Author: Jan Beulich AuthorDate: Fri Jan 8 16:50:47 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 16:50:47 2021 +0100 x86/shadow: cosmetics to sh_unshadow_for_p2m_change() Besides the adjustments for style - use switch(), - widen scope of commonly used variables, - narrow scope of other variables. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 64 +++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index e2ed049f14..d09c940585 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3089,7 +3089,9 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, l1_pgentry_t old, l1_pgentry_t new, unsigned int level) { + mfn_t omfn = l1e_get_mfn(old); unsigned int oflags = l1e_get_flags(old); + p2m_type_t p2mt = p2m_flags_to_type(oflags); /* * If there are any shadows, update them. But if shadow_teardown() @@ -3098,53 +3100,57 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, if ( unlikely(!d->arch.paging.shadow.total_pages) ) return; - /* The following assertion is to make sure we don't step on 1GB host - * page support of HVM guest. */ - ASSERT(!(level > 2 && (oflags & _PAGE_PRESENT) && (oflags & _PAGE_PSE))); - - /* If we're removing an MFN from the p2m, remove it from the shadows too */ - if ( level == 1 ) + switch ( level ) { - mfn_t mfn = l1e_get_mfn(old); - p2m_type_t p2mt = p2m_flags_to_type(oflags); + default: + /* + * The following assertion is to make sure we don't step on 1GB host + * page support of HVM guest. + */ + ASSERT(!((oflags & _PAGE_PRESENT) && (oflags & _PAGE_PSE))); + break; - if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(mfn) ) + /* If we're removing an MFN from the p2m, remove it from the shadows too */ + case 1: + if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(omfn) ) { - sh_remove_all_shadows_and_parents(d, mfn); - if ( sh_remove_all_mappings(d, mfn, _gfn(gfn)) ) + sh_remove_all_shadows_and_parents(d, omfn); + if ( sh_remove_all_mappings(d, omfn, _gfn(gfn)) ) guest_flush_tlb_mask(d, d->dirty_cpumask); } - } + break; - /* If we're removing a superpage mapping from the p2m, we need to check + /* + * If we're removing a superpage mapping from the p2m, we need to check * all the pages covered by it. If they're still there in the new - * scheme, that's OK, but otherwise they must be unshadowed. */ - if ( level == 2 && (oflags & _PAGE_PRESENT) && (oflags & _PAGE_PSE) ) - { - unsigned int i; - cpumask_t flushmask; - mfn_t omfn = l1e_get_mfn(old); - mfn_t nmfn = l1e_get_mfn(new); - l1_pgentry_t *npte = NULL; - p2m_type_t p2mt = p2m_flags_to_type(oflags); + * scheme, that's OK, but otherwise they must be unshadowed. + */ + case 2: + if ( !(oflags & _PAGE_PRESENT) || !(oflags & _PAGE_PSE) ) + break; if ( p2m_is_valid(p2mt) && mfn_valid(omfn) ) { + unsigned int i; + cpumask_t flushmask; + mfn_t nmfn = l1e_get_mfn(new); + l1_pgentry_t *npte = NULL; + cpumask_clear(&flushmask); /* If we're replacing a superpage with a normal L1 page, map it */ - if ( (l1e_get_flags(new) & _PAGE_PRESENT) - && !(l1e_get_flags(new) & _PAGE_PSE) - && mfn_valid(nmfn) ) + if ( (l1e_get_flags(new) & _PAGE_PRESENT) && + !(l1e_get_flags(new) & _PAGE_PSE) && + mfn_valid(nmfn) ) npte = map_domain_page(nmfn); gfn &= ~(L1_PAGETABLE_ENTRIES - 1); for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ ) { - if ( !npte - || !p2m_is_ram(p2m_flags_to_type(l1e_get_flags(npte[i]))) - || !mfn_eq(l1e_get_mfn(npte[i]), omfn) ) + if ( !npte || + !p2m_is_ram(p2m_flags_to_type(l1e_get_flags(npte[i]))) || + !mfn_eq(l1e_get_mfn(npte[i]), omfn) ) { /* This GFN->MFN mapping has gone away */ sh_remove_all_shadows_and_parents(d, omfn); @@ -3158,6 +3164,8 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, if ( npte ) unmap_domain_page(npte); } + + break; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 08 15:55:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jan 2021 15:55:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.63682.113037 (Exim 4.92) (envelope-from ) id 1kxu6y-0008IH-SD; Fri, 08 Jan 2021 15:55:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 63682.113037; Fri, 08 Jan 2021 15: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 1kxu6y-0008I9-On; Fri, 08 Jan 2021 15:55:36 +0000 Received: by outflank-mailman (input) for mailman id 63682; Fri, 08 Jan 2021 15:55:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu6x-0008I0-E2 for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu6x-0003Rq-DE for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxu6x-00011p-CL for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15: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=eLTC9nom7Y2EPJEclpU7vwiwllqgObi1ZqppEIV2IrM=; b=GvGM1fUvhjcrDFF0HlMuBLpVWB 4pXWX5OFAeQEyaVXRZ2J78Xhy8N+vF0e5qnjb6o87z2fQnt11XpOHuORaKSFwl6maEFIq6F+XMt1M 3B1J9QpnEpRtprIpgDxaOtXoj6an2lcuZIg5H/3Fmv+Ug52PAubRPq9+aJ8WnqPrZSMo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/shadow: adjust TLB flushing in sh_unshadow_for_p2m_change() Message-Id: Date: Fri, 08 Jan 2021 15:55:35 +0000 commit 5b772457e8e549908d6a3fae6412e55c0f7258fb Author: Jan Beulich AuthorDate: Fri Jan 8 16:51:19 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 16:51:19 2021 +0100 x86/shadow: adjust TLB flushing in sh_unshadow_for_p2m_change() Accumulating transient state of d->dirty_cpumask in a local variable is unnecessary here: The flush is fine to make with the dirty set at the time of the call. With this, move the invocation to a central place at the end of the function. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index d09c940585..df95c4db11 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3092,6 +3092,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, mfn_t omfn = l1e_get_mfn(old); unsigned int oflags = l1e_get_flags(old); p2m_type_t p2mt = p2m_flags_to_type(oflags); + bool flush = false; /* * If there are any shadows, update them. But if shadow_teardown() @@ -3116,7 +3117,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, { sh_remove_all_shadows_and_parents(d, omfn); if ( sh_remove_all_mappings(d, omfn, _gfn(gfn)) ) - guest_flush_tlb_mask(d, d->dirty_cpumask); + flush = true; } break; @@ -3132,12 +3133,9 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, if ( p2m_is_valid(p2mt) && mfn_valid(omfn) ) { unsigned int i; - cpumask_t flushmask; mfn_t nmfn = l1e_get_mfn(new); l1_pgentry_t *npte = NULL; - cpumask_clear(&flushmask); - /* If we're replacing a superpage with a normal L1 page, map it */ if ( (l1e_get_flags(new) & _PAGE_PRESENT) && !(l1e_get_flags(new) & _PAGE_PSE) && @@ -3155,11 +3153,10 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, /* This GFN->MFN mapping has gone away */ sh_remove_all_shadows_and_parents(d, omfn); if ( sh_remove_all_mappings(d, omfn, _gfn(gfn + i)) ) - cpumask_or(&flushmask, &flushmask, d->dirty_cpumask); + flush = true; } omfn = mfn_add(omfn, 1); } - guest_flush_tlb_mask(d, &flushmask); if ( npte ) unmap_domain_page(npte); @@ -3167,6 +3164,9 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, break; } + + if ( flush ) + guest_flush_tlb_mask(d, d->dirty_cpumask); } #if (SHADOW_OPTIMIZATIONS & SHOPT_FAST_FAULT_PATH) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 08 15:55:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jan 2021 15:55:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.63683.113039 (Exim 4.92) (envelope-from ) id 1kxu78-0008Js-TI; Fri, 08 Jan 2021 15:55:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 63683.113039; Fri, 08 Jan 2021 15:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu78-0008Jk-QP; Fri, 08 Jan 2021 15:55:46 +0000 Received: by outflank-mailman (input) for mailman id 63683; Fri, 08 Jan 2021 15:55:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu77-0008Jd-Hx for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kxu77-0003S1-GJ for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15:55:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kxu77-00012U-FJ for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 15: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=BptXiN5bPMwMWGnvFv5XJeGfWyYvyc3znELqw0k68Xw=; b=0dtOhtQZcbJWOhHfMlDTGmT38K zZCIqG51AbKTem2mAFAiKCuCryjC9CsK49t0SnazlynqFXajPN88zaX5ruPmIG+KVMLdWwhzMGwea gqvVGCyPLJ2UM4iGPJ4EuA4P3j5VMwPk5Mhg55oxzkEtTD9OfUtnActfV5rNPLnoPpoE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hypercall: fix gnttab hypercall args conditional build on pvshim Message-Id: Date: Fri, 08 Jan 2021 15:55:45 +0000 commit b468b464c89e92629bd52cec58e9f51eee2e950a Author: Roger Pau Monné AuthorDate: Fri Jan 8 16:51:52 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 16:51:52 2021 +0100 x86/hypercall: fix gnttab hypercall args conditional build on pvshim A pvshim build doesn't require the grant table functionality built in, but it does require knowing the number of arguments the hypercall has so the hypercall parameter clobbering works properly. Instead of also setting the argument count for the gnttab case if PV shim functionality is enabled, just drop all of the conditionals from hypercall_args_table, as a hypercall having a NULL handler won't get to use that information anyway. Note this hasn't been detected by osstest because the tools pvshim build is done without debug enabled, so the hypercall parameter clobbering doesn't happen. Fixes: d2151152dd2 ('xen: make grant table support configurable') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hypercall.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c index dd00983005..14da9bc4ad 100644 --- a/xen/arch/x86/hypercall.c +++ b/xen/arch/x86/hypercall.c @@ -47,9 +47,7 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(xen_version, 2), ARGS(console_io, 3), ARGS(physdev_op_compat, 1), -#ifdef CONFIG_GRANT_TABLE ARGS(grant_table_op, 3), -#endif ARGS(vm_assist, 2), COMP(update_va_mapping_otherdomain, 4, 5), ARGS(vcpu_op, 3), @@ -65,17 +63,11 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(sysctl, 1), ARGS(domctl, 1), ARGS(kexec_op, 2), -#ifdef CONFIG_ARGO ARGS(argo_op, 5), -#endif ARGS(xenpmu_op, 2), -#ifdef CONFIG_HVM ARGS(hvm_op, 2), ARGS(dm_op, 3), -#endif -#ifdef CONFIG_HYPFS ARGS(hypfs_op, 5), -#endif ARGS(mca, 1), ARGS(arch_1, 1), }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 08 23:44:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jan 2021 23:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.63921.113305 (Exim 4.92) (envelope-from ) id 1ky1QL-0006A2-Ts; Fri, 08 Jan 2021 23:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 63921.113305; Fri, 08 Jan 2021 23: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 1ky1QL-00069u-Qa; Fri, 08 Jan 2021 23:44:05 +0000 Received: by outflank-mailman (input) for mailman id 63921; Fri, 08 Jan 2021 23:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ky1QL-00069g-80 for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 23:44:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ky1QL-0003S6-3a for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 23:44:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ky1QL-0003Ib-1d for xen-changelog@lists.xenproject.org; Fri, 08 Jan 2021 23:44:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jJBhnciBrPM+SBXO/4z4fQcQvWX3tOXy/DvTP6ub0Cg=; b=2gxZUy3Pohqv+COcBTB976PbrZ O9TYYmzF2zGonHRYi3888sy44kggN4MdM+oQCTKsozy8zLTPvU7blBoixwWrQJVYumqm6kvysuiJG g+DF9LclowfSQUv8nQIWA+olw+dGmmlRGJzG3SCMdK0ML88H0pOu6LLbrQP7wn+Qb34U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: do not read MVFR2 when is not defined Message-Id: Date: Fri, 08 Jan 2021 23:44:05 +0000 commit ce59e3dda5f99afbe7257e1e9a22dffd5c4d033c Author: Stefano Stabellini AuthorDate: Tue Jan 5 11:05:48 2021 -0800 Commit: Stefano Stabellini CommitDate: Fri Jan 8 15:35:51 2021 -0800 xen/arm: do not read MVFR2 when is not defined MVFR2 is not available on ARMv7. It is available on ARMv8 aarch32 and aarch64. If Xen reads MVFR2 on ARMv7 it could crash. Avoid the issue by doing the following: - define MVFR2_MAYBE_UNDEFINED on arm32 - if MVFR2_MAYBE_UNDEFINED, do not attempt to read MVFR2 in Xen - keep the 3rd register_t in struct cpuinfo_arm.mvfr on arm32 so that a guest read to the register returns '0' instead of crashing the guest. '0' is an appropriate value to return to the guest because it is defined as "no support for miscellaneous features". Aarch64 Xen is not affected by this patch. Fixes: 9cfdb489af81 ("xen/arm: Add ID registers and complete cpuinfo") Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/cpufeature.c | 2 ++ xen/include/asm-arm/arm32/sysregs.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 1f6a85aafe..698bfa0201 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -150,7 +150,9 @@ void identify_cpu(struct cpuinfo_arm *c) c->mvfr.bits[0] = READ_SYSREG(MVFR0_EL1); c->mvfr.bits[1] = READ_SYSREG(MVFR1_EL1); +#ifndef MVFR2_MAYBE_UNDEFINED c->mvfr.bits[2] = READ_SYSREG(MVFR2_EL1); +#endif } /* diff --git a/xen/include/asm-arm/arm32/sysregs.h b/xen/include/asm-arm/arm32/sysregs.h index 25cdcbfa4e..6841d5de43 100644 --- a/xen/include/asm-arm/arm32/sysregs.h +++ b/xen/include/asm-arm/arm32/sysregs.h @@ -62,6 +62,9 @@ #define READ_SYSREG(R...) READ_SYSREG32(R) #define WRITE_SYSREG(V, R...) WRITE_SYSREG32(V, R) +/* MVFR2 is not defined on ARMv7 */ +#define MVFR2_MAYBE_UNDEFINED + #endif /* __ASSEMBLY__ */ #endif /* __ASM_ARM_ARM32_SYSREGS_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 11 14:00:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Jan 2021 14:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.64871.114695 (Exim 4.92) (envelope-from ) id 1kyxjp-0003UG-DX; Mon, 11 Jan 2021 14:00:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 64871.114695; Mon, 11 Jan 2021 14:00:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxjp-0003U5-9s; Mon, 11 Jan 2021 14:00:05 +0000 Received: by outflank-mailman (input) for mailman id 64871; Mon, 11 Jan 2021 14:00:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxjo-0003QK-OC for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxjo-0005GX-MM for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kyxjo-0002Hd-Ku for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14: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=gwyc6QxRQDmBOYURH0yNeSL2lrcsii0ZwGLJfTzMj8A=; b=h2Y5/DnSdjnuYEeFUQrQyQ9s8s f+BgByysMSM1JTrKoXWjCVdLmcsQn0WtLUw1/eLIZCye5/WMa61MfIJjnk9nOpSnw4yUh4NvfewK0 B5Gsz8b2QvjYSd06ZurqK42jrEg6uB4QOUVV+ag8V9vQ/zS/gVR27+vxV0lbKXQ09qa4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PV: consistently inline {,un}adjust_guest_le() Message-Id: Date: Mon, 11 Jan 2021 14:00:04 +0000 commit 4e70f31a5bb979016eae341fcf4a0f136d451115 Author: Jan Beulich AuthorDate: Mon Jan 11 14:50:38 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:50:38 2021 +0100 x86/PV: consistently inline {,un}adjust_guest_le() Commit 8a74707a7c ("x86/nospec: Use always_inline to fix code gen for evaluate_nospec") converted inline to always_inline for adjust_guest_l[134]e(), but left adjust_guest_l2e() and unadjust_guest_l3e() alone without saying why these two would differ in the needed / wanted treatment. Adjust these two as well. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/pv/mm.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/pv/mm.h b/xen/arch/x86/pv/mm.h index 62b1194e87..a11cc88e5a 100644 --- a/xen/arch/x86/pv/mm.h +++ b/xen/arch/x86/pv/mm.h @@ -110,8 +110,8 @@ static always_inline l1_pgentry_t adjust_guest_l1e(l1_pgentry_t l1e, return l1e; } -static inline l2_pgentry_t adjust_guest_l2e(l2_pgentry_t l2e, - const struct domain *d) +static always_inline l2_pgentry_t adjust_guest_l2e(l2_pgentry_t l2e, + const struct domain *d) { if ( likely(l2e_get_flags(l2e) & _PAGE_PRESENT) && likely(!is_pv_32bit_domain(d)) ) @@ -130,8 +130,8 @@ static always_inline l3_pgentry_t adjust_guest_l3e(l3_pgentry_t l3e, return l3e; } -static inline l3_pgentry_t unadjust_guest_l3e(l3_pgentry_t l3e, - const struct domain *d) +static always_inline l3_pgentry_t unadjust_guest_l3e(l3_pgentry_t l3e, + const struct domain *d) { if ( unlikely(is_pv_32bit_domain(d)) && likely(l3e_get_flags(l3e) & _PAGE_PRESENT) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 11 14:00:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Jan 2021 14:00:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.64872.114700 (Exim 4.92) (envelope-from ) id 1kyxk0-0003Yc-Eg; Mon, 11 Jan 2021 14:00:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 64872.114700; Mon, 11 Jan 2021 14: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 1kyxk0-0003YU-BW; Mon, 11 Jan 2021 14:00:16 +0000 Received: by outflank-mailman (input) for mailman id 64872; Mon, 11 Jan 2021 14:00:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxjy-0003YP-S3 for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxjy-0005Gd-QR for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kyxjy-0002Iy-Oa for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00: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=DoBTiyC186wjedXEzYgyvofeCCbdAAeKascm9GiYrb4=; b=LY6dz44StVqUjYNWIN3uqfvtbC K9JwLtJHolsX5kvKboo3/PGb+lgV3GBdiYj4TVxH9XudlFIk79db2SNLAMSz67P2mJsqXfsGUylO7 D0QnFmMCcBXJu3px9OzNrNeFXjdIjtQ7qDXCpekJhVDiE+SqMc3OrAFSm5Mx1Gi+zhoY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PV: fold redundant calls to adjust_guest_le() Message-Id: Date: Mon, 11 Jan 2021 14:00:14 +0000 commit 2039ebfd59eef01176f5d26e83654f8bfbe0a949 Author: Jan Beulich AuthorDate: Mon Jan 11 14:51:39 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:51:39 2021 +0100 x86/PV: fold redundant calls to adjust_guest_le() At least from an abstract perspective it is quite odd for us to compare adjusted old and unadjusted new page table entries when determining whether the fast path can be used. This is largely benign because FASTPATH_FLAG_WHITELIST covers most of the flags which the adjustments may set, and the flags getting set don't affect the outcome of get_page_from_le(). There's one exception: 32-bit L3 entries get _PAGE_RW set, but get_page_from_l3e() doesn't allow linear page tables to be created at this level for such guests. Apart from this _PAGE_RW is unused by get_page_from_le() (for N > 1), and hence forcing the bit on early has no functional effect. The main reason for the change, however, is that adjust_guest_le() aren't exactly cheap - both in terms of pure code size and because each one has at least one evaluate_nospec() by way of containing is_pv_32bit_domain() conditionals. Call the functions once ahead of the fast path checks, instead of twice after. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/mm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 79acf20c4e..63e9fae919 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2195,10 +2195,11 @@ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t nl1e, nl1e = l1e_from_page(page, l1e_get_flags(nl1e)); } + nl1e = adjust_guest_l1e(nl1e, pt_dom); + /* Fast path for sufficiently-similar mappings. */ if ( !l1e_has_changed(ol1e, nl1e, ~FASTPATH_FLAG_WHITELIST) ) { - nl1e = adjust_guest_l1e(nl1e, pt_dom); rc = UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, pt_vcpu, preserve_ad); if ( page ) @@ -2223,7 +2224,6 @@ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t nl1e, if ( page ) put_page(page); - nl1e = adjust_guest_l1e(nl1e, pt_dom); if ( unlikely(!UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, pt_vcpu, preserve_ad)) ) { @@ -2275,10 +2275,11 @@ static int mod_l2_entry(l2_pgentry_t *pl2e, return -EINVAL; } + nl2e = adjust_guest_l2e(nl2e, d); + /* Fast path for sufficiently-similar mappings. */ if ( !l2e_has_changed(ol2e, nl2e, ~FASTPATH_FLAG_WHITELIST) ) { - nl2e = adjust_guest_l2e(nl2e, d); if ( UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, mfn, vcpu, preserve_ad) ) return 0; return -EBUSY; @@ -2287,7 +2288,6 @@ static int mod_l2_entry(l2_pgentry_t *pl2e, if ( unlikely((rc = get_page_from_l2e(nl2e, mfn, d, 0)) < 0) ) return rc; - nl2e = adjust_guest_l2e(nl2e, d); if ( unlikely(!UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, mfn, vcpu, preserve_ad)) ) { @@ -2337,10 +2337,11 @@ static int mod_l3_entry(l3_pgentry_t *pl3e, return -EINVAL; } + nl3e = adjust_guest_l3e(nl3e, d); + /* Fast path for sufficiently-similar mappings. */ if ( !l3e_has_changed(ol3e, nl3e, ~FASTPATH_FLAG_WHITELIST) ) { - nl3e = adjust_guest_l3e(nl3e, d); rc = UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, mfn, vcpu, preserve_ad); return rc ? 0 : -EFAULT; } @@ -2350,7 +2351,6 @@ static int mod_l3_entry(l3_pgentry_t *pl3e, return rc; rc = 0; - nl3e = adjust_guest_l3e(nl3e, d); if ( unlikely(!UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, mfn, vcpu, preserve_ad)) ) { @@ -2399,10 +2399,11 @@ static int mod_l4_entry(l4_pgentry_t *pl4e, return -EINVAL; } + nl4e = adjust_guest_l4e(nl4e, d); + /* Fast path for sufficiently-similar mappings. */ if ( !l4e_has_changed(ol4e, nl4e, ~FASTPATH_FLAG_WHITELIST) ) { - nl4e = adjust_guest_l4e(nl4e, d); rc = UPDATE_ENTRY(l4, pl4e, ol4e, nl4e, mfn, vcpu, preserve_ad); return rc ? 0 : -EFAULT; } @@ -2412,7 +2413,6 @@ static int mod_l4_entry(l4_pgentry_t *pl4e, return rc; rc = 0; - nl4e = adjust_guest_l4e(nl4e, d); if ( unlikely(!UPDATE_ENTRY(l4, pl4e, ol4e, nl4e, mfn, vcpu, preserve_ad)) ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 11 14:00:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Jan 2021 14:00:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.64873.114705 (Exim 4.92) (envelope-from ) id 1kyxkA-0003Zu-Ga; Mon, 11 Jan 2021 14:00:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 64873.114705; Mon, 11 Jan 2021 14: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 1kyxkA-0003Zi-D9; Mon, 11 Jan 2021 14:00:26 +0000 Received: by outflank-mailman (input) for mailman id 64873; Mon, 11 Jan 2021 14:00:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxk8-0003ZW-UD for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxk8-0005Gk-TO for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kyxk8-0002Jb-SU for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00: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=CEdoMrwgya6EzZY+ngbQvQR+7OXnCww3dPytEl94xAM=; b=TCqOHN63K1JeQrVs98K9PV47+D 3fKBdpUQnUtSzSBAdyJnMIJTRb12P2RGtFfl73AJRri/Rq94qTcieVe4SJJWp+yrDnvmFX4MHCxv7 C6sXtmjgkp3u0K58FMzEB+4oH8GxhxxKdiwhe5689jKl3ig206f41iwc52mZn+QAIDn4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] evtchn: don't call Xen consumer callback with per-channel lock held Message-Id: Date: Mon, 11 Jan 2021 14:00:24 +0000 commit 1376ef90d31c971df79de331911bf861a9a11a44 Author: Jan Beulich AuthorDate: Mon Jan 11 14:53:02 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:53:02 2021 +0100 evtchn: don't call Xen consumer callback with per-channel lock held While there don't look to be any problems with this right now, the lock order implications from holding the lock can be very difficult to follow (and may be easy to violate unknowingly). The present callbacks don't (and no such callback should) have any need for the lock to be held. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/common/event_channel.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 3aa4189d7a..37592028c8 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -775,9 +775,18 @@ int evtchn_send(struct domain *ld, unsigned int lport) rport = lchn->u.interdomain.remote_port; rchn = evtchn_from_port(rd, rport); if ( consumer_is_xen(rchn) ) - xen_notification_fn(rchn)(rd->vcpu[rchn->notify_vcpu_id], rport); - else - evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); + { + /* Don't keep holding the lock for the call below. */ + xen_event_channel_notification_t fn = xen_notification_fn(rchn); + struct vcpu *rv = rd->vcpu[rchn->notify_vcpu_id]; + + rcu_lock_domain(rd); + evtchn_read_unlock(lchn); + fn(rv, rport); + rcu_unlock_domain(rd); + return 0; + } + evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); break; case ECS_IPI: evtchn_port_set_pending(ld, lchn->notify_vcpu_id, lchn); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 11 14:00:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Jan 2021 14:00:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.64874.114708 (Exim 4.92) (envelope-from ) id 1kyxkK-0003bD-Ha; Mon, 11 Jan 2021 14:00:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 64874.114708; Mon, 11 Jan 2021 14:00: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 1kyxkK-0003b5-Eb; Mon, 11 Jan 2021 14:00:36 +0000 Received: by outflank-mailman (input) for mailman id 64874; Mon, 11 Jan 2021 14:00:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxkJ-0003at-2K for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxkJ-0005H0-0a for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kyxkI-0002KA-VU for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00: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=3/q2KKWAlSdrx6EIEC63Im3tsWPCdbbbLqzh8pejrHQ=; b=UlaJgW9dKyMBhxiZ0t6hpF0dwr vJ/9wcMsyhkZPCkidLMY1gAGIidNkdwk2TsGWVcNUDXIiuc6AJEfZZnfcJSX/4rF6txNiIOe7XaSH 8pQfqJzplEIoz861y0jwHslmPMZJ7RBha5B8q04vEN42xHUKL1f9tf9+e8ARi4QVqQJ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] evtchn: closing of vIRQ-s doesn't require looping over all vCPU-s Message-Id: Date: Mon, 11 Jan 2021 14:00:34 +0000 commit 7cf8a2d0ec5cf1ec84a213c54fd14aa18d1609ac Author: Jan Beulich AuthorDate: Mon Jan 11 14:53:55 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:53:55 2021 +0100 evtchn: closing of vIRQ-s doesn't require looping over all vCPU-s Global vIRQ-s have their event channel association tracked on vCPU 0. Per-vCPU vIRQ-s can't have their notify_vcpu_id changed. Hence it is well-known which vCPU's virq_to_evtchn[] needs updating. Signed-off-by: Jan Beulich Reviewed-by: Julien Grall --- xen/common/event_channel.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 37592028c8..d590ddad99 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -606,7 +606,6 @@ static long evtchn_bind_pirq(evtchn_bind_pirq_t *bind) int evtchn_close(struct domain *d1, int port1, bool guest) { struct domain *d2 = NULL; - struct vcpu *v; struct evtchn *chn1, *chn2; int port2; long rc = 0; @@ -657,17 +656,19 @@ int evtchn_close(struct domain *d1, int port1, bool guest) break; } - case ECS_VIRQ: - for_each_vcpu ( d1, v ) - { - unsigned long flags; + case ECS_VIRQ: { + struct vcpu *v; + unsigned long flags; + + v = d1->vcpu[virq_is_global(chn1->u.virq) ? 0 : chn1->notify_vcpu_id]; + + write_lock_irqsave(&v->virq_lock, flags); + ASSERT(read_atomic(&v->virq_to_evtchn[chn1->u.virq]) == port1); + write_atomic(&v->virq_to_evtchn[chn1->u.virq], 0); + write_unlock_irqrestore(&v->virq_lock, flags); - write_lock_irqsave(&v->virq_lock, flags); - if ( read_atomic(&v->virq_to_evtchn[chn1->u.virq]) == port1 ) - write_atomic(&v->virq_to_evtchn[chn1->u.virq], 0); - write_unlock_irqrestore(&v->virq_lock, flags); - } break; + } case ECS_IPI: break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 11 14:00:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Jan 2021 14:00:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.64875.114712 (Exim 4.92) (envelope-from ) id 1kyxkU-0003ch-J8; Mon, 11 Jan 2021 14:00:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 64875.114712; Mon, 11 Jan 2021 14:00: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 1kyxkU-0003cZ-G6; Mon, 11 Jan 2021 14:00:46 +0000 Received: by outflank-mailman (input) for mailman id 64875; Mon, 11 Jan 2021 14:00:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxkT-0003cP-4Y for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxkT-0005HE-3q for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kyxkT-0002Ku-2w for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00: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=QFK1uGtWeLv8IC5xBW8xVS5KmIXP/b1VSBdA3PPXQfM=; b=lgChKFKG9SP6ZKezBzkZ08dLzL xMXE3T9bIWjGJnSZ7/yVMfvcdo7hiZ0kCIL31KZy/zg0WOHuecvxzZnT9VxRTOG1CWLEvvdwCtk5Y fP/xHXJtfKISxX7PIN3cTS/1NY87fPnbo22nLCnSjWXcnPaCvvX2hnujQhuHBgVyXcCs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] ACPI: reduce verbosity by default Message-Id: Date: Mon, 11 Jan 2021 14:00:45 +0000 commit b4b0a8609c42d9e01dd51fd59ab2859f7df2a961 Author: Jan Beulich AuthorDate: Mon Jan 11 14:55:16 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:55:16 2021 +0100 ACPI: reduce verbosity by default While they're KERN_INFO messages and hence not visible by default, we still have had reports that the amount of output is too large, not the least because - the command line controlled resizing of the console ring buffer happens only after SRAT parsing (which may alone produce more than 16k of output), - the default resizing of the console ring buffer happens only after ACPI table parsing, since the default size gets calculated depending on the number or processors found. Gate all per-processor logging behind a new "acpi=verbose", making sure we wouldn't unintentionally pass this on to Dom0. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- docs/misc/xen-command-line.pandoc | 12 ++++++------ xen/arch/x86/setup.c | 12 +++++++++--- xen/arch/x86/srat.c | 12 ++++++++---- xen/drivers/acpi/tables.c | 7 +++++++ xen/include/xen/acpi.h | 2 ++ 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 1cb1aee5ed..7ec1e804b7 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -75,13 +75,10 @@ of Boolean and String. These are noted in the relevant sections. ## Parameter details ### acpi -> `= force | ht | noirq | ` +> `= force | ht | noirq | | verbose` **String**, or **Boolean** to disable. -The **acpi** option is used to control a set of four related boolean -flags; `acpi_force`, `acpi_ht`, `acpi_noirq` and `acpi_disabled`. - By default, Xen will scan the DMI data and blacklist certain systems which are known to have broken ACPI setups. Providing `acpi=force` will cause Xen to ignore the blacklist and attempt to use all ACPI @@ -97,12 +94,15 @@ which requires this option to function should be blacklisted. Additionally, this will not prevent Xen from finding IO-APIC entries from the MP tables. -Finally, any of the boolean false options can be used to disable ACPI +Further, any of the boolean false options can be used to disable ACPI usage entirely. Because responsibility for ACPI processing is shared between Xen and the domain 0 kernel this option is automatically propagated to the -domain 0 command line +domain 0 command line. + +Finally, `acpi=verbose` will enable per-processor information logging +which may otherwise be too noisy in particular on large systems. ### acpi_apic_instance > `= ` diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index ad65167864..23bbb6e8c1 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -78,6 +78,7 @@ unsigned long __read_mostly cr4_pv32_mask; /* "acpi=force": Override the disable blacklist. */ /* "acpi=ht": Limit ACPI just to boot-time to enable HT. */ /* "acpi=noirq": Disables ACPI interrupt routing. */ +/* "acpi=verbose": Enables more verbose ACPI boot time logging. */ static int parse_acpi_param(const char *s); custom_param("acpi", parse_acpi_param); @@ -216,9 +217,6 @@ static char __initdata acpi_param[10] = ""; static int __init parse_acpi_param(const char *s) { - /* Save the parameter so it can be propagated to domain0. */ - safe_strcpy(acpi_param, s); - /* Interpret the parameter for use within Xen. */ if ( !parse_bool(s, NULL) ) { @@ -240,9 +238,17 @@ static int __init parse_acpi_param(const char *s) { acpi_noirq_set(); } + else if ( !strcmp(s, "verbose") ) + { + opt_acpi_verbose = true; + return 0; + } else return -EINVAL; + /* Save the parameter so it can be propagated to domain0. */ + safe_strcpy(acpi_param, s); + return 0; } diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 506a56d66b..6b77b98201 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -230,8 +230,10 @@ acpi_numa_x2apic_affinity_init(const struct acpi_srat_x2apic_cpu_affinity *pa) apicid_to_node[pa->apic_id] = node; node_set(node, processor_nodes_parsed); acpi_numa = 1; - printk(KERN_INFO "SRAT: PXM %u -> APIC %08x -> Node %u\n", - pxm, pa->apic_id, node); + + if (opt_acpi_verbose) + printk(KERN_INFO "SRAT: PXM %u -> APIC %08x -> Node %u\n", + pxm, pa->apic_id, node); } /* Callback for Proximity Domain -> LAPIC mapping */ @@ -263,8 +265,10 @@ acpi_numa_processor_affinity_init(const struct acpi_srat_cpu_affinity *pa) apicid_to_node[pa->apic_id] = node; node_set(node, processor_nodes_parsed); acpi_numa = 1; - printk(KERN_INFO "SRAT: PXM %u -> APIC %02x -> Node %u\n", - pxm, pa->apic_id, node); + + if (opt_acpi_verbose) + printk(KERN_INFO "SRAT: PXM %u -> APIC %02x -> Node %u\n", + pxm, pa->apic_id, node); } /* Callback for parsing of the Proximity Domain <-> Memory Area mappings */ diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index 8c2a279e18..789deef3c1 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -36,6 +36,8 @@ #define ACPI_MAX_TABLES 128 +bool __initdata opt_acpi_verbose; + static const char *__initdata mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" }; static const char *__initdata @@ -51,6 +53,7 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) switch (header->type) { case ACPI_MADT_TYPE_LOCAL_APIC: + if (opt_acpi_verbose) { struct acpi_madt_local_apic *p = (struct acpi_madt_local_apic *)header; @@ -62,6 +65,7 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) break; case ACPI_MADT_TYPE_LOCAL_X2APIC: + if (opt_acpi_verbose) { struct acpi_madt_local_x2apic *p = (struct acpi_madt_local_x2apic *)header; @@ -115,6 +119,7 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) break; case ACPI_MADT_TYPE_LOCAL_APIC_NMI: + if (opt_acpi_verbose) { struct acpi_madt_local_apic_nmi *p = (struct acpi_madt_local_apic_nmi *)header; @@ -128,6 +133,7 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) break; case ACPI_MADT_TYPE_LOCAL_X2APIC_NMI: + if (opt_acpi_verbose) { u16 polarity, trigger; struct acpi_madt_local_x2apic_nmi *p = @@ -167,6 +173,7 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) break; case ACPI_MADT_TYPE_LOCAL_SAPIC: + if (opt_acpi_verbose) { struct acpi_madt_local_sapic *p = (struct acpi_madt_local_sapic *)header; diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index 21d5e9feb5..088c238a50 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -53,6 +53,8 @@ extern acpi_physical_address rsdp_hint; +extern bool opt_acpi_verbose; + enum acpi_interrupt_id { ACPI_INTERRUPT_PMI = 1, ACPI_INTERRUPT_INIT, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 11 14:00:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Jan 2021 14:00:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.64876.114716 (Exim 4.92) (envelope-from ) id 1kyxke-0003eE-KX; Mon, 11 Jan 2021 14:00:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 64876.114716; Mon, 11 Jan 2021 14:00: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 1kyxke-0003e6-Hk; Mon, 11 Jan 2021 14:00:56 +0000 Received: by outflank-mailman (input) for mailman id 64876; Mon, 11 Jan 2021 14:00:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxkd-0003dy-7Y for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxkd-0005HL-6j for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kyxkd-0002Lk-5r for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:00: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=s1YcGrZsVWB+5V6yXIdelLC6Ve5W/ypxLC4Y0YGfiOo=; b=loI3yqirAys1QyXLntYBJb3ewq czThpMi2PB/CSbpjvXqAUEQP2eIaIvXrwGjAru3CRANPMxwnJLrDA8IcYwRUxuCbgSNH+AfunS6c+ a5DymZUSLQTHHOeQuwovPD0HIp4wxKfmQl3HWL7p7algvEK6SMtoMYnvvDfhpuPSJoLk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/ACPI: don't overwrite FADT Message-Id: Date: Mon, 11 Jan 2021 14:00:55 +0000 commit 654c917d94d24587bb6b4a8d862baf04b25cbe33 Author: Jan Beulich AuthorDate: Mon Jan 11 14:55:52 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:55:52 2021 +0100 x86/ACPI: don't overwrite FADT When marking fields invalid for our own purposes, we should do so in our local copy (so we will notice later on), not in the firmware provided one (which another entity may want to look at again, e.g. after kexec). Also mark the function parameter const to notice such issues right away. Instead use the pointer at the firmware copy for specifying an adjacent printk()'s arguments. If nothing else this at least reduces the number of relocations the assembler hasto emit and the linker has to process. Fixes: 62d1a69a4e9f ("ACPI: support v5 (reduced HW) sleep interface") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 6345490f93..9e857c3ab1 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -349,7 +349,7 @@ static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) /* Get pm1x_cnt and pm1x_evt information for ACPI sleep */ static void __init -acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) +acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt) { struct acpi_table_facs *facs = NULL; uint64_t facs_pa; @@ -362,10 +362,10 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) printk(KERN_INFO PREFIX "v5 SLEEP INFO: control[%d:%"PRIx64"]," " status[%d:%"PRIx64"]\n", - acpi_sinfo.sleep_control.space_id, - acpi_sinfo.sleep_control.address, - acpi_sinfo.sleep_status.space_id, - acpi_sinfo.sleep_status.address); + fadt->sleep_control.space_id, + fadt->sleep_control.address, + fadt->sleep_status.space_id, + fadt->sleep_status.address); if ((fadt->sleep_control.address && (fadt->sleep_control.bit_offset || @@ -384,8 +384,8 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) fadt->sleep_status.bit_offset, fadt->sleep_status.bit_width, fadt->sleep_status.access_width); - fadt->sleep_control.address = 0; - fadt->sleep_status.address = 0; + acpi_sinfo.sleep_control.address = 0; + acpi_sinfo.sleep_status.address = 0; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 11 14:01:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Jan 2021 14:01:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.64878.114734 (Exim 4.92) (envelope-from ) id 1kyxkp-0003hZ-4K; Mon, 11 Jan 2021 14:01:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 64878.114734; Mon, 11 Jan 2021 14:01:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxkp-0003hQ-0F; Mon, 11 Jan 2021 14:01:07 +0000 Received: by outflank-mailman (input) for mailman id 64878; Mon, 11 Jan 2021 14:01:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxkn-0003go-AO for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:01:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxkn-0005I1-9S for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:01:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kyxkn-0002Mj-8p for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:01: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=Jtdqy64kr307ntvjGJAgqMmXRKOsc/pI93vjSXGz/yQ=; b=iXURtIniql41pyO+N0p7lXMnZ+ FhhCPvUy2Cw/Z+J7GB1pUseRGYDycrKZlxDnYD/h0wEwy6soAEidN1loDtxp6HWrFuSqRonGQyYlx CjMho8GpVuJLix/63mJzuJYMgx4k4kGJ4Dgse4Fy2oE55gI7hRty0EYn/fOAwLR+EWiA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] ACPI: replace casts by container_of() Message-Id: Date: Mon, 11 Jan 2021 14:01:05 +0000 commit e945fcf84321547fac36e0d6ad6916daff578fdc Author: Jan Beulich AuthorDate: Mon Jan 11 14:56:23 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:56:23 2021 +0100 ACPI: replace casts by container_of() The latter is slightly more type-safe. Also add const where possible, including without need to touch further code. Additionally replace an adjacent unnecessary use of u16. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 11 +++++---- xen/drivers/acpi/tables.c | 60 +++++++++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 9e857c3ab1..d8c355a02f 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -63,9 +63,8 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; static int __init acpi_parse_madt(struct acpi_table_header *table) { - struct acpi_table_madt *madt; - - madt = (struct acpi_table_madt *)table; + struct acpi_table_madt *madt = + container_of(table, struct acpi_table_madt, header); if (madt->address) { acpi_lapic_addr = (u64) madt->address; @@ -277,7 +276,8 @@ acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end static int __init acpi_parse_hpet(struct acpi_table_header *table) { - struct acpi_table_hpet *hpet_tbl = (struct acpi_table_hpet *)table; + const struct acpi_table_hpet *hpet_tbl = + container_of(table, const struct acpi_table_hpet, header); if (hpet_tbl->address.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) { printk(KERN_WARNING PREFIX "HPET timers must be located in " @@ -471,7 +471,8 @@ acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt) static int __init acpi_parse_fadt(struct acpi_table_header *table) { - struct acpi_table_fadt *fadt = (struct acpi_table_fadt *)table; + const struct acpi_table_fadt *fadt = + container_of(table, const struct acpi_table_fadt, header); #ifdef CONFIG_ACPI_INTERPRETER /* initialize sci_int early for INT_SRC_OVR MADT parsing */ diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index 789deef3c1..f39cd5eaac 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -55,8 +55,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_LOCAL_APIC: if (opt_acpi_verbose) { - struct acpi_madt_local_apic *p = - (struct acpi_madt_local_apic *)header; + const struct acpi_madt_local_apic *p = + container_of(header, const struct acpi_madt_local_apic, header); + printk(KERN_INFO PREFIX "LAPIC (acpi_id[0x%02x] lapic_id[0x%02x] %s)\n", p->processor_id, p->id, @@ -67,8 +68,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_LOCAL_X2APIC: if (opt_acpi_verbose) { - struct acpi_madt_local_x2apic *p = - (struct acpi_madt_local_x2apic *)header; + const struct acpi_madt_local_x2apic *p = + container_of(header, const struct acpi_madt_local_x2apic, header); + printk(KERN_INFO PREFIX "X2APIC (apic_id[0x%02x] uid[0x%02x] %s)\n", p->local_apic_id, p->uid, @@ -79,8 +81,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_IO_APIC: { - struct acpi_madt_io_apic *p = - (struct acpi_madt_io_apic *)header; + const struct acpi_madt_io_apic *p = + container_of(header, const struct acpi_madt_io_apic, header); + printk(KERN_INFO PREFIX "IOAPIC (id[0x%02x] address[0x%08x] gsi_base[%d])\n", p->id, p->address, p->global_irq_base); @@ -89,8 +92,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_INTERRUPT_OVERRIDE: { - struct acpi_madt_interrupt_override *p = - (struct acpi_madt_interrupt_override *)header; + const struct acpi_madt_interrupt_override *p = + container_of(header, const struct acpi_madt_interrupt_override, header); + printk(KERN_INFO PREFIX "INT_SRC_OVR (bus %d bus_irq %d global_irq %d %s %s)\n", p->bus, p->source_irq, p->global_irq, @@ -108,8 +112,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_NMI_SOURCE: { - struct acpi_madt_nmi_source *p = - (struct acpi_madt_nmi_source *)header; + const struct acpi_madt_nmi_source *p = + container_of(header, const struct acpi_madt_nmi_source, header); + printk(KERN_INFO PREFIX "NMI_SRC (%s %s global_irq %d)\n", mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK], @@ -121,8 +126,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_LOCAL_APIC_NMI: if (opt_acpi_verbose) { - struct acpi_madt_local_apic_nmi *p = - (struct acpi_madt_local_apic_nmi *)header; + const struct acpi_madt_local_apic_nmi *p = + container_of(header, const struct acpi_madt_local_apic_nmi, header); + printk(KERN_INFO PREFIX "LAPIC_NMI (acpi_id[0x%02x] %s %s lint[%#x])\n", p->processor_id, @@ -135,12 +141,10 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_LOCAL_X2APIC_NMI: if (opt_acpi_verbose) { - u16 polarity, trigger; - struct acpi_madt_local_x2apic_nmi *p = - (struct acpi_madt_local_x2apic_nmi *)header; - - polarity = p->inti_flags & ACPI_MADT_POLARITY_MASK; - trigger = (p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2; + const struct acpi_madt_local_x2apic_nmi *p = + container_of(header, const struct acpi_madt_local_x2apic_nmi, header); + unsigned int polarity = MASK_EXTR(p->inti_flags, ACPI_MADT_POLARITY_MASK); + unsigned int trigger = MASK_EXTR(p->inti_flags, ACPI_MADT_TRIGGER_MASK); printk(KERN_INFO PREFIX "X2APIC_NMI (uid[0x%02x] %s %s lint[%#x])\n", @@ -153,8 +157,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE: { - struct acpi_madt_local_apic_override *p = - (struct acpi_madt_local_apic_override *)header; + const struct acpi_madt_local_apic_override *p = + container_of(header, const struct acpi_madt_local_apic_override, header); + printk(KERN_INFO PREFIX "LAPIC_ADDR_OVR (address[%p])\n", (void *)(unsigned long)p->address); @@ -163,8 +168,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_IO_SAPIC: { - struct acpi_madt_io_sapic *p = - (struct acpi_madt_io_sapic *)header; + const struct acpi_madt_io_sapic *p = + container_of(header, const struct acpi_madt_io_sapic, header); + printk(KERN_INFO PREFIX "IOSAPIC (id[%#x] address[%p] gsi_base[%d])\n", p->id, (void *)(unsigned long)p->address, @@ -175,8 +181,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_LOCAL_SAPIC: if (opt_acpi_verbose) { - struct acpi_madt_local_sapic *p = - (struct acpi_madt_local_sapic *)header; + const struct acpi_madt_local_sapic *p = + container_of(header, const struct acpi_madt_local_sapic, header); + printk(KERN_INFO PREFIX "LSAPIC (acpi_id[0x%02x] lsapic_id[0x%02x] lsapic_eid[0x%02x] %s)\n", p->processor_id, p->id, p->eid, @@ -186,8 +193,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_INTERRUPT_SOURCE: { - struct acpi_madt_interrupt_source *p = - (struct acpi_madt_interrupt_source *)header; + const struct acpi_madt_interrupt_source *p = + container_of(header, const struct acpi_madt_interrupt_source, header); + printk(KERN_INFO PREFIX "PLAT_INT_SRC (%s %s type[%#x] id[0x%04x] eid[%#x] iosapic_vector[%#x] global_irq[%#x]\n", mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK], -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 11 14:01:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Jan 2021 14:01:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.64882.114735 (Exim 4.92) (envelope-from ) id 1kyxkz-0003l1-5G; Mon, 11 Jan 2021 14:01:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 64882.114735; Mon, 11 Jan 2021 14:01:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxkz-0003kt-2I; Mon, 11 Jan 2021 14:01:17 +0000 Received: by outflank-mailman (input) for mailman id 64882; Mon, 11 Jan 2021 14:01:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxkx-0003kE-Dz for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:01:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxkx-0005IA-DI for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:01:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kyxkx-0002Nf-Bd for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:01: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=0iz3Mj4QSv78aPcyLzyE8CleQRrNBYB0ZiCvMzG+2V4=; b=iW/kPoodCEUFtL39/7+N4EVzL9 zcRWYtecqP3hLm6xPXmzDNcAhoaj9PX+0to5ZdJDjSQy4Yb8FMWZ31qwn+A+TyS6clIBxrCgkGESU DmmIRfmduBO94KgQ/stCgaodoqY2c32gdhSebvREm4uMVyTPE5rbI4tfG5rkmZxpbEGg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: drop fake CONFIG_{HPET,X86_PM}_TIMER Message-Id: Date: Mon, 11 Jan 2021 14:01:15 +0000 commit 8fc9852324a9d91c7aa0b9d733c501f2138e1a27 Author: Jan Beulich AuthorDate: Mon Jan 11 14:56:53 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:56:53 2021 +0100 x86: drop fake CONFIG_{HPET,X86_PM}_TIMER I don't think we mean to ever make them real Kconfig options, so let's just do away with them. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 9 --------- xen/include/asm-x86/config.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index d8c355a02f..0999af9d9d 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -37,9 +37,7 @@ #include #include #include -#ifdef CONFIG_HPET_TIMER #include /* for hpet_address */ -#endif #include #include @@ -272,8 +270,6 @@ acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end return 0; } -#ifdef CONFIG_HPET_TIMER - static int __init acpi_parse_hpet(struct acpi_table_header *table) { const struct acpi_table_hpet *hpet_tbl = @@ -309,9 +305,6 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table) return 0; } -#else -#define acpi_parse_hpet NULL -#endif static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) { @@ -484,7 +477,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) fadt->force_apic_physical_destination_mode; #endif -#ifdef CONFIG_X86_PM_TIMER /* detect the location of the ACPI PM Timer */ if (fadt->header.revision >= FADT2_REVISION_ID && fadt->xpm_timer_block.space_id == ACPI_ADR_SPACE_SYSTEM_IO) { @@ -517,7 +509,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) if (pmtmr_ioport) printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x (%u bits)\n", pmtmr_ioport, pmtmr_width); -#endif acpi_smi_cmd = fadt->smi_command; acpi_enable_value = fadt->acpi_enable; diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index eb25fc4758..74406f0239 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -19,8 +19,6 @@ #define BITS_PER_XEN_ULONG BITS_PER_LONG -#define CONFIG_X86_PM_TIMER 1 -#define CONFIG_HPET_TIMER 1 #define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 11 14:01:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Jan 2021 14:01:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.64883.114741 (Exim 4.92) (envelope-from ) id 1kyxl9-0003nT-7E; Mon, 11 Jan 2021 14:01:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 64883.114741; Mon, 11 Jan 2021 14:01:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxl9-0003nL-3o; Mon, 11 Jan 2021 14:01:27 +0000 Received: by outflank-mailman (input) for mailman id 64883; Mon, 11 Jan 2021 14:01:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxl7-0003n0-HA for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:01:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kyxl7-0005Jm-GD for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:01:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kyxl7-0002OO-FO for xen-changelog@lists.xenproject.org; Mon, 11 Jan 2021 14:01: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=H67J0TW08k+9ECQoa7A6vcBXa49bQbzsm9J1byfGfEE=; b=tRvTaJsOr2pTUGXgfmItx64MHZ 298pY4zs9lry5QuarVE7PP+kJhyUsEdGSnkyQIByJ3+CW8mAXrmtavCF/a+bK7pNpZW1CK2qkKeZL eGOvMW58nQDrJBYQXbQGApDsm/5kNEUVnJ+PaQlzyUfawFn30vUJ0Wxmq8GATbBC35OU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/acpi: remove dead code Message-Id: Date: Mon, 11 Jan 2021 14:01:25 +0000 commit faa0ab2a1df0381e00d85312247024b32d60a7b9 Author: Roger Pau Monné AuthorDate: Mon Jan 11 14:58:00 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:58:00 2021 +0100 x86/acpi: remove dead code After the recent changes to acpi_fadt_parse_sleep_info the bad label can never be called with facs mapped, and hence the unmap can be removed. Additionally remove the whole label, since it was used by a single caller. Move the relevant code from the label. No functional change intended. CID: 1471722 Fixes: 16ca5b3f873 ('x86/ACPI: don't invalidate S5 data when S3 wakeup vector cannot be determined') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/boot.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 0999af9d9d..ff4685279f 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -382,8 +382,14 @@ acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt) } } - if (fadt->flags & ACPI_FADT_HW_REDUCED) - goto bad; + if (fadt->flags & ACPI_FADT_HW_REDUCED) { + memset(&acpi_sinfo, 0, + offsetof(struct acpi_sleep_info, sleep_control)); + memset(&acpi_sinfo.sleep_status + 1, 0, + (long)(&acpi_sinfo + 1) - + (long)(&acpi_sinfo.sleep_status + 1)); + return; + } acpi_fadt_copy_address(pm1a_cnt, pm1a_control, pm1_control); acpi_fadt_copy_address(pm1b_cnt, pm1b_control, pm1_control); @@ -451,15 +457,6 @@ acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt) printk(KERN_INFO PREFIX " wakeup_vec[%"PRIx64"], vec_size[%x]\n", acpi_sinfo.wakeup_vector, acpi_sinfo.vector_width); - return; - - bad: - if (facs) - acpi_os_unmap_memory(facs, sizeof(*facs)); - memset(&acpi_sinfo, 0, - offsetof(struct acpi_sleep_info, sleep_control)); - memset(&acpi_sinfo.sleep_status + 1, 0, - (long)(&acpi_sinfo + 1) - (long)(&acpi_sinfo.sleep_status + 1)); } static int __init acpi_parse_fadt(struct acpi_table_header *table) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 12 00:44:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Jan 2021 00:44:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.65428.115920 (Exim 4.92) (envelope-from ) id 1kz7n4-0005Cg-GU; Tue, 12 Jan 2021 00:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65428.115920; Tue, 12 Jan 2021 00:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz7n4-0005CY-DT; Tue, 12 Jan 2021 00:44:06 +0000 Received: by outflank-mailman (input) for mailman id 65428; Tue, 12 Jan 2021 00:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz7n3-0005CT-9E for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 00:44:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz7n3-0000wQ-4O for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 00:44:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kz7n3-0008FA-3W for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 00:44:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=h6TIOnUmxWtKkTvElsA8h6cxZF8J0FXldrKvW68TC3c=; b=4fMVxX70Kmn9pbfgmyB/dL1qnY o7GrPJ8aXhg2WoqJZXC8VaLlzkzmidxbydh2lq1spFBAHJakdM1uuXU7ABMrLYVFsuy9Pc3vjsAQq UtJyBASQ5F0Dj3fb31/YN3adoAqTPqkJX7XAaXUh9m5r95d0xHsFBg4D56Uezuy9DUEY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/iommu: smmu: Use 1U << 31 rather than 1 << 31 Message-Id: Date: Tue, 12 Jan 2021 00:44:05 +0000 commit 17b2ddf07a1b31c8c7ed96014772a0729e1460ac Author: Julien Grall AuthorDate: Thu Dec 24 15:24:19 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 11 16:24:12 2021 -0800 xen/iommu: smmu: Use 1U << 31 rather than 1 << 31 Replace all the use of 1 << 31 with 1U << 31 to prevent undefined behavior in the SMMU driver. Signed-off-by: Julien Grall Reviewed-by: Jan Beulich [stefano: fix title and description] Signed-off-by: Stefano Stabellini Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index ed04d85e05..3e8aa37866 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -405,7 +405,7 @@ static struct iommu_group *iommu_group_get(struct device *dev) #define ID0_NUMSMRG_SHIFT 0 #define ID0_NUMSMRG_MASK 0xff -#define ID1_PAGESIZE (1 << 31) +#define ID1_PAGESIZE (1U << 31) #define ID1_NUMPAGENDXB_SHIFT 28 #define ID1_NUMPAGENDXB_MASK 7 #define ID1_NUMS2CB_SHIFT 16 @@ -438,7 +438,7 @@ static struct iommu_group *iommu_group_get(struct device *dev) /* Stream mapping registers */ #define ARM_SMMU_GR0_SMR(n) (0x800 + ((n) << 2)) -#define SMR_VALID (1 << 31) +#define SMR_VALID (1U << 31) #define SMR_MASK_SHIFT 16 #define SMR_MASK_MASK 0x7fff #define SMR_ID_SHIFT 0 @@ -506,7 +506,7 @@ static struct iommu_group *iommu_group_get(struct device *dev) #define RESUME_RETRY (0 << 0) #define RESUME_TERMINATE (1 << 0) -#define TTBCR_EAE (1 << 31) +#define TTBCR_EAE (1U << 31) #define TTBCR_PASIZE_SHIFT 16 #define TTBCR_PASIZE_MASK 0x7 @@ -562,7 +562,7 @@ static struct iommu_group *iommu_group_get(struct device *dev) #define MAIR_ATTR_IDX_CACHE 1 #define MAIR_ATTR_IDX_DEV 2 -#define FSR_MULTI (1 << 31) +#define FSR_MULTI (1U << 31) #define FSR_SS (1 << 30) #define FSR_UUT (1 << 8) #define FSR_ASF (1 << 7) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 12 00:44:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Jan 2021 00:44:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.65429.115924 (Exim 4.92) (envelope-from ) id 1kz7nE-0005DU-I6; Tue, 12 Jan 2021 00:44:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65429.115924; Tue, 12 Jan 2021 00:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz7nE-0005DM-F3; Tue, 12 Jan 2021 00:44:16 +0000 Received: by outflank-mailman (input) for mailman id 65429; Tue, 12 Jan 2021 00:44:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz7nD-0005DF-97 for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 00:44:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz7nD-0000wj-8B for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 00:44:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kz7nD-0008Fw-6R for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 00:44:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pjLGSKH8fy/VcxyM4Da2QyCOX8YlWMHpVjKWMjRzVc0=; b=U6K8aay2/5DIH/0HMz33PAzmHd hajziKfNbBNpb0rRk2UzcIye7tApDTNZ7bbU2RAW98+QhhSvFK2g3pDDZjBiX3LPeJarVfzV8TLRg LkzJ+wi8fTtyH0Y96dS664C6YbBOVmSpMZ1eU9Jbblu+qqqn7rTM4ilwLq00eguPVYUQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] iommu/arm: ipmmu-vmsa: Use 1U << 31 rather than 1 << 31 Message-Id: Date: Tue, 12 Jan 2021 00:44:15 +0000 commit 0e97d99f0e9fc627f29680d20d2619184c894f14 Author: Oleksandr Tyshchenko AuthorDate: Mon Jan 11 12:33:55 2021 +0200 Commit: Stefano Stabellini CommitDate: Mon Jan 11 16:31:15 2021 -0800 iommu/arm: ipmmu-vmsa: Use 1U << 31 rather than 1 << 31 Replace all the use of 1 << 31 with 1U << 31 to prevent undefined behavior in the IPMMU-VMSA driver. Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Stefano Stabellini --- xen/drivers/passthrough/arm/ipmmu-vmsa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/arm/ipmmu-vmsa.c b/xen/drivers/passthrough/arm/ipmmu-vmsa.c index 346165c3fa..aef358d880 100644 --- a/xen/drivers/passthrough/arm/ipmmu-vmsa.c +++ b/xen/drivers/passthrough/arm/ipmmu-vmsa.c @@ -187,7 +187,7 @@ static DEFINE_SPINLOCK(ipmmu_devices_lock); #define IMCAAR 0x0004 #define IMTTBCR 0x0008 -#define IMTTBCR_EAE (1 << 31) +#define IMTTBCR_EAE (1U << 31) #define IMTTBCR_PMB (1 << 30) #define IMTTBCR_SH1_NON_SHAREABLE (0 << 28) #define IMTTBCR_SH1_OUTER_SHAREABLE (2 << 28) @@ -251,7 +251,7 @@ static DEFINE_SPINLOCK(ipmmu_devices_lock); #define IMUCTR(n) ((n) < 32 ? IMUCTR0(n) : IMUCTR32(n)) #define IMUCTR0(n) (0x0300 + ((n) * 16)) #define IMUCTR32(n) (0x0600 + (((n) - 32) * 16)) -#define IMUCTR_FIXADDEN (1 << 31) +#define IMUCTR_FIXADDEN (1U << 31) #define IMUCTR_FIXADD_MASK (0xff << 16) #define IMUCTR_FIXADD_SHIFT 16 #define IMUCTR_TTSEL_MMU(n) ((n) << 4) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 12 00:44:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Jan 2021 00:44:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.65430.115928 (Exim 4.92) (envelope-from ) id 1kz7nO-0005F3-Je; Tue, 12 Jan 2021 00:44:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65430.115928; Tue, 12 Jan 2021 00:44:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz7nO-0005Ev-GZ; Tue, 12 Jan 2021 00:44:26 +0000 Received: by outflank-mailman (input) for mailman id 65430; Tue, 12 Jan 2021 00:44:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz7nN-0005Ej-D7 for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 00:44:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz7nN-0000wr-Bp for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 00:44:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kz7nN-0008I8-AW for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 00: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=WNt1okmNBASh6dSLL0GgqEDPzzIT7i61NlsL2sEYlu8=; b=RL01HJaizbbtcC7n9y749xEPga fhLaqhdxvaj3uZP3qf9RWuqdnfRZYmUboSCIa7bihzRWuCzoODYmOzRxp5wSL7x5MOT6m0QUGYCWI AoJI/mIdjdpOs7I3zKm8r+x4OzwoDkQyoRAXrpJbm7PsvyPD/aQF/HXVjRY2If0K/inM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/serial: scif: Rework how the parameters are found Message-Id: Date: Tue, 12 Jan 2021 00:44:25 +0000 commit edad4c760a1b28abb15836ac4325912203c44905 Author: Julien Grall AuthorDate: Thu Dec 24 16:50:21 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 11 16:35:13 2021 -0800 xen/serial: scif: Rework how the parameters are found clang 11 will throw the following error while build Xen: scif-uart.c:333:33: error: cast to smaller integer type 'enum port_types' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast] uart->params = &port_params[(enum port_types)match->data]; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ The error can be prevented by directly storing a pointer to the port parameters rather than the a cast of the port type. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/drivers/char/scif-uart.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/char/scif-uart.c b/xen/drivers/char/scif-uart.c index 9d3f66b55b..ee204a11a4 100644 --- a/xen/drivers/char/scif-uart.c +++ b/xen/drivers/char/scif-uart.c @@ -286,8 +286,8 @@ static struct uart_driver __read_mostly scif_uart_driver = { static const struct dt_device_match scif_uart_dt_match[] __initconst = { - { .compatible = "renesas,scif", .data = (void *)SCIF_PORT }, - { .compatible = "renesas,scifa", .data = (void *)SCIFA_PORT }, + { .compatible = "renesas,scif", .data = &port_params[SCIF_PORT] }, + { .compatible = "renesas,scifa", .data = &port_params[SCIFA_PORT] }, { /* sentinel */ }, }; @@ -330,7 +330,7 @@ static int __init scif_uart_init(struct dt_device_node *dev, match = dt_match_node(scif_uart_dt_match, dev); ASSERT( match ); - uart->params = &port_params[(enum port_types)match->data]; + uart->params = match->data; uart->vuart.base_addr = addr; uart->vuart.size = size; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 12 19:33:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Jan 2021 19:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.65951.116912 (Exim 4.92) (envelope-from ) id 1kzPPf-00050X-A5; Tue, 12 Jan 2021 19:33:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65951.116912; Tue, 12 Jan 2021 19:33:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzPPf-00050P-7D; Tue, 12 Jan 2021 19:33:07 +0000 Received: by outflank-mailman (input) for mailman id 65951; Tue, 12 Jan 2021 19:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzPPd-00050K-Oz for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 19:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzPPd-0003JR-Mw for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 19:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kzPPd-0002UI-LQ for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 19: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=TgnV4ELDK9cilWlmZka78GozCoGqke1rdVfvQSyCrek=; b=uwpWLmlsw9a1yvkYgfhG06Y+Ab cihwr/ymX6RukQDlOYEH3OfYlJ3V5eHdop2tDlzYNiXR+c2Ke6HqFlcFstFmMa7RRrbTAhckmjQRQ oRGtzOfr8jmElOIv13/IqJmSQsNHDYXce0G+d/QTackfnt6oRebvIPrjMFJQL+dd06Gg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/memory: Introduce CONFIG_ARCH_ACQUIRE_RESOURCE Message-Id: Date: Tue, 12 Jan 2021 19:33:05 +0000 commit 0db1ded6b57cb9ebfaefa2682ed817c0a9dd4ae3 Author: Andrew Cooper AuthorDate: Mon Jul 27 12:28:24 2020 +0100 Commit: Andrew Cooper CommitDate: Tue Jan 12 18:17:02 2021 +0000 xen/memory: Introduce CONFIG_ARCH_ACQUIRE_RESOURCE New architectures shouldn't be forced to implement no-op stubs for unused functionality. Introduce CONFIG_ARCH_ACQUIRE_RESOURCE which can be opted in to, and provide compatibility logic in xen/mm.h No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: Paul Durrant Acked-by: Julien Grall --- xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 3 +++ xen/include/asm-arm/mm.h | 8 -------- xen/include/xen/mm.h | 9 +++++++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 24868aa6ad..78f351f94b 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -6,6 +6,7 @@ config X86 select ACPI select ACPI_LEGACY_TABLES_LOOKUP select ARCH_SUPPORTS_INT128 + select ARCH_ACQUIRE_RESOURCE select COMPAT select CORE_PARKING select HAS_ALTERNATIVE diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 0661328a99..b5c91a1664 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -22,6 +22,9 @@ config GRANT_TABLE If unsure, say Y. +config ARCH_ACQUIRE_RESOURCE + bool + config HAS_ALTERNATIVE bool diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index f8ba49b118..0b7de3102e 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -358,14 +358,6 @@ static inline void put_page_and_type(struct page_info *page) void clear_and_clean_page(struct page_info *page); -static inline -int arch_acquire_resource(struct domain *d, unsigned int type, unsigned int id, - unsigned long frame, unsigned int nr_frames, - xen_pfn_t mfn_list[]) -{ - return -EOPNOTSUPP; -} - unsigned int arch_get_dma_bitsize(void); #endif /* __ARCH_ARM_MM__ */ diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 85a8df9948..e62a5b726e 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -702,4 +702,13 @@ static inline void put_page_alloc_ref(struct page_info *page) } } +#ifndef CONFIG_ARCH_ACQUIRE_RESOURCE +static inline int arch_acquire_resource( + struct domain *d, unsigned int type, unsigned int id, unsigned long frame, + unsigned int nr_frames, xen_pfn_t mfn_list[]) +{ + return -EOPNOTSUPP; +} +#endif /* !CONFIG_ARCH_ACQUIRE_RESOURCE */ + #endif /* __XEN_MM_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 12 19:33:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Jan 2021 19:33:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.65952.116915 (Exim 4.92) (envelope-from ) id 1kzPPp-00051d-BX; Tue, 12 Jan 2021 19:33:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65952.116915; Tue, 12 Jan 2021 19:33: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 1kzPPp-00051W-8i; Tue, 12 Jan 2021 19:33:17 +0000 Received: by outflank-mailman (input) for mailman id 65952; Tue, 12 Jan 2021 19:33:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzPPn-00051P-T1 for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 19:33:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzPPn-0003L1-Qo for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 19:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kzPPn-0002WC-P6 for xen-changelog@lists.xenproject.org; Tue, 12 Jan 2021 19: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=NduBXxlxWPj5cGn9hWOzUFvhrViG8l0Ag/A/LobO5HI=; b=RnPBq1eb4fbcpHA7Xhz4bMo1Iy TVDtTA/vjGnexzRZcvg8bba8V6JVDuNWEuODwcRF6O2pViuHB6lfN2Q7vOI0+S1QTzR3Sb+LjSQAp cRvG3b4Fz0bh9DbL43J0jvFCYJA3XryY5K7XQyGQ0FkSNslZRpLpoNDAYvG0x7SAg3ls=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/memory: Fix compat XENMEM_acquire_resource for size requests Message-Id: Date: Tue, 12 Jan 2021 19:33:15 +0000 commit 414be7b66349e7dca42bc1fd47c2b2f5b2d27432 Author: Andrew Cooper AuthorDate: Tue Jul 28 11:23:54 2020 +0100 Commit: Andrew Cooper CommitDate: Tue Jan 12 18:17:02 2021 +0000 xen/memory: Fix compat XENMEM_acquire_resource for size requests Copy the nr_frames from the structure which actually has the correct value, so the caller doesn't unconditionally receive 0. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant --- xen/common/compat/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 3851f756c7..ed92e05b08 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -599,7 +599,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) if ( __copy_field_to_guest( guest_handle_cast(compat, compat_mem_acquire_resource_t), - &cmp.mar, nr_frames) ) + nat.mar, nr_frames) ) return -EFAULT; } else -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jan 13 19:44:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Jan 2021 19:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.66741.118660 (Exim 4.92) (envelope-from ) id 1kzm3q-0000u2-F4; Wed, 13 Jan 2021 19:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66741.118660; Wed, 13 Jan 2021 19:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzm3q-0000tu-C9; Wed, 13 Jan 2021 19:44:06 +0000 Received: by outflank-mailman (input) for mailman id 66741; Wed, 13 Jan 2021 19:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzm3p-0000tp-Dx for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 19:44:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzm3p-0003CN-CI for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 19:44:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kzm3p-0002Sd-9p for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 19:44:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4h53K6xSRnEzeplU8IA3b0rO3rUkHUB7IBRWHbtTN70=; b=5ehyFhZA+634X02cJizeFf3vpl Hyqy7CmhcwfWTACAStjq1JXo/Ppbyjwd6FnEAmJMqmJqLigP/0BLC44GHoYNKKHwVNQmnYuimzZk5 1QkG/vev2P0/GYoVnhR7rL/uG9Gs9TUgCx/K4TFnlemvqxhYuGhsO1HB9jStzkVpnOII=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests: Drop obsolete running scripts Message-Id: Date: Wed, 13 Jan 2021 19:44:05 +0000 commit ec6c5d39982f230851278a2512e04bad6397f6ce Author: Andrew Cooper AuthorDate: Tue Jan 12 18:33:39 2021 +0000 Commit: Andrew Cooper CommitDate: Wed Jan 13 19:30:50 2021 +0000 tools/tests: Drop obsolete running scripts The python unit tests were dropped in Xen 4.12 due to being obsolete, but the scripts to run the tests were missed. Clean up .gitignore as well. Also drop the libxenctrl {C,LD}FLAGS adjustments in the Makefile. This logic isn't used, and isn't appropriate even in principle, as there are tests in here which don't want to use libxenctrl. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- .gitignore | 3 -- tools/tests/Makefile | 3 -- tools/tests/run_tests.sh | 61 ------------------------------------- tools/tests/utests/run_all_tests.py | 23 -------------- 4 files changed, 90 deletions(-) diff --git a/.gitignore b/.gitignore index b169d78ed7..1b54ea3111 100644 --- a/.gitignore +++ b/.gitignore @@ -274,9 +274,6 @@ tools/tests/x86_emulator/x86_emulate tools/tests/x86_emulator/xop*.[ch] tools/tests/xen-access/xen-access tools/tests/xenstore/xs-test -tools/tests/regression/installed/* -tools/tests/regression/build/* -tools/tests/regression/downloads/* tools/tests/mem-sharing/memshrtool tools/tests/mce-test/tools/xen-mceinj tools/tests/vpci/list.h diff --git a/tools/tests/Makefile b/tools/tests/Makefile index ed3bed404b..9077fa14d3 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -1,9 +1,6 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += $(CFLAGS_libxenctrl) -LDLIBS += $(LDLIBS_libxenctrl) - SUBDIRS-y := SUBDIRS-$(CONFIG_X86) += cpu-policy SUBDIRS-$(CONFIG_X86) += mce-test diff --git a/tools/tests/run_tests.sh b/tools/tests/run_tests.sh deleted file mode 100644 index c492876b4b..0000000000 --- a/tools/tests/run_tests.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -# -# This runs the available unit-tests with all different supported -# python versions. -# -# To run this this must be 'cd'ed to the tests directory. -# - -ENABLE_UNSUPPORTED=0 - -function usage() -{ - printf "Usage: %s: [-u]\n" $0 - printf " -u: run test with unsupported python versions also\n" -} - -function run_one_test() -{ - PYTHON=$1 - PYTHON_EXECUTABLE=`echo $PYTHON | tr -d "-"` - echo "+++ Running tests with $PYTHON" - export LD_LIBRARY_PATH=./regression/installed/$PYTHON/lib - ./regression/installed/$PYTHON/bin/$PYTHON_EXECUTABLE \ - utests/run_all_tests.py - echo "--- Finished tests with $PYTHON" -} - -function run_all_tests() -{ - for PYTHON in $@; - do - run_one_test $PYTHON - done -} - -while getopts u name -do - case $name in - h) usage; exit 0;; - u) ENABLE_UNSUPPORTED=1;; - ?) usage; exit 2;; - esac -done - -# Build the different python versions -(cd regression && make -j4 runtime-environment) - -# Supported: when an unit test fails this should be seen as an error -PYTHON_SUPPORTED="python-2.4 python-2.5 python-2.6" -# Unsupported: failure should be seen as a hint -PYTHON_UNSUPPORTED="python-3.1" - -export PYTHONPATH=`echo $PWD/../python/build/lib.*`:$PWD - -set -e -run_all_tests $PYTHON_SUPPORTED - -if test $ENABLE_UNSUPPORTED -eq 1 -then - run_all_tests $PYTHON_UNSUPPORTED -fi diff --git a/tools/tests/utests/run_all_tests.py b/tools/tests/utests/run_all_tests.py deleted file mode 100644 index 7318c81ff2..0000000000 --- a/tools/tests/utests/run_all_tests.py +++ /dev/null @@ -1,23 +0,0 @@ -#============================================================================ -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# 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 . -#============================================================================ -# Copyright (C) 2009 flonatel GmbH & Co. KG -#============================================================================ - -import unittest - -suite = unittest.TestSuite([]) - -if __name__ == "__main__": - testresult = unittest.TextTestRunner(verbosity=3).run(suite) - -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jan 13 19:44:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Jan 2021 19:44:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.66742.118664 (Exim 4.92) (envelope-from ) id 1kzm41-0000uo-H9; Wed, 13 Jan 2021 19:44:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66742.118664; Wed, 13 Jan 2021 19:44: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 1kzm41-0000ug-Dq; Wed, 13 Jan 2021 19:44:17 +0000 Received: by outflank-mailman (input) for mailman id 66742; Wed, 13 Jan 2021 19:44:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzm3z-0000uY-JU for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 19:44:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzm3z-0003CV-I7 for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 19:44:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kzm3z-0002Te-EX for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 19:44:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Fqy6ua6jvNay5NbrM9RjKMzoplkL4ypz6/3fVt3mvlI=; b=z+oBfNeenAISopXxankipciEWu CzrRvGtHRPPYJqEIl25nQeEeKC36vEqOJp4fmySgk7TmkXLb1LyPibPja1tDPPT/xXiAKFXZ1O+6X M3ImSdT8QceQhSHUqTKj+l3E09Yu+EuSVaJq244wWtBhiHs3PFdpT5oGHx41B2mSpc0U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: Move xen-access from tests/ to misc/ Message-Id: Date: Wed, 13 Jan 2021 19:44:15 +0000 commit 2de267435687b9ee73f9a89213d13d647ba01689 Author: Andrew Cooper AuthorDate: Tue Jan 12 18:37:53 2021 +0000 Commit: Andrew Cooper CommitDate: Wed Jan 13 19:30:50 2021 +0000 tools: Move xen-access from tests/ to misc/ xen-access is a tool for a human to use, rather than a test. Move it into misc/ as a more appropriate location to live. Move the -DXC_WANT_COMPAT_DEVICEMODEL_API from CFLAGS into xen-access.c itself to avoid adding Makefile complexity. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson Acked-by: Tamas K Lengyel --- .gitignore | 1 - MAINTAINERS | 2 +- tools/misc/.gitignore | 1 + tools/misc/Makefile | 4 + tools/misc/xen-access.c | 947 ++++++++++++++++++++++++++++++++++++ tools/tests/Makefile | 1 - tools/tests/xen-access/Makefile | 33 -- tools/tests/xen-access/xen-access.c | 946 ----------------------------------- 8 files changed, 953 insertions(+), 982 deletions(-) diff --git a/.gitignore b/.gitignore index 1b54ea3111..630bdf5b99 100644 --- a/.gitignore +++ b/.gitignore @@ -272,7 +272,6 @@ tools/tests/x86_emulator/*sse*.[ch] tools/tests/x86_emulator/test_x86_emulator tools/tests/x86_emulator/x86_emulate tools/tests/x86_emulator/xop*.[ch] -tools/tests/xen-access/xen-access tools/tests/xenstore/xs-test tools/tests/mem-sharing/memshrtool tools/tests/mce-test/tools/xen-mceinj diff --git a/MAINTAINERS b/MAINTAINERS index 6dbd99aff4..5079b834c2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -486,7 +486,7 @@ M: Tamas K Lengyel R: Alexandru Isaila R: Petre Pircalabu S: Supported -F: tools/tests/xen-access +F: tools/misc/xen-access.c F: xen/arch/*/monitor.c F: xen/arch/*/vm_event.c F: xen/arch/arm/mem_access.c diff --git a/tools/misc/.gitignore b/tools/misc/.gitignore index c5fe2cfccd..e332ed4ec7 100644 --- a/tools/misc/.gitignore +++ b/tools/misc/.gitignore @@ -1 +1,2 @@ +xen-access xen-ucode diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 7d37f297a9..612b7002e5 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -30,6 +30,7 @@ INSTALL_SBIN += xenlockprof INSTALL_SBIN += xenperf INSTALL_SBIN += xenpm INSTALL_SBIN += xenwatchdogd +INSTALL_SBIN += xen-access INSTALL_SBIN += xen-livepatch INSTALL_SBIN += xen-diag INSTALL_SBIN += $(INSTALL_SBIN-y) @@ -73,6 +74,9 @@ clean: .PHONY: distclean distclean: clean +xen-access: xen-access.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenevtchn) $(APPEND_LDFLAGS) + xen-cpuid: xen-cpuid.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) diff --git a/tools/misc/xen-access.c b/tools/misc/xen-access.c new file mode 100644 index 0000000000..4bbef0bd2e --- /dev/null +++ b/tools/misc/xen-access.c @@ -0,0 +1,947 @@ +/* + * xen-access.c + * + * Exercises the basic per-page access mechanisms + * + * Copyright (c) 2011 Virtuata, Inc. + * Copyright (c) 2009 by Citrix Systems, Inc. (Patrick Colp), based on + * xenpaging.c + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define XC_WANT_COMPAT_DEVICEMODEL_API +#include +#include +#include + +#include + +#if defined(__arm__) || defined(__aarch64__) +#include +#define START_PFN (GUEST_RAM0_BASE >> 12) +#elif defined(__i386__) || defined(__x86_64__) +#define START_PFN 0ULL +#endif + +#define DPRINTF(a, b...) fprintf(stderr, a, ## b) +#define ERROR(a, b...) fprintf(stderr, a "\n", ## b) +#define PERROR(a, b...) fprintf(stderr, a ": %s\n", ## b, strerror(errno)) + +/* From xen/include/asm-x86/processor.h */ +#define X86_TRAP_DEBUG 1 +#define X86_TRAP_INT3 3 + +/* From xen/include/asm-x86/x86-defns.h */ +#define X86_CR4_PGE 0x00000080 /* enable global pages */ + +typedef struct vm_event { + domid_t domain_id; + xenevtchn_handle *xce_handle; + int port; + vm_event_back_ring_t back_ring; + uint32_t evtchn_port; + void *ring_page; +} vm_event_t; + +typedef struct xenaccess { + xc_interface *xc_handle; + + xen_pfn_t max_gpfn; + + vm_event_t vm_event; +} xenaccess_t; + +static int interrupted; +bool evtchn_bind = 0, evtchn_open = 0, mem_access_enable = 0; + +static void close_handler(int sig) +{ + interrupted = sig; +} + +int xc_wait_for_event_or_timeout(xc_interface *xch, xenevtchn_handle *xce, unsigned long ms) +{ + struct pollfd fd = { .fd = xenevtchn_fd(xce), .events = POLLIN | POLLERR }; + int port; + int rc; + + rc = poll(&fd, 1, ms); + if ( rc == -1 ) + { + if (errno == EINTR) + return 0; + + ERROR("Poll exited with an error"); + goto err; + } + + if ( rc == 1 ) + { + port = xenevtchn_pending(xce); + if ( port == -1 ) + { + ERROR("Failed to read port from event channel"); + goto err; + } + + rc = xenevtchn_unmask(xce, port); + if ( rc != 0 ) + { + ERROR("Failed to unmask event channel port"); + goto err; + } + } + else + port = -1; + + return port; + + err: + return -errno; +} + +int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) +{ + int rc; + + if ( xenaccess == NULL ) + return 0; + + /* Tear down domain xenaccess in Xen */ + if ( xenaccess->vm_event.ring_page ) + munmap(xenaccess->vm_event.ring_page, XC_PAGE_SIZE); + + if ( mem_access_enable ) + { + rc = xc_monitor_disable(xenaccess->xc_handle, + xenaccess->vm_event.domain_id); + if ( rc != 0 ) + { + ERROR("Error tearing down domain xenaccess in xen"); + return rc; + } + } + + /* Unbind VIRQ */ + if ( evtchn_bind ) + { + rc = xenevtchn_unbind(xenaccess->vm_event.xce_handle, + xenaccess->vm_event.port); + if ( rc != 0 ) + { + ERROR("Error unbinding event port"); + return rc; + } + } + + /* Close event channel */ + if ( evtchn_open ) + { + rc = xenevtchn_close(xenaccess->vm_event.xce_handle); + if ( rc != 0 ) + { + ERROR("Error closing event channel"); + return rc; + } + } + + /* Close connection to Xen */ + rc = xc_interface_close(xenaccess->xc_handle); + if ( rc != 0 ) + { + ERROR("Error closing connection to xen"); + return rc; + } + xenaccess->xc_handle = NULL; + + free(xenaccess); + + return 0; +} + +xenaccess_t *xenaccess_init(xc_interface **xch_r, domid_t domain_id) +{ + xenaccess_t *xenaccess = 0; + xc_interface *xch; + int rc; + + xch = xc_interface_open(NULL, NULL, 0); + if ( !xch ) + goto err_iface; + + DPRINTF("xenaccess init\n"); + *xch_r = xch; + + /* Allocate memory */ + xenaccess = malloc(sizeof(xenaccess_t)); + memset(xenaccess, 0, sizeof(xenaccess_t)); + + /* Open connection to xen */ + xenaccess->xc_handle = xch; + + /* Set domain id */ + xenaccess->vm_event.domain_id = domain_id; + + /* Enable mem_access */ + xenaccess->vm_event.ring_page = + xc_monitor_enable(xenaccess->xc_handle, + xenaccess->vm_event.domain_id, + &xenaccess->vm_event.evtchn_port); + if ( xenaccess->vm_event.ring_page == NULL ) + { + switch ( errno ) { + case EBUSY: + ERROR("xenaccess is (or was) active on this domain"); + break; + case ENODEV: + ERROR("EPT not supported for this guest"); + break; + default: + perror("Error enabling mem_access"); + break; + } + goto err; + } + mem_access_enable = 1; + + /* Open event channel */ + xenaccess->vm_event.xce_handle = xenevtchn_open(NULL, 0); + if ( xenaccess->vm_event.xce_handle == NULL ) + { + ERROR("Failed to open event channel"); + goto err; + } + evtchn_open = 1; + + /* Bind event notification */ + rc = xenevtchn_bind_interdomain(xenaccess->vm_event.xce_handle, + xenaccess->vm_event.domain_id, + xenaccess->vm_event.evtchn_port); + if ( rc < 0 ) + { + ERROR("Failed to bind event channel"); + goto err; + } + evtchn_bind = 1; + xenaccess->vm_event.port = rc; + + /* Initialise ring */ + SHARED_RING_INIT((vm_event_sring_t *)xenaccess->vm_event.ring_page); + BACK_RING_INIT(&xenaccess->vm_event.back_ring, + (vm_event_sring_t *)xenaccess->vm_event.ring_page, + XC_PAGE_SIZE); + + /* Get max_gpfn */ + rc = xc_domain_maximum_gpfn(xenaccess->xc_handle, + xenaccess->vm_event.domain_id, + &xenaccess->max_gpfn); + + if ( rc ) + { + ERROR("Failed to get max gpfn"); + goto err; + } + + DPRINTF("max_gpfn = %"PRI_xen_pfn"\n", xenaccess->max_gpfn); + + return xenaccess; + + err: + rc = xenaccess_teardown(xch, xenaccess); + if ( rc ) + { + ERROR("Failed to teardown xenaccess structure!\n"); + } + + err_iface: + return NULL; +} + +static inline +int control_singlestep( + xc_interface *xch, + domid_t domain_id, + unsigned long vcpu, + bool enable) +{ + uint32_t op = enable ? + XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_ON : XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_OFF; + + return xc_domain_debug_control(xch, domain_id, op, vcpu); +} + +/* + * Note that this function is not thread safe. + */ +static void get_request(vm_event_t *vm_event, vm_event_request_t *req) +{ + vm_event_back_ring_t *back_ring; + RING_IDX req_cons; + + back_ring = &vm_event->back_ring; + req_cons = back_ring->req_cons; + + /* Copy request */ + memcpy(req, RING_GET_REQUEST(back_ring, req_cons), sizeof(*req)); + req_cons++; + + /* Update ring */ + back_ring->req_cons = req_cons; + back_ring->sring->req_event = req_cons + 1; +} + +/* + * X86 control register names + */ +static const char* get_x86_ctrl_reg_name(uint32_t index) +{ + static const char* names[] = { + [VM_EVENT_X86_CR0] = "CR0", + [VM_EVENT_X86_CR3] = "CR3", + [VM_EVENT_X86_CR4] = "CR4", + [VM_EVENT_X86_XCR0] = "XCR0", + }; + + if ( index >= ARRAY_SIZE(names) || names[index] == NULL ) + return ""; + + return names[index]; +} + +/* + * Note that this function is not thread safe. + */ +static void put_response(vm_event_t *vm_event, vm_event_response_t *rsp) +{ + vm_event_back_ring_t *back_ring; + RING_IDX rsp_prod; + + back_ring = &vm_event->back_ring; + rsp_prod = back_ring->rsp_prod_pvt; + + /* Copy response */ + memcpy(RING_GET_RESPONSE(back_ring, rsp_prod), rsp, sizeof(*rsp)); + rsp_prod++; + + /* Update ring */ + back_ring->rsp_prod_pvt = rsp_prod; + RING_PUSH_RESPONSES(back_ring); +} + +void usage(char* progname) +{ + fprintf(stderr, "Usage: %s [-m] write|exec", progname); +#if defined(__i386__) || defined(__x86_64__) + fprintf(stderr, "|breakpoint|altp2m_write|altp2m_exec|debug|cpuid|desc_access|write_ctrlreg_cr4|altp2m_write_no_gpt"); +#elif defined(__arm__) || defined(__aarch64__) + fprintf(stderr, "|privcall"); +#endif + fprintf(stderr, + "\n" + "Logs first page writes, execs, or breakpoint traps that occur on the domain.\n" + "\n" + "-m requires this program to run, or else the domain may pause\n"); +} + +int main(int argc, char *argv[]) +{ + struct sigaction act; + domid_t domain_id; + xenaccess_t *xenaccess; + vm_event_request_t req; + vm_event_response_t rsp; + int rc = -1; + int rc1; + xc_interface *xch; + xenmem_access_t default_access = XENMEM_access_rwx; + xenmem_access_t after_first_access = XENMEM_access_rwx; + int memaccess = 0; + int required = 0; + int breakpoint = 0; + int shutting_down = 0; + int privcall = 0; + int altp2m = 0; + int debug = 0; + int cpuid = 0; + int desc_access = 0; + int write_ctrlreg_cr4 = 0; + int altp2m_write_no_gpt = 0; + uint16_t altp2m_view_id = 0; + + char* progname = argv[0]; + argv++; + argc--; + + if ( argc == 3 && argv[0][0] == '-' ) + { + if ( !strcmp(argv[0], "-m") ) + required = 1; + else + { + usage(progname); + return -1; + } + argv++; + argc--; + } + + if ( argc != 2 ) + { + usage(progname); + return -1; + } + + domain_id = atoi(argv[0]); + argv++; + argc--; + + if ( !strcmp(argv[0], "write") ) + { + default_access = XENMEM_access_rx; + after_first_access = XENMEM_access_rwx; + memaccess = 1; + } + else if ( !strcmp(argv[0], "exec") ) + { + default_access = XENMEM_access_rw; + after_first_access = XENMEM_access_rwx; + memaccess = 1; + } +#if defined(__i386__) || defined(__x86_64__) + else if ( !strcmp(argv[0], "breakpoint") ) + { + breakpoint = 1; + } + else if ( !strcmp(argv[0], "altp2m_write") ) + { + default_access = XENMEM_access_rx; + altp2m = 1; + memaccess = 1; + } + else if ( !strcmp(argv[0], "altp2m_exec") ) + { + default_access = XENMEM_access_rw; + altp2m = 1; + memaccess = 1; + } + else if ( !strcmp(argv[0], "altp2m_write_no_gpt") ) + { + default_access = XENMEM_access_rw; + altp2m_write_no_gpt = 1; + memaccess = 1; + altp2m = 1; + } + else if ( !strcmp(argv[0], "debug") ) + { + debug = 1; + } + else if ( !strcmp(argv[0], "cpuid") ) + { + cpuid = 1; + } + else if ( !strcmp(argv[0], "desc_access") ) + { + desc_access = 1; + } + else if ( !strcmp(argv[0], "write_ctrlreg_cr4") ) + { + write_ctrlreg_cr4 = 1; + } +#elif defined(__arm__) || defined(__aarch64__) + else if ( !strcmp(argv[0], "privcall") ) + { + privcall = 1; + } +#endif + else + { + usage(argv[0]); + return -1; + } + + xenaccess = xenaccess_init(&xch, domain_id); + if ( xenaccess == NULL ) + { + ERROR("Error initialising xenaccess"); + return 1; + } + + DPRINTF("starting %s %u\n", argv[0], domain_id); + + /* ensure that if we get a signal, we'll do cleanup, then exit */ + act.sa_handler = close_handler; + act.sa_flags = 0; + sigemptyset(&act.sa_mask); + sigaction(SIGHUP, &act, NULL); + sigaction(SIGTERM, &act, NULL); + sigaction(SIGINT, &act, NULL); + sigaction(SIGALRM, &act, NULL); + + /* Set whether the access listener is required */ + rc = xc_domain_set_access_required(xch, domain_id, required); + if ( rc < 0 ) + { + ERROR("Error %d setting mem_access listener required\n", rc); + goto exit; + } + + /* With altp2m we just create a new, restricted view of the memory */ + if ( memaccess && altp2m ) + { + xen_pfn_t gfn = 0; + unsigned long perm_set = 0; + + if( altp2m_write_no_gpt ) + { + rc = xc_monitor_inguest_pagefault(xch, domain_id, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting inguest pagefault\n", rc); + goto exit; + } + rc = xc_monitor_emul_unimplemented(xch, domain_id, 1); + if ( rc < 0 ) + { + ERROR("Error %d failed to enable emul unimplemented\n", rc); + goto exit; + } + } + + rc = xc_altp2m_set_domain_state( xch, domain_id, 1 ); + if ( rc < 0 ) + { + ERROR("Error %d enabling altp2m on domain!\n", rc); + goto exit; + } + + rc = xc_altp2m_create_view( xch, domain_id, default_access, &altp2m_view_id ); + if ( rc < 0 ) + { + ERROR("Error %d creating altp2m view!\n", rc); + goto exit; + } + + DPRINTF("altp2m view created with id %u\n", altp2m_view_id); + DPRINTF("Setting altp2m mem_access permissions.. "); + + for(; gfn < xenaccess->max_gpfn; ++gfn) + { + rc = xc_altp2m_set_mem_access( xch, domain_id, altp2m_view_id, gfn, + default_access); + if ( !rc ) + perm_set++; + } + + DPRINTF("done! Permissions set on %lu pages.\n", perm_set); + + rc = xc_altp2m_switch_to_view( xch, domain_id, altp2m_view_id ); + if ( rc < 0 ) + { + ERROR("Error %d switching to altp2m view!\n", rc); + goto exit; + } + + rc = xc_monitor_singlestep( xch, domain_id, 1 ); + if ( rc < 0 ) + { + ERROR("Error %d failed to enable singlestep monitoring!\n", rc); + goto exit; + } + } + + if ( memaccess && !altp2m ) + { + /* Set the default access type and convert all pages to it */ + rc = xc_set_mem_access(xch, domain_id, default_access, ~0ull, 0); + if ( rc < 0 ) + { + ERROR("Error %d setting default mem access type\n", rc); + goto exit; + } + + rc = xc_set_mem_access(xch, domain_id, default_access, START_PFN, + (xenaccess->max_gpfn - START_PFN) ); + + if ( rc < 0 ) + { + ERROR("Error %d setting all memory to access type %d\n", rc, + default_access); + goto exit; + } + } + + if ( breakpoint ) + { + rc = xc_monitor_software_breakpoint(xch, domain_id, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting breakpoint trapping with vm_event\n", rc); + goto exit; + } + } + + if ( debug ) + { + rc = xc_monitor_debug_exceptions(xch, domain_id, 1, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting debug exception listener with vm_event\n", rc); + goto exit; + } + } + + if ( cpuid ) + { + rc = xc_monitor_cpuid(xch, domain_id, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting cpuid listener with vm_event\n", rc); + goto exit; + } + } + + if ( desc_access ) + { + rc = xc_monitor_descriptor_access(xch, domain_id, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting descriptor access listener with vm_event\n", rc); + goto exit; + } + } + + if ( privcall ) + { + rc = xc_monitor_privileged_call(xch, domain_id, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting privileged call trapping with vm_event\n", rc); + goto exit; + } + } + + if ( write_ctrlreg_cr4 ) + { + /* Mask the CR4.PGE bit so no events will be generated for global TLB flushes. */ + rc = xc_monitor_write_ctrlreg(xch, domain_id, VM_EVENT_X86_CR4, 1, 1, + X86_CR4_PGE, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting write control register trapping with vm_event\n", rc); + goto exit; + } + } + + /* Wait for access */ + for (;;) + { + if ( interrupted ) + { + /* Unregister for every event */ + DPRINTF("xenaccess shutting down on signal %d\n", interrupted); + + if ( breakpoint ) + rc = xc_monitor_software_breakpoint(xch, domain_id, 0); + if ( debug ) + rc = xc_monitor_debug_exceptions(xch, domain_id, 0, 0); + if ( cpuid ) + rc = xc_monitor_cpuid(xch, domain_id, 0); + if ( desc_access ) + rc = xc_monitor_descriptor_access(xch, domain_id, 0); + if ( write_ctrlreg_cr4 ) + rc = xc_monitor_write_ctrlreg(xch, domain_id, VM_EVENT_X86_CR4, 0, 0, 0, 0); + + if ( privcall ) + rc = xc_monitor_privileged_call(xch, domain_id, 0); + + if ( altp2m ) + { + rc = xc_altp2m_switch_to_view( xch, domain_id, 0 ); + rc = xc_altp2m_destroy_view(xch, domain_id, altp2m_view_id); + rc = xc_altp2m_set_domain_state(xch, domain_id, 0); + rc = xc_monitor_singlestep(xch, domain_id, 0); + } else { + rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, ~0ull, 0); + rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, START_PFN, + (xenaccess->max_gpfn - START_PFN) ); + } + + shutting_down = 1; + } + + rc = xc_wait_for_event_or_timeout(xch, xenaccess->vm_event.xce_handle, 100); + if ( rc < -1 ) + { + ERROR("Error getting event"); + interrupted = -1; + continue; + } + else if ( rc != -1 ) + { + DPRINTF("Got event from Xen\n"); + } + + while ( RING_HAS_UNCONSUMED_REQUESTS(&xenaccess->vm_event.back_ring) ) + { + get_request(&xenaccess->vm_event, &req); + + if ( req.version != VM_EVENT_INTERFACE_VERSION ) + { + ERROR("Error: vm_event interface version mismatch!\n"); + interrupted = -1; + continue; + } + + memset( &rsp, 0, sizeof (rsp) ); + rsp.version = VM_EVENT_INTERFACE_VERSION; + rsp.vcpu_id = req.vcpu_id; + rsp.flags = (req.flags & VM_EVENT_FLAG_VCPU_PAUSED); + rsp.reason = req.reason; + + switch (req.reason) { + case VM_EVENT_REASON_MEM_ACCESS: + if ( !shutting_down ) + { + /* + * This serves no other purpose here then demonstrating the use of the API. + * At shutdown we have already reset all the permissions so really no use getting it again. + */ + xenmem_access_t access; + rc = xc_get_mem_access(xch, domain_id, req.u.mem_access.gfn, &access); + if (rc < 0) + { + ERROR("Error %d getting mem_access event\n", rc); + interrupted = -1; + continue; + } + } + + printf("PAGE ACCESS: %c%c%c for GFN %"PRIx64" (offset %06" + PRIx64") gla %016"PRIx64" (valid: %c; fault in gpt: %c; fault with gla: %c) (vcpu %u [%c], altp2m view %u)\n", + (req.u.mem_access.flags & MEM_ACCESS_R) ? 'r' : '-', + (req.u.mem_access.flags & MEM_ACCESS_W) ? 'w' : '-', + (req.u.mem_access.flags & MEM_ACCESS_X) ? 'x' : '-', + req.u.mem_access.gfn, + req.u.mem_access.offset, + req.u.mem_access.gla, + (req.u.mem_access.flags & MEM_ACCESS_GLA_VALID) ? 'y' : 'n', + (req.u.mem_access.flags & MEM_ACCESS_FAULT_IN_GPT) ? 'y' : 'n', + (req.u.mem_access.flags & MEM_ACCESS_FAULT_WITH_GLA) ? 'y': 'n', + req.vcpu_id, + (req.flags & VM_EVENT_FLAG_VCPU_PAUSED) ? 'p' : 'r', + req.altp2m_idx); + + if ( altp2m && req.flags & VM_EVENT_FLAG_ALTERNATE_P2M) + { + DPRINTF("\tSwitching back to default view!\n"); + + rsp.flags |= (VM_EVENT_FLAG_ALTERNATE_P2M | VM_EVENT_FLAG_TOGGLE_SINGLESTEP); + rsp.altp2m_idx = 0; + } + else if ( default_access != after_first_access ) + { + rc = xc_set_mem_access(xch, domain_id, after_first_access, + req.u.mem_access.gfn, 1); + if (rc < 0) + { + ERROR("Error %d setting gfn to access_type %d\n", rc, + after_first_access); + interrupted = -1; + continue; + } + } + + rsp.u.mem_access = req.u.mem_access; + break; + case VM_EVENT_REASON_SOFTWARE_BREAKPOINT: + printf("Breakpoint: rip=%016"PRIx64", gfn=%"PRIx64" (vcpu %d)\n", + req.data.regs.x86.rip, + req.u.software_breakpoint.gfn, + req.vcpu_id); + + /* Reinject */ + rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, + X86_TRAP_INT3, + req.u.software_breakpoint.type, -1, + req.u.software_breakpoint.insn_length, 0); + if (rc < 0) + { + ERROR("Error %d injecting breakpoint\n", rc); + interrupted = -1; + continue; + } + break; + case VM_EVENT_REASON_PRIVILEGED_CALL: + printf("Privileged call: pc=%"PRIx64" (vcpu %d)\n", + req.data.regs.arm.pc, + req.vcpu_id); + + rsp.data.regs.arm = req.data.regs.arm; + rsp.data.regs.arm.pc += 4; + rsp.flags |= VM_EVENT_FLAG_SET_REGISTERS; + break; + case VM_EVENT_REASON_SINGLESTEP: + printf("Singlestep: rip=%016"PRIx64", vcpu %d, altp2m %u\n", + req.data.regs.x86.rip, + req.vcpu_id, + req.altp2m_idx); + + if ( altp2m ) + { + printf("\tSwitching altp2m to view %u!\n", altp2m_view_id); + + rsp.flags |= VM_EVENT_FLAG_ALTERNATE_P2M; + rsp.altp2m_idx = altp2m_view_id; + } + + rsp.flags |= VM_EVENT_FLAG_TOGGLE_SINGLESTEP; + + break; + case VM_EVENT_REASON_DEBUG_EXCEPTION: + printf("Debug exception: rip=%016"PRIx64", vcpu %d. Type: %u. Length: %u. Pending dbg 0x%08"PRIx64"\n", + req.data.regs.x86.rip, + req.vcpu_id, + req.u.debug_exception.type, + req.u.debug_exception.insn_length, + req.u.debug_exception.pending_dbg); + + /* Reinject */ + rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, + X86_TRAP_DEBUG, + req.u.debug_exception.type, -1, + req.u.debug_exception.insn_length, + req.u.debug_exception.pending_dbg); + if (rc < 0) + { + ERROR("Error %d injecting breakpoint\n", rc); + interrupted = -1; + continue; + } + + break; + case VM_EVENT_REASON_CPUID: + printf("CPUID executed: rip=%016"PRIx64", vcpu %d. Insn length: %"PRIu32" " \ + "0x%"PRIx32" 0x%"PRIx32": EAX=0x%"PRIx64" EBX=0x%"PRIx64" ECX=0x%"PRIx64" EDX=0x%"PRIx64"\n", + req.data.regs.x86.rip, + req.vcpu_id, + req.u.cpuid.insn_length, + req.u.cpuid.leaf, + req.u.cpuid.subleaf, + req.data.regs.x86.rax, + req.data.regs.x86.rbx, + req.data.regs.x86.rcx, + req.data.regs.x86.rdx); + rsp.flags |= VM_EVENT_FLAG_SET_REGISTERS; + rsp.data = req.data; + rsp.data.regs.x86.rip += req.u.cpuid.insn_length; + break; + case VM_EVENT_REASON_DESCRIPTOR_ACCESS: + printf("Descriptor access: rip=%016"PRIx64", vcpu %d: "\ + "VMExit info=0x%"PRIx32", descriptor=%d, is write=%d\n", + req.data.regs.x86.rip, + req.vcpu_id, + req.u.desc_access.arch.vmx.instr_info, + req.u.desc_access.descriptor, + req.u.desc_access.is_write); + rsp.flags |= VM_EVENT_FLAG_EMULATE; + break; + case VM_EVENT_REASON_WRITE_CTRLREG: + printf("Control register written: rip=%016"PRIx64", vcpu %d: " + "reg=%s, old_value=%016"PRIx64", new_value=%016"PRIx64"\n", + req.data.regs.x86.rip, + req.vcpu_id, + get_x86_ctrl_reg_name(req.u.write_ctrlreg.index), + req.u.write_ctrlreg.old_value, + req.u.write_ctrlreg.new_value); + break; + case VM_EVENT_REASON_EMUL_UNIMPLEMENTED: + if ( altp2m_write_no_gpt && req.flags & VM_EVENT_FLAG_ALTERNATE_P2M ) + { + DPRINTF("\tSwitching back to default view!\n"); + + rsp.flags |= (VM_EVENT_FLAG_ALTERNATE_P2M | + VM_EVENT_FLAG_TOGGLE_SINGLESTEP); + rsp.altp2m_idx = 0; + } + break; + default: + fprintf(stderr, "UNKNOWN REASON CODE %d\n", req.reason); + } + + /* Put the response on the ring */ + put_response(&xenaccess->vm_event, &rsp); + } + + /* Tell Xen page is ready */ + rc = xenevtchn_notify(xenaccess->vm_event.xce_handle, + xenaccess->vm_event.port); + + if ( rc != 0 ) + { + ERROR("Error resuming page"); + interrupted = -1; + } + + if ( shutting_down ) + break; + } + DPRINTF("xenaccess shut down on signal %d\n", interrupted); + +exit: + if ( altp2m ) + { + uint32_t vcpu_id; + for ( vcpu_id = 0; vcpu_id -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include - -#if defined(__arm__) || defined(__aarch64__) -#include -#define START_PFN (GUEST_RAM0_BASE >> 12) -#elif defined(__i386__) || defined(__x86_64__) -#define START_PFN 0ULL -#endif - -#define DPRINTF(a, b...) fprintf(stderr, a, ## b) -#define ERROR(a, b...) fprintf(stderr, a "\n", ## b) -#define PERROR(a, b...) fprintf(stderr, a ": %s\n", ## b, strerror(errno)) - -/* From xen/include/asm-x86/processor.h */ -#define X86_TRAP_DEBUG 1 -#define X86_TRAP_INT3 3 - -/* From xen/include/asm-x86/x86-defns.h */ -#define X86_CR4_PGE 0x00000080 /* enable global pages */ - -typedef struct vm_event { - domid_t domain_id; - xenevtchn_handle *xce_handle; - int port; - vm_event_back_ring_t back_ring; - uint32_t evtchn_port; - void *ring_page; -} vm_event_t; - -typedef struct xenaccess { - xc_interface *xc_handle; - - xen_pfn_t max_gpfn; - - vm_event_t vm_event; -} xenaccess_t; - -static int interrupted; -bool evtchn_bind = 0, evtchn_open = 0, mem_access_enable = 0; - -static void close_handler(int sig) -{ - interrupted = sig; -} - -int xc_wait_for_event_or_timeout(xc_interface *xch, xenevtchn_handle *xce, unsigned long ms) -{ - struct pollfd fd = { .fd = xenevtchn_fd(xce), .events = POLLIN | POLLERR }; - int port; - int rc; - - rc = poll(&fd, 1, ms); - if ( rc == -1 ) - { - if (errno == EINTR) - return 0; - - ERROR("Poll exited with an error"); - goto err; - } - - if ( rc == 1 ) - { - port = xenevtchn_pending(xce); - if ( port == -1 ) - { - ERROR("Failed to read port from event channel"); - goto err; - } - - rc = xenevtchn_unmask(xce, port); - if ( rc != 0 ) - { - ERROR("Failed to unmask event channel port"); - goto err; - } - } - else - port = -1; - - return port; - - err: - return -errno; -} - -int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) -{ - int rc; - - if ( xenaccess == NULL ) - return 0; - - /* Tear down domain xenaccess in Xen */ - if ( xenaccess->vm_event.ring_page ) - munmap(xenaccess->vm_event.ring_page, XC_PAGE_SIZE); - - if ( mem_access_enable ) - { - rc = xc_monitor_disable(xenaccess->xc_handle, - xenaccess->vm_event.domain_id); - if ( rc != 0 ) - { - ERROR("Error tearing down domain xenaccess in xen"); - return rc; - } - } - - /* Unbind VIRQ */ - if ( evtchn_bind ) - { - rc = xenevtchn_unbind(xenaccess->vm_event.xce_handle, - xenaccess->vm_event.port); - if ( rc != 0 ) - { - ERROR("Error unbinding event port"); - return rc; - } - } - - /* Close event channel */ - if ( evtchn_open ) - { - rc = xenevtchn_close(xenaccess->vm_event.xce_handle); - if ( rc != 0 ) - { - ERROR("Error closing event channel"); - return rc; - } - } - - /* Close connection to Xen */ - rc = xc_interface_close(xenaccess->xc_handle); - if ( rc != 0 ) - { - ERROR("Error closing connection to xen"); - return rc; - } - xenaccess->xc_handle = NULL; - - free(xenaccess); - - return 0; -} - -xenaccess_t *xenaccess_init(xc_interface **xch_r, domid_t domain_id) -{ - xenaccess_t *xenaccess = 0; - xc_interface *xch; - int rc; - - xch = xc_interface_open(NULL, NULL, 0); - if ( !xch ) - goto err_iface; - - DPRINTF("xenaccess init\n"); - *xch_r = xch; - - /* Allocate memory */ - xenaccess = malloc(sizeof(xenaccess_t)); - memset(xenaccess, 0, sizeof(xenaccess_t)); - - /* Open connection to xen */ - xenaccess->xc_handle = xch; - - /* Set domain id */ - xenaccess->vm_event.domain_id = domain_id; - - /* Enable mem_access */ - xenaccess->vm_event.ring_page = - xc_monitor_enable(xenaccess->xc_handle, - xenaccess->vm_event.domain_id, - &xenaccess->vm_event.evtchn_port); - if ( xenaccess->vm_event.ring_page == NULL ) - { - switch ( errno ) { - case EBUSY: - ERROR("xenaccess is (or was) active on this domain"); - break; - case ENODEV: - ERROR("EPT not supported for this guest"); - break; - default: - perror("Error enabling mem_access"); - break; - } - goto err; - } - mem_access_enable = 1; - - /* Open event channel */ - xenaccess->vm_event.xce_handle = xenevtchn_open(NULL, 0); - if ( xenaccess->vm_event.xce_handle == NULL ) - { - ERROR("Failed to open event channel"); - goto err; - } - evtchn_open = 1; - - /* Bind event notification */ - rc = xenevtchn_bind_interdomain(xenaccess->vm_event.xce_handle, - xenaccess->vm_event.domain_id, - xenaccess->vm_event.evtchn_port); - if ( rc < 0 ) - { - ERROR("Failed to bind event channel"); - goto err; - } - evtchn_bind = 1; - xenaccess->vm_event.port = rc; - - /* Initialise ring */ - SHARED_RING_INIT((vm_event_sring_t *)xenaccess->vm_event.ring_page); - BACK_RING_INIT(&xenaccess->vm_event.back_ring, - (vm_event_sring_t *)xenaccess->vm_event.ring_page, - XC_PAGE_SIZE); - - /* Get max_gpfn */ - rc = xc_domain_maximum_gpfn(xenaccess->xc_handle, - xenaccess->vm_event.domain_id, - &xenaccess->max_gpfn); - - if ( rc ) - { - ERROR("Failed to get max gpfn"); - goto err; - } - - DPRINTF("max_gpfn = %"PRI_xen_pfn"\n", xenaccess->max_gpfn); - - return xenaccess; - - err: - rc = xenaccess_teardown(xch, xenaccess); - if ( rc ) - { - ERROR("Failed to teardown xenaccess structure!\n"); - } - - err_iface: - return NULL; -} - -static inline -int control_singlestep( - xc_interface *xch, - domid_t domain_id, - unsigned long vcpu, - bool enable) -{ - uint32_t op = enable ? - XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_ON : XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_OFF; - - return xc_domain_debug_control(xch, domain_id, op, vcpu); -} - -/* - * Note that this function is not thread safe. - */ -static void get_request(vm_event_t *vm_event, vm_event_request_t *req) -{ - vm_event_back_ring_t *back_ring; - RING_IDX req_cons; - - back_ring = &vm_event->back_ring; - req_cons = back_ring->req_cons; - - /* Copy request */ - memcpy(req, RING_GET_REQUEST(back_ring, req_cons), sizeof(*req)); - req_cons++; - - /* Update ring */ - back_ring->req_cons = req_cons; - back_ring->sring->req_event = req_cons + 1; -} - -/* - * X86 control register names - */ -static const char* get_x86_ctrl_reg_name(uint32_t index) -{ - static const char* names[] = { - [VM_EVENT_X86_CR0] = "CR0", - [VM_EVENT_X86_CR3] = "CR3", - [VM_EVENT_X86_CR4] = "CR4", - [VM_EVENT_X86_XCR0] = "XCR0", - }; - - if ( index >= ARRAY_SIZE(names) || names[index] == NULL ) - return ""; - - return names[index]; -} - -/* - * Note that this function is not thread safe. - */ -static void put_response(vm_event_t *vm_event, vm_event_response_t *rsp) -{ - vm_event_back_ring_t *back_ring; - RING_IDX rsp_prod; - - back_ring = &vm_event->back_ring; - rsp_prod = back_ring->rsp_prod_pvt; - - /* Copy response */ - memcpy(RING_GET_RESPONSE(back_ring, rsp_prod), rsp, sizeof(*rsp)); - rsp_prod++; - - /* Update ring */ - back_ring->rsp_prod_pvt = rsp_prod; - RING_PUSH_RESPONSES(back_ring); -} - -void usage(char* progname) -{ - fprintf(stderr, "Usage: %s [-m] write|exec", progname); -#if defined(__i386__) || defined(__x86_64__) - fprintf(stderr, "|breakpoint|altp2m_write|altp2m_exec|debug|cpuid|desc_access|write_ctrlreg_cr4|altp2m_write_no_gpt"); -#elif defined(__arm__) || defined(__aarch64__) - fprintf(stderr, "|privcall"); -#endif - fprintf(stderr, - "\n" - "Logs first page writes, execs, or breakpoint traps that occur on the domain.\n" - "\n" - "-m requires this program to run, or else the domain may pause\n"); -} - -int main(int argc, char *argv[]) -{ - struct sigaction act; - domid_t domain_id; - xenaccess_t *xenaccess; - vm_event_request_t req; - vm_event_response_t rsp; - int rc = -1; - int rc1; - xc_interface *xch; - xenmem_access_t default_access = XENMEM_access_rwx; - xenmem_access_t after_first_access = XENMEM_access_rwx; - int memaccess = 0; - int required = 0; - int breakpoint = 0; - int shutting_down = 0; - int privcall = 0; - int altp2m = 0; - int debug = 0; - int cpuid = 0; - int desc_access = 0; - int write_ctrlreg_cr4 = 0; - int altp2m_write_no_gpt = 0; - uint16_t altp2m_view_id = 0; - - char* progname = argv[0]; - argv++; - argc--; - - if ( argc == 3 && argv[0][0] == '-' ) - { - if ( !strcmp(argv[0], "-m") ) - required = 1; - else - { - usage(progname); - return -1; - } - argv++; - argc--; - } - - if ( argc != 2 ) - { - usage(progname); - return -1; - } - - domain_id = atoi(argv[0]); - argv++; - argc--; - - if ( !strcmp(argv[0], "write") ) - { - default_access = XENMEM_access_rx; - after_first_access = XENMEM_access_rwx; - memaccess = 1; - } - else if ( !strcmp(argv[0], "exec") ) - { - default_access = XENMEM_access_rw; - after_first_access = XENMEM_access_rwx; - memaccess = 1; - } -#if defined(__i386__) || defined(__x86_64__) - else if ( !strcmp(argv[0], "breakpoint") ) - { - breakpoint = 1; - } - else if ( !strcmp(argv[0], "altp2m_write") ) - { - default_access = XENMEM_access_rx; - altp2m = 1; - memaccess = 1; - } - else if ( !strcmp(argv[0], "altp2m_exec") ) - { - default_access = XENMEM_access_rw; - altp2m = 1; - memaccess = 1; - } - else if ( !strcmp(argv[0], "altp2m_write_no_gpt") ) - { - default_access = XENMEM_access_rw; - altp2m_write_no_gpt = 1; - memaccess = 1; - altp2m = 1; - } - else if ( !strcmp(argv[0], "debug") ) - { - debug = 1; - } - else if ( !strcmp(argv[0], "cpuid") ) - { - cpuid = 1; - } - else if ( !strcmp(argv[0], "desc_access") ) - { - desc_access = 1; - } - else if ( !strcmp(argv[0], "write_ctrlreg_cr4") ) - { - write_ctrlreg_cr4 = 1; - } -#elif defined(__arm__) || defined(__aarch64__) - else if ( !strcmp(argv[0], "privcall") ) - { - privcall = 1; - } -#endif - else - { - usage(argv[0]); - return -1; - } - - xenaccess = xenaccess_init(&xch, domain_id); - if ( xenaccess == NULL ) - { - ERROR("Error initialising xenaccess"); - return 1; - } - - DPRINTF("starting %s %u\n", argv[0], domain_id); - - /* ensure that if we get a signal, we'll do cleanup, then exit */ - act.sa_handler = close_handler; - act.sa_flags = 0; - sigemptyset(&act.sa_mask); - sigaction(SIGHUP, &act, NULL); - sigaction(SIGTERM, &act, NULL); - sigaction(SIGINT, &act, NULL); - sigaction(SIGALRM, &act, NULL); - - /* Set whether the access listener is required */ - rc = xc_domain_set_access_required(xch, domain_id, required); - if ( rc < 0 ) - { - ERROR("Error %d setting mem_access listener required\n", rc); - goto exit; - } - - /* With altp2m we just create a new, restricted view of the memory */ - if ( memaccess && altp2m ) - { - xen_pfn_t gfn = 0; - unsigned long perm_set = 0; - - if( altp2m_write_no_gpt ) - { - rc = xc_monitor_inguest_pagefault(xch, domain_id, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting inguest pagefault\n", rc); - goto exit; - } - rc = xc_monitor_emul_unimplemented(xch, domain_id, 1); - if ( rc < 0 ) - { - ERROR("Error %d failed to enable emul unimplemented\n", rc); - goto exit; - } - } - - rc = xc_altp2m_set_domain_state( xch, domain_id, 1 ); - if ( rc < 0 ) - { - ERROR("Error %d enabling altp2m on domain!\n", rc); - goto exit; - } - - rc = xc_altp2m_create_view( xch, domain_id, default_access, &altp2m_view_id ); - if ( rc < 0 ) - { - ERROR("Error %d creating altp2m view!\n", rc); - goto exit; - } - - DPRINTF("altp2m view created with id %u\n", altp2m_view_id); - DPRINTF("Setting altp2m mem_access permissions.. "); - - for(; gfn < xenaccess->max_gpfn; ++gfn) - { - rc = xc_altp2m_set_mem_access( xch, domain_id, altp2m_view_id, gfn, - default_access); - if ( !rc ) - perm_set++; - } - - DPRINTF("done! Permissions set on %lu pages.\n", perm_set); - - rc = xc_altp2m_switch_to_view( xch, domain_id, altp2m_view_id ); - if ( rc < 0 ) - { - ERROR("Error %d switching to altp2m view!\n", rc); - goto exit; - } - - rc = xc_monitor_singlestep( xch, domain_id, 1 ); - if ( rc < 0 ) - { - ERROR("Error %d failed to enable singlestep monitoring!\n", rc); - goto exit; - } - } - - if ( memaccess && !altp2m ) - { - /* Set the default access type and convert all pages to it */ - rc = xc_set_mem_access(xch, domain_id, default_access, ~0ull, 0); - if ( rc < 0 ) - { - ERROR("Error %d setting default mem access type\n", rc); - goto exit; - } - - rc = xc_set_mem_access(xch, domain_id, default_access, START_PFN, - (xenaccess->max_gpfn - START_PFN) ); - - if ( rc < 0 ) - { - ERROR("Error %d setting all memory to access type %d\n", rc, - default_access); - goto exit; - } - } - - if ( breakpoint ) - { - rc = xc_monitor_software_breakpoint(xch, domain_id, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting breakpoint trapping with vm_event\n", rc); - goto exit; - } - } - - if ( debug ) - { - rc = xc_monitor_debug_exceptions(xch, domain_id, 1, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting debug exception listener with vm_event\n", rc); - goto exit; - } - } - - if ( cpuid ) - { - rc = xc_monitor_cpuid(xch, domain_id, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting cpuid listener with vm_event\n", rc); - goto exit; - } - } - - if ( desc_access ) - { - rc = xc_monitor_descriptor_access(xch, domain_id, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting descriptor access listener with vm_event\n", rc); - goto exit; - } - } - - if ( privcall ) - { - rc = xc_monitor_privileged_call(xch, domain_id, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting privileged call trapping with vm_event\n", rc); - goto exit; - } - } - - if ( write_ctrlreg_cr4 ) - { - /* Mask the CR4.PGE bit so no events will be generated for global TLB flushes. */ - rc = xc_monitor_write_ctrlreg(xch, domain_id, VM_EVENT_X86_CR4, 1, 1, - X86_CR4_PGE, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting write control register trapping with vm_event\n", rc); - goto exit; - } - } - - /* Wait for access */ - for (;;) - { - if ( interrupted ) - { - /* Unregister for every event */ - DPRINTF("xenaccess shutting down on signal %d\n", interrupted); - - if ( breakpoint ) - rc = xc_monitor_software_breakpoint(xch, domain_id, 0); - if ( debug ) - rc = xc_monitor_debug_exceptions(xch, domain_id, 0, 0); - if ( cpuid ) - rc = xc_monitor_cpuid(xch, domain_id, 0); - if ( desc_access ) - rc = xc_monitor_descriptor_access(xch, domain_id, 0); - if ( write_ctrlreg_cr4 ) - rc = xc_monitor_write_ctrlreg(xch, domain_id, VM_EVENT_X86_CR4, 0, 0, 0, 0); - - if ( privcall ) - rc = xc_monitor_privileged_call(xch, domain_id, 0); - - if ( altp2m ) - { - rc = xc_altp2m_switch_to_view( xch, domain_id, 0 ); - rc = xc_altp2m_destroy_view(xch, domain_id, altp2m_view_id); - rc = xc_altp2m_set_domain_state(xch, domain_id, 0); - rc = xc_monitor_singlestep(xch, domain_id, 0); - } else { - rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, ~0ull, 0); - rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, START_PFN, - (xenaccess->max_gpfn - START_PFN) ); - } - - shutting_down = 1; - } - - rc = xc_wait_for_event_or_timeout(xch, xenaccess->vm_event.xce_handle, 100); - if ( rc < -1 ) - { - ERROR("Error getting event"); - interrupted = -1; - continue; - } - else if ( rc != -1 ) - { - DPRINTF("Got event from Xen\n"); - } - - while ( RING_HAS_UNCONSUMED_REQUESTS(&xenaccess->vm_event.back_ring) ) - { - get_request(&xenaccess->vm_event, &req); - - if ( req.version != VM_EVENT_INTERFACE_VERSION ) - { - ERROR("Error: vm_event interface version mismatch!\n"); - interrupted = -1; - continue; - } - - memset( &rsp, 0, sizeof (rsp) ); - rsp.version = VM_EVENT_INTERFACE_VERSION; - rsp.vcpu_id = req.vcpu_id; - rsp.flags = (req.flags & VM_EVENT_FLAG_VCPU_PAUSED); - rsp.reason = req.reason; - - switch (req.reason) { - case VM_EVENT_REASON_MEM_ACCESS: - if ( !shutting_down ) - { - /* - * This serves no other purpose here then demonstrating the use of the API. - * At shutdown we have already reset all the permissions so really no use getting it again. - */ - xenmem_access_t access; - rc = xc_get_mem_access(xch, domain_id, req.u.mem_access.gfn, &access); - if (rc < 0) - { - ERROR("Error %d getting mem_access event\n", rc); - interrupted = -1; - continue; - } - } - - printf("PAGE ACCESS: %c%c%c for GFN %"PRIx64" (offset %06" - PRIx64") gla %016"PRIx64" (valid: %c; fault in gpt: %c; fault with gla: %c) (vcpu %u [%c], altp2m view %u)\n", - (req.u.mem_access.flags & MEM_ACCESS_R) ? 'r' : '-', - (req.u.mem_access.flags & MEM_ACCESS_W) ? 'w' : '-', - (req.u.mem_access.flags & MEM_ACCESS_X) ? 'x' : '-', - req.u.mem_access.gfn, - req.u.mem_access.offset, - req.u.mem_access.gla, - (req.u.mem_access.flags & MEM_ACCESS_GLA_VALID) ? 'y' : 'n', - (req.u.mem_access.flags & MEM_ACCESS_FAULT_IN_GPT) ? 'y' : 'n', - (req.u.mem_access.flags & MEM_ACCESS_FAULT_WITH_GLA) ? 'y': 'n', - req.vcpu_id, - (req.flags & VM_EVENT_FLAG_VCPU_PAUSED) ? 'p' : 'r', - req.altp2m_idx); - - if ( altp2m && req.flags & VM_EVENT_FLAG_ALTERNATE_P2M) - { - DPRINTF("\tSwitching back to default view!\n"); - - rsp.flags |= (VM_EVENT_FLAG_ALTERNATE_P2M | VM_EVENT_FLAG_TOGGLE_SINGLESTEP); - rsp.altp2m_idx = 0; - } - else if ( default_access != after_first_access ) - { - rc = xc_set_mem_access(xch, domain_id, after_first_access, - req.u.mem_access.gfn, 1); - if (rc < 0) - { - ERROR("Error %d setting gfn to access_type %d\n", rc, - after_first_access); - interrupted = -1; - continue; - } - } - - rsp.u.mem_access = req.u.mem_access; - break; - case VM_EVENT_REASON_SOFTWARE_BREAKPOINT: - printf("Breakpoint: rip=%016"PRIx64", gfn=%"PRIx64" (vcpu %d)\n", - req.data.regs.x86.rip, - req.u.software_breakpoint.gfn, - req.vcpu_id); - - /* Reinject */ - rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, - X86_TRAP_INT3, - req.u.software_breakpoint.type, -1, - req.u.software_breakpoint.insn_length, 0); - if (rc < 0) - { - ERROR("Error %d injecting breakpoint\n", rc); - interrupted = -1; - continue; - } - break; - case VM_EVENT_REASON_PRIVILEGED_CALL: - printf("Privileged call: pc=%"PRIx64" (vcpu %d)\n", - req.data.regs.arm.pc, - req.vcpu_id); - - rsp.data.regs.arm = req.data.regs.arm; - rsp.data.regs.arm.pc += 4; - rsp.flags |= VM_EVENT_FLAG_SET_REGISTERS; - break; - case VM_EVENT_REASON_SINGLESTEP: - printf("Singlestep: rip=%016"PRIx64", vcpu %d, altp2m %u\n", - req.data.regs.x86.rip, - req.vcpu_id, - req.altp2m_idx); - - if ( altp2m ) - { - printf("\tSwitching altp2m to view %u!\n", altp2m_view_id); - - rsp.flags |= VM_EVENT_FLAG_ALTERNATE_P2M; - rsp.altp2m_idx = altp2m_view_id; - } - - rsp.flags |= VM_EVENT_FLAG_TOGGLE_SINGLESTEP; - - break; - case VM_EVENT_REASON_DEBUG_EXCEPTION: - printf("Debug exception: rip=%016"PRIx64", vcpu %d. Type: %u. Length: %u. Pending dbg 0x%08"PRIx64"\n", - req.data.regs.x86.rip, - req.vcpu_id, - req.u.debug_exception.type, - req.u.debug_exception.insn_length, - req.u.debug_exception.pending_dbg); - - /* Reinject */ - rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, - X86_TRAP_DEBUG, - req.u.debug_exception.type, -1, - req.u.debug_exception.insn_length, - req.u.debug_exception.pending_dbg); - if (rc < 0) - { - ERROR("Error %d injecting breakpoint\n", rc); - interrupted = -1; - continue; - } - - break; - case VM_EVENT_REASON_CPUID: - printf("CPUID executed: rip=%016"PRIx64", vcpu %d. Insn length: %"PRIu32" " \ - "0x%"PRIx32" 0x%"PRIx32": EAX=0x%"PRIx64" EBX=0x%"PRIx64" ECX=0x%"PRIx64" EDX=0x%"PRIx64"\n", - req.data.regs.x86.rip, - req.vcpu_id, - req.u.cpuid.insn_length, - req.u.cpuid.leaf, - req.u.cpuid.subleaf, - req.data.regs.x86.rax, - req.data.regs.x86.rbx, - req.data.regs.x86.rcx, - req.data.regs.x86.rdx); - rsp.flags |= VM_EVENT_FLAG_SET_REGISTERS; - rsp.data = req.data; - rsp.data.regs.x86.rip += req.u.cpuid.insn_length; - break; - case VM_EVENT_REASON_DESCRIPTOR_ACCESS: - printf("Descriptor access: rip=%016"PRIx64", vcpu %d: "\ - "VMExit info=0x%"PRIx32", descriptor=%d, is write=%d\n", - req.data.regs.x86.rip, - req.vcpu_id, - req.u.desc_access.arch.vmx.instr_info, - req.u.desc_access.descriptor, - req.u.desc_access.is_write); - rsp.flags |= VM_EVENT_FLAG_EMULATE; - break; - case VM_EVENT_REASON_WRITE_CTRLREG: - printf("Control register written: rip=%016"PRIx64", vcpu %d: " - "reg=%s, old_value=%016"PRIx64", new_value=%016"PRIx64"\n", - req.data.regs.x86.rip, - req.vcpu_id, - get_x86_ctrl_reg_name(req.u.write_ctrlreg.index), - req.u.write_ctrlreg.old_value, - req.u.write_ctrlreg.new_value); - break; - case VM_EVENT_REASON_EMUL_UNIMPLEMENTED: - if ( altp2m_write_no_gpt && req.flags & VM_EVENT_FLAG_ALTERNATE_P2M ) - { - DPRINTF("\tSwitching back to default view!\n"); - - rsp.flags |= (VM_EVENT_FLAG_ALTERNATE_P2M | - VM_EVENT_FLAG_TOGGLE_SINGLESTEP); - rsp.altp2m_idx = 0; - } - break; - default: - fprintf(stderr, "UNKNOWN REASON CODE %d\n", req.reason); - } - - /* Put the response on the ring */ - put_response(&xenaccess->vm_event, &rsp); - } - - /* Tell Xen page is ready */ - rc = xenevtchn_notify(xenaccess->vm_event.xce_handle, - xenaccess->vm_event.port); - - if ( rc != 0 ) - { - ERROR("Error resuming page"); - interrupted = -1; - } - - if ( shutting_down ) - break; - } - DPRINTF("xenaccess shut down on signal %d\n", interrupted); - -exit: - if ( altp2m ) - { - uint32_t vcpu_id; - for ( vcpu_id = 0; vcpu_id Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Jan 2021 19:44:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.66743.118668 (Exim 4.92) (envelope-from ) id 1kzm4B-0000w6-Kd; Wed, 13 Jan 2021 19:44:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66743.118668; Wed, 13 Jan 2021 19:44: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 1kzm4B-0000vz-Hi; Wed, 13 Jan 2021 19:44:27 +0000 Received: by outflank-mailman (input) for mailman id 66743; Wed, 13 Jan 2021 19:44:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzm49-0000vo-M5 for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 19:44:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzm49-0003Cd-LE for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 19:44:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kzm49-0002WE-KO for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 19: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=krKQ8nQ8cfTUz+5Pfu+WTM4ELRFKKY2qAPPlV2K9Ui8=; b=xRE63ueQXQudD/waU+DwaLYtFC lrjLTIuqnfQz4/pzjwz1j/w2+FmkxkpLYdi09Vy9l0+/uI+2aikuDv4RpL/xkCLk2Xprfv9s5pdUl kQiARwa882cz2M0+MkeJN3/HgSsclBM8TXLaczziG9YzROCJnneTl9J8EyoSxF/y9ua4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: Move memshrtool from tests/ to misc/ Message-Id: Date: Wed, 13 Jan 2021 19:44:25 +0000 commit 67848a25515353ccc67d4931bb4311e10dad0d13 Author: Andrew Cooper AuthorDate: Tue Jan 12 18:37:53 2021 +0000 Commit: Andrew Cooper CommitDate: Wed Jan 13 19:30:50 2021 +0000 tools: Move memshrtool from tests/ to misc/ memshrtool is a tool for a human to use, rather than a test. Move it into misc/ as a more appropriate location to live. Also rename it to xen-memshare Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- .gitignore | 1 - tools/misc/.gitignore | 1 + tools/misc/Makefile | 4 + tools/misc/xen-memshare.c | 207 +++++++++++++++++++++++++++++++++++ tools/tests/Makefile | 1 - tools/tests/mem-sharing/Makefile | 31 ------ tools/tests/mem-sharing/memshrtool.c | 207 ----------------------------------- 7 files changed, 212 insertions(+), 240 deletions(-) diff --git a/.gitignore b/.gitignore index 630bdf5b99..35957cc21f 100644 --- a/.gitignore +++ b/.gitignore @@ -273,7 +273,6 @@ tools/tests/x86_emulator/test_x86_emulator tools/tests/x86_emulator/x86_emulate tools/tests/x86_emulator/xop*.[ch] tools/tests/xenstore/xs-test -tools/tests/mem-sharing/memshrtool tools/tests/mce-test/tools/xen-mceinj tools/tests/vpci/list.h tools/tests/vpci/vpci.[hc] diff --git a/tools/misc/.gitignore b/tools/misc/.gitignore index e332ed4ec7..b2c3b21f57 100644 --- a/tools/misc/.gitignore +++ b/tools/misc/.gitignore @@ -1,2 +1,3 @@ xen-access +xen-memshare xen-ucode diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 612b7002e5..912c5d4f0e 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -22,6 +22,7 @@ INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool INSTALL_SBIN-$(CONFIG_X86) += xen-hvmcrash INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx INSTALL_SBIN-$(CONFIG_X86) += xen-lowmemd +INSTALL_SBIN-$(CONFIG_X86) += xen-memshare INSTALL_SBIN-$(CONFIG_X86) += xen-mfndump INSTALL_SBIN-$(CONFIG_X86) += xen-ucode INSTALL_SBIN += xencov @@ -86,6 +87,9 @@ xen-hvmctx: xen-hvmctx.o xen-hvmcrash: xen-hvmcrash.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) +xen-memshare: xen-memshare.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + xenperf: xenperf.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) diff --git a/tools/misc/xen-memshare.c b/tools/misc/xen-memshare.c new file mode 100644 index 0000000000..8e5e22b9e9 --- /dev/null +++ b/tools/misc/xen-memshare.c @@ -0,0 +1,207 @@ +/* + * memshrtool.c + * + * Copyright 2011 GridCentric Inc. (Adin Scannell, Andres Lagar-Cavilla) + */ + +#include +#include +#include +#include +#include +#include + +#define XC_WANT_COMPAT_MAP_FOREIGN_API +#include "xenctrl.h" + +static int usage(const char* prog) +{ + printf("usage: %s [args...]\n", prog); + printf("where may be:\n"); + printf(" info - Display total sharing info.\n"); + printf(" enable - Enable sharing on a domain.\n"); + printf(" disable - Disable sharing on a domain.\n"); + printf(" nominate - Nominate a page for sharing.\n"); + printf(" share \n"); + printf(" - Share two pages.\n"); + printf(" range \n"); + printf(" - Share pages between domains in a range.\n"); + printf(" unshare - Unshare a page by grabbing a writable map.\n"); + printf(" add-to-physmap \n"); + printf(" - Populate a page in a domain with a shared page.\n"); + printf(" debug-gfn - Debug a particular domain and gfn.\n"); + printf(" audit - Audit the sharing subsytem in Xen.\n"); + return 1; +} + +#define R(f) do { \ + int rc = f; \ + if ( rc < 0 ) { \ + printf("error executing %s: %s\n", #f, \ + ((errno * -1) == XENMEM_SHARING_OP_S_HANDLE_INVALID) ? \ + "problem with client handle" :\ + ((errno * -1) == XENMEM_SHARING_OP_C_HANDLE_INVALID) ? \ + "problem with source handle" : strerror(errno)); \ + return rc; \ + } \ +} while(0) + +int main(int argc, const char** argv) +{ + const char* cmd = NULL; + xc_interface *xch = xc_interface_open(0, 0, 0); + + if( argc < 2 ) + return usage(argv[0]); + + cmd = argv[1]; + + if( !strcasecmp(cmd, "info") ) + { + long rc; + if( argc != 2 ) + return usage(argv[0]); + + rc = xc_sharing_freed_pages(xch); + if ( rc < 0 ) + return 1; + + printf("used = %ld\n", rc); + rc = xc_sharing_used_frames(xch); + if ( rc < 0 ) + return 1; + printf("freed = %ld\n", rc); + } + else if( !strcasecmp(cmd, "enable") ) + { + domid_t domid; + + if( argc != 3 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + R(xc_memshr_control(xch, domid, 1)); + } + else if( !strcasecmp(cmd, "disable") ) + { + domid_t domid; + + if( argc != 3 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + R(xc_memshr_control(xch, domid, 0)); + } + else if( !strcasecmp(cmd, "nominate") ) + { + domid_t domid; + unsigned long gfn; + uint64_t handle; + + if( argc != 4 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + R(xc_memshr_nominate_gfn(xch, domid, gfn, &handle)); + printf("handle = 0x%08llx\n", (unsigned long long) handle); + } + else if( !strcasecmp(cmd, "share") ) + { + domid_t domid; + unsigned long gfn; + uint64_t handle; + domid_t source_domid; + unsigned long source_gfn; + uint64_t source_handle; + + if( argc != 8 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + handle = strtol(argv[4], NULL, 0); + source_domid = strtol(argv[5], NULL, 0); + source_gfn = strtol(argv[6], NULL, 0); + source_handle = strtol(argv[7], NULL, 0); + R(xc_memshr_share_gfns(xch, source_domid, source_gfn, source_handle, domid, gfn, handle)); + } + else if( !strcasecmp(cmd, "unshare") ) + { + domid_t domid; + unsigned long gfn; + void *map; + + if( argc != 4 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + map = xc_map_foreign_range(xch, domid, 4096, PROT_WRITE, gfn); + if( map ) + munmap(map, 4096); + R((int)!map); + } + else if( !strcasecmp(cmd, "add-to-physmap") ) + { + domid_t domid; + unsigned long gfn; + domid_t source_domid; + unsigned long source_gfn; + uint64_t source_handle; + + if( argc != 7 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + source_domid = strtol(argv[4], NULL, 0); + source_gfn = strtol(argv[5], NULL, 0); + source_handle = strtol(argv[6], NULL, 0); + R(xc_memshr_add_to_physmap(xch, source_domid, source_gfn, source_handle, domid, gfn)); + } + else if( !strcasecmp(cmd, "debug-gfn") ) + { + domid_t domid; + unsigned long gfn; + + if( argc != 4 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + R(xc_memshr_debug_gfn(xch, domid, gfn)); + } + else if( !strcasecmp(cmd, "audit") ) + { + int rc = xc_memshr_audit(xch); + if ( rc < 0 ) + { + printf("error executing xc_memshr_audit: %s\n", strerror(errno)); + return rc; + } + printf("Audit returned %d errors.\n", rc); + } + else if( !strcasecmp(cmd, "range") ) + { + domid_t sdomid, cdomid; + int rc; + uint64_t first_gfn, last_gfn; + + if ( argc != 6 ) + return usage(argv[0]); + + sdomid = strtol(argv[2], NULL, 0); + cdomid = strtol(argv[3], NULL, 0); + first_gfn = strtoul(argv[4], NULL, 0); + last_gfn = strtoul(argv[5], NULL, 0); + + rc = xc_memshr_range_share(xch, sdomid, cdomid, first_gfn, last_gfn); + if ( rc < 0 ) + { + printf("error executing xc_memshr_range_share: %s\n", strerror(errno)); + return rc; + } + } + return 0; +} diff --git a/tools/tests/Makefile b/tools/tests/Makefile index 771715be0f..fc9b715951 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -4,7 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := SUBDIRS-$(CONFIG_X86) += cpu-policy SUBDIRS-$(CONFIG_X86) += mce-test -SUBDIRS-y += mem-sharing ifneq ($(clang),y) SUBDIRS-$(CONFIG_X86) += x86_emulator endif diff --git a/tools/tests/mem-sharing/Makefile b/tools/tests/mem-sharing/Makefile deleted file mode 100644 index 5cd96e4cc9..0000000000 --- a/tools/tests/mem-sharing/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -XEN_ROOT=$(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -CFLAGS += -Werror - -CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += $(CFLAGS_xeninclude) - -TARGETS-y := -TARGETS-$(CONFIG_X86) += memshrtool -TARGETS := $(TARGETS-y) - -.PHONY: all -all: build - -.PHONY: build -build: $(TARGETS) - -.PHONY: clean -clean: - $(RM) *.o $(TARGETS) *~ $(DEPS_RM) - -.PHONY: distclean -distclean: clean - -memshrtool: memshrtool.o - $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) - --include $(DEPS_INCLUDE) - -install uninstall: diff --git a/tools/tests/mem-sharing/memshrtool.c b/tools/tests/mem-sharing/memshrtool.c deleted file mode 100644 index 8e5e22b9e9..0000000000 --- a/tools/tests/mem-sharing/memshrtool.c +++ /dev/null @@ -1,207 +0,0 @@ -/* - * memshrtool.c - * - * Copyright 2011 GridCentric Inc. (Adin Scannell, Andres Lagar-Cavilla) - */ - -#include -#include -#include -#include -#include -#include - -#define XC_WANT_COMPAT_MAP_FOREIGN_API -#include "xenctrl.h" - -static int usage(const char* prog) -{ - printf("usage: %s [args...]\n", prog); - printf("where may be:\n"); - printf(" info - Display total sharing info.\n"); - printf(" enable - Enable sharing on a domain.\n"); - printf(" disable - Disable sharing on a domain.\n"); - printf(" nominate - Nominate a page for sharing.\n"); - printf(" share \n"); - printf(" - Share two pages.\n"); - printf(" range \n"); - printf(" - Share pages between domains in a range.\n"); - printf(" unshare - Unshare a page by grabbing a writable map.\n"); - printf(" add-to-physmap \n"); - printf(" - Populate a page in a domain with a shared page.\n"); - printf(" debug-gfn - Debug a particular domain and gfn.\n"); - printf(" audit - Audit the sharing subsytem in Xen.\n"); - return 1; -} - -#define R(f) do { \ - int rc = f; \ - if ( rc < 0 ) { \ - printf("error executing %s: %s\n", #f, \ - ((errno * -1) == XENMEM_SHARING_OP_S_HANDLE_INVALID) ? \ - "problem with client handle" :\ - ((errno * -1) == XENMEM_SHARING_OP_C_HANDLE_INVALID) ? \ - "problem with source handle" : strerror(errno)); \ - return rc; \ - } \ -} while(0) - -int main(int argc, const char** argv) -{ - const char* cmd = NULL; - xc_interface *xch = xc_interface_open(0, 0, 0); - - if( argc < 2 ) - return usage(argv[0]); - - cmd = argv[1]; - - if( !strcasecmp(cmd, "info") ) - { - long rc; - if( argc != 2 ) - return usage(argv[0]); - - rc = xc_sharing_freed_pages(xch); - if ( rc < 0 ) - return 1; - - printf("used = %ld\n", rc); - rc = xc_sharing_used_frames(xch); - if ( rc < 0 ) - return 1; - printf("freed = %ld\n", rc); - } - else if( !strcasecmp(cmd, "enable") ) - { - domid_t domid; - - if( argc != 3 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - R(xc_memshr_control(xch, domid, 1)); - } - else if( !strcasecmp(cmd, "disable") ) - { - domid_t domid; - - if( argc != 3 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - R(xc_memshr_control(xch, domid, 0)); - } - else if( !strcasecmp(cmd, "nominate") ) - { - domid_t domid; - unsigned long gfn; - uint64_t handle; - - if( argc != 4 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - gfn = strtol(argv[3], NULL, 0); - R(xc_memshr_nominate_gfn(xch, domid, gfn, &handle)); - printf("handle = 0x%08llx\n", (unsigned long long) handle); - } - else if( !strcasecmp(cmd, "share") ) - { - domid_t domid; - unsigned long gfn; - uint64_t handle; - domid_t source_domid; - unsigned long source_gfn; - uint64_t source_handle; - - if( argc != 8 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - gfn = strtol(argv[3], NULL, 0); - handle = strtol(argv[4], NULL, 0); - source_domid = strtol(argv[5], NULL, 0); - source_gfn = strtol(argv[6], NULL, 0); - source_handle = strtol(argv[7], NULL, 0); - R(xc_memshr_share_gfns(xch, source_domid, source_gfn, source_handle, domid, gfn, handle)); - } - else if( !strcasecmp(cmd, "unshare") ) - { - domid_t domid; - unsigned long gfn; - void *map; - - if( argc != 4 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - gfn = strtol(argv[3], NULL, 0); - map = xc_map_foreign_range(xch, domid, 4096, PROT_WRITE, gfn); - if( map ) - munmap(map, 4096); - R((int)!map); - } - else if( !strcasecmp(cmd, "add-to-physmap") ) - { - domid_t domid; - unsigned long gfn; - domid_t source_domid; - unsigned long source_gfn; - uint64_t source_handle; - - if( argc != 7 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - gfn = strtol(argv[3], NULL, 0); - source_domid = strtol(argv[4], NULL, 0); - source_gfn = strtol(argv[5], NULL, 0); - source_handle = strtol(argv[6], NULL, 0); - R(xc_memshr_add_to_physmap(xch, source_domid, source_gfn, source_handle, domid, gfn)); - } - else if( !strcasecmp(cmd, "debug-gfn") ) - { - domid_t domid; - unsigned long gfn; - - if( argc != 4 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - gfn = strtol(argv[3], NULL, 0); - R(xc_memshr_debug_gfn(xch, domid, gfn)); - } - else if( !strcasecmp(cmd, "audit") ) - { - int rc = xc_memshr_audit(xch); - if ( rc < 0 ) - { - printf("error executing xc_memshr_audit: %s\n", strerror(errno)); - return rc; - } - printf("Audit returned %d errors.\n", rc); - } - else if( !strcasecmp(cmd, "range") ) - { - domid_t sdomid, cdomid; - int rc; - uint64_t first_gfn, last_gfn; - - if ( argc != 6 ) - return usage(argv[0]); - - sdomid = strtol(argv[2], NULL, 0); - cdomid = strtol(argv[3], NULL, 0); - first_gfn = strtoul(argv[4], NULL, 0); - last_gfn = strtoul(argv[5], NULL, 0); - - rc = xc_memshr_range_share(xch, sdomid, cdomid, first_gfn, last_gfn); - if ( rc < 0 ) - { - printf("error executing xc_memshr_range_share: %s\n", strerror(errno)); - return rc; - } - } - return 0; -} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jan 13 19:44:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Jan 2021 19:44:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.66744.118672 (Exim 4.92) (envelope-from ) id 1kzm4L-0000xh-MM; Wed, 13 Jan 2021 19:44:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66744.118672; Wed, 13 Jan 2021 19:44: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 1kzm4L-0000xZ-JP; Wed, 13 Jan 2021 19:44:37 +0000 Received: by outflank-mailman (input) for mailman id 66744; Wed, 13 Jan 2021 19:44:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzm4J-0000xM-Px for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 19:44:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzm4J-0003Eb-OO for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 19:44:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kzm4J-0002XX-NN for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 19:44:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SyXIvQZE0BRQ4UEZxDnN2lGwbMDU3xmE1/rvNC25FVQ=; b=4EtqLY28hecZ0D97UUM+/cHC7W f2efXhytn5N9RUfZvjeyhV5IHLKetnz4pwzBwEoLtRihQ9/RmLth5TxFgwHyrHkr0ujDyGLq7ambA G3scUyRK8+5OOYtqtb5a9IYBdHU7WLw8BfdhwFA+4lzU0WQfuOqeZydK6PDtBfg1KyyM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mem_sharing: fix wrong field name used in 2c5119d Message-Id: Date: Wed, 13 Jan 2021 19:44:35 +0000 commit bc70924c79f154ee453fcf4079e0eabb0452300d Author: Tamas K Lengyel AuthorDate: Tue Jan 12 18:28:45 2021 -0800 Commit: Andrew Cooper CommitDate: Wed Jan 13 19:30:50 2021 +0000 x86/mem_sharing: fix wrong field name used in 2c5119d The arch_domain struct has "msr", not "msrs". Spotted by a TravisCI Randconfig build. Reported-by: Andrew Cooper Signed-off-by: Tamas K Lengyel Acked-by: Andrew Cooper --- xen/arch/x86/mm/mem_sharing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index a98a1709c2..c8a6d11b90 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1781,7 +1781,7 @@ static int fork(struct domain *cd, struct domain *d) domain_pause(d); cd->max_pages = d->max_pages; *cd->arch.cpuid = *d->arch.cpuid; - *cd->arch.msrs = *d->arch.msrs; + *cd->arch.msr = *d->arch.msr; cd->parent = d; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jan 13 20:00:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Jan 2021 20:00:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.66745.118676 (Exim 4.92) (envelope-from ) id 1kzmJK-0002sS-Qs; Wed, 13 Jan 2021 20:00:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66745.118676; Wed, 13 Jan 2021 20:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzmJK-0002sK-Nv; Wed, 13 Jan 2021 20:00:06 +0000 Received: by outflank-mailman (input) for mailman id 66745; Wed, 13 Jan 2021 20:00:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzmJJ-0002iv-6l for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 20:00:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzmJJ-0003Zw-4y for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 20:00:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kzmJJ-00043e-3S for xen-changelog@lists.xenproject.org; Wed, 13 Jan 2021 20:00:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=E13SK9/2ULGic0OhNFS1PYMIVoMaAMb/9g4OZvss+P8=; b=hIU3QttV6PhBnRxkiOXxgNNMvx 0LSiyaoJVMB4toXB4fk9WhWPArUrjEehKRxFzBuZfgv9R/qCMfbBhmDsXNXW29MYUDHbDNVhowRT+ A4G36/R5Uzm+2+2c+5x60bQvWN55NxvbyVpWaCbsZH6pA0nkqSTIETVLVmI/CDKWtRjo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Correct the coding style of get_cycles Message-Id: Date: Wed, 13 Jan 2021 20:00:05 +0000 commit 896128e9352327c4ff2b5c0c6cfa3856e45e2ca3 Author: Wei Chen AuthorDate: Tue Jan 5 15:19:45 2021 +0800 Commit: Julien Grall CommitDate: Wed Jan 13 19:56:32 2021 +0000 xen/arm: Correct the coding style of get_cycles It seems the arm inline function get_cycles has used 8 spaces for line indent since 2012. This patch correct them to 4 spaces and remove extra space between function name and bracket. Signed-off-by: Wei Chen Acked-by: Julien Grall --- xen/include/asm-arm/time.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index 1b2c13614b..5c4529ebb5 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -11,29 +11,29 @@ typedef uint64_t cycles_t; -static inline cycles_t get_cycles (void) +static inline cycles_t get_cycles(void) { - isb(); + isb(); + /* + * ARM_WORKAROUND_858921: Cortex-A73 (all versions) counter read + * can return a wrong value when the counter crosses a 32bit boundary. + */ + if ( !check_workaround_858921() ) + return READ_SYSREG64(CNTPCT_EL0); + else + { /* - * ARM_WORKAROUND_858921: Cortex-A73 (all versions) counter read - * can return a wrong value when the counter crosses a 32bit boundary. + * A recommended workaround for erratum 858921 is to: + * 1- Read twice CNTPCT. + * 2- Compare bit[32] of the two read values. + * - If bit[32] is different, keep the old value. + * - If bit[32] is the same, keep the new value. */ - if ( !check_workaround_858921() ) - return READ_SYSREG64(CNTPCT_EL0); - else - { - /* - * A recommended workaround for erratum 858921 is to: - * 1- Read twice CNTPCT. - * 2- Compare bit[32] of the two read values. - * - If bit[32] is different, keep the old value. - * - If bit[32] is the same, keep the new value. - */ - cycles_t old, new; - old = READ_SYSREG64(CNTPCT_EL0); - new = READ_SYSREG64(CNTPCT_EL0); - return (((old ^ new) >> 32) & 1) ? old : new; - } + cycles_t old, new; + old = READ_SYSREG64(CNTPCT_EL0); + new = READ_SYSREG64(CNTPCT_EL0); + return (((old ^ new) >> 32) & 1) ? old : new; + } } /* List of timer's IRQ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 00:11:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 00:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.66804.118808 (Exim 4.92) (envelope-from ) id 1kzqED-0002oL-Hl; Thu, 14 Jan 2021 00:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66804.118808; Thu, 14 Jan 2021 00: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 1kzqED-0002oF-EI; Thu, 14 Jan 2021 00:11:05 +0000 Received: by outflank-mailman (input) for mailman id 66804; Thu, 14 Jan 2021 00:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzqEC-0002oA-Hl for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 00:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzqEC-0008MW-Ef for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 00:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kzqEC-0006xW-DH for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 00: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=vLn5xlnTKF+QlC0GR5aB8yullOfKQ+LXeIh+ZyGUA2Y=; b=bUqi4ereT9zNMKzMhVt1v8iFXP Pm3pjmAHsnJHsOpWmLuR8Y6m7qrnaFtagD/ygafXqTn9uSAB8/RYIfXjraTK428dkUnrEt0jjK1E1 nN6qXFTNgcy6ijbCK6fTXqZ8N/iidcQN/K4H0z53YZiL30CKCHge8g+7auKPviuRDmPM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: don't read aarch32 regs when aarch32 isn't available Message-Id: Date: Thu, 14 Jan 2021 00:11:04 +0000 commit 0293fd24bbaa2c4fa0acbe2abcd2d41b96ecd7e1 Author: Stefano Stabellini AuthorDate: Tue Jan 12 15:44:50 2021 -0800 Commit: Stefano Stabellini CommitDate: Wed Jan 13 16:00:51 2021 -0800 xen/arm: don't read aarch32 regs when aarch32 isn't available Don't read aarch32 system registers at boot time when the aarch32 state is not available at EL0. They are UNKNOWN, so it is not useful to read them. Moreover, on Cavium ThunderX reading ID_PFR2_EL1 generates an unsupported exception which causes a Xen crash. Instead, only read them when aarch32 is available. Leave the corresponding fields in struct cpuinfo_arm so that they are read-as-zero from a guest. Since we are editing identify_cpu, also fix the indentation: 4 spaces instead of 8. Fixes: 9cfdb489af81 ("xen/arm: Add ID registers and complete cpuinfo") Link: https://lore.kernel.org/xen-devel/f90e40ee-b042-6cc5-a08d-aef41a279527@suse.com/ Suggested-by: Julien Grall Signed-off-by: Stefano Stabellini Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- xen/arch/arm/cpufeature.c | 35 +++++++++++++++++++++-------------- xen/include/asm-arm/cpufeature.h | 2 ++ 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 698bfa0201..99fe4db280 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -101,29 +101,35 @@ int enable_nonboot_cpu_caps(const struct arm_cpu_capabilities *caps) void identify_cpu(struct cpuinfo_arm *c) { - c->midr.bits = READ_SYSREG(MIDR_EL1); - c->mpidr.bits = READ_SYSREG(MPIDR_EL1); + bool aarch32_el0 = true; + + c->midr.bits = READ_SYSREG(MIDR_EL1); + c->mpidr.bits = READ_SYSREG(MPIDR_EL1); #ifdef CONFIG_ARM_64 - c->pfr64.bits[0] = READ_SYSREG(ID_AA64PFR0_EL1); - c->pfr64.bits[1] = READ_SYSREG(ID_AA64PFR1_EL1); + c->pfr64.bits[0] = READ_SYSREG(ID_AA64PFR0_EL1); + c->pfr64.bits[1] = READ_SYSREG(ID_AA64PFR1_EL1); + + c->dbg64.bits[0] = READ_SYSREG(ID_AA64DFR0_EL1); + c->dbg64.bits[1] = READ_SYSREG(ID_AA64DFR1_EL1); - c->dbg64.bits[0] = READ_SYSREG(ID_AA64DFR0_EL1); - c->dbg64.bits[1] = READ_SYSREG(ID_AA64DFR1_EL1); + c->aux64.bits[0] = READ_SYSREG(ID_AA64AFR0_EL1); + c->aux64.bits[1] = READ_SYSREG(ID_AA64AFR1_EL1); - c->aux64.bits[0] = READ_SYSREG(ID_AA64AFR0_EL1); - c->aux64.bits[1] = READ_SYSREG(ID_AA64AFR1_EL1); + c->mm64.bits[0] = READ_SYSREG(ID_AA64MMFR0_EL1); + c->mm64.bits[1] = READ_SYSREG(ID_AA64MMFR1_EL1); + c->mm64.bits[2] = READ_SYSREG(ID_AA64MMFR2_EL1); - c->mm64.bits[0] = READ_SYSREG(ID_AA64MMFR0_EL1); - c->mm64.bits[1] = READ_SYSREG(ID_AA64MMFR1_EL1); - c->mm64.bits[2] = READ_SYSREG(ID_AA64MMFR2_EL1); + c->isa64.bits[0] = READ_SYSREG(ID_AA64ISAR0_EL1); + c->isa64.bits[1] = READ_SYSREG(ID_AA64ISAR1_EL1); - c->isa64.bits[0] = READ_SYSREG(ID_AA64ISAR0_EL1); - c->isa64.bits[1] = READ_SYSREG(ID_AA64ISAR1_EL1); + c->zfr64.bits[0] = READ_SYSREG(ID_AA64ZFR0_EL1); - c->zfr64.bits[0] = READ_SYSREG(ID_AA64ZFR0_EL1); + aarch32_el0 = cpu_feature64_has_el0_32(c); #endif + if ( aarch32_el0 ) + { c->pfr32.bits[0] = READ_SYSREG(ID_PFR0_EL1); c->pfr32.bits[1] = READ_SYSREG(ID_PFR1_EL1); c->pfr32.bits[2] = READ_SYSREG(ID_PFR2_EL1); @@ -153,6 +159,7 @@ void identify_cpu(struct cpuinfo_arm *c) #ifndef MVFR2_MAYBE_UNDEFINED c->mvfr.bits[2] = READ_SYSREG(MVFR2_EL1); #endif + } } /* diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 6058744c18..13a2739a69 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -5,6 +5,8 @@ #define cpu_feature64(c, feat) ((c)->pfr64.feat) #define boot_cpu_feature64(feat) (boot_cpu_data.pfr64.feat) +#define cpu_feature64_has_el0_32(c) (cpu_feature64(c, el0) == 2) + #define cpu_has_el0_32 (boot_cpu_feature64(el0) == 2) #define cpu_has_el0_64 (boot_cpu_feature64(el0) >= 1) #define cpu_has_el1_32 (boot_cpu_feature64(el1) == 2) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 12:11:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 12:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.66964.119155 (Exim 4.92) (envelope-from ) id 1l01Sz-00043x-BI; Thu, 14 Jan 2021 12:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66964.119155; Thu, 14 Jan 2021 12: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 1l01Sz-00043p-8B; Thu, 14 Jan 2021 12:11:05 +0000 Received: by outflank-mailman (input) for mailman id 66964; Thu, 14 Jan 2021 12:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01Sy-00043k-Hy for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01Sy-0002hg-Ep for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l01Sy-0002BP-Cv for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12: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=B/NpcWvR7UXLENrePfvp/PFj0zhibxH0Q6/fYc8cWnQ=; b=PPav+9b/llX1KD4YoyR607mIaJ F6TtCQSI5emR6Lo9ko+h/4KlQEiR+4wgeBNZLUH8tzGp5KYpaIe0W20oraocYojXlz/MPs3CpzRVK r1R+edA/zwX2rjrKXVMDRFFSgYxkwyDgZ9j3MW+bSHPELywYopIMVZj1ZsmzMwzC6T/A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] memory: avoid pointless continuation in xenmem_add_to_physmap() Message-Id: Date: Thu, 14 Jan 2021 12:11:04 +0000 commit d9751646697b1e2d337990264068ead3c10b993a Author: Jan Beulich AuthorDate: Thu Jan 14 13:00:26 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 14 13:00:26 2021 +0100 memory: avoid pointless continuation in xenmem_add_to_physmap() Adjust so we uniformly avoid needlessly arranging for a continuation on the last iteration. Fixes: 5777a3742d88 ("IOMMU: hold page ref until after deferred TLB flush") Signed-off-by: Jan Beulich Reviewed-by: Julien Grall --- xen/common/memory.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index b21b6c452d..ccb4d49fc6 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -858,8 +858,9 @@ int xenmem_add_to_physmap(struct domain *d, struct xen_add_to_physmap *xatp, ++extra.ppage; /* Check for continuation if it's not the last iteration. */ - if ( (++done >= ARRAY_SIZE(pages) && extra.ppage) || - (xatp->size > done && hypercall_preempt_check()) ) + if ( xatp->size > ++done && + ((done >= ARRAY_SIZE(pages) && extra.ppage) || + hypercall_preempt_check()) ) { rc = start + done; break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 12:11:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 12:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.66965.119159 (Exim 4.92) (envelope-from ) id 1l01T9-00044q-CQ; Thu, 14 Jan 2021 12:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66965.119159; Thu, 14 Jan 2021 12:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01T9-00044i-9e; Thu, 14 Jan 2021 12:11:15 +0000 Received: by outflank-mailman (input) for mailman id 66965; Thu, 14 Jan 2021 12:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01T8-00044a-Kp for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01T8-0002hm-It for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l01T8-0002CF-HA for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12: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=mn/QS5uBQt8xuzOenXa/HenRYjveY2hnIMa+iBW5Scc=; b=YRIUXQhT8q0sgMd0E56aWeMi2l N7jrgxVP8V6T42BHjAjBOwwFfaobq3ok01HNrcQ44WK2DF/Nz4a8ZOCGVd0c9P9w/wIPxd5hHEiEk fQToo13k8Sauw9SsO+TYwoKCwMGn3t+SKUFCy/JXvE/lz3Va3v+lfX/XSF6YrRYFI8HI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] lib: drop (replace) debug_build() Message-Id: Date: Thu, 14 Jan 2021 12:11:14 +0000 commit 1bdd12364e5a3afbd34148477705c6ab8953aa41 Author: Jan Beulich AuthorDate: Thu Jan 14 13:01:14 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 14 13:01:14 2021 +0100 lib: drop (replace) debug_build() Its expansion shouldn't be tied to NDEBUG - down the road we may want to allow enabling assertions independently of CONFIG_DEBUG. Replace the few uses by a new xen_build_info() helper, subsuming gcov_string at the same time (while replacing the stale CONFIG_GCOV used there) and also adding CONFIG_UBSAN indication. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Julien Grall --- xen/arch/arm/traps.c | 4 ++-- xen/arch/x86/x86_64/traps.c | 4 ++-- xen/common/version.c | 24 ++++++++++++++++++++++++ xen/drivers/char/console.c | 6 +++--- xen/include/xen/lib.h | 8 -------- xen/include/xen/version.h | 1 + 6 files changed, 32 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index c1a9ad6056..1af1bb9f1b 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -175,14 +175,14 @@ static void print_xen_info(void) { char taint_str[TAINT_STRING_MAX_LEN]; - printk("----[ Xen-%d.%d%s %s debug=%c " gcov_string " %s ]----\n", + printk("----[ Xen-%d.%d%s %s %s %s ]----\n", xen_major_version(), xen_minor_version(), xen_extra_version(), #ifdef CONFIG_ARM_32 "arm32", #else "arm64", #endif - debug_build() ? 'y' : 'n', print_tainted(taint_str)); + xen_build_info(), print_tainted(taint_str)); } #ifdef CONFIG_ARM_32 diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index b1ef40a846..4116ecb9c0 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -29,9 +29,9 @@ static void print_xen_info(void) { char taint_str[TAINT_STRING_MAX_LEN]; - printk("----[ Xen-%d.%d%s x86_64 debug=%c " gcov_string " %s ]----\n", + printk("----[ Xen-%d.%d%s x86_64 %s %s ]----\n", xen_major_version(), xen_minor_version(), xen_extra_version(), - debug_build() ? 'y' : 'n', print_tainted(taint_str)); + xen_build_info(), print_tainted(taint_str)); } enum context { CTXT_hypervisor, CTXT_pv_guest, CTXT_hvm_guest }; diff --git a/xen/common/version.c b/xen/common/version.c index 937eb1281c..d320135208 100644 --- a/xen/common/version.c +++ b/xen/common/version.c @@ -70,6 +70,30 @@ const char *xen_deny(void) return ""; } +static const char build_info[] = + "debug=" +#ifdef CONFIG_DEBUG + "y" +#else + "n" +#endif +#ifdef CONFIG_COVERAGE +# ifdef __clang__ + " llvmcov=y" +# else + " gcov=y" +# endif +#endif +#ifdef CONFIG_UBSAN + " ubsan=y" +#endif + ""; + +const char *xen_build_info(void) +{ + return build_info; +} + static const void *build_id_p __read_mostly; static unsigned int build_id_len __read_mostly; diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 861ad53a8f..e3c483fd13 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1002,10 +1002,10 @@ void __init console_init_preirq(void) spin_lock(&console_lock); __putstr(xen_banner()); spin_unlock(&console_lock); - printk("Xen version %d.%d%s (%s@%s) (%s) debug=%c " gcov_string " %s\n", + printk("Xen version %d.%d%s (%s@%s) (%s) %s %s\n", xen_major_version(), xen_minor_version(), xen_extra_version(), - xen_compile_by(), xen_compile_domain(), - xen_compiler(), debug_build() ? 'y' : 'n', xen_compile_date()); + xen_compile_by(), xen_compile_domain(), xen_compiler(), + xen_build_info(), xen_compile_date()); printk("Latest ChangeSet: %s\n", xen_changeset()); /* Locate and print the buildid, if applicable. */ diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 5841bd489c..1198c7c0b2 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -48,21 +48,13 @@ #define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) #endif -#ifdef CONFIG_GCOV -#define gcov_string "gcov=y" -#else -#define gcov_string "" -#endif - #ifndef NDEBUG #define ASSERT(p) \ do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0) #define ASSERT_UNREACHABLE() assert_failed("unreachable") -#define debug_build() 1 #else #define ASSERT(p) do { if ( 0 && (p) ) {} } while (0) #define ASSERT_UNREACHABLE() do { } while (0) -#define debug_build() 0 #endif #define ABS(_x) ({ \ diff --git a/xen/include/xen/version.h b/xen/include/xen/version.h index 9ac926d0e1..93c5877363 100644 --- a/xen/include/xen/version.h +++ b/xen/include/xen/version.h @@ -16,6 +16,7 @@ const char *xen_extra_version(void); const char *xen_changeset(void); const char *xen_banner(void); const char *xen_deny(void); +const char *xen_build_info(void); int xen_build_id(const void **p, unsigned int *len); #ifdef BUILD_ID -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 12:11:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 12:11:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.66967.119163 (Exim 4.92) (envelope-from ) id 1l01TJ-00046Q-ER; Thu, 14 Jan 2021 12:11:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66967.119163; Thu, 14 Jan 2021 12:11:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01TJ-00046I-B9; Thu, 14 Jan 2021 12:11:25 +0000 Received: by outflank-mailman (input) for mailman id 66967; Thu, 14 Jan 2021 12:11:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01TI-000468-Md for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01TI-0002hx-Lv for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l01TI-0002D6-L1 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9Qg4jZZ8HweHUFTDjlpwAy2HjCH1JiDnM0dF8vdXfmQ=; b=qGKOLi6VzSl5OGAb9M2MzmXuEh 9+MK0YNvba5Rb1jni4fNdg1+Wmq/P3nSzNXHFOrPUlMZSvU8+THuL80ceDn8uptZDQOAyrJJy6cCl 1yNWFBhbtkkbS/tsp/5USzrFynwYzDI61K9gQxHmi7xHYVHvcaRO7HzieCpzas23zgis=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] argo: don't pointlessly use get_domain_by_id() Message-Id: Date: Thu, 14 Jan 2021 12:11:24 +0000 commit ff20706cd7da8de9282cb6c0d37bde80630b0b86 Author: Jan Beulich AuthorDate: Thu Jan 14 13:02:35 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 14 13:02:35 2021 +0100 argo: don't pointlessly use get_domain_by_id() For short-lived references rcu_lock_domain_by_id() is the better (slightly cheaper) alternative. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Christopher Clark --- xen/common/argo.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/xen/common/argo.c b/xen/common/argo.c index aa3443a377..49be715f63 100644 --- a/xen/common/argo.c +++ b/xen/common/argo.c @@ -445,13 +445,13 @@ signal_domain(struct domain *d) static void signal_domid(domid_t domain_id) { - struct domain *d = get_domain_by_id(domain_id); + struct domain *d = rcu_lock_domain_by_id(domain_id); if ( !d ) return; signal_domain(d); - put_domain(d); + rcu_unlock_domain(d); } static void @@ -983,7 +983,7 @@ ringbuf_insert(const struct domain *d, struct argo_ring_info *ring_info, static void wildcard_pending_list_remove(domid_t domain_id, struct pending_ent *ent) { - struct domain *d = get_domain_by_id(domain_id); + struct domain *d = rcu_lock_domain_by_id(domain_id); if ( !d ) return; @@ -996,13 +996,13 @@ wildcard_pending_list_remove(domid_t domain_id, struct pending_ent *ent) list_del(&ent->wildcard_node); spin_unlock(&d->argo->wildcard_L2_lock); } - put_domain(d); + rcu_unlock_domain(d); } static void wildcard_pending_list_insert(domid_t domain_id, struct pending_ent *ent) { - struct domain *d = get_domain_by_id(domain_id); + struct domain *d = rcu_lock_domain_by_id(domain_id); if ( !d ) return; @@ -1015,7 +1015,7 @@ wildcard_pending_list_insert(domid_t domain_id, struct pending_ent *ent) list_add(&ent->wildcard_node, &d->argo->wildcard_pend_list); spin_unlock(&d->argo->wildcard_L2_lock); } - put_domain(d); + rcu_unlock_domain(d); } static void @@ -1283,7 +1283,7 @@ partner_rings_remove(struct domain *src_d) struct argo_send_info, node)) ) { - struct domain *dst_d = get_domain_by_id(send_info->id.domain_id); + struct domain *dst_d = rcu_lock_domain_by_id(send_info->id.domain_id); if ( dst_d && dst_d->argo ) { @@ -1302,7 +1302,7 @@ partner_rings_remove(struct domain *src_d) ASSERT_UNREACHABLE(); if ( dst_d ) - put_domain(dst_d); + rcu_unlock_domain(dst_d); list_del(&send_info->node); xfree(send_info); @@ -1330,7 +1330,7 @@ fill_ring_data(const struct domain *currd, ent.flags = 0; - dst_d = get_domain_by_id(ent.ring.domain_id); + dst_d = rcu_lock_domain_by_id(ent.ring.domain_id); if ( !dst_d || !dst_d->argo ) goto out; @@ -1340,10 +1340,7 @@ fill_ring_data(const struct domain *currd, */ ret = xsm_argo_send(currd, dst_d); if ( ret ) - { - put_domain(dst_d); - return ret; - } + goto out; read_lock(&dst_d->argo->rings_L2_rwlock); @@ -1405,7 +1402,7 @@ fill_ring_data(const struct domain *currd, out: if ( dst_d ) - put_domain(dst_d); + rcu_unlock_domain(dst_d); if ( !ret && (__copy_field_to_guest(data_ent_hnd, &ent, flags) || __copy_field_to_guest(data_ent_hnd, &ent, max_message_size)) ) @@ -1569,7 +1566,7 @@ unregister_ring(struct domain *currd, if ( ring_id.partner_id == XEN_ARGO_DOMID_ANY ) goto out; - dst_d = get_domain_by_id(ring_id.partner_id); + dst_d = rcu_lock_domain_by_id(ring_id.partner_id); if ( !dst_d || !dst_d->argo ) { ASSERT_UNREACHABLE(); @@ -1592,7 +1589,7 @@ unregister_ring(struct domain *currd, read_unlock(&L1_global_argo_rwlock); if ( dst_d ) - put_domain(dst_d); + rcu_unlock_domain(dst_d); xfree(send_info); @@ -1663,7 +1660,7 @@ register_ring(struct domain *currd, } else { - dst_d = get_domain_by_id(reg.partner_id); + dst_d = rcu_lock_domain_by_id(reg.partner_id); if ( !dst_d ) { argo_dprintk("!dst_d, ESRCH\n"); @@ -1845,7 +1842,7 @@ register_ring(struct domain *currd, out: if ( dst_d ) - put_domain(dst_d); + rcu_unlock_domain(dst_d); if ( ret ) xfree(send_info); @@ -1988,7 +1985,7 @@ sendv(struct domain *src_d, xen_argo_addr_t *src_addr, src_id.domain_id = src_d->domain_id; src_id.partner_id = dst_addr->domain_id; - dst_d = get_domain_by_id(dst_addr->domain_id); + dst_d = rcu_lock_domain_by_id(dst_addr->domain_id); if ( !dst_d ) return -ESRCH; @@ -1998,7 +1995,7 @@ sendv(struct domain *src_d, xen_argo_addr_t *src_addr, gprintk(XENLOG_ERR, "argo: XSM REJECTED %i -> %i\n", src_d->domain_id, dst_d->domain_id); - put_domain(dst_d); + rcu_unlock_domain(dst_d); return ret; } @@ -2068,7 +2065,7 @@ sendv(struct domain *src_d, xen_argo_addr_t *src_addr, signal_domain(dst_d); if ( dst_d ) - put_domain(dst_d); + rcu_unlock_domain(dst_d); return ( ret < 0 ) ? ret : len; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 12:11:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 12:11:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.66968.119167 (Exim 4.92) (envelope-from ) id 1l01TT-00047j-Fg; Thu, 14 Jan 2021 12:11:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66968.119167; Thu, 14 Jan 2021 12:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01TT-00047b-Cs; Thu, 14 Jan 2021 12:11:35 +0000 Received: by outflank-mailman (input) for mailman id 66968; Thu, 14 Jan 2021 12:11:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01TS-00047U-Ph for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01TS-0002i8-Ou for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l01TS-0002E6-OE for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Q2UXVhiPy7taJX4wlZpz6rXxmG2yxE69pD//IUDZhXE=; b=r6ZUdOcxI9oDdLHRow5rKderJG AfVwrIPGGUlYg9X+s6jn6L7bXgv5XyKo97KOqXuNHQvCBhKAikZr3aIHi5pGC5qPg5JgJQNBmtpoh 1GMgihf/2vIheOYx0Z3NlpL7uPGzqq0i1ncRo93ad05G74jJ4YkyLVuq9Vkh8sJDjDH4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenstat: ensure strnlen() declaration is visible Message-Id: Date: Thu, 14 Jan 2021 12:11:34 +0000 commit 01d411fd2d2e5045a32847d6d7729bb574753e05 Author: Jan Beulich AuthorDate: Thu Jan 14 13:03:01 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 14 13:03:01 2021 +0100 tools/libxenstat: ensure strnlen() declaration is visible Its guard was updated such that it is visible by default when POSIX 2008 was adopted by glibc. It's not visible by default on older glibc. Fixes: 40fe714ca424 ("tools/libs/stat: use memcpy instead of strncpy in getBridge") Signed-off-by: Jan Beulich Reviewed-by: Ian Jackson --- tools/libs/stat/xenstat_linux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/libs/stat/xenstat_linux.c b/tools/libs/stat/xenstat_linux.c index e0d242e1bc..c00b26d4d8 100644 --- a/tools/libs/stat/xenstat_linux.c +++ b/tools/libs/stat/xenstat_linux.c @@ -20,6 +20,7 @@ * Use is subject to license terms. */ +#define _GNU_SOURCE #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 12:11:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 12:11:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.66969.119171 (Exim 4.92) (envelope-from ) id 1l01Te-00049E-HW; Thu, 14 Jan 2021 12:11:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66969.119171; Thu, 14 Jan 2021 12: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 1l01Te-000496-EP; Thu, 14 Jan 2021 12:11:46 +0000 Received: by outflank-mailman (input) for mailman id 66969; Thu, 14 Jan 2021 12:11:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01Tc-00048v-UD for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l01Tc-0002iH-SD for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l01Tc-0002Eo-Qx for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 12:11:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7JPFq0lEZOFQ+mEy4LNaV0S4b7lUiNFsxAMyfKUCnuo=; b=QnoDsf8sqDG/gItw4jkkYvYcK8 Ds1C3TEPHH4krYfoY7WDZuHEULeNui0BqpVi8oB3/P55AAi+mBP4vwx9UDQWzaMcub9EV8jsBT+hA k0XlT0kpNDrlz+yVkPrS0hvBwt5mB1ao49LY5pilRfgOBW0ff8+3Glo+DYYyLUtEa+NQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] stubdom: fix tpm_version Message-Id: Date: Thu, 14 Jan 2021 12:11:44 +0000 commit 84a37d24a9e962e9c2fa8eb4671ea60c0958157d Author: Olaf Hering AuthorDate: Thu Jan 14 13:03:23 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 14 13:03:23 2021 +0100 stubdom: fix tpm_version It is just a declaration, not a variable. ld: /home/abuild/rpmbuild/BUILD/xen-4.14.20200616T103126.3625b04991/non-dbg/stubdom/vtpmmgr/vtpmmgr.a(vtpm_cmd_handler.o):(.bss+0x0): multiple definition of `tpm_version'; /home/abuild/rpmbuild/BUILD/xen-4.14.20200616T103126.3625b04991/non-dbg/stubdom/vtpmmgr/vtpmmgr.a(vtpmmgr.o):(.bss+0x0): first defined here Signed-off-by: Olaf Hering Reviewed-by: Samuel Thibault --- stubdom/vtpmmgr/vtpmmgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubdom/vtpmmgr/vtpmmgr.h b/stubdom/vtpmmgr/vtpmmgr.h index 2e6f8de9e4..f40ca9fd67 100644 --- a/stubdom/vtpmmgr/vtpmmgr.h +++ b/stubdom/vtpmmgr/vtpmmgr.h @@ -53,7 +53,7 @@ enum { TPM1_HARDWARE = 1, TPM2_HARDWARE, -} tpm_version; +}; struct tpm_hardware_version { int hw_version; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:22:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67367.120111 (Exim 4.92) (envelope-from ) id 1l05Ns-0002om-0w; Thu, 14 Jan 2021 16:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67367.120111; Thu, 14 Jan 2021 16: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 1l05Nr-0002oe-U5; Thu, 14 Jan 2021 16:22:03 +0000 Received: by outflank-mailman (input) for mailman id 67367; Thu, 14 Jan 2021 16:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Nq-0002oZ-SQ for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Nq-0007yN-MI for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Nq-0005gq-LK for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16: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=uZoC5yBMNjp05yVFyoECvDN1/M+lFy8QbIUg5HA4ALU=; b=XTa3tNG882GTqhtqC9Ez33ggzI jMQzFkSPk6+waqs5we5UvxLEoY619rRKMLOW7pdq8Bn850pH8gE0Zq28sw+eviXltai7shk4PgCpm A/k5q7gpBMcUggrck5rYApptSuk8LW7DWyRQGjnjm7yZSAQMJDZAT47BGo4hmP+ikeNY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Use READ_SYSREG instead of 32/64 versions Message-Id: Date: Thu, 14 Jan 2021 16:22:02 +0000 commit a9f1f03b2710f5ce84f69c1c4516349531053fac Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:01 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:22:49 2021 -0800 xen/arm: Use READ_SYSREG instead of 32/64 versions Modify identify_cpu function to use READ_SYSREG instead of READ_SYSREG32 or READ_SYSREG64. All aarch32 specific registers (for example ID_PFR0_EL1) are 64bit when accessed from aarch64 with upper bits read as 0, so it is right to access them as 64bit registers on a 64bit platform. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/cpufeature.c | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 44126dbf07..115e1b164d 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -99,44 +99,44 @@ int enable_nonboot_cpu_caps(const struct arm_cpu_capabilities *caps) void identify_cpu(struct cpuinfo_arm *c) { - c->midr.bits = READ_SYSREG32(MIDR_EL1); + c->midr.bits = READ_SYSREG(MIDR_EL1); c->mpidr.bits = READ_SYSREG(MPIDR_EL1); #ifdef CONFIG_ARM_64 - c->pfr64.bits[0] = READ_SYSREG64(ID_AA64PFR0_EL1); - c->pfr64.bits[1] = READ_SYSREG64(ID_AA64PFR1_EL1); + c->pfr64.bits[0] = READ_SYSREG(ID_AA64PFR0_EL1); + c->pfr64.bits[1] = READ_SYSREG(ID_AA64PFR1_EL1); - c->dbg64.bits[0] = READ_SYSREG64(ID_AA64DFR0_EL1); - c->dbg64.bits[1] = READ_SYSREG64(ID_AA64DFR1_EL1); + c->dbg64.bits[0] = READ_SYSREG(ID_AA64DFR0_EL1); + c->dbg64.bits[1] = READ_SYSREG(ID_AA64DFR1_EL1); - c->aux64.bits[0] = READ_SYSREG64(ID_AA64AFR0_EL1); - c->aux64.bits[1] = READ_SYSREG64(ID_AA64AFR1_EL1); + c->aux64.bits[0] = READ_SYSREG(ID_AA64AFR0_EL1); + c->aux64.bits[1] = READ_SYSREG(ID_AA64AFR1_EL1); - c->mm64.bits[0] = READ_SYSREG64(ID_AA64MMFR0_EL1); - c->mm64.bits[1] = READ_SYSREG64(ID_AA64MMFR1_EL1); + c->mm64.bits[0] = READ_SYSREG(ID_AA64MMFR0_EL1); + c->mm64.bits[1] = READ_SYSREG(ID_AA64MMFR1_EL1); - c->isa64.bits[0] = READ_SYSREG64(ID_AA64ISAR0_EL1); - c->isa64.bits[1] = READ_SYSREG64(ID_AA64ISAR1_EL1); + c->isa64.bits[0] = READ_SYSREG(ID_AA64ISAR0_EL1); + c->isa64.bits[1] = READ_SYSREG(ID_AA64ISAR1_EL1); #endif - c->pfr32.bits[0] = READ_SYSREG32(ID_PFR0_EL1); - c->pfr32.bits[1] = READ_SYSREG32(ID_PFR1_EL1); + c->pfr32.bits[0] = READ_SYSREG(ID_PFR0_EL1); + c->pfr32.bits[1] = READ_SYSREG(ID_PFR1_EL1); - c->dbg32.bits[0] = READ_SYSREG32(ID_DFR0_EL1); + c->dbg32.bits[0] = READ_SYSREG(ID_DFR0_EL1); - c->aux32.bits[0] = READ_SYSREG32(ID_AFR0_EL1); + c->aux32.bits[0] = READ_SYSREG(ID_AFR0_EL1); - c->mm32.bits[0] = READ_SYSREG32(ID_MMFR0_EL1); - c->mm32.bits[1] = READ_SYSREG32(ID_MMFR1_EL1); - c->mm32.bits[2] = READ_SYSREG32(ID_MMFR2_EL1); - c->mm32.bits[3] = READ_SYSREG32(ID_MMFR3_EL1); + c->mm32.bits[0] = READ_SYSREG(ID_MMFR0_EL1); + c->mm32.bits[1] = READ_SYSREG(ID_MMFR1_EL1); + c->mm32.bits[2] = READ_SYSREG(ID_MMFR2_EL1); + c->mm32.bits[3] = READ_SYSREG(ID_MMFR3_EL1); - c->isa32.bits[0] = READ_SYSREG32(ID_ISAR0_EL1); - c->isa32.bits[1] = READ_SYSREG32(ID_ISAR1_EL1); - c->isa32.bits[2] = READ_SYSREG32(ID_ISAR2_EL1); - c->isa32.bits[3] = READ_SYSREG32(ID_ISAR3_EL1); - c->isa32.bits[4] = READ_SYSREG32(ID_ISAR4_EL1); - c->isa32.bits[5] = READ_SYSREG32(ID_ISAR5_EL1); + c->isa32.bits[0] = READ_SYSREG(ID_ISAR0_EL1); + c->isa32.bits[1] = READ_SYSREG(ID_ISAR1_EL1); + c->isa32.bits[2] = READ_SYSREG(ID_ISAR2_EL1); + c->isa32.bits[3] = READ_SYSREG(ID_ISAR3_EL1); + c->isa32.bits[4] = READ_SYSREG(ID_ISAR4_EL1); + c->isa32.bits[5] = READ_SYSREG(ID_ISAR5_EL1); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:22:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67368.120116 (Exim 4.92) (envelope-from ) id 1l05O2-0002pm-4O; Thu, 14 Jan 2021 16:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67368.120116; Thu, 14 Jan 2021 16:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05O2-0002pe-0m; Thu, 14 Jan 2021 16:22:14 +0000 Received: by outflank-mailman (input) for mailman id 67368; Thu, 14 Jan 2021 16:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05O0-0002pX-RR for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05O0-0007yQ-Pm for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05O0-0005hi-Oo for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16: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=haIlTc81+GJMZKqXT+xDOc5hE9DBgRusP4w5OTkWwms=; b=TWgwdGPyHYQx0xWhOpUIg8NfEW J7IDwkMLM6Tfklf9mtP9PIGTZh9ZO9P1kTeCbJtW8PZfhYtou04LGwS6Ha5phmGxZujFhkjpd5siy KGgfKLatZAR/GoLHVqUBDj5i1hN0rg7tOny0ATzRBjd8AKDtj2DfT04RetOmFN3lEL0M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add ID registers and complete cpuinfo Message-Id: Date: Thu, 14 Jan 2021 16:22:12 +0000 commit 9cfdb489af810f71acb7dcdb87075dc7b3b313a0 Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:02 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:23:19 2021 -0800 xen/arm: Add ID registers and complete cpuinfo Add definition and entries in cpuinfo for ID registers introduced in newer Arm Architecture reference manual: - ID_PFR2: processor feature register 2 - ID_DFR1: debug feature register 1 - ID_MMFR4 and ID_MMFR5: Memory model feature registers 4 and 5 - ID_ISA6: ISA Feature register 6 Add more bitfield definitions in PFR fields of cpuinfo. Add MVFR2 register definition for aarch32. Add MVFRx_EL1 defines for aarch32. Add mvfr values in cpuinfo. Add some registers definition for arm64 in sysregs as some are not always know by compilers. Initialize the new values added in cpuinfo in identify_cpu during init. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/cpufeature.c | 12 ++++++++ xen/include/asm-arm/arm64/sysregs.h | 28 +++++++++++++++++++ xen/include/asm-arm/cpregs.h | 15 ++++++++++ xen/include/asm-arm/cpufeature.h | 56 +++++++++++++++++++++++++++++++------ 4 files changed, 102 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 115e1b164d..86b99ee960 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -114,15 +114,20 @@ void identify_cpu(struct cpuinfo_arm *c) c->mm64.bits[0] = READ_SYSREG(ID_AA64MMFR0_EL1); c->mm64.bits[1] = READ_SYSREG(ID_AA64MMFR1_EL1); + c->mm64.bits[2] = READ_SYSREG(ID_AA64MMFR2_EL1); c->isa64.bits[0] = READ_SYSREG(ID_AA64ISAR0_EL1); c->isa64.bits[1] = READ_SYSREG(ID_AA64ISAR1_EL1); + + c->zfr64.bits[0] = READ_SYSREG(ID_AA64ZFR0_EL1); #endif c->pfr32.bits[0] = READ_SYSREG(ID_PFR0_EL1); c->pfr32.bits[1] = READ_SYSREG(ID_PFR1_EL1); + c->pfr32.bits[2] = READ_SYSREG(ID_PFR2_EL1); c->dbg32.bits[0] = READ_SYSREG(ID_DFR0_EL1); + c->dbg32.bits[1] = READ_SYSREG(ID_DFR1_EL1); c->aux32.bits[0] = READ_SYSREG(ID_AFR0_EL1); @@ -130,6 +135,8 @@ void identify_cpu(struct cpuinfo_arm *c) c->mm32.bits[1] = READ_SYSREG(ID_MMFR1_EL1); c->mm32.bits[2] = READ_SYSREG(ID_MMFR2_EL1); c->mm32.bits[3] = READ_SYSREG(ID_MMFR3_EL1); + c->mm32.bits[4] = READ_SYSREG(ID_MMFR4_EL1); + c->mm32.bits[5] = READ_SYSREG(ID_MMFR5_EL1); c->isa32.bits[0] = READ_SYSREG(ID_ISAR0_EL1); c->isa32.bits[1] = READ_SYSREG(ID_ISAR1_EL1); @@ -137,6 +144,11 @@ void identify_cpu(struct cpuinfo_arm *c) c->isa32.bits[3] = READ_SYSREG(ID_ISAR3_EL1); c->isa32.bits[4] = READ_SYSREG(ID_ISAR4_EL1); c->isa32.bits[5] = READ_SYSREG(ID_ISAR5_EL1); + c->isa32.bits[6] = READ_SYSREG(ID_ISAR6_EL1); + + c->mvfr.bits[0] = READ_SYSREG(MVFR0_EL1); + c->mvfr.bits[1] = READ_SYSREG(MVFR1_EL1); + c->mvfr.bits[2] = READ_SYSREG(MVFR2_EL1); } /* diff --git a/xen/include/asm-arm/arm64/sysregs.h b/xen/include/asm-arm/arm64/sysregs.h index c60029d38f..077fd95fb7 100644 --- a/xen/include/asm-arm/arm64/sysregs.h +++ b/xen/include/asm-arm/arm64/sysregs.h @@ -57,6 +57,34 @@ #define ICH_AP1R2_EL2 __AP1Rx_EL2(2) #define ICH_AP1R3_EL2 __AP1Rx_EL2(3) +/* + * Define ID coprocessor registers if they are not + * already defined by the compiler. + * + * Values picked from linux kernel + */ +#ifndef ID_AA64MMFR2_EL1 +#define ID_AA64MMFR2_EL1 S3_0_C0_C7_2 +#endif +#ifndef ID_PFR2_EL1 +#define ID_PFR2_EL1 S3_0_C0_C3_4 +#endif +#ifndef ID_MMFR4_EL1 +#define ID_MMFR4_EL1 S3_0_C0_C2_6 +#endif +#ifndef ID_MMFR5_EL1 +#define ID_MMFR5_EL1 S3_0_C0_C3_6 +#endif +#ifndef ID_ISAR6_EL1 +#define ID_ISAR6_EL1 S3_0_C0_C2_7 +#endif +#ifndef ID_AA64ZFR0_EL1 +#define ID_AA64ZFR0_EL1 S3_0_C0_C4_4 +#endif +#ifndef ID_DFR1_EL1 +#define ID_DFR1_EL1 S3_0_C0_C3_5 +#endif + /* Access to system registers */ #define READ_SYSREG32(name) ((uint32_t)READ_SYSREG64(name)) diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index 8fd344146e..6daf2b1a30 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -63,6 +63,8 @@ #define FPSID p10,7,c0,c0,0 /* Floating-Point System ID Register */ #define FPSCR p10,7,c1,c0,0 /* Floating-Point Status and Control Register */ #define MVFR0 p10,7,c7,c0,0 /* Media and VFP Feature Register 0 */ +#define MVFR1 p10,7,c6,c0,0 /* Media and VFP Feature Register 1 */ +#define MVFR2 p10,7,c5,c0,0 /* Media and VFP Feature Register 2 */ #define FPEXC p10,7,c8,c0,0 /* Floating-Point Exception Control Register */ #define FPINST p10,7,c9,c0,0 /* Floating-Point Instruction Register */ #define FPINST2 p10,7,c10,c0,0 /* Floating-point Instruction Register 2 */ @@ -108,18 +110,23 @@ #define MPIDR p15,0,c0,c0,5 /* Multiprocessor Affinity Register */ #define ID_PFR0 p15,0,c0,c1,0 /* Processor Feature Register 0 */ #define ID_PFR1 p15,0,c0,c1,1 /* Processor Feature Register 1 */ +#define ID_PFR2 p15,0,c0,c3,4 /* Processor Feature Register 2 */ #define ID_DFR0 p15,0,c0,c1,2 /* Debug Feature Register 0 */ +#define ID_DFR1 p15,0,c0,c3,5 /* Debug Feature Register 1 */ #define ID_AFR0 p15,0,c0,c1,3 /* Auxiliary Feature Register 0 */ #define ID_MMFR0 p15,0,c0,c1,4 /* Memory Model Feature Register 0 */ #define ID_MMFR1 p15,0,c0,c1,5 /* Memory Model Feature Register 1 */ #define ID_MMFR2 p15,0,c0,c1,6 /* Memory Model Feature Register 2 */ #define ID_MMFR3 p15,0,c0,c1,7 /* Memory Model Feature Register 3 */ +#define ID_MMFR4 p15,0,c0,c2,6 /* Memory Model Feature Register 4 */ +#define ID_MMFR5 p15,0,c0,c3,6 /* Memory Model Feature Register 5 */ #define ID_ISAR0 p15,0,c0,c2,0 /* ISA Feature Register 0 */ #define ID_ISAR1 p15,0,c0,c2,1 /* ISA Feature Register 1 */ #define ID_ISAR2 p15,0,c0,c2,2 /* ISA Feature Register 2 */ #define ID_ISAR3 p15,0,c0,c2,3 /* ISA Feature Register 3 */ #define ID_ISAR4 p15,0,c0,c2,4 /* ISA Feature Register 4 */ #define ID_ISAR5 p15,0,c0,c2,5 /* ISA Feature Register 5 */ +#define ID_ISAR6 p15,0,c0,c2,7 /* ISA Feature Register 6 */ #define CCSIDR p15,1,c0,c0,0 /* Cache Size ID Registers */ #define CLIDR p15,1,c0,c0,1 /* Cache Level ID Register */ #define CSSELR p15,2,c0,c0,0 /* Cache Size Selection Register */ @@ -312,18 +319,23 @@ #define HSTR_EL2 HSTR #define ID_AFR0_EL1 ID_AFR0 #define ID_DFR0_EL1 ID_DFR0 +#define ID_DFR1_EL1 ID_DFR1 #define ID_ISAR0_EL1 ID_ISAR0 #define ID_ISAR1_EL1 ID_ISAR1 #define ID_ISAR2_EL1 ID_ISAR2 #define ID_ISAR3_EL1 ID_ISAR3 #define ID_ISAR4_EL1 ID_ISAR4 #define ID_ISAR5_EL1 ID_ISAR5 +#define ID_ISAR6_EL1 ID_ISAR6 #define ID_MMFR0_EL1 ID_MMFR0 #define ID_MMFR1_EL1 ID_MMFR1 #define ID_MMFR2_EL1 ID_MMFR2 #define ID_MMFR3_EL1 ID_MMFR3 +#define ID_MMFR4_EL1 ID_MMFR4 +#define ID_MMFR5_EL1 ID_MMFR5 #define ID_PFR0_EL1 ID_PFR0 #define ID_PFR1_EL1 ID_PFR1 +#define ID_PFR2_EL1 ID_PFR2 #define IFSR32_EL2 IFSR #define MDCR_EL2 HDCR #define MIDR_EL1 MIDR @@ -347,6 +359,9 @@ #define VPIDR_EL2 VPIDR #define VTCR_EL2 VTCR #define VTTBR_EL2 VTTBR +#define MVFR0_EL1 MVFR0 +#define MVFR1_EL1 MVFR1 +#define MVFR2_EL1 MVFR2 #endif #endif diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index c7b5052992..74139be1cc 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -148,6 +148,7 @@ struct cpuinfo_arm { union { uint64_t bits[2]; struct { + /* PFR0 */ unsigned long el0:4; unsigned long el1:4; unsigned long el2:4; @@ -155,9 +156,23 @@ struct cpuinfo_arm { unsigned long fp:4; /* Floating Point */ unsigned long simd:4; /* Advanced SIMD */ unsigned long gic:4; /* GIC support */ - unsigned long __res0:28; + unsigned long ras:4; + unsigned long sve:4; + unsigned long sel2:4; + unsigned long mpam:4; + unsigned long amu:4; + unsigned long dit:4; + unsigned long __res0:4; unsigned long csv2:4; - unsigned long __res1:4; + unsigned long cvs3:4; + + /* PFR1 */ + unsigned long bt:4; + unsigned long ssbs:4; + unsigned long mte:4; + unsigned long ras_frac:4; + unsigned long mpam_frac:4; + unsigned long __res1:44; }; } pfr64; @@ -170,7 +185,7 @@ struct cpuinfo_arm { } aux64; union { - uint64_t bits[2]; + uint64_t bits[3]; struct { unsigned long pa_range:4; unsigned long asid_bits:4; @@ -190,6 +205,8 @@ struct cpuinfo_arm { unsigned long pan:4; unsigned long __res1:8; unsigned long __res2:32; + + unsigned long __res3:64; }; } mm64; @@ -197,6 +214,10 @@ struct cpuinfo_arm { uint64_t bits[2]; } isa64; + struct { + register_t bits[1]; + } zfr64; + #endif /* @@ -204,25 +225,38 @@ struct cpuinfo_arm { * when running in 32-bit mode. */ union { - uint32_t bits[2]; + uint32_t bits[3]; struct { + /* PFR0 */ unsigned long arm:4; unsigned long thumb:4; unsigned long jazelle:4; unsigned long thumbee:4; - unsigned long __res0:16; + unsigned long csv2:4; + unsigned long amu:4; + unsigned long dit:4; + unsigned long ras:4; + /* PFR1 */ unsigned long progmodel:4; unsigned long security:4; unsigned long mprofile:4; unsigned long virt:4; unsigned long gentimer:4; - unsigned long __res1:12; + unsigned long sec_frac:4; + unsigned long virt_frac:4; + unsigned long gic:4; + + /* PFR2 */ + unsigned long csv3:4; + unsigned long ssbs:4; + unsigned long ras_frac:4; + unsigned long __res2:20; }; } pfr32; struct { - uint32_t bits[1]; + uint32_t bits[2]; } dbg32; struct { @@ -230,12 +264,16 @@ struct cpuinfo_arm { } aux32; struct { - uint32_t bits[4]; + uint32_t bits[6]; } mm32; struct { - uint32_t bits[6]; + uint32_t bits[7]; } isa32; + + struct { + register_t bits[3]; + } mvfr; }; extern struct cpuinfo_arm boot_cpu_data; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:22:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67369.120119 (Exim 4.92) (envelope-from ) id 1l05OC-0002r3-5k; Thu, 14 Jan 2021 16:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67369.120119; Thu, 14 Jan 2021 16:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05OC-0002qv-2Q; Thu, 14 Jan 2021 16:22:24 +0000 Received: by outflank-mailman (input) for mailman id 67369; Thu, 14 Jan 2021 16:22:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05OA-0002ql-Us for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05OA-0007yY-TA for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05OA-0005iF-SG for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16: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=xWd1bUtPWk8q/FgF2E0H0WWGvf1FMyQxX11L9vy3pNA=; b=3nfDH4t/V/WWTHwTYLhgPQA8k5 Ujc6p09GLfLVoCq43X8pVgoiw+922GffiUtfUl/dSxyICDd/WkHdjwN9KptavKWpngdNeu+6JSU2l XjGIguquvZg6w1JNikID1wWZUtCvKMgXNsuUwEDasFWfPcdI3G0L4oNUnOQOn6IZ97w0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add arm64 ID registers definitions Message-Id: Date: Thu, 14 Jan 2021 16:22:22 +0000 commit 2d66a1f095f716e4bf7e47d61e1d1de13e99167a Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:03 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:23:34 2021 -0800 xen/arm: Add arm64 ID registers definitions Add coprocessor registers definitions for all ID registers trapped through the TID3 bit of HSR. Those are the one that will be emulated in Xen to only publish to guests the features that are supported by Xen and that are accessible to guests. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/include/asm-arm/arm64/hsr.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/xen/include/asm-arm/arm64/hsr.h b/xen/include/asm-arm/arm64/hsr.h index ca931dd2fe..e691d41c17 100644 --- a/xen/include/asm-arm/arm64/hsr.h +++ b/xen/include/asm-arm/arm64/hsr.h @@ -110,6 +110,43 @@ #define HSR_SYSREG_CNTP_CTL_EL0 HSR_SYSREG(3,3,c14,c2,1) #define HSR_SYSREG_CNTP_CVAL_EL0 HSR_SYSREG(3,3,c14,c2,2) +/* Those registers are used when HCR_EL2.TID3 is set */ +#define HSR_SYSREG_ID_PFR0_EL1 HSR_SYSREG(3,0,c0,c1,0) +#define HSR_SYSREG_ID_PFR1_EL1 HSR_SYSREG(3,0,c0,c1,1) +#define HSR_SYSREG_ID_PFR2_EL1 HSR_SYSREG(3,0,c0,c3,4) +#define HSR_SYSREG_ID_DFR0_EL1 HSR_SYSREG(3,0,c0,c1,2) +#define HSR_SYSREG_ID_DFR1_EL1 HSR_SYSREG(3,0,c0,c3,5) +#define HSR_SYSREG_ID_AFR0_EL1 HSR_SYSREG(3,0,c0,c1,3) +#define HSR_SYSREG_ID_MMFR0_EL1 HSR_SYSREG(3,0,c0,c1,4) +#define HSR_SYSREG_ID_MMFR1_EL1 HSR_SYSREG(3,0,c0,c1,5) +#define HSR_SYSREG_ID_MMFR2_EL1 HSR_SYSREG(3,0,c0,c1,6) +#define HSR_SYSREG_ID_MMFR3_EL1 HSR_SYSREG(3,0,c0,c1,7) +#define HSR_SYSREG_ID_MMFR4_EL1 HSR_SYSREG(3,0,c0,c2,6) +#define HSR_SYSREG_ID_MMFR5_EL1 HSR_SYSREG(3,0,c0,c3,6) +#define HSR_SYSREG_ID_ISAR0_EL1 HSR_SYSREG(3,0,c0,c2,0) +#define HSR_SYSREG_ID_ISAR1_EL1 HSR_SYSREG(3,0,c0,c2,1) +#define HSR_SYSREG_ID_ISAR2_EL1 HSR_SYSREG(3,0,c0,c2,2) +#define HSR_SYSREG_ID_ISAR3_EL1 HSR_SYSREG(3,0,c0,c2,3) +#define HSR_SYSREG_ID_ISAR4_EL1 HSR_SYSREG(3,0,c0,c2,4) +#define HSR_SYSREG_ID_ISAR5_EL1 HSR_SYSREG(3,0,c0,c2,5) +#define HSR_SYSREG_ID_ISAR6_EL1 HSR_SYSREG(3,0,c0,c2,7) +#define HSR_SYSREG_MVFR0_EL1 HSR_SYSREG(3,0,c0,c3,0) +#define HSR_SYSREG_MVFR1_EL1 HSR_SYSREG(3,0,c0,c3,1) +#define HSR_SYSREG_MVFR2_EL1 HSR_SYSREG(3,0,c0,c3,2) + +#define HSR_SYSREG_ID_AA64PFR0_EL1 HSR_SYSREG(3,0,c0,c4,0) +#define HSR_SYSREG_ID_AA64PFR1_EL1 HSR_SYSREG(3,0,c0,c4,1) +#define HSR_SYSREG_ID_AA64DFR0_EL1 HSR_SYSREG(3,0,c0,c5,0) +#define HSR_SYSREG_ID_AA64DFR1_EL1 HSR_SYSREG(3,0,c0,c5,1) +#define HSR_SYSREG_ID_AA64ISAR0_EL1 HSR_SYSREG(3,0,c0,c6,0) +#define HSR_SYSREG_ID_AA64ISAR1_EL1 HSR_SYSREG(3,0,c0,c6,1) +#define HSR_SYSREG_ID_AA64MMFR0_EL1 HSR_SYSREG(3,0,c0,c7,0) +#define HSR_SYSREG_ID_AA64MMFR1_EL1 HSR_SYSREG(3,0,c0,c7,1) +#define HSR_SYSREG_ID_AA64MMFR2_EL1 HSR_SYSREG(3,0,c0,c7,2) +#define HSR_SYSREG_ID_AA64AFR0_EL1 HSR_SYSREG(3,0,c0,c5,4) +#define HSR_SYSREG_ID_AA64AFR1_EL1 HSR_SYSREG(3,0,c0,c5,5) +#define HSR_SYSREG_ID_AA64ZFR0_EL1 HSR_SYSREG(3,0,c0,c4,4) + #endif /* __ASM_ARM_ARM64_HSR_H */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:22:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67370.120123 (Exim 4.92) (envelope-from ) id 1l05OM-0002tI-6y; Thu, 14 Jan 2021 16:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67370.120123; Thu, 14 Jan 2021 16:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05OM-0002tB-48; Thu, 14 Jan 2021 16:22:34 +0000 Received: by outflank-mailman (input) for mailman id 67370; Thu, 14 Jan 2021 16:22:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05OL-0002t0-2b for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05OL-0007yf-0t for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05OK-0005iq-VS for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16: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=n/b56ITDCwYb2SsPWDz56/lw9fcWDB95UOK0wBCqujM=; b=eowU2/IFb+uqfTHVooUo6wpPiF c4dRVYT/KgAWgROX3HL/sNhJeRxdVyFNw+BCzmGS/8evIuGkZv0wHCYZL6mhOLpDZ/IEaC+WapBtM H5T96JOjNfVwXswihrC4o/qu9FBgkA7cX1BkWa9JBJPP0Kbz+Wq72gtXCAQfOc33YJCk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: create a cpuinfo structure for guest Message-Id: Date: Thu, 14 Jan 2021 16:22:32 +0000 commit 3669a1cb95983dc1c01be46e7df5dd9357d7b973 Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:04 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:25:03 2021 -0800 xen/arm: create a cpuinfo structure for guest Create a cpuinfo structure for guest and mask into it the features that we do not support in Xen or that we do not want to publish to guests. Modify some values in the cpuinfo structure for guests to mask some features which we do not want to allow to guests (like AMU) or we do not support (like SVE). Modify some values in the guest cpuinfo structure to guests to hide some processor features: - SVE as this is not supported by Xen and guest are not allowed to use this features (ZEN is set to 0 in CPTR_EL2). - AMU as HCPTR_TAM is set in CPTR_EL2 so AMU cannot be used by guests All other bits are left untouched. - RAS as this is not supported by Xen. The code is trying to group together registers modifications for the same feature to be able in the long term to easily enable/disable a feature depending on user parameters or add other registers modification in the same place (like enabling/disabling HCR bits). Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/cpufeature.c | 51 ++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/cpufeature.h | 2 ++ 2 files changed, 53 insertions(+) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 86b99ee960..1f6a85aafe 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -24,6 +24,8 @@ DECLARE_BITMAP(cpu_hwcaps, ARM_NCAPS); +struct cpuinfo_arm __read_mostly guest_cpuinfo; + void update_cpu_capabilities(const struct arm_cpu_capabilities *caps, const char *info) { @@ -151,6 +153,55 @@ void identify_cpu(struct cpuinfo_arm *c) c->mvfr.bits[2] = READ_SYSREG(MVFR2_EL1); } +/* + * This function is creating a cpuinfo structure with values modified to mask + * all cpu features that should not be published to guest. + * The created structure is then used to provide ID registers values to guests. + */ +static int __init create_guest_cpuinfo(void) +{ + /* + * TODO: The code is currently using only the features detected on the boot + * core. In the long term we should try to compute values containing only + * features supported by all cores. + */ + guest_cpuinfo = boot_cpu_data; + +#ifdef CONFIG_ARM_64 + /* Hide MPAM support as xen does not support it */ + guest_cpuinfo.pfr64.mpam = 0; + guest_cpuinfo.pfr64.mpam_frac = 0; + + /* Hide SVE as Xen does not support it */ + guest_cpuinfo.pfr64.sve = 0; + guest_cpuinfo.zfr64.bits[0] = 0; + + /* Hide MTE support as Xen does not support it */ + guest_cpuinfo.pfr64.mte = 0; +#endif + + /* Hide AMU support */ +#ifdef CONFIG_ARM_64 + guest_cpuinfo.pfr64.amu = 0; +#endif + guest_cpuinfo.pfr32.amu = 0; + + /* Hide RAS support as Xen does not support it */ +#ifdef CONFIG_ARM_64 + guest_cpuinfo.pfr64.ras = 0; + guest_cpuinfo.pfr64.ras_frac = 0; +#endif + guest_cpuinfo.pfr32.ras = 0; + guest_cpuinfo.pfr32.ras_frac = 0; + + return 0; +} +/* + * This function needs to be run after all smp are started to have + * cpuinfo structures for all cores. + */ +__initcall(create_guest_cpuinfo); + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 74139be1cc..6058744c18 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -283,6 +283,8 @@ extern void identify_cpu(struct cpuinfo_arm *); extern struct cpuinfo_arm cpu_data[]; #define current_cpu_data cpu_data[smp_processor_id()] +extern struct cpuinfo_arm guest_cpuinfo; + #endif /* __ASSEMBLY__ */ #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:22:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67371.120127 (Exim 4.92) (envelope-from ) id 1l05OW-0002vy-8c; Thu, 14 Jan 2021 16:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67371.120127; Thu, 14 Jan 2021 16:22:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05OW-0002vq-5j; Thu, 14 Jan 2021 16:22:44 +0000 Received: by outflank-mailman (input) for mailman id 67371; Thu, 14 Jan 2021 16:22:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05OV-0002vK-5I for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05OV-0007yr-44 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05OV-0005jd-3B for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22: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=5Lnd7nfpRXuxyn5YVymWzjYZ6ihg8cIQcVz+M/qfnjI=; b=e3DXf4Dp+UvpGY5xk+DbXIq7ZU iXF55ixdS07PCbyu2Rcu6XkZSt0YK5vwb1D9F+F+jtIuILW0DU6h6p2oQBpk1hX57Vk5IBbqXuw7X 97RdbpnHXzbDpabV00bGh8Ajb9z6ktQQgJrM634tKgY67D6/8d/umJ8Bz+5ZgrqIi6fo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add handler for ID registers on arm64 Message-Id: Date: Thu, 14 Jan 2021 16:22:43 +0000 commit 07b9acea116e8329d613004766b8606756986db5 Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:05 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:25:14 2021 -0800 xen/arm: Add handler for ID registers on arm64 Add vsysreg emulation for registers trapped when TID3 bit is activated in HSR. The emulation is returning the value stored in cpuinfo_guest structure for know registers and is handling reserved registers as RAZ. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/vsysreg.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/xen/arch/arm/arm64/vsysreg.c b/xen/arch/arm/arm64/vsysreg.c index 8a85507d9d..41f18612c6 100644 --- a/xen/arch/arm/arm64/vsysreg.c +++ b/xen/arch/arm/arm64/vsysreg.c @@ -69,6 +69,14 @@ TVM_REG(CONTEXTIDR_EL1) break; \ } +/* Macro to generate easily case for ID co-processor emulation */ +#define GENERATE_TID3_INFO(reg, field, offset) \ + case HSR_SYSREG_##reg: \ + { \ + return handle_ro_read_val(regs, regidx, hsr.sysreg.read, hsr, \ + 1, guest_cpuinfo.field.bits[offset]); \ + } + void do_sysreg(struct cpu_user_regs *regs, const union hsr hsr) { @@ -259,6 +267,80 @@ void do_sysreg(struct cpu_user_regs *regs, */ return handle_raz_wi(regs, regidx, hsr.sysreg.read, hsr, 1); + /* + * HCR_EL2.TID3 + * + * This is trapping most Identification registers used by a guest + * to identify the processor features + */ + GENERATE_TID3_INFO(ID_PFR0_EL1, pfr32, 0) + GENERATE_TID3_INFO(ID_PFR1_EL1, pfr32, 1) + GENERATE_TID3_INFO(ID_PFR2_EL1, pfr32, 2) + GENERATE_TID3_INFO(ID_DFR0_EL1, dbg32, 0) + GENERATE_TID3_INFO(ID_DFR1_EL1, dbg32, 1) + GENERATE_TID3_INFO(ID_AFR0_EL1, aux32, 0) + GENERATE_TID3_INFO(ID_MMFR0_EL1, mm32, 0) + GENERATE_TID3_INFO(ID_MMFR1_EL1, mm32, 1) + GENERATE_TID3_INFO(ID_MMFR2_EL1, mm32, 2) + GENERATE_TID3_INFO(ID_MMFR3_EL1, mm32, 3) + GENERATE_TID3_INFO(ID_MMFR4_EL1, mm32, 4) + GENERATE_TID3_INFO(ID_MMFR5_EL1, mm32, 5) + GENERATE_TID3_INFO(ID_ISAR0_EL1, isa32, 0) + GENERATE_TID3_INFO(ID_ISAR1_EL1, isa32, 1) + GENERATE_TID3_INFO(ID_ISAR2_EL1, isa32, 2) + GENERATE_TID3_INFO(ID_ISAR3_EL1, isa32, 3) + GENERATE_TID3_INFO(ID_ISAR4_EL1, isa32, 4) + GENERATE_TID3_INFO(ID_ISAR5_EL1, isa32, 5) + GENERATE_TID3_INFO(ID_ISAR6_EL1, isa32, 6) + GENERATE_TID3_INFO(MVFR0_EL1, mvfr, 0) + GENERATE_TID3_INFO(MVFR1_EL1, mvfr, 1) + GENERATE_TID3_INFO(MVFR2_EL1, mvfr, 2) + GENERATE_TID3_INFO(ID_AA64PFR0_EL1, pfr64, 0) + GENERATE_TID3_INFO(ID_AA64PFR1_EL1, pfr64, 1) + GENERATE_TID3_INFO(ID_AA64DFR0_EL1, dbg64, 0) + GENERATE_TID3_INFO(ID_AA64DFR1_EL1, dbg64, 1) + GENERATE_TID3_INFO(ID_AA64ISAR0_EL1, isa64, 0) + GENERATE_TID3_INFO(ID_AA64ISAR1_EL1, isa64, 1) + GENERATE_TID3_INFO(ID_AA64MMFR0_EL1, mm64, 0) + GENERATE_TID3_INFO(ID_AA64MMFR1_EL1, mm64, 1) + GENERATE_TID3_INFO(ID_AA64MMFR2_EL1, mm64, 2) + GENERATE_TID3_INFO(ID_AA64AFR0_EL1, aux64, 0) + GENERATE_TID3_INFO(ID_AA64AFR1_EL1, aux64, 1) + GENERATE_TID3_INFO(ID_AA64ZFR0_EL1, zfr64, 0) + + /* + * Those cases are catching all Reserved registers trapped by TID3 which + * currently have no assignment. + * HCR.TID3 is trapping all registers in the group 3: + * Op0 == 3, op1 == 0, CRn == c0,CRm == {c1-c7}, op2 == {0-7}. + * Those registers are defined as being RO in the Arm Architecture + * Reference manual Armv8 (Chapter D12.3.2 of issue F.c) so handle them + * as Read-only read as zero. + */ + case HSR_SYSREG(3,0,c0,c3,3): + case HSR_SYSREG(3,0,c0,c3,7): + case HSR_SYSREG(3,0,c0,c4,2): + case HSR_SYSREG(3,0,c0,c4,3): + case HSR_SYSREG(3,0,c0,c4,5): + case HSR_SYSREG(3,0,c0,c4,6): + case HSR_SYSREG(3,0,c0,c4,7): + case HSR_SYSREG(3,0,c0,c5,2): + case HSR_SYSREG(3,0,c0,c5,3): + case HSR_SYSREG(3,0,c0,c5,6): + case HSR_SYSREG(3,0,c0,c5,7): + case HSR_SYSREG(3,0,c0,c6,2): + case HSR_SYSREG(3,0,c0,c6,3): + case HSR_SYSREG(3,0,c0,c6,4): + case HSR_SYSREG(3,0,c0,c6,5): + case HSR_SYSREG(3,0,c0,c6,6): + case HSR_SYSREG(3,0,c0,c6,7): + case HSR_SYSREG(3,0,c0,c7,3): + case HSR_SYSREG(3,0,c0,c7,4): + case HSR_SYSREG(3,0,c0,c7,5): + case HSR_SYSREG(3,0,c0,c7,6): + case HSR_SYSREG(3,0,c0,c7,7): + return handle_ro_raz(regs, regidx, hsr.sysreg.read, hsr, 1); + /* * HCR_EL2.TIDCP * -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:22:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67372.120131 (Exim 4.92) (envelope-from ) id 1l05Og-0002yn-Br; Thu, 14 Jan 2021 16:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67372.120131; Thu, 14 Jan 2021 16:22:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Og-0002yf-8j; Thu, 14 Jan 2021 16:22:54 +0000 Received: by outflank-mailman (input) for mailman id 67372; Thu, 14 Jan 2021 16:22:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Of-0002yR-7n for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Of-0007zn-73 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Of-0005kH-6H for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:22: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=mbl6K5e6J8JKoq6N2gA3XsopVqzOLWh3xp9DiOPRuWM=; b=t1qCcQLD1mfjUTSucgzxaIJVBa ufxbSuQGQBA5zGgZooFiglNBYbIr4/VrqwJ8V2sXTsZw1zTP+zgJm4CeuoHVo7tH/cm8QaGUdsrsx /ejY/P/Lg78dMttZPzutNBWidRmEJasnPZhg71VnN+dDyvM6zasUWj/R/JKPLZctsktg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add handler for cp15 ID registers Message-Id: Date: Thu, 14 Jan 2021 16:22:53 +0000 commit 8f81064a07c64952931eafdd9a9a3017ed6ffd26 Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:06 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:26:41 2021 -0800 xen/arm: Add handler for cp15 ID registers Add support for emulation of cp15 based ID registers (on arm32 or when running a 32bit guest on arm64). The handlers are returning the values stored in the guest_cpuinfo structure for known registers and RAZ for all reserved registers. In the current status the MVFR registers are no supported. Signed-off-by: Bertrand Marquis [Stefano: fix code style] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini --- xen/arch/arm/vcpreg.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index cdc91cdf5b..cbab95b37a 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -155,6 +155,24 @@ TVM_REG32(CONTEXTIDR, CONTEXTIDR_EL1) break; \ } +/* Macro to generate easily case for ID co-processor emulation */ +#define GENERATE_TID3_INFO(reg, field, offset) \ + case HSR_CPREG32(reg): \ + { \ + return handle_ro_read_val(regs, regidx, cp32.read, hsr, 1, \ + guest_cpuinfo.field.bits[offset]);\ + } + +/* helper to define cases for all registers for one CRm value */ +#define HSR_CPREG32_TID3_CASES(REG) case HSR_CPREG32(p15,0,c0,REG,0): \ + case HSR_CPREG32(p15,0,c0,REG,1): \ + case HSR_CPREG32(p15,0,c0,REG,2): \ + case HSR_CPREG32(p15,0,c0,REG,3): \ + case HSR_CPREG32(p15,0,c0,REG,4): \ + case HSR_CPREG32(p15,0,c0,REG,5): \ + case HSR_CPREG32(p15,0,c0,REG,6): \ + case HSR_CPREG32(p15,0,c0,REG,7) + void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) { const struct hsr_cp32 cp32 = hsr.cp32; @@ -286,6 +304,53 @@ void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) */ return handle_raz_wi(regs, regidx, cp32.read, hsr, 1); + /* + * HCR_EL2.TID3 + * + * This is trapping most Identification registers used by a guest + * to identify the processor features + */ + GENERATE_TID3_INFO(ID_PFR0, pfr32, 0) + GENERATE_TID3_INFO(ID_PFR1, pfr32, 1) + GENERATE_TID3_INFO(ID_PFR2, pfr32, 2) + GENERATE_TID3_INFO(ID_DFR0, dbg32, 0) + GENERATE_TID3_INFO(ID_DFR1, dbg32, 1) + GENERATE_TID3_INFO(ID_AFR0, aux32, 0) + GENERATE_TID3_INFO(ID_MMFR0, mm32, 0) + GENERATE_TID3_INFO(ID_MMFR1, mm32, 1) + GENERATE_TID3_INFO(ID_MMFR2, mm32, 2) + GENERATE_TID3_INFO(ID_MMFR3, mm32, 3) + GENERATE_TID3_INFO(ID_MMFR4, mm32, 4) + GENERATE_TID3_INFO(ID_MMFR5, mm32, 5) + GENERATE_TID3_INFO(ID_ISAR0, isa32, 0) + GENERATE_TID3_INFO(ID_ISAR1, isa32, 1) + GENERATE_TID3_INFO(ID_ISAR2, isa32, 2) + GENERATE_TID3_INFO(ID_ISAR3, isa32, 3) + GENERATE_TID3_INFO(ID_ISAR4, isa32, 4) + GENERATE_TID3_INFO(ID_ISAR5, isa32, 5) + GENERATE_TID3_INFO(ID_ISAR6, isa32, 6) + /* MVFR registers are in cp10 not cp15 */ + + /* + * Those cases are catching all Reserved registers trapped by TID3 which + * currently have no assignment. + * HCR.TID3 is trapping all registers in the group 3: + * coproc == p15, opc1 == 0, CRn == c0, CRm == {c2-c7}, opc2 == {0-7}. + * Those registers are defined as being RO in the Arm Architecture + * Reference manual Armv8 (Chapter D12.3.2 of issue F.c) so handle them + * as Read-only read as zero. + */ + case HSR_CPREG32(p15,0,c0,c3,0): + case HSR_CPREG32(p15,0,c0,c3,1): + case HSR_CPREG32(p15,0,c0,c3,2): + case HSR_CPREG32(p15,0,c0,c3,3): + case HSR_CPREG32(p15,0,c0,c3,7): + HSR_CPREG32_TID3_CASES(c4): + HSR_CPREG32_TID3_CASES(c5): + HSR_CPREG32_TID3_CASES(c6): + HSR_CPREG32_TID3_CASES(c7): + return handle_ro_raz(regs, regidx, cp32.read, hsr, 1); + /* * HCR_EL2.TIDCP * -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:23:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67373.120134 (Exim 4.92) (envelope-from ) id 1l05Oq-0003Ax-DT; Thu, 14 Jan 2021 16:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67373.120134; Thu, 14 Jan 2021 16: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 1l05Oq-0003Ap-AJ; Thu, 14 Jan 2021 16:23:04 +0000 Received: by outflank-mailman (input) for mailman id 67373; Thu, 14 Jan 2021 16:23:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Op-000384-BR for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Op-00080A-Af for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Op-0005lC-9U for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23: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=DhQkhd2ITVEsBdiBCfYQj6p9ery91y994YxtmL0gJdY=; b=pLYVrJR1g+j/tMWWq4I5DjD0NP HWb3PElP9/PWCxgv4GUxiRLlezbO5jBcm1aTKoetaV8fg6c8iQjFcpMVeGiedPs/kJh2odaJYM1NR y+k6tYq7ZdhfsGR60P01upzwQGIzIgqi/xUoaSr7SHBuLBB+o2YsCI6HEFleEb11OQfg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add CP10 exception support to handle MVFR Message-Id: Date: Thu, 14 Jan 2021 16:23:03 +0000 commit 73ff36144014218f796f7e07c1224a1c580012d1 Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:07 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:27:21 2021 -0800 xen/arm: Add CP10 exception support to handle MVFR Add support for cp10 exceptions decoding to be able to emulate the values for MVFR0, MVFR1 and MVFR2 when TID3 bit of HSR is activated. This is required for aarch32 guests accessing MVFR registers using vmrs and vmsr instructions. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/traps.c | 5 +++++ xen/arch/arm/vcpreg.c | 37 +++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/perfc_defn.h | 1 + xen/include/asm-arm/traps.h | 1 + 4 files changed, 44 insertions(+) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 22bd1bd4c6..28d9d64558 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2097,6 +2097,11 @@ void do_trap_guest_sync(struct cpu_user_regs *regs) perfc_incr(trap_cp14_dbg); do_cp14_dbg(regs, hsr); break; + case HSR_EC_CP10: + GUEST_BUG_ON(!psr_mode_is_32bit(regs)); + perfc_incr(trap_cp10); + do_cp10(regs, hsr); + break; case HSR_EC_CP: GUEST_BUG_ON(!psr_mode_is_32bit(regs)); perfc_incr(trap_cp); diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index cbab95b37a..55351fc087 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -664,6 +664,43 @@ void do_cp14_dbg(struct cpu_user_regs *regs, const union hsr hsr) inject_undef_exception(regs, hsr); } +void do_cp10(struct cpu_user_regs *regs, const union hsr hsr) +{ + const struct hsr_cp32 cp32 = hsr.cp32; + int regidx = cp32.reg; + + if ( !check_conditional_instr(regs, hsr) ) + { + advance_pc(regs, hsr); + return; + } + + switch ( hsr.bits & HSR_CP32_REGS_MASK ) + { + /* + * HCR.TID3 is trapping access to MVFR register used to identify the + * VFP/Simd using VMRS/VMSR instructions. + * Exception encoding is using MRC/MCR standard with the reg field in Crn + * as are declared MVFR0 and MVFR1 in cpregs.h + */ + GENERATE_TID3_INFO(MVFR0, mvfr, 0) + GENERATE_TID3_INFO(MVFR1, mvfr, 1) + GENERATE_TID3_INFO(MVFR2, mvfr, 2) + + default: + gdprintk(XENLOG_ERR, + "%s p10, %d, r%d, cr%d, cr%d, %d @ 0x%"PRIregister"\n", + cp32.read ? "mrc" : "mcr", + cp32.op1, cp32.reg, cp32.crn, cp32.crm, cp32.op2, regs->pc); + gdprintk(XENLOG_ERR, "unhandled 32-bit CP10 access %#x\n", + hsr.bits & HSR_CP32_REGS_MASK); + inject_undef_exception(regs, hsr); + return; + } + + advance_pc(regs, hsr); +} + void do_cp(struct cpu_user_regs *regs, const union hsr hsr) { const struct hsr_cp cp = hsr.cp; diff --git a/xen/include/asm-arm/perfc_defn.h b/xen/include/asm-arm/perfc_defn.h index 6a83185163..31f071222b 100644 --- a/xen/include/asm-arm/perfc_defn.h +++ b/xen/include/asm-arm/perfc_defn.h @@ -11,6 +11,7 @@ PERFCOUNTER(trap_cp15_64, "trap: cp15 64-bit access") PERFCOUNTER(trap_cp14_32, "trap: cp14 32-bit access") PERFCOUNTER(trap_cp14_64, "trap: cp14 64-bit access") PERFCOUNTER(trap_cp14_dbg, "trap: cp14 dbg access") +PERFCOUNTER(trap_cp10, "trap: cp10 access") PERFCOUNTER(trap_cp, "trap: cp access") PERFCOUNTER(trap_smc32, "trap: 32-bit smc") PERFCOUNTER(trap_hvc32, "trap: 32-bit hvc") diff --git a/xen/include/asm-arm/traps.h b/xen/include/asm-arm/traps.h index 997c37884e..c4a3d0fb1b 100644 --- a/xen/include/asm-arm/traps.h +++ b/xen/include/asm-arm/traps.h @@ -62,6 +62,7 @@ void do_cp15_64(struct cpu_user_regs *regs, const union hsr hsr); void do_cp14_32(struct cpu_user_regs *regs, const union hsr hsr); void do_cp14_64(struct cpu_user_regs *regs, const union hsr hsr); void do_cp14_dbg(struct cpu_user_regs *regs, const union hsr hsr); +void do_cp10(struct cpu_user_regs *regs, const union hsr hsr); void do_cp(struct cpu_user_regs *regs, const union hsr hsr); /* SMCCC handling */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:23:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67374.120139 (Exim 4.92) (envelope-from ) id 1l05P0-0003I4-FF; Thu, 14 Jan 2021 16:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67374.120139; Thu, 14 Jan 2021 16: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 1l05P0-0003Hw-C0; Thu, 14 Jan 2021 16:23:14 +0000 Received: by outflank-mailman (input) for mailman id 67374; Thu, 14 Jan 2021 16:23:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Oz-0003Hp-Ex for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Oz-00080I-EB for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Oz-0005m9-D1 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=59cDK3Dh9FoHDRvc95t4qhK3FBkXUuUsFNhCevh1uKY=; b=G3+9bX+2ZeCBmW7MTJGX6+UHcR GK5vfEW8jFKDxYNzjZdNZEESDH2n8sEEfSRK/m7UOU73xvsO6lYMR7aiAg1jiS3J8H7BTAt5ivcBc 67o1FCCUTkHDZi/NRiwghNW5CTyjoIyyCNn1kDG84SEdZgnbUTOLt1RcDszMgrlxPTnk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Activate TID3 in HCR_EL2 Message-Id: Date: Thu, 14 Jan 2021 16:23:13 +0000 commit 6ea3e32a5e0e6ba0f568aa5fd5a6b016c0c21ca0 Author: Bertrand Marquis AuthorDate: Thu Dec 17 15:38:08 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 4 11:27:32 2021 -0800 xen/arm: Activate TID3 in HCR_EL2 Activate TID3 bit in HCR register when starting a guest. This will trap all coprecessor ID registers so that we can give to guest values corresponding to what they can actually use and mask some features to guests even though they would be supported by the underlying hardware (like SVE or MPAM). Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 28d9d64558..c1a9ad6056 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -98,7 +98,7 @@ register_t get_default_hcr_flags(void) { return (HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_FMO|HCR_VM| (vwfi != NATIVE ? (HCR_TWI|HCR_TWE) : 0) | - HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP|HCR_FB|HCR_TSW); + HCR_TID3|HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP|HCR_FB|HCR_TSW); } static enum { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:23:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67375.120143 (Exim 4.92) (envelope-from ) id 1l05PA-0003Jq-Gs; Thu, 14 Jan 2021 16:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67375.120143; Thu, 14 Jan 2021 16: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 1l05PA-0003Ji-Db; Thu, 14 Jan 2021 16:23:24 +0000 Received: by outflank-mailman (input) for mailman id 67375; Thu, 14 Jan 2021 16:23:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05P9-0003JY-IF for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05P9-00080P-HX for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05P9-0005n8-Gf for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16: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=3bUxfmR/Y0lHTodLs3o2ag8/b1kZoZh5grVcdDWM4CQ=; b=VXuD7LSuvOSY4cNcZts3azAcba YiGbPeTWtISI6TnzFqnfkI2LGx9bgzWdE2ArCEvko8a7AxcfEoPRe9LaObsnHftUa1bD7N80Aflx3 2pgCMcERGIv8Vm1raj+lg31VZE5VCXI0VGqOmnsBbX9KSYh6eZXgzuKy91OYQrq0IlvQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ACPI: fix S3 wakeup vector mapping Message-Id: Date: Thu, 14 Jan 2021 16:23:23 +0000 commit 0f089bbf43ecce6f27576cb548ba4341d0ec46a8 Author: Jan Beulich AuthorDate: Tue Jan 5 13:09:55 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:09:55 2021 +0100 x86/ACPI: fix S3 wakeup vector mapping Use of __acpi_map_table() here was at least close to an abuse already before, but it will now consistently return NULL here. Drop the layering violation and use set_fixmap() directly. Re-use of the ACPI fixmap area is hopefully going to remain "fine" for the time being. Add checks to acpi_enter_sleep(): The vector now needs to be contained within a single page, but the ACPI spec requires 64-byte alignment of FACS anyway. Also bail if no wakeup vector was determined in the first place, in part as preparation for a subsequent relaxation change. Fixes: 1c4aa69ca1e1 ("xen/acpi: Rework acpi_os_map_memory() and acpi_os_unmap_memory()") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/acpi/boot.c | 5 +++++ xen/arch/x86/acpi/power.c | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index cecb414681..b34bd6a581 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -443,6 +443,11 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) "FACS is shorter than ACPI spec allow: %#x", facs->length); + if (facs_pa % 64) + printk(KERN_WARNING PREFIX + "FACS is not 64-byte aligned: %#lx", + facs_pa); + acpi_sinfo.wakeup_vector = facs_pa + offsetof(struct acpi_table_facs, firmware_waking_vector); acpi_sinfo.vector_width = 32; diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 7f162a4df9..ad9b8733f3 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -174,17 +174,20 @@ static void acpi_sleep_prepare(u32 state) if ( state != ACPI_STATE_S3 ) return; - wakeup_vector_va = __acpi_map_table( - acpi_sinfo.wakeup_vector, sizeof(uint64_t)); - /* TBoot will set resume vector itself (when it is safe to do so). */ if ( tboot_in_measured_env() ) return; + set_fixmap(FIX_ACPI_END, acpi_sinfo.wakeup_vector); + wakeup_vector_va = fix_to_virt(FIX_ACPI_END) + + PAGE_OFFSET(acpi_sinfo.wakeup_vector); + if ( acpi_sinfo.vector_width == 32 ) *(uint32_t *)wakeup_vector_va = bootsym_phys(wakeup_start); else *(uint64_t *)wakeup_vector_va = bootsym_phys(wakeup_start); + + clear_fixmap(FIX_ACPI_END); } static void acpi_sleep_post(u32 state) {} @@ -331,6 +334,12 @@ static long enter_state_helper(void *data) */ int acpi_enter_sleep(struct xenpf_enter_acpi_sleep *sleep) { + if ( sleep->sleep_state == ACPI_STATE_S3 && + (!acpi_sinfo.wakeup_vector || !acpi_sinfo.vector_width || + (PAGE_OFFSET(acpi_sinfo.wakeup_vector) > + PAGE_SIZE - acpi_sinfo.vector_width / 8)) ) + return -EOPNOTSUPP; + if ( sleep->flags & XENPF_ACPI_SLEEP_EXTENDED ) { if ( !acpi_sinfo.sleep_control.address || -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:23:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67376.120147 (Exim 4.92) (envelope-from ) id 1l05PK-0003L9-Ie; Thu, 14 Jan 2021 16:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67376.120147; Thu, 14 Jan 2021 16: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 1l05PK-0003L0-FC; Thu, 14 Jan 2021 16:23:34 +0000 Received: by outflank-mailman (input) for mailman id 67376; Thu, 14 Jan 2021 16:23:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05PJ-0003Ks-LF for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05PJ-00080X-KV for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05PJ-0005o5-Jk for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16: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=7toMH0+b/TnHGDw9BNkYm/aRG3L8fRmA/z6fMY82ju4=; b=IqVh77+PDCAq3QC6hCGnj26J8l DvAPx9pIVwnXchgVC9QK2ByWmdpCWLLFmfbTBNMDIhWmL9LPHeze3s9mEeE6meMFIIPhRBIKZIc6d ev5Hb9mmpH9pi7NVzShufJDAdD9CjzzvlKptudNahX0mStGzU+z7OaIdhGkwAGgZqMfU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ACPI: don't invalidate S5 data when S3 wakeup vector cannot be determined Message-Id: Date: Thu, 14 Jan 2021 16:23:33 +0000 commit 16ca5b3f873f17f4fbdaecf46c133e1aa3d623b2 Author: Jan Beulich AuthorDate: Tue Jan 5 13:11:04 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:11:04 2021 +0100 x86/ACPI: don't invalidate S5 data when S3 wakeup vector cannot be determined We can be more tolerant as long as the data collected from FACS is only needed to enter S3. A prior change already added suitable checking to acpi_enter_sleep(). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/acpi/boot.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index b34bd6a581..6345490f93 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -420,22 +420,22 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) facs_pa = (uint64_t)fadt->facs; } if (!facs_pa) - goto bad; + return; facs = acpi_os_map_memory(facs_pa, sizeof(*facs)); if (!facs) - goto bad; + return; if (strncmp(facs->signature, "FACS", 4)) { printk(KERN_ERR PREFIX "Invalid FACS signature %.4s\n", facs->signature); - goto bad; + goto done; } if (facs->length < 24) { printk(KERN_ERR PREFIX "Invalid FACS table length: %#x", facs->length); - goto bad; + goto done; } if (facs->length < 64) @@ -452,6 +452,7 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) offsetof(struct acpi_table_facs, firmware_waking_vector); acpi_sinfo.vector_width = 32; + done: acpi_os_unmap_memory(facs, sizeof(*facs)); printk(KERN_INFO PREFIX -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:23:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:23:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67377.120151 (Exim 4.92) (envelope-from ) id 1l05PV-0003Mo-Jy; Thu, 14 Jan 2021 16:23:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67377.120151; Thu, 14 Jan 2021 16:23:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05PV-0003Mg-Gq; Thu, 14 Jan 2021 16:23:45 +0000 Received: by outflank-mailman (input) for mailman id 67377; Thu, 14 Jan 2021 16:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05PT-0003MX-Pd for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05PT-00080f-NG for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05PT-0005oq-Mj for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16: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=HO6PX2mt4yMWvWHfnpwxQiDRNXx6+0cgho6gRZTLHis=; b=KT8pAQSrpYUzrPkXORPAjmTaoG sRmX8uE/lZKyAqF/EiEHhnK7dyt9CXX6pwlhEXHvH/MUl8U7aGaW5YI6HyhpYzhnYKueYVgopYVh3 Rb1Jte+ERErRKqA31USa3hdPuiWso5fOCuKeYclNJSb3Ybbxnf+e6I+pF50c2fIhktTM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/build: limit rebuilding of asm-offsets.h Message-Id: Date: Thu, 14 Jan 2021 16:23:43 +0000 commit 7d2d7a43d0141de69d837854ce139bcd47a7b859 Author: Jan Beulich AuthorDate: Tue Jan 5 13:12:15 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:12:15 2021 +0100 x86/build: limit rebuilding of asm-offsets.h This file has a long dependencies list (through asm-offsets.[cs]) and a long list of dependents. IOW if any of the former changes, all of the latter will be rebuilt, even if there's no actual change to the generated file. This is the primary scenario we have the move-if-changed macro for. Since debug information may easily cause the file contents to change in benign ways, also avoid emitting this into the output file. Finally already before this change *.new files needed including in what gets removed by the "clean" target. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 863aed043f..7f4f5ed96f 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -241,7 +241,8 @@ efi/buildid.o efi/relocs-dummy.o: $(BASEDIR)/arch/x86/efi/built_in.o efi/buildid.o efi/relocs-dummy.o: ; asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c $(BASEDIR)/include/asm-x86/asm-macros.h - $(CC) $(filter-out -Wa$(comma)% -flto,$(c_flags)) -S -o $@ $< + $(CC) $(filter-out -Wa$(comma)% -flto,$(c_flags)) -S -g0 -o $@.new $< + $(call move-if-changed,$@.new,$@) asm-macros.i: CFLAGS-y += -D__ASSEMBLY__ -P @@ -268,7 +269,7 @@ efi/mkreloc: efi/mkreloc.c .PHONY: clean clean:: - rm -f asm-offsets.s *.lds boot/*.o boot/*~ boot/core boot/mkelf32 + rm -f asm-offsets.s *.lds *.new boot/*.o boot/*~ boot/core boot/mkelf32 rm -f asm-macros.i $(BASEDIR)/include/asm-x86/asm-macros.* rm -f $(BASEDIR)/.xen-syms.[0-9]* boot/.*.d $(BASEDIR)/.xen.elf32 rm -f $(BASEDIR)/.xen.efi.[0-9]* efi/*.efi efi/mkreloc -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:23:55 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:23:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67378.120155 (Exim 4.92) (envelope-from ) id 1l05Pf-0003O1-LU; Thu, 14 Jan 2021 16:23:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67378.120155; Thu, 14 Jan 2021 16:23: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 1l05Pf-0003Nt-IZ; Thu, 14 Jan 2021 16:23:55 +0000 Received: by outflank-mailman (input) for mailman id 67378; Thu, 14 Jan 2021 16:23:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Pd-0003Nh-Qp for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Pd-00081A-Q3 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:23:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Pd-0005pQ-PS for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16: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=ELN7h0WUgq/lm37bIVr0AlmXcsYDEMM1F2aCkO7Zj0U=; b=znuRgcX80VjyvUypvjJeJ4BWRy wQgVWo0w4n9UMBQuN3A1DxQc+2UTdGZBHsqDriBhM7L6mqItwVvObiHadOstWgdU8Jqv3wkVL02t6 QqWTfzP4oIIIeRH9a3pT1SaQh+zb+6bnXef+v+ctzIltSEDhjqm37zS7GO3l810w64b8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/build: limit #include-ing by asm-offsets.c Message-Id: Date: Thu, 14 Jan 2021 16:23:53 +0000 commit bb4ef1507d2d6fca8b52cd645c94112ac7924f4c Author: Jan Beulich AuthorDate: Tue Jan 5 13:12:37 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:12:37 2021 +0100 x86/build: limit #include-ing by asm-offsets.c This file has a long dependencies list and asm-offsets.h, generated from it, has a long list of dependents. IOW if any of the former changes, all of the latter will be rebuilt, even if there's no actual change to the generated file. Therefore avoid including headers we don't actually need (generally or configuration dependent). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/x86_64/asm-offsets.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 9f66a69be7..67ed86a648 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -5,11 +5,13 @@ */ #define COMPILE_OFFSETS +#ifdef CONFIG_PERF_COUNTERS #include +#endif #include -#include +#ifdef CONFIG_PV #include -#include +#endif #include #include #include @@ -101,7 +103,6 @@ void __dummy__(void) #ifdef CONFIG_PV OFFSET(DOMAIN_is_32bit_pv, struct domain, arch.pv.is_32bit); BLANK(); -#endif OFFSET(VCPUINFO_upcall_pending, struct vcpu_info, evtchn_upcall_pending); OFFSET(VCPUINFO_upcall_mask, struct vcpu_info, evtchn_upcall_mask); @@ -110,6 +111,7 @@ void __dummy__(void) OFFSET(COMPAT_VCPUINFO_upcall_pending, struct compat_vcpu_info, evtchn_upcall_pending); OFFSET(COMPAT_VCPUINFO_upcall_mask, struct compat_vcpu_info, evtchn_upcall_mask); BLANK(); +#endif OFFSET(CPUINFO_guest_cpu_user_regs, struct cpu_info, guest_cpu_user_regs); OFFSET(CPUINFO_verw_sel, struct cpu_info, verw_sel); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:24:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:24:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67379.120159 (Exim 4.92) (envelope-from ) id 1l05Pp-0003Qz-OX; Thu, 14 Jan 2021 16:24:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67379.120159; Thu, 14 Jan 2021 16:24:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Pp-0003Qr-LS; Thu, 14 Jan 2021 16:24:05 +0000 Received: by outflank-mailman (input) for mailman id 67379; Thu, 14 Jan 2021 16:24:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Pn-0003Qj-Tn for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Pn-00081Y-Su for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Pn-0005qR-SH for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16: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=eEXdtxKSj12FNEFSyEcOKChd9NU6yeYFmOHjiUf9f+s=; b=RLJr7Cni5wspnwhR9DzuPj9Sd/ PwVBhe/IRluuZ51okVLNMnVemlvmqdY09YRoYVomI9LYd9JKm3Q67rGT0/M8gNvOm/SR6gSxxKJ/e V7VvBK/BIzQzI/y/Nb6iBVHqiiMbrv4Vfuj2RJ71mt2PeABU66YQDWZo8aC7nInuHypc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/build: restrict contents of asm-offsets.h when !HVM / !PV Message-Id: Date: Thu, 14 Jan 2021 16:24:03 +0000 commit b1c014aa93bd48d7111271ce2dd1b892d98a92fd Author: Jan Beulich AuthorDate: Tue Jan 5 13:13:18 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:13:18 2021 +0100 x86/build: restrict contents of asm-offsets.h when !HVM / !PV This file has a long dependencies list (through asm-offsets.[cs]) and a long list of dependents. IOW if any of the former changes, all of the latter will be rebuilt, even if there's no actual change to the generated file. Therefore avoid producing symbols we don't actually need, depending on configuration. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/x86_64/asm-offsets.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 67ed86a648..ce030b124f 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -84,6 +84,7 @@ void __dummy__(void) DEFINE(_VGCF_syscall_disables_events, _VGCF_syscall_disables_events); BLANK(); +#ifdef CONFIG_HVM OFFSET(VCPU_svm_vmcb_pa, struct vcpu, arch.hvm.svm.vmcb_pa); OFFSET(VCPU_svm_vmcb, struct vcpu, arch.hvm.svm.vmcb); BLANK(); @@ -99,6 +100,7 @@ void __dummy__(void) OFFSET(VCPU_nhvm_p2m, struct vcpu, arch.hvm.nvcpu.nv_p2m); OFFSET(VCPU_nsvm_hap_enabled, struct vcpu, arch.hvm.nvcpu.u.nsvm.ns_hap_enabled); BLANK(); +#endif #ifdef CONFIG_PV OFFSET(DOMAIN_is_32bit_pv, struct domain, arch.pv.is_32bit); @@ -128,6 +130,7 @@ void __dummy__(void) DEFINE(CPUINFO_sizeof, sizeof(struct cpu_info)); BLANK(); +#ifdef CONFIG_PV OFFSET(TRAPINFO_eip, struct trap_info, address); OFFSET(TRAPINFO_cs, struct trap_info, cs); OFFSET(TRAPINFO_flags, struct trap_info, flags); @@ -139,6 +142,7 @@ void __dummy__(void) OFFSET(TRAPBOUNCE_cs, struct trap_bounce, cs); OFFSET(TRAPBOUNCE_eip, struct trap_bounce, eip); BLANK(); +#endif OFFSET(VCPUMSR_spec_ctrl_raw, struct vcpu_msrs, spec_ctrl.raw); BLANK(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:24:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:24:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67380.120163 (Exim 4.92) (envelope-from ) id 1l05Pz-0003SG-Pz; Thu, 14 Jan 2021 16:24:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67380.120163; Thu, 14 Jan 2021 16:24:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Pz-0003S8-Mz; Thu, 14 Jan 2021 16:24:15 +0000 Received: by outflank-mailman (input) for mailman id 67380; Thu, 14 Jan 2021 16:24:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Py-0003Rx-0V for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Px-00081g-Vz for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Px-0005r3-VK for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kmjTNwKS4c9BhwRGxcngeJIX6tQFWzo3LyWGDji8280=; b=27CUvgAXI856v3kIW53C0P4b8y dhXsa4SFdx54T8t582U4Srmtq0lnpaBZagf25NCtyW9gK0kcI2Q3NLoP0VYDSqQW+AbT4hV9Ib/sT vRtQpSh7873CAUgZmAn7xT7viynvhbPVKSdx9ytGT/OfKEXUx1z9QDNSV021oFM50dBM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: hypercall vector is unused when !PV32 Message-Id: Date: Thu, 14 Jan 2021 16:24:13 +0000 commit b06ffca9e7c9a6088e98a8d72e905c03dc585225 Author: Jan Beulich AuthorDate: Tue Jan 5 13:17:02 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:17:02 2021 +0100 x86: hypercall vector is unused when !PV32 This vector can be used as an ordinary interrupt handling one in this case. To be sure no references are left, make the #define itself conditional. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/irq.c | 6 +++++- xen/arch/x86/pv/traps.c | 4 ++++ xen/arch/x86/x86_64/compat/entry.S | 4 ++++ xen/arch/x86/x86_64/entry.S | 4 +++- xen/include/asm-x86/mach-default/irq_vectors.h | 5 ++++- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 768a8fc7c9..e315fef4a6 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -443,8 +443,12 @@ int __init init_irq_data(void) irq_max_guests = 32; #ifdef CONFIG_PV - /* Never allocate the hypercall vector or Linux/BSD fast-trap vector. */ + /* Never allocate the Linux/BSD fast-trap vector. */ set_bit(LEGACY_SYSCALL_VECTOR, used_vectors); +#endif + +#ifdef CONFIG_PV32 + /* Never allocate the hypercall vector. */ set_bit(HYPERCALL_VECTOR, used_vectors); #endif diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index d97ebf7890..7439b76df8 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -30,6 +30,7 @@ #include #include +#ifdef CONFIG_PV32 void do_entry_int82(struct cpu_user_regs *regs) { if ( unlikely(untrusted_msi) ) @@ -37,6 +38,7 @@ void do_entry_int82(struct cpu_user_regs *regs) pv_hypercall(regs); } +#endif void pv_inject_event(const struct x86_event *event) { @@ -155,9 +157,11 @@ static void nmi_softirq(void) void __init pv_trap_init(void) { +#ifdef CONFIG_PV32 /* The 32-on-64 hypercall vector is only accessible from ring 1. */ _set_gate(idt_table + HYPERCALL_VECTOR, SYS_DESC_trap_gate, 1, entry_int82); +#endif /* Fast trap for int80 (faster than taking the #GP-fixup path). */ _set_gate(idt_table + LEGACY_SYSCALL_VECTOR, SYS_DESC_trap_gate, 3, diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 3b2136b272..16a2f439a7 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -11,6 +11,8 @@ #include #include +#ifdef CONFIG_PV32 + ENTRY(entry_int82) ASM_CLAC pushq $0 @@ -27,6 +29,8 @@ ENTRY(entry_int82) mov %rsp, %rdi call do_entry_int82 +#endif /* CONFIG_PV32 */ + /* %rbx: struct vcpu */ ENTRY(compat_test_all_events) ASSERT_NOT_IN_ATOMIC diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 526c388458..c16b3c90be 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -985,8 +985,10 @@ autogen_stubs: /* Automatically generated stubs. */ .rept X86_NR_VECTORS /* Common interrupts, heading towards do_IRQ(). */ -#ifdef CONFIG_PV +#if defined(CONFIG_PV32) .if vec >= FIRST_IRQ_VECTOR && vec != HYPERCALL_VECTOR && vec != LEGACY_SYSCALL_VECTOR +#elif defined(CONFIG_PV) + .if vec >= FIRST_IRQ_VECTOR && vec != LEGACY_SYSCALL_VECTOR #else .if vec >= FIRST_IRQ_VECTOR #endif diff --git a/xen/include/asm-x86/mach-default/irq_vectors.h b/xen/include/asm-x86/mach-default/irq_vectors.h index 3de1d96de9..f546aedd87 100644 --- a/xen/include/asm-x86/mach-default/irq_vectors.h +++ b/xen/include/asm-x86/mach-default/irq_vectors.h @@ -22,7 +22,10 @@ #define FIRST_LEGACY_VECTOR FIRST_DYNAMIC_VECTOR #define LAST_LEGACY_VECTOR (FIRST_LEGACY_VECTOR + 0xf) -#define HYPERCALL_VECTOR 0x82 +#ifdef CONFIG_PV32 +#define HYPERCALL_VECTOR 0x82 +#endif + #define LEGACY_SYSCALL_VECTOR 0x80 /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:24:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:24:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67381.120168 (Exim 4.92) (envelope-from ) id 1l05Q9-0003TP-SI; Thu, 14 Jan 2021 16:24:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67381.120168; Thu, 14 Jan 2021 16:24:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Q9-0003TH-Oo; Thu, 14 Jan 2021 16:24:25 +0000 Received: by outflank-mailman (input) for mailman id 67381; Thu, 14 Jan 2021 16:24:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Q8-0003T9-3R for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Q8-00081o-2h for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Q8-0005tJ-21 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24: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=4108fkUS0Zct7butPcnKxEuzSPren9S/4Mrm0KC+mRU=; b=nsajnI2jOHluM/uViEAsTSPw7W Zjo46/aqRlY9ZktbvsMOAaDYmu6E34dYZIjpaeqx5cweDTexnyFxdwUXjNzjBkwBxm/ZIiZgE4DcG 0ajacFLwZfNogi3PkmFYier/qgNgxWS74gNmyXFF5qruPWiD3v54+qeGWKxV0vBFEqms=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vPCI: tolerate (un)masking a disabled MSI-X entry Message-Id: Date: Thu, 14 Jan 2021 16:24:24 +0000 commit 04b090366ca59e8a75837c822df261a8d0bd1a30 Author: Jan Beulich AuthorDate: Tue Jan 5 13:17:54 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:17:54 2021 +0100 x86/vPCI: tolerate (un)masking a disabled MSI-X entry None of the four reasons causing vpci_msix_arch_mask_entry() to get called (there's just a single call site) are impossible or illegal prior to an entry actually having got set up: - the entry may remain masked (in this case, however, a prior masked -> unmasked transition would already not have worked), - MSI-X may not be enabled, - the global mask bit may be set, - the entry may not otherwise have been updated. Hence the function asserting that the entry was previously set up was simply wrong. Since the caller tracks the masked state (and setting up of an entry would only be effected when that software bit is clear), it's okay to skip both masking and unmasking requests in this case. Fixes: d6281be9d0145 ('vpci/msix: add MSI-X handlers') Reported-by: Manuel Bouyer Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Tested-by: Manuel Bouyer --- xen/arch/x86/hvm/vmsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 7ca19353ab..ddcfc6c229 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -840,8 +840,8 @@ void vpci_msi_arch_print(const struct vpci_msi *msi) void vpci_msix_arch_mask_entry(struct vpci_msix_entry *entry, const struct pci_dev *pdev, bool mask) { - ASSERT(entry->arch.pirq != INVALID_PIRQ); - vpci_mask_pirq(pdev->domain, entry->arch.pirq, mask); + if ( entry->arch.pirq != INVALID_PIRQ ) + vpci_mask_pirq(pdev->domain, entry->arch.pirq, mask); } int vpci_msix_arch_enable_entry(struct vpci_msix_entry *entry, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:24:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:24:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67383.120171 (Exim 4.92) (envelope-from ) id 1l05QJ-0003Uq-TK; Thu, 14 Jan 2021 16:24:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67383.120171; Thu, 14 Jan 2021 16:24:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05QJ-0003Ui-QN; Thu, 14 Jan 2021 16:24:35 +0000 Received: by outflank-mailman (input) for mailman id 67383; Thu, 14 Jan 2021 16:24:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05QI-0003UV-6I for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05QI-00081v-5d for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05QI-0005u2-4x for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24: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=vnRTQJYT7QQpDYkVRShzD2UCQDTEohn3K3a8cNiEl7U=; b=fl9XemT1w8zSIgsmIGIHLaXBor ME9RTPC/kJv8yJxsAhJEJEKbq0UIRbV5fca91oBoVwTw0jYh5WYCaGhDLIYPpb4OcWmE8lnm3/m16 0v+Jie83pyud9kwXedB4PXreCF99CcooOlAnG0xD9B+voyehZYM0nHyM3hSKj0QXsnwM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vPCI: check address in vpci_msi_update() Message-Id: Date: Thu, 14 Jan 2021 16:24:34 +0000 commit 0f7bcaf19f7c67ee8c07d1674b2bbb70f16c2d11 Author: Jan Beulich AuthorDate: Tue Jan 5 13:18:26 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:18:26 2021 +0100 x86/vPCI: check address in vpci_msi_update() If the upper address bits don't match the interrupt delivery address space window, entirely different behavior would need to be implemented. Refuse such requests for the time being. Replace adjacent hard tabs while introducing MSI_ADDR_BASE_MASK. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/vmsi.c | 7 +++++++ xen/include/asm-x86/msi.h | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index ddcfc6c229..a2ac82c95c 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -682,6 +682,13 @@ static int vpci_msi_update(const struct pci_dev *pdev, uint32_t data, ASSERT(pcidevs_locked()); + if ( (address & MSI_ADDR_BASE_MASK) != MSI_ADDR_HEADER ) + { + gdprintk(XENLOG_ERR, "%pp: PIRQ %u: unsupported address %lx\n", + &pdev->sbdf, pirq, address); + return -EOPNOTSUPP; + } + for ( i = 0; i < vectors; i++ ) { uint8_t vector = MASK_EXTR(data, MSI_DATA_VECTOR_MASK); diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 18cf2de61e..e228b0f3f3 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -36,8 +36,9 @@ * Shift/mask fields for msi address */ -#define MSI_ADDR_BASE_HI 0 -#define MSI_ADDR_BASE_LO 0xfee00000 +#define MSI_ADDR_BASE_HI 0 +#define MSI_ADDR_BASE_LO 0xfee00000 +#define MSI_ADDR_BASE_MASK (~0xfffff) #define MSI_ADDR_HEADER MSI_ADDR_BASE_LO #define MSI_ADDR_DESTMODE_SHIFT 2 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:24:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:24:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67384.120175 (Exim 4.92) (envelope-from ) id 1l05QT-0003WS-Ux; Thu, 14 Jan 2021 16:24:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67384.120175; Thu, 14 Jan 2021 16:24:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05QT-0003WJ-Rv; Thu, 14 Jan 2021 16:24:45 +0000 Received: by outflank-mailman (input) for mailman id 67384; Thu, 14 Jan 2021 16:24:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05QS-0003WA-9s for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05QS-000821-9A for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05QS-0005ur-7x for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24: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=nuMxnXSQ2rTnaxsPh78AWS+g4AqKV7Jo2NRlEfYBcNA=; b=vtu7gCrzUg4/bVsUe1tM9rQdyX hGw2UOguyFTQmtvAW+MpdIYWW67G+ta4Lwcrc70zPqQbhqr6SDuEHIl3YNAg5foHDjBdS5bG8oEA4 Mv0CGfOoEVmDyUVG0ngvcHZUmPD4WXMhr0zznM7incIdNcmbGv4bRF1bqfStEQijPslo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vPCI/MSI-X: make use of xzalloc_flex_struct() Message-Id: Date: Thu, 14 Jan 2021 16:24:44 +0000 commit 4bac861340cf6551cfdac308621a984464701405 Author: Jan Beulich AuthorDate: Tue Jan 5 13:19:28 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:19:28 2021 +0100 vPCI/MSI-X: make use of xzalloc_flex_struct() ... instead of effectively open-coding it in a type-unsafe way. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/msix.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index 64dd0a929c..e008f92c1c 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -23,8 +23,6 @@ #include #include -#define VMSIX_SIZE(num) offsetof(struct vpci_msix, entries[num]) - #define VMSIX_ADDR_IN_RANGE(addr, vpci, nr) \ ((addr) >= vmsix_table_addr(vpci, nr) && \ (addr) < vmsix_table_addr(vpci, nr) + vmsix_table_size(vpci, nr)) @@ -455,7 +453,8 @@ static int init_msix(struct pci_dev *pdev) max_entries = msix_table_size(control); - pdev->vpci->msix = xzalloc_bytes(VMSIX_SIZE(max_entries)); + pdev->vpci->msix = xzalloc_flex_struct(struct vpci_msix, entries, + max_entries); if ( !pdev->vpci->msix ) return -ENOMEM; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:24:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:24:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67385.120179 (Exim 4.92) (envelope-from ) id 1l05Qe-0003Xa-0C; Thu, 14 Jan 2021 16:24:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67385.120179; Thu, 14 Jan 2021 16:24:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Qd-0003XS-TT; Thu, 14 Jan 2021 16:24:55 +0000 Received: by outflank-mailman (input) for mailman id 67385; Thu, 14 Jan 2021 16:24:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Qc-0003XL-Cm for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Qc-00082O-C1 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Qc-0005vX-BK for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:24: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=EMlAJzWdcBG0Z/najBbvt6NH3Ybl5+nGHM5AExuuON8=; b=clvrWPLhGEBiVlN7RNDpPIwsEC Yugy5GIFEowMof5Ir0W3/DBpdvy1KtbHgGl3hHeCaeM13/lL+mi3yioQitbXo5ck2qSsQ9yxkBXdt sRuzeB2yUyhL+dVWUsgD+ZJy+Pr+BI3VBjWhMIw9IWAFgoWy+3dZs1w6cKnC4zGNUYcY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vPCI/MSI-X: tidy init_msix() Message-Id: Date: Thu, 14 Jan 2021 16:24:54 +0000 commit 6fbb41258e9f733cd2b9254efae035c350d93920 Author: Jan Beulich AuthorDate: Tue Jan 5 13:20:13 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:20:13 2021 +0100 vPCI/MSI-X: tidy init_msix() First of all introduce a local variable for the to be allocated struct. The compiler can't CSE all the occurrences (I'm observing 80 bytes of code saved with gcc 10). Additionally, while the caller can cope and there was no memory leak, globally "announce" the struct only once done initializing it. This also removes the dependency of the function on the caller cleaning up after it in case of an error. Also prefer a local variable over using a structure field previously set from this very variable. Finally move the call to vpci_add_register() ahead of all further initialization of the struct, to bail early in case of error. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/msix.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index e008f92c1c..846a048a4a 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -442,6 +442,7 @@ static int init_msix(struct pci_dev *pdev) uint8_t slot = PCI_SLOT(pdev->devfn), func = PCI_FUNC(pdev->devfn); unsigned int msix_offset, i, max_entries; uint16_t control; + struct vpci_msix *msix; int rc; msix_offset = pci_find_cap_offset(pdev->seg, pdev->bus, slot, func, @@ -453,34 +454,37 @@ static int init_msix(struct pci_dev *pdev) max_entries = msix_table_size(control); - pdev->vpci->msix = xzalloc_flex_struct(struct vpci_msix, entries, - max_entries); - if ( !pdev->vpci->msix ) + msix = xzalloc_flex_struct(struct vpci_msix, entries, max_entries); + if ( !msix ) return -ENOMEM; - pdev->vpci->msix->max_entries = max_entries; - pdev->vpci->msix->pdev = pdev; + rc = vpci_add_register(pdev->vpci, control_read, control_write, + msix_control_reg(msix_offset), 2, msix); + if ( rc ) + { + xfree(msix); + return rc; + } + + msix->max_entries = max_entries; + msix->pdev = pdev; - pdev->vpci->msix->tables[VPCI_MSIX_TABLE] = + msix->tables[VPCI_MSIX_TABLE] = pci_conf_read32(pdev->sbdf, msix_table_offset_reg(msix_offset)); - pdev->vpci->msix->tables[VPCI_MSIX_PBA] = + msix->tables[VPCI_MSIX_PBA] = pci_conf_read32(pdev->sbdf, msix_pba_offset_reg(msix_offset)); - for ( i = 0; i < pdev->vpci->msix->max_entries; i++) + for ( i = 0; i < max_entries; i++) { - pdev->vpci->msix->entries[i].masked = true; - vpci_msix_arch_init_entry(&pdev->vpci->msix->entries[i]); + msix->entries[i].masked = true; + vpci_msix_arch_init_entry(&msix->entries[i]); } - rc = vpci_add_register(pdev->vpci, control_read, control_write, - msix_control_reg(msix_offset), 2, pdev->vpci->msix); - if ( rc ) - return rc; - if ( list_empty(&d->arch.hvm.msix_tables) ) register_mmio_handler(d, &vpci_msix_table_ops); - list_add(&pdev->vpci->msix->next, &d->arch.hvm.msix_tables); + pdev->vpci->msix = msix; + list_add(&msix->next, &d->arch.hvm.msix_tables); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:25:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:25:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67386.120182 (Exim 4.92) (envelope-from ) id 1l05Qo-0003Yw-2J; Thu, 14 Jan 2021 16:25:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67386.120182; Thu, 14 Jan 2021 16:25: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 1l05Qn-0003Yo-VA; Thu, 14 Jan 2021 16:25:05 +0000 Received: by outflank-mailman (input) for mailman id 67386; Thu, 14 Jan 2021 16:25:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Qm-0003Yg-Fq for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Qm-00082l-F2 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Qm-0005wU-EL for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25: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=AyxyT+jITd/VE7HgaTs6OuM1OE47ctvuakuihvmwZiI=; b=lhL4QXNY5sOIkVin57IqiX2zsv b2blHV5n/1K1IOkWpYKtqQE4YzdQzhsRDjHLQnHrEl0L1+Z/xEE7tCMyaUaDq2Y6jjruIyRs9OYFy HSAylWJFiBn5Xk8SDjujx6GgsirbSYb3NGDiHM1XatJqpt8l0RaF0mrkjzTSrN/GZnN4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] lib/sort: adjust types Message-Id: Date: Thu, 14 Jan 2021 16:25:04 +0000 commit fa679ef8b429cf2906318a845ba90f0568fa531d Author: Jan Beulich AuthorDate: Tue Jan 5 13:20:54 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 5 13:20:54 2021 +0100 lib/sort: adjust types First and foremost do away with the use of plain int for sizes or size- derived values. Use size_t, despite this requiring some adjustment to the logic. Also replace u32 by uint32_t. While not directly related also drop a leftover #ifdef from x86's swap_ex - this was needed only back when 32-bit Xen was still a thing. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/extable.c | 4 +--- xen/include/xen/sort.h | 2 +- xen/lib/sort.c | 22 ++++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 70972f1085..109ab7da98 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -37,8 +37,7 @@ static int init_or_livepatch cmp_ex(const void *a, const void *b) return 0; } -#ifndef swap_ex -static void init_or_livepatch swap_ex(void *a, void *b, int size) +static void init_or_livepatch swap_ex(void *a, void *b, size_t size) { struct exception_table_entry *l = a, *r = b, tmp; long delta = b - a; @@ -49,7 +48,6 @@ static void init_or_livepatch swap_ex(void *a, void *b, int size) r->addr = tmp.addr - delta; r->cont = tmp.cont - delta; } -#endif void init_or_livepatch sort_exception_table(struct exception_table_entry *start, const struct exception_table_entry *stop) diff --git a/xen/include/xen/sort.h b/xen/include/xen/sort.h index ec89c3aed4..a403652948 100644 --- a/xen/include/xen/sort.h +++ b/xen/include/xen/sort.h @@ -5,6 +5,6 @@ void sort(void *base, size_t num, size_t size, int (*cmp)(const void *, const void *), - void (*swap)(void *, void *, int)); + void (*swap)(void *, void *, size_t)); #endif /* __XEN_SORT_H__ */ diff --git a/xen/lib/sort.c b/xen/lib/sort.c index ee983d0bc3..35ce0d7abd 100644 --- a/xen/lib/sort.c +++ b/xen/lib/sort.c @@ -6,14 +6,15 @@ #include -static void u32_swap(void *a, void *b, int size) +static void u32_swap(void *a, void *b, size_t size) { - u32 t = *(u32 *)a; - *(u32 *)a = *(u32 *)b; - *(u32 *)b = t; + uint32_t t = *(uint32_t *)a; + + *(uint32_t *)a = *(uint32_t *)b; + *(uint32_t *)b = t; } -static void generic_swap(void *a, void *b, int size) +static void generic_swap(void *a, void *b, size_t size) { char t; @@ -43,18 +44,18 @@ static void generic_swap(void *a, void *b, int size) void sort(void *base, size_t num, size_t size, int (*cmp)(const void *, const void *), - void (*swap)(void *, void *, int size)) + void (*swap)(void *, void *, size_t size)) { /* pre-scale counters for performance */ - int i = (num / 2 - 1) * size, n = num * size, c, r; + size_t i = (num / 2) * size, n = num * size, c, r; if ( !swap ) swap = (size == 4 ? u32_swap : generic_swap); /* heapify */ - for ( ; i >= 0; i -= size ) + while ( i > 0 ) { - for ( r = i; r * 2 + size < n; r = c ) + for ( r = i -= size; r * 2 + size < n; r = c ) { c = r * 2 + size; if ( (c < n - size) && (cmp(base + c, base + c + size) < 0) ) @@ -66,8 +67,9 @@ void sort(void *base, size_t num, size_t size, } /* sort */ - for ( i = n - size; i >= 0; i -= size ) + for ( i = n; i > 0; ) { + i -= size; swap(base, base + i, size); for ( r = 0; r * 2 + size < i; r = c ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:25:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:25:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67387.120187 (Exim 4.92) (envelope-from ) id 1l05Qy-0003aO-5r; Thu, 14 Jan 2021 16:25:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67387.120187; Thu, 14 Jan 2021 16:25: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 1l05Qy-0003aF-2o; Thu, 14 Jan 2021 16:25:16 +0000 Received: by outflank-mailman (input) for mailman id 67387; Thu, 14 Jan 2021 16:25:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Qw-0003a6-JN for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Qw-00082x-Ie for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Qw-0005xI-HO for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25: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=1P025qD8onAhTID11ZZxFbuFXJvaBOws44FpZiysV/Q=; b=FXrW+Ulp31l4Lp008Gl1FaAaHK ZqiYo7jFwF8gZUKw5Y2Pzgquhgee8z6w3Onc/GzTAH2+F2DK5UyKTW7L+LgfqoLC8vwOOCfuUi5An zAzy7nN6y0aRCqZdLIOe2017JFLTp7trvCRg651/7la54JAEha3d+4Mi7G8gX0zvuPBg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/foreignmemory: implement the missing functions on FreeBSD Message-Id: Date: Thu, 14 Jan 2021 16:25:14 +0000 commit 4f022a2de7a35dda6d05175b2b5fb6dafab7b6fc Author: Roger Pau Monne AuthorDate: Tue Jan 5 11:25:45 2021 +0100 Commit: Wei Liu CommitDate: Tue Jan 5 12:33:55 2021 +0000 libs/foreignmemory: implement the missing functions on FreeBSD Implement restrict, map resource and unmap resource helpers on FreeBSD. Signed-off-by: Roger Pau Monné Acked-by: Wei Liu --- tools/include/xen-sys/FreeBSD/privcmd.h | 14 +++++++++ tools/libs/foreignmemory/freebsd.c | 51 +++++++++++++++++++++++++++++++++ tools/libs/foreignmemory/private.h | 2 +- 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/tools/include/xen-sys/FreeBSD/privcmd.h b/tools/include/xen-sys/FreeBSD/privcmd.h index cf1241f039..603aad67d5 100644 --- a/tools/include/xen-sys/FreeBSD/privcmd.h +++ b/tools/include/xen-sys/FreeBSD/privcmd.h @@ -56,9 +56,23 @@ typedef struct privcmd_mmap_entry { unsigned long npages; } privcmd_mmap_entry_t; +struct ioctl_privcmd_mmapresource { + domid_t dom; /* target domain */ + unsigned int type; /* type of resource to map */ + unsigned int id; /* type-specific resource identifier */ + unsigned int idx; /* the index of the initial frame to be mapped */ + unsigned long num; /* number of frames of the resource to be mapped */ + unsigned long addr; /* physical address to map into */ +}; +typedef struct ioctl_privcmd_mmapresource privcmd_mmap_resource_t; + #define IOCTL_PRIVCMD_HYPERCALL \ _IOWR('E', 0, struct ioctl_privcmd_hypercall) #define IOCTL_PRIVCMD_MMAPBATCH \ _IOWR('E', 1, struct ioctl_privcmd_mmapbatch) +#define IOCTL_PRIVCMD_MMAP_RESOURCE \ + _IOW('E', 2, struct ioctl_privcmd_mmapresource) +#define IOCTL_PRIVCMD_RESTRICT \ + _IOW('E', 4, domid_t) #endif /* !__XEN_PRIVCMD_H__ */ diff --git a/tools/libs/foreignmemory/freebsd.c b/tools/libs/foreignmemory/freebsd.c index 6e6bc4b11f..3d403a7cd0 100644 --- a/tools/libs/foreignmemory/freebsd.c +++ b/tools/libs/foreignmemory/freebsd.c @@ -95,6 +95,57 @@ int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem, return munmap(addr, num << PAGE_SHIFT); } +int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem, + domid_t domid) +{ + return ioctl(fmem->fd, IOCTL_PRIVCMD_RESTRICT, &domid); +} + +int osdep_xenforeignmemory_unmap_resource(xenforeignmemory_handle *fmem, + xenforeignmemory_resource_handle *fres) +{ + return fres ? munmap(fres->addr, fres->nr_frames << PAGE_SHIFT) : 0; +} + +int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem, + xenforeignmemory_resource_handle *fres) +{ + privcmd_mmap_resource_t mr = { + .dom = fres->domid, + .type = fres->type, + .id = fres->id, + .idx = fres->frame, + .num = fres->nr_frames, + }; + int rc; + + fres->addr = mmap(fres->addr, fres->nr_frames << PAGE_SHIFT, + fres->prot, fres->flags | MAP_SHARED, fmem->fd, 0); + if ( fres->addr == MAP_FAILED ) + return -1; + + mr.addr = (uintptr_t)fres->addr; + + rc = ioctl(fmem->fd, IOCTL_PRIVCMD_MMAP_RESOURCE, &mr); + if ( rc ) + { + int saved_errno; + + if ( errno != ENOSYS ) + PERROR("mmap resource ioctl failed"); + else + errno = EOPNOTSUPP; + + saved_errno = errno; + osdep_xenforeignmemory_unmap_resource(fmem, fres); + errno = saved_errno; + + return -1; + } + + return 0; +} + /* * Local variables: * mode: C diff --git a/tools/libs/foreignmemory/private.h b/tools/libs/foreignmemory/private.h index 8f1bf081ed..ebd45c4785 100644 --- a/tools/libs/foreignmemory/private.h +++ b/tools/libs/foreignmemory/private.h @@ -54,7 +54,7 @@ struct xenforeignmemory_resource_handle { int flags; }; -#ifndef __linux__ +#if !defined(__linux__) && !defined(__FreeBSD__) static inline int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem, domid_t domid) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:25:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:25:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67388.120190 (Exim 4.92) (envelope-from ) id 1l05R8-0003ba-7h; Thu, 14 Jan 2021 16:25:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67388.120190; Thu, 14 Jan 2021 16:25: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 1l05R8-0003bV-4O; Thu, 14 Jan 2021 16:25:26 +0000 Received: by outflank-mailman (input) for mailman id 67388; Thu, 14 Jan 2021 16:25:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05R6-0003bM-MD for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05R6-000835-LU for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05R6-0005yE-Kr for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wjaETyJ5HY/lMKfhm5rw/8zQB2TfIYv82GWezbUrhII=; b=wra2etVaBYfL/9h9N1C2AE7df/ x+QuEMGoNLwR2zpsXBHC7PLwgYU4nqKEd3eYK2B1AxxkxEMqJb9byyyfdklaxNqtf85iXAMIWlo6Y fAZPyjMPe0QoR1aRPoxCLAzK5nHKzAyCLFtWysP7NZMDRfH0U3n5E+rswz+t0t8quiEE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/devicemodel: add dm_op support for FreeBSD Message-Id: Date: Thu, 14 Jan 2021 16:25:24 +0000 commit bbf71e99f01b883ebf1c60209b99953c1b95d8a0 Author: Roger Pau Monne AuthorDate: Tue Jan 5 11:25:46 2021 +0100 Commit: Wei Liu CommitDate: Tue Jan 5 12:33:55 2021 +0000 libs/devicemodel: add dm_op support for FreeBSD The FreeBSD ioctls have the same fields has the Linux ones, so the same file can be shared between both OSes. No functional change for OSes different than FreeBSD. Signed-off-by: Roger Pau Monné Acked-by: Wei Liu --- tools/include/xen-sys/FreeBSD/privcmd.h | 15 ++++ tools/libs/devicemodel/Makefile | 4 +- tools/libs/devicemodel/common.c | 138 ++++++++++++++++++++++++++++++++ tools/libs/devicemodel/linux.c | 138 -------------------------------- 4 files changed, 155 insertions(+), 140 deletions(-) diff --git a/tools/include/xen-sys/FreeBSD/privcmd.h b/tools/include/xen-sys/FreeBSD/privcmd.h index 603aad67d5..649ad443c7 100644 --- a/tools/include/xen-sys/FreeBSD/privcmd.h +++ b/tools/include/xen-sys/FreeBSD/privcmd.h @@ -66,12 +66,27 @@ struct ioctl_privcmd_mmapresource { }; typedef struct ioctl_privcmd_mmapresource privcmd_mmap_resource_t; +struct privcmd_dmop_buf { + void *uptr; /* pointer to memory (in calling process) */ + size_t size; /* size of the buffer */ +}; +typedef struct privcmd_dmop_buf privcmd_dm_op_buf_t; + +struct ioctl_privcmd_dmop { + domid_t dom; /* target domain */ + unsigned int num; /* num of buffers */ + const struct privcmd_dmop_buf *ubufs; /* array of buffers */ +}; +typedef struct ioctl_privcmd_dmop privcmd_dm_op_t; + #define IOCTL_PRIVCMD_HYPERCALL \ _IOWR('E', 0, struct ioctl_privcmd_hypercall) #define IOCTL_PRIVCMD_MMAPBATCH \ _IOWR('E', 1, struct ioctl_privcmd_mmapbatch) #define IOCTL_PRIVCMD_MMAP_RESOURCE \ _IOW('E', 2, struct ioctl_privcmd_mmapresource) +#define IOCTL_PRIVCMD_DM_OP \ + _IOW('E', 3, struct ioctl_privcmd_dmop) #define IOCTL_PRIVCMD_RESTRICT \ _IOW('E', 4, domid_t) diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile index b67fc0fac1..500de7adc5 100644 --- a/tools/libs/devicemodel/Makefile +++ b/tools/libs/devicemodel/Makefile @@ -5,8 +5,8 @@ MAJOR = 1 MINOR = 3 SRCS-y += core.c -SRCS-$(CONFIG_Linux) += linux.c -SRCS-$(CONFIG_FreeBSD) += compat.c +SRCS-$(CONFIG_Linux) += common.c +SRCS-$(CONFIG_FreeBSD) += common.c SRCS-$(CONFIG_SunOS) += compat.c SRCS-$(CONFIG_NetBSD) += compat.c SRCS-$(CONFIG_MiniOS) += compat.c diff --git a/tools/libs/devicemodel/common.c b/tools/libs/devicemodel/common.c new file mode 100644 index 0000000000..0fdc7121f1 --- /dev/null +++ b/tools/libs/devicemodel/common.c @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2017 Citrix Systems Inc. + * + * 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; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include "private.h" + +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + +int osdep_xendevicemodel_open(xendevicemodel_handle *dmod) +{ + int fd = open("/dev/xen/privcmd", O_RDWR | O_CLOEXEC); + privcmd_dm_op_t uop; + int rc; + + if (fd < 0) { + /* + * If the 'new' privcmd interface doesn't exist then don't treat + * this as an error, but an old privcmd clearly won't implement + * IOCTL_PRIVCMD_DM_OP so don't bother trying to open it. + */ + if (errno == ENOENT || errno == ENXIO || errno == ENODEV) + goto out; + + PERROR("Could not obtain handle on privileged command interface"); + return -1; + } + + /* + * Check to see if IOCTL_PRIVCMD_DM_OP is implemented as we want to + * use that in preference to libxencall. + */ + uop.dom = DOMID_INVALID; + uop.num = 0; + uop.ubufs = NULL; + + rc = ioctl(fd, IOCTL_PRIVCMD_DM_OP, &uop); + if (rc < 0) { + close(fd); + fd = -1; + } + +out: + dmod->fd = fd; + return 0; +} + +int osdep_xendevicemodel_close(xendevicemodel_handle *dmod) +{ + if (dmod->fd < 0) + return 0; + + return close(dmod->fd); +} + +int osdep_xendevicemodel_op(xendevicemodel_handle *dmod, + domid_t domid, unsigned int nr_bufs, + struct xendevicemodel_buf bufs[]) +{ + privcmd_dm_op_buf_t *ubufs; + privcmd_dm_op_t uop; + unsigned int i; + int rc; + + if (dmod->fd < 0) + return xendevicemodel_xcall(dmod, domid, nr_bufs, bufs); + + ubufs = calloc(nr_bufs, sizeof (*ubufs)); + if (!ubufs) + return -1; + + for (i = 0; i < nr_bufs; i++) { + ubufs[i].uptr = bufs[i].ptr; + ubufs[i].size = bufs[i].size; + } + + uop.dom = domid; + uop.num = nr_bufs; + uop.ubufs = ubufs; + + rc = ioctl(dmod->fd, IOCTL_PRIVCMD_DM_OP, &uop); + + free(ubufs); + + if (rc < 0) + return -1; + + return 0; +} + +int osdep_xendevicemodel_restrict(xendevicemodel_handle *dmod, + domid_t domid) +{ + if (dmod->fd < 0) { + errno = EOPNOTSUPP; + return -1; + } + + return ioctl(dmod->fd, IOCTL_PRIVCMD_RESTRICT, &domid); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libs/devicemodel/linux.c b/tools/libs/devicemodel/linux.c deleted file mode 100644 index 0fdc7121f1..0000000000 --- a/tools/libs/devicemodel/linux.c +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (c) 2017 Citrix Systems Inc. - * - * 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; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include "private.h" - -#ifndef O_CLOEXEC -#define O_CLOEXEC 0 -#endif - -int osdep_xendevicemodel_open(xendevicemodel_handle *dmod) -{ - int fd = open("/dev/xen/privcmd", O_RDWR | O_CLOEXEC); - privcmd_dm_op_t uop; - int rc; - - if (fd < 0) { - /* - * If the 'new' privcmd interface doesn't exist then don't treat - * this as an error, but an old privcmd clearly won't implement - * IOCTL_PRIVCMD_DM_OP so don't bother trying to open it. - */ - if (errno == ENOENT || errno == ENXIO || errno == ENODEV) - goto out; - - PERROR("Could not obtain handle on privileged command interface"); - return -1; - } - - /* - * Check to see if IOCTL_PRIVCMD_DM_OP is implemented as we want to - * use that in preference to libxencall. - */ - uop.dom = DOMID_INVALID; - uop.num = 0; - uop.ubufs = NULL; - - rc = ioctl(fd, IOCTL_PRIVCMD_DM_OP, &uop); - if (rc < 0) { - close(fd); - fd = -1; - } - -out: - dmod->fd = fd; - return 0; -} - -int osdep_xendevicemodel_close(xendevicemodel_handle *dmod) -{ - if (dmod->fd < 0) - return 0; - - return close(dmod->fd); -} - -int osdep_xendevicemodel_op(xendevicemodel_handle *dmod, - domid_t domid, unsigned int nr_bufs, - struct xendevicemodel_buf bufs[]) -{ - privcmd_dm_op_buf_t *ubufs; - privcmd_dm_op_t uop; - unsigned int i; - int rc; - - if (dmod->fd < 0) - return xendevicemodel_xcall(dmod, domid, nr_bufs, bufs); - - ubufs = calloc(nr_bufs, sizeof (*ubufs)); - if (!ubufs) - return -1; - - for (i = 0; i < nr_bufs; i++) { - ubufs[i].uptr = bufs[i].ptr; - ubufs[i].size = bufs[i].size; - } - - uop.dom = domid; - uop.num = nr_bufs; - uop.ubufs = ubufs; - - rc = ioctl(dmod->fd, IOCTL_PRIVCMD_DM_OP, &uop); - - free(ubufs); - - if (rc < 0) - return -1; - - return 0; -} - -int osdep_xendevicemodel_restrict(xendevicemodel_handle *dmod, - domid_t domid) -{ - if (dmod->fd < 0) { - errno = EOPNOTSUPP; - return -1; - } - - return ioctl(dmod->fd, IOCTL_PRIVCMD_RESTRICT, &domid); -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:25:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:25:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67389.120195 (Exim 4.92) (envelope-from ) id 1l05RI-0003cn-9B; Thu, 14 Jan 2021 16:25:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67389.120195; Thu, 14 Jan 2021 16:25: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 1l05RI-0003cf-60; Thu, 14 Jan 2021 16:25:36 +0000 Received: by outflank-mailman (input) for mailman id 67389; Thu, 14 Jan 2021 16:25:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05RG-0003cT-PB for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05RG-00083N-OL for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05RG-0005z2-Nk for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pNhHunNazZmq7Fn2PyhdRkasV/I9DRTZL5udUaxdbxY=; b=MwR1XiUS7lPARp5vE7coIIVdjL p9Bt7h0Iv8PkrW0Rmb/czu48i5OsQEV+968ZCF8PiOUpj2tfa6INFjjfHk/WYal8aC3n+fPK/qjpp 3ZSv0JEsHvgJVIOyvPX6cBNzecFWaf2D8wbKrG0oh4TKxd6mkhveBWOGl820TuZytaRI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxenguest: handle more than 16T in precopy_stats Message-Id: Date: Thu, 14 Jan 2021 16:25:34 +0000 commit 4e421ad0f4e4286c81aae839f9e99e73718a64ae Author: Olaf Hering AuthorDate: Tue Jan 5 09:30:48 2021 +0100 Commit: Wei Liu CommitDate: Tue Jan 5 12:33:55 2021 +0000 tools/libxenguest: handle more than 16T in precopy_stats total_written tracks the number of transferred dirty pages. Signed-off-by: Olaf Hering Acked-by: Wei Liu --- tools/include/xenguest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/include/xenguest.h b/tools/include/xenguest.h index a9984dbea5..775cf34c04 100644 --- a/tools/include/xenguest.h +++ b/tools/include/xenguest.h @@ -438,7 +438,7 @@ struct xenevtchn_handle; struct precopy_stats { unsigned int iteration; - unsigned int total_written; + unsigned long total_written; long dirty_count; /* -1 if unknown */ }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:25:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:25:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67390.120198 (Exim 4.92) (envelope-from ) id 1l05RS-0003eU-AK; Thu, 14 Jan 2021 16:25:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67390.120198; Thu, 14 Jan 2021 16:25: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 1l05RS-0003eM-7Z; Thu, 14 Jan 2021 16:25:46 +0000 Received: by outflank-mailman (input) for mailman id 67390; Thu, 14 Jan 2021 16:25:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05RQ-0003e9-Ry for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05RQ-000857-RC for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05RQ-0005zk-Qa for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7AJcbMYxOswcxMIXGAUxusUdEr5er2nlpvYVKe7Th+s=; b=JNWcZngqPFKUbPRYGVPHhM7yTj oTnfBoCxGkwdMIfbDbbJZnbtf7xBdZ+FEX/e8K/clKzmAQtuX3eGgj5UgsqI/mbKqSAED4TNlmM3w kmapGmJdKKgqoVmBWcx8n8zsjZo1zZkRmOCThXl8MD0GrLZWxHswuWXbYnrn7s6HO7P4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: ipxe: update for fixing build with GCC10 Message-Id: Date: Thu, 14 Jan 2021 16:25:44 +0000 commit c7115531ea8ede5c6ab27f972c1be6ecad388f55 Author: Olaf Hering AuthorDate: Mon Jan 4 12:52:23 2021 +0100 Commit: Wei Liu CommitDate: Tue Jan 5 12:33:55 2021 +0000 tools: ipxe: update for fixing build with GCC10 Update to v1.21.1 to fix build in Tumbleweed, which has been broken since months due to lack of new release. Signed-off-by: Olaf Hering Acked-by: Wei Liu --- tools/firmware/etherboot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile index 0de30599bf..ed9e11305f 100644 --- a/tools/firmware/etherboot/Makefile +++ b/tools/firmware/etherboot/Makefile @@ -10,7 +10,7 @@ else IPXE_GIT_URL ?= git://git.ipxe.org/ipxe.git endif -IPXE_GIT_TAG := 1dd56dbd11082fb622c2ed21cfaced4f47d798a6 +IPXE_GIT_TAG := 988d2c13cdf0f0b4140685af35ced70ac5b3283c IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:25:55 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:25:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67391.120202 (Exim 4.92) (envelope-from ) id 1l05Rb-0003fY-C4; Thu, 14 Jan 2021 16:25:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67391.120202; Thu, 14 Jan 2021 16:25: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 1l05Rb-0003fQ-9D; Thu, 14 Jan 2021 16:25:55 +0000 Received: by outflank-mailman (input) for mailman id 67391; Thu, 14 Jan 2021 16:25:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Ra-0003fK-Um for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Ra-00085Y-U6 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Ra-00061W-TR for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:25:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=m0l5CrSGByMHFiXlTuOJ9snQr7ii/2MmH7rd9j/NS7Q=; b=Xmj6ivmtGhQMjbcSblq05bbkM3 RFub0682ctJych11kejTUnVgx8/c6QVzZWzhwO2znye1FaG98JYEP9Qc8x/0kGYP/wvpjS809tA+l qWKHoOLhoi58f5gmQDGFOBYYzUHQwnZv/zYL41lpTYDEM16p5z8eJ/I0kYY/sT7Sh0eU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: cleanup remaining backend xs dirs after driver domain Message-Id: Date: Thu, 14 Jan 2021 16:25:54 +0000 commit c992efd06a4c092f6fb3b8ab10d4f8ca35d42bbd Author: Marek Marczykowski-Górecki AuthorDate: Sun Nov 8 15:59:42 2020 +0100 Commit: Wei Liu CommitDate: Tue Jan 5 12:33:55 2021 +0000 libxl: cleanup remaining backend xs dirs after driver domain When device is removed, backend domain (which may be a driver domain) is responsible for removing backend entries from xenstore. But in case of driver domain, it has no access to remove all of them - specifically the directory named after frontend-id remains. This may accumulate enough to exceed xenstore quote of the driver domain, breaking further devices. Fix this by calling libxl__xs_path_cleanup() on the backend path from libxl__device_destroy() in the toolstack domain too. Note libxl__device_destroy() is called when the driver domain already removed what it can (see device_destroy_be_watch_cb()->device_hotplug_done()). Signed-off-by: Marek Marczykowski-Górecki Acked-by: Wei Liu --- tools/libs/light/libxl_device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/libs/light/libxl_device.c b/tools/libs/light/libxl_device.c index ac173a043d..36c4e41e4d 100644 --- a/tools/libs/light/libxl_device.c +++ b/tools/libs/light/libxl_device.c @@ -763,6 +763,12 @@ int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) * from the backend path. */ libxl__xs_path_cleanup(gc, t, be_path); + } else if (domid == LIBXL_TOOLSTACK_DOMID && !libxl_only) { + /* + * Then, toolstack domain is in charge of removing the parent + * directory if empty already. + */ + libxl__xs_path_cleanup(gc, t, be_path); } rc = libxl__xs_transaction_commit(gc, &t); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:26:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:26:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67392.120208 (Exim 4.92) (envelope-from ) id 1l05Rl-0003gz-ET; Thu, 14 Jan 2021 16:26:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67392.120208; Thu, 14 Jan 2021 16:26:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Rl-0003gp-Aq; Thu, 14 Jan 2021 16:26:05 +0000 Received: by outflank-mailman (input) for mailman id 67392; Thu, 14 Jan 2021 16:26:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Rl-0003gj-1f for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Rl-00085t-0x for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Rl-00062T-09 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26: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=IjDCMHrZ2eXpoCgEdY5p2zArUyUN2jdWXvQN2XCuz5U=; b=yEFbCBUwNa0wgWdZ5dPO+gSZQt 4TlZi69qRP0ZW1LgiXiOgsXEKYTltgL+BUDpn2OGTX/p57Ao+d476zskb6ItA/ngiOaqLKVdGMkBy Tien5xsDXUfRoJvbyFwUuRMShnVMJQBHHVX1hzdk5whR4bNNyv1T6GxCVnlFg0diemlE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxenguest: remove get_platform_info from xg_save_restore.h Message-Id: Date: Thu, 14 Jan 2021 16:26:05 +0000 commit 7a83d9d53d9e4a3c694d26968e2d3200835f5060 Author: Olaf Hering AuthorDate: Tue Jan 5 16:02:47 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Jan 5 17:10:23 2021 +0000 tools/libxenguest: remove get_platform_info from xg_save_restore.h Last user was removed with commit 4ddf474e2b7c045fadeaf765ac6157de745e84d6 Previously it was also used in migration code, which was removed with commit b15bc4345e772df92e5ffdbc4c1e9ae2a6206617 Signed-off-by: Olaf Hering Acked-by: Andrew Cooper --- tools/libs/guest/xg_domain.c | 2 +- tools/libs/guest/xg_save_restore.h | 60 -------------------------------------- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/tools/libs/guest/xg_domain.c b/tools/libs/guest/xg_domain.c index 58713cd35d..5019c84e0e 100644 --- a/tools/libs/guest/xg_domain.c +++ b/tools/libs/guest/xg_domain.c @@ -67,7 +67,7 @@ int xc_map_domain_meminfo(xc_interface *xch, uint32_t domid, } _di.guest_width = minfo->guest_width; - /* Get page table levels (see get_platform_info() in xg_save_restore.h */ + /* Get page table levels */ if ( xc_version(xch, XENVER_capabilities, &xen_caps) ) { PERROR("Could not get Xen capabilities (for page table levels)"); diff --git a/tools/libs/guest/xg_save_restore.h b/tools/libs/guest/xg_save_restore.h index 88120eb54b..e4fe747c4e 100644 --- a/tools/libs/guest/xg_save_restore.h +++ b/tools/libs/guest/xg_save_restore.h @@ -29,66 +29,6 @@ /* When pinning page tables at the end of restore, we also use batching. */ #define MAX_PIN_BATCH 1024 -/* -** Determine various platform information required for save/restore, in -** particular: -** -** - the maximum MFN on this machine, used to compute the size of -** the M2P table; -** -** - the starting virtual address of the the hypervisor; we use this -** to determine which parts of guest address space(s) do and don't -** require canonicalization during save/restore; and -** -** - the number of page-table levels for save/ restore. This should -** be a property of the domain, but for the moment we just read it -** from the hypervisor. -** -** - The width of a guest word (unsigned long), in bytes. -** -** Returns 1 on success, 0 on failure. -*/ -static inline int get_platform_info(xc_interface *xch, uint32_t dom, - /* OUT */ unsigned long *max_mfn, - /* OUT */ unsigned long *hvirt_start, - /* OUT */ unsigned int *pt_levels, - /* OUT */ unsigned int *guest_width) -{ - xen_capabilities_info_t xen_caps = ""; - xen_platform_parameters_t xen_params; - - if (xc_version(xch, XENVER_platform_parameters, &xen_params) != 0) - return 0; - - if (xc_version(xch, XENVER_capabilities, &xen_caps) != 0) - return 0; - - if (xc_maximum_ram_page(xch, max_mfn)) - return 0; - - *hvirt_start = xen_params.virt_start; - - if ( xc_domain_get_guest_width(xch, dom, guest_width) != 0) - return 0; - - /* 64-bit tools will see the 64-bit hvirt_start, but 32-bit guests - * will be using the compat one. */ - if ( *guest_width < sizeof (unsigned long) ) - /* XXX need to fix up a way of extracting this value from Xen if - * XXX it becomes variable for domU */ - *hvirt_start = 0xf5800000; - - if (strstr(xen_caps, "xen-3.0-x86_64")) - /* Depends on whether it's a compat 32-on-64 guest */ - *pt_levels = ( (*guest_width == 8) ? 4 : 3 ); - else if (strstr(xen_caps, "xen-3.0-x86_32p")) - *pt_levels = 3; - else - return 0; - - return 1; -} - /* ** Save/restore deal with the mfn_to_pfn (M2P) and pfn_to_mfn (P2M) tables. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:26:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:26:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67393.120211 (Exim 4.92) (envelope-from ) id 1l05Rw-0003iW-Gq; Thu, 14 Jan 2021 16:26:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67393.120211; Thu, 14 Jan 2021 16:26:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Rw-0003iO-Dw; Thu, 14 Jan 2021 16:26:16 +0000 Received: by outflank-mailman (input) for mailman id 67393; Thu, 14 Jan 2021 16:26:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Rv-0003iB-4p for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Rv-000861-48 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Rv-00063Q-3P for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26: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=rsM/buCmMrgQ9zmzc4ekg8QoSLL7FJDA6/heDXlUJLA=; b=v1QMoe+cTXoy0wkplKdb3rQ3ds xvR34PI7UKFHuCJGZtHlDZZE4KtN1D2YTCGe+qPNTR70fUTpa9+sQTxnRnGgpLlEddxj14m1s1M2a EMIIZ71zjPJR41WS97YpVCMW8EIzhN5qP7KujRZbB1JFcWTNfHS7UWCtBXi5fGSI6Qrw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxenguest: remove FOLD_CR3 from xg_save_restore.h Message-Id: Date: Thu, 14 Jan 2021 16:26:15 +0000 commit 22deecf9fef271246327bfe8d62d0205a29db64d Author: Olaf Hering AuthorDate: Tue Jan 5 16:05:36 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Jan 5 17:10:31 2021 +0000 tools/libxenguest: remove FOLD_CR3 from xg_save_restore.h The last user was removed with commit b15bc4345e772df92e5ffdbc4c1e9ae2a6206617 Signed-off-by: Olaf Hering Acked-by: Andrew Cooper --- tools/libs/guest/xg_save_restore.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tools/libs/guest/xg_save_restore.h b/tools/libs/guest/xg_save_restore.h index e4fe747c4e..a9c1a2dbe3 100644 --- a/tools/libs/guest/xg_save_restore.h +++ b/tools/libs/guest/xg_save_restore.h @@ -49,16 +49,6 @@ #define M2P_SIZE(_m) ROUNDUP(((_m) * sizeof(xen_pfn_t)), M2P_SHIFT) #define M2P_CHUNKS(_m) (M2P_SIZE((_m)) >> M2P_SHIFT) -#define UNFOLD_CR3(_c) \ - ((uint64_t)((dinfo->guest_width == 8) \ - ? ((_c) >> 12) \ - : (((uint32_t)(_c) >> 12) | ((uint32_t)(_c) << 20)))) - -#define FOLD_CR3(_c) \ - ((uint64_t)((dinfo->guest_width == 8) \ - ? ((uint64_t)(_c)) << 12 \ - : (((uint32_t)(_c) << 12) | ((uint32_t)(_c) >> 20)))) - #define MEMCPY_FIELD(_d, _s, _f, _w) do { \ if ((_w) == 8) \ memcpy(&(_d)->x64._f, &(_s)->x64._f,sizeof((_d)->x64._f)); \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:26:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:26:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67394.120215 (Exim 4.92) (envelope-from ) id 1l05S6-0003jW-J4; Thu, 14 Jan 2021 16:26:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67394.120215; Thu, 14 Jan 2021 16:26:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05S6-0003jO-FV; Thu, 14 Jan 2021 16:26:26 +0000 Received: by outflank-mailman (input) for mailman id 67394; Thu, 14 Jan 2021 16:26:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05S5-0003jH-7Z for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05S5-00086B-6s for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05S5-00064Q-6L for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26: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=bnlzfhjsUrwh4ZNo5dgCpL32wcD9krjc5F6K8uw1il0=; b=MXUWdBpW2ULTAb8yZT1b5A00dA oIwB7NEeD6yV+cBGH7GRy2PBAmVfBTzyZle09T2VCyUkwnmaf6Vkl4b/F0VKtH5J7mUBJDocgW08k e9QEcSznZNeFmcaP9c/2OpvFWiSvsEkjNPRubmM4oTEPTIo3TG2fV1dU5yiG5BZwSRq4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxenguest: move M2P macros to xg_private.h Message-Id: Date: Thu, 14 Jan 2021 16:26:25 +0000 commit edf5b22022aea0a76eaeb36cc060d984340e1e18 Author: Olaf Hering AuthorDate: Tue Jan 5 16:13:56 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Jan 5 17:11:43 2021 +0000 tools/libxenguest: move M2P macros to xg_private.h Just code movement as a preparatory change before xg_sr_* will be moved. Signed-off-by: Olaf Hering Acked-by: Andrew Cooper --- tools/libs/guest/xg_private.h | 10 ++++++++++ tools/libs/guest/xg_save_restore.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/libs/guest/xg_private.h b/tools/libs/guest/xg_private.h index fee3191cd4..c3ed8c1257 100644 --- a/tools/libs/guest/xg_private.h +++ b/tools/libs/guest/xg_private.h @@ -135,4 +135,14 @@ static inline xen_pfn_t xc_pfn_to_mfn(xen_pfn_t pfn, xen_pfn_t *p2m, int pin_table(xc_interface *xch, unsigned int type, unsigned long mfn, uint32_t dom); +/* + * The M2P is made up of some number of 'chunks' of at least 2MB in size. + * The below definitions and utility function(s) deal with mapping the M2P + * regarldess of the underlying machine memory size or architecture. + */ +#define M2P_SHIFT L2_PAGETABLE_SHIFT_PAE +#define M2P_CHUNK_SIZE (1 << M2P_SHIFT) +#define M2P_SIZE(_m) ROUNDUP(((_m) * sizeof(xen_pfn_t)), M2P_SHIFT) +#define M2P_CHUNKS(_m) (M2P_SIZE((_m)) >> M2P_SHIFT) + #endif /* XG_PRIVATE_H */ diff --git a/tools/libs/guest/xg_save_restore.h b/tools/libs/guest/xg_save_restore.h index a9c1a2dbe3..3dbbc8dcd2 100644 --- a/tools/libs/guest/xg_save_restore.h +++ b/tools/libs/guest/xg_save_restore.h @@ -39,16 +39,6 @@ #define PFN_TO_KB(_pfn) ((_pfn) << (PAGE_SHIFT - 10)) -/* -** The M2P is made up of some number of 'chunks' of at least 2MB in size. -** The below definitions and utility function(s) deal with mapping the M2P -** regarldess of the underlying machine memory size or architecture. -*/ -#define M2P_SHIFT L2_PAGETABLE_SHIFT_PAE -#define M2P_CHUNK_SIZE (1 << M2P_SHIFT) -#define M2P_SIZE(_m) ROUNDUP(((_m) * sizeof(xen_pfn_t)), M2P_SHIFT) -#define M2P_CHUNKS(_m) (M2P_SIZE((_m)) >> M2P_SHIFT) - #define MEMCPY_FIELD(_d, _s, _f, _w) do { \ if ((_w) == 8) \ memcpy(&(_d)->x64._f, &(_s)->x64._f,sizeof((_d)->x64._f)); \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:26:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:26:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67395.120219 (Exim 4.92) (envelope-from ) id 1l05SG-0003l1-KO; Thu, 14 Jan 2021 16:26:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67395.120219; Thu, 14 Jan 2021 16:26:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05SG-0003kr-HA; Thu, 14 Jan 2021 16:26:36 +0000 Received: by outflank-mailman (input) for mailman id 67395; Thu, 14 Jan 2021 16:26:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05SF-0003ke-BZ for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05SF-00086J-9l for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05SF-00065L-9A for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26: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=wdoyhG32eitSKZdker4qX+EPMq/SP+UokZqCUdUU3iw=; b=m23g8oeY6pENrI3c/BFhfYTJy3 9p+KNil4h1hlRx8dWFl9nYAETo0jLgD0vwVv6cQIvHNChv9nMjMr6NjbSwKlfMoabNox65X+NAUXB 6+hxFsk+lDdOcIKI1MPNJsD/MCm++67UiHSQzKYbUN7WqWuvrhqOUDlgPP2GjBPcfnc8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mem_sharing: Copy CPUID and MSR configuration during vm forking Message-Id: Date: Thu, 14 Jan 2021 16:26:35 +0000 commit 2c5119d637d46a4af759213a4eba042ae278464d Author: Tamas K Lengyel AuthorDate: Tue Jan 5 13:58:23 2021 -0800 Commit: Andrew Cooper CommitDate: Tue Jan 5 23:00:27 2021 +0000 x86/mem_sharing: Copy CPUID and MSR configuration during vm forking Signed-off-by: Tamas K Lengyel Acked-by: Andrew Cooper --- xen/arch/x86/mm/mem_sharing.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index c428fd16ce..fc7b2a4102 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1764,6 +1764,8 @@ static int fork(struct domain *cd, struct domain *d) domain_pause(d); cd->max_pages = d->max_pages; + *cd->arch.cpuid = *d->arch.cpuid; + *cd->arch.msrs = *d->arch.msrs; cd->parent = d; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:26:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:26:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67396.120223 (Exim 4.92) (envelope-from ) id 1l05SQ-0003mR-Li; Thu, 14 Jan 2021 16:26:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67396.120223; Thu, 14 Jan 2021 16:26:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05SQ-0003mJ-Ij; Thu, 14 Jan 2021 16:26:46 +0000 Received: by outflank-mailman (input) for mailman id 67396; Thu, 14 Jan 2021 16:26:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05SP-0003m9-DW for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05SP-00086S-Ch for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05SP-00065z-C4 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26: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=CupP3KaqZ3w08T7O4SkqLimW4lDl4UEy7cN7+JZHziI=; b=PNl1uk8KXh7CcgIpQN2DKG9//R eveZrIWjzyvHDc5jBYPAg87leZZNSIDIWWh4+queFR25WYHmb5+iOvB059T+cK4uJnAqgAJwb51WB 0hofyFENRAK1KZeADjPDEw8SgTwSN7u+vDPEA/A58NkeQSoSNl9LXXagRgDTJ5AR0zCw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vm_event: transfer nested p2m base info Message-Id: Date: Thu, 14 Jan 2021 16:26:45 +0000 commit d581cf8839417b73f02d8b6f79cf33e9903933db Author: Tamas K Lengyel AuthorDate: Sun Jan 3 11:41:17 2021 -0700 Commit: Andrew Cooper CommitDate: Tue Jan 5 23:00:27 2021 +0000 x86/vm_event: transfer nested p2m base info Required to introspect events originating from nested VMs. Signed-off-by: Tamas K Lengyel Acked-by: Andrew Cooper --- xen/arch/x86/hvm/monitor.c | 32 ++++++++++++++++++++++++++++++-- xen/include/public/vm_event.h | 17 ++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/monitor.c b/xen/arch/x86/hvm/monitor.c index e4a09964a0..b44a1e1dfe 100644 --- a/xen/arch/x86/hvm/monitor.c +++ b/xen/arch/x86/hvm/monitor.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -33,6 +34,15 @@ #include #include +static void set_npt_base(struct vcpu *v, vm_event_request_t *req) +{ + if ( nestedhvm_enabled(v->domain) && nestedhvm_vcpu_in_guestmode(v) ) + { + req->flags |= VM_EVENT_FLAG_NESTED_P2M; + req->data.regs.x86.npt_base = nhvm_vcpu_p2m_base(v); + } +} + bool hvm_monitor_cr(unsigned int index, unsigned long value, unsigned long old) { struct vcpu *curr = current; @@ -53,6 +63,8 @@ bool hvm_monitor_cr(unsigned int index, unsigned long value, unsigned long old) .u.write_ctrlreg.old_value = old }; + set_npt_base(curr, &req); + return monitor_traps(curr, sync, &req) >= 0 && curr->domain->arch.monitor.control_register_values; } @@ -73,6 +85,8 @@ bool hvm_monitor_emul_unimplemented(void) .vcpu_id = curr->vcpu_id, }; + set_npt_base(curr, &req); + return curr->domain->arch.monitor.emul_unimplemented_enabled && monitor_traps(curr, true, &req) == 1; } @@ -92,6 +106,8 @@ bool hvm_monitor_msr(unsigned int msr, uint64_t new_value, uint64_t old_value) .u.mov_to_msr.old_value = old_value }; + set_npt_base(curr, &req); + return monitor_traps(curr, 1, &req) >= 0 && curr->domain->arch.monitor.control_register_values; } @@ -103,6 +119,7 @@ void hvm_monitor_descriptor_access(uint64_t exit_info, uint64_t vmx_exit_qualification, uint8_t descriptor, bool is_write) { + struct vcpu *curr = current; vm_event_request_t req = { .reason = VM_EVENT_REASON_DESCRIPTOR_ACCESS, .u.desc_access.descriptor = descriptor, @@ -115,7 +132,9 @@ void hvm_monitor_descriptor_access(uint64_t exit_info, req.u.desc_access.arch.vmx.exit_qualification = vmx_exit_qualification; } - monitor_traps(current, true, &req); + set_npt_base(curr, &req); + + monitor_traps(curr, true, &req); } static inline unsigned long gfn_of_rip(unsigned long rip) @@ -189,6 +208,8 @@ int hvm_monitor_debug(unsigned long rip, enum hvm_monitor_debug_type type, return -EOPNOTSUPP; } + set_npt_base(curr, &req); + return monitor_traps(curr, sync, &req); } @@ -207,12 +228,15 @@ int hvm_monitor_cpuid(unsigned long insn_length, unsigned int leaf, req.u.cpuid.leaf = leaf; req.u.cpuid.subleaf = subleaf; + set_npt_base(curr, &req); + return monitor_traps(curr, 1, &req); } void hvm_monitor_interrupt(unsigned int vector, unsigned int type, unsigned int err, uint64_t cr2) { + struct vcpu *curr = current; vm_event_request_t req = { .reason = VM_EVENT_REASON_INTERRUPT, .u.interrupt.x86.vector = vector, @@ -221,7 +245,9 @@ void hvm_monitor_interrupt(unsigned int vector, unsigned int type, .u.interrupt.x86.cr2 = cr2, }; - monitor_traps(current, 1, &req); + set_npt_base(curr, &req); + + monitor_traps(curr, 1, &req); } /* @@ -297,6 +323,8 @@ bool hvm_monitor_check_p2m(unsigned long gla, gfn_t gfn, uint32_t pfec, req.u.mem_access.gla = gla; req.u.mem_access.offset = gpa & ~PAGE_MASK; + set_npt_base(curr, &req); + return monitor_traps(curr, true, &req) >= 0; } diff --git a/xen/include/public/vm_event.h b/xen/include/public/vm_event.h index fdd3ad8a30..141ea024a3 100644 --- a/xen/include/public/vm_event.h +++ b/xen/include/public/vm_event.h @@ -29,7 +29,7 @@ #include "xen.h" -#define VM_EVENT_INTERFACE_VERSION 0x00000006 +#define VM_EVENT_INTERFACE_VERSION 0x00000007 #if defined(__XEN__) || defined(__XEN_TOOLS__) @@ -119,6 +119,10 @@ * which singlestep gets automatically disabled. */ #define VM_EVENT_FLAG_FAST_SINGLESTEP (1 << 11) +/* + * Set if the event comes from a nested VM and thus npt_base is valid. + */ +#define VM_EVENT_FLAG_NESTED_P2M (1 << 12) /* * Reasons for the vm event request @@ -208,6 +212,17 @@ struct vm_event_regs_x86 { uint64_t msr_star; uint64_t msr_lstar; uint64_t gdtr_base; + + /* + * When VM_EVENT_FLAG_NESTED_P2M is set, this event comes from a nested + * VM. npt_base is the guest physical address of the L1 hypervisors + * EPT/NPT tables for the nested guest. + * + * All bits outside of architectural address ranges are reserved for + * future metadata. + */ + uint64_t npt_base; + uint32_t cs_base; uint32_t ss_base; uint32_t ds_base; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:26:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:26:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67397.120227 (Exim 4.92) (envelope-from ) id 1l05Sa-0003ne-O4; Thu, 14 Jan 2021 16:26:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67397.120227; Thu, 14 Jan 2021 16:26:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Sa-0003nX-Kh; Thu, 14 Jan 2021 16:26:56 +0000 Received: by outflank-mailman (input) for mailman id 67397; Thu, 14 Jan 2021 16:26:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05SZ-0003nM-GG for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05SZ-00086s-FW for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05SZ-00066o-Es for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:26: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=g6KSpysmqZ2SuNinBC/nG4kw1IgbrtMLqYzePv2fTNg=; b=APBH7p/I1ywk6CrTuTtf9RGBas JT2k4aBZYQfGOKzcIaDzoQ6l+8miB1lphJlv495FDq3Y9+rw9ClTPneQ3A/3/Lz1Yy28m1I6WxlMe NqNqDVSMlFEuMPs0a7UIZzA0SakWkKeDd2YsrBZeZ2qh+pio8cR13qE7xhQqb6Rwv0eU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vPCI/MSI-X: fold clearing of entry->updated Message-Id: Date: Thu, 14 Jan 2021 16:26:55 +0000 commit c58654c22ae0dc74c2613e5e1a922b2bbd217abb Author: Jan Beulich AuthorDate: Thu Jan 7 15:03:17 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:03:17 2021 +0100 vPCI/MSI-X: fold clearing of entry->updated Both call sites clear the flag after a successfull call to update_entry(). This can be simplified by moving the clearing into the function, onto its success path. As a result of neither caller caring about update_entry()'s return value anymore, the function gets switched to return void. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/msix.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index 846a048a4a..846f1b8d70 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -37,8 +37,8 @@ static uint32_t control_read(const struct pci_dev *pdev, unsigned int reg, (msix->masked ? PCI_MSIX_FLAGS_MASKALL : 0); } -static int update_entry(struct vpci_msix_entry *entry, - const struct pci_dev *pdev, unsigned int nr) +static void update_entry(struct vpci_msix_entry *entry, + const struct pci_dev *pdev, unsigned int nr) { int rc = vpci_msix_arch_disable_entry(entry, pdev); @@ -48,7 +48,7 @@ static int update_entry(struct vpci_msix_entry *entry, gprintk(XENLOG_WARNING, "%pp: unable to disable entry %u for update: %d\n", &pdev->sbdf, nr, rc); - return rc; + return; } rc = vpci_msix_arch_enable_entry(entry, pdev, @@ -59,10 +59,10 @@ static int update_entry(struct vpci_msix_entry *entry, gprintk(XENLOG_WARNING, "%pp: unable to enable entry %u: %d\n", &pdev->sbdf, nr, rc); /* Entry is likely not properly configured. */ - return rc; + return; } - return 0; + entry->updated = false; } static void control_write(const struct pci_dev *pdev, unsigned int reg, @@ -90,13 +90,8 @@ static void control_write(const struct pci_dev *pdev, unsigned int reg, if ( new_enabled && !new_masked && (!msix->enabled || msix->masked) ) { for ( i = 0; i < msix->max_entries; i++ ) - { - if ( msix->entries[i].masked || !msix->entries[i].updated || - update_entry(&msix->entries[i], pdev, i) ) - continue; - - msix->entries[i].updated = false; - } + if ( !msix->entries[i].masked && msix->entries[i].updated ) + update_entry(&msix->entries[i], pdev, i); } else if ( !new_enabled && msix->enabled ) { @@ -363,10 +358,7 @@ static int msix_write(struct vcpu *v, unsigned long addr, unsigned int len, * data fields Xen needs to disable and enable the entry in order * to pick up the changes. */ - if ( update_entry(entry, pdev, vmsix_entry_nr(msix, entry)) ) - break; - - entry->updated = false; + update_entry(entry, pdev, vmsix_entry_nr(msix, entry)); } else vpci_msix_arch_mask_entry(entry, pdev, entry->masked); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:27:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:27:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67398.120231 (Exim 4.92) (envelope-from ) id 1l05Sk-0003oy-PP; Thu, 14 Jan 2021 16:27:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67398.120231; Thu, 14 Jan 2021 16:27:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Sk-0003oq-MI; Thu, 14 Jan 2021 16:27:06 +0000 Received: by outflank-mailman (input) for mailman id 67398; Thu, 14 Jan 2021 16:27:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Sj-0003og-OS for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Sj-00087D-Id for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Sj-00067b-Hv for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GxBi0xDAh8Hs1OIFJHaHv4yPph0H1LT9jlyC1xGY1Zw=; b=KZiGGCdnbt3uhFDVvcHIhDo1Sy 7IrgRo1LPtv1yg1OHPvMUEXJhVzwq+Dwj6/VtvztqIVFjaN5MzN+gmPYR34ei1Gzg0hTPDzFX2dWw +L0WCIW0b9azc/YGE4a17QFfs2G3Y50o0uIAW7NKLjz9nH3y+zXUqjbeH+gJQgsUf4zE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] common: don't (kind of) open-code rcu_lock_domain_by_any_id() Message-Id: Date: Thu, 14 Jan 2021 16:27:05 +0000 commit a625c335593ed8475367f91fa9746c82d927794f Author: Jan Beulich AuthorDate: Thu Jan 7 15:06:15 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:06:15 2021 +0100 common: don't (kind of) open-code rcu_lock_domain_by_any_id() Even more so when using rcu_lock_domain_by_id() in place of the more efficient rcu_lock_current_domain(). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/common/event_channel.c | 5 +---- xen/common/page_alloc.c | 8 +------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 4a48094356..3aa4189d7a 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -349,10 +349,7 @@ static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) domid_t rdom = bind->remote_dom; long rc; - if ( rdom == DOMID_SELF ) - rdom = current->domain->domain_id; - - if ( (rd = rcu_lock_domain_by_id(rdom)) == NULL ) + if ( (rd = rcu_lock_domain_by_any_id(rdom)) == NULL ) return -ESRCH; /* Avoid deadlock by first acquiring lock of domain with smaller id. */ diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 4e86d79935..fcb308d92f 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2568,12 +2568,6 @@ struct domain *get_pg_owner(domid_t domid) { struct domain *pg_owner = NULL, *curr = current->domain; - if ( likely(domid == DOMID_SELF) ) - { - pg_owner = rcu_lock_current_domain(); - goto out; - } - if ( unlikely(domid == curr->domain_id) ) { gdprintk(XENLOG_WARNING, "Cannot specify itself as foreign domain\n"); @@ -2591,7 +2585,7 @@ struct domain *get_pg_owner(domid_t domid) break; default: - if ( (pg_owner = rcu_lock_domain_by_id(domid)) == NULL ) + if ( (pg_owner = rcu_lock_domain_by_any_id(domid)) == NULL ) gdprintk(XENLOG_WARNING, "Unknown domain d%d\n", domid); break; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:27:19 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:27:19 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67399.120235 (Exim 4.92) (envelope-from ) id 1l05Su-0003q5-R7; Thu, 14 Jan 2021 16:27:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67399.120235; Thu, 14 Jan 2021 16:27:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Su-0003px-Nv; Thu, 14 Jan 2021 16:27:16 +0000 Received: by outflank-mailman (input) for mailman id 67399; Thu, 14 Jan 2021 16:27:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05St-0003pq-PM for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05St-00087L-No for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05St-00068s-Lj for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CC/vCQgHRIuK0LYuaFlRPuPtf4aUZgawHKpzO3eSlEE=; b=Or5VmkPQFykEn3pdrbKmt8eCcW 6zBzYUbC1C2VmKv7e8T4Dx1a+d1iW81UO9Wl+PiXzRpW+A7DuUBfYpWkJh9DT24uDhNWnIzzYR4y9 FuCU6FGcwxE72u88rvBy+zC/3SXW9mDN+9swhiQBLGrPWM0zvJZNa5AANMK8LzgVSIzI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: don't pointlessly use get_domain_by_id() Message-Id: Date: Thu, 14 Jan 2021 16:27:15 +0000 commit 37c709a16f8b6ab145d4a6dce171464837bd72a7 Author: Jan Beulich AuthorDate: Thu Jan 7 15:08:51 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:08:51 2021 +0100 x86: don't pointlessly use get_domain_by_id() For short-lived references rcu_lock_domain_by_id() is the better (slightly cheaper) alternative. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mcaction.c | 7 ++++--- xen/arch/x86/cpu/mcheck/mce.c | 21 ++++++++++----------- xen/arch/x86/debug.c | 4 ++-- xen/arch/x86/irq.c | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mcaction.c b/xen/arch/x86/cpu/mcheck/mcaction.c index 69332fb84d..f4f265c1bc 100644 --- a/xen/arch/x86/cpu/mcheck/mcaction.c +++ b/xen/arch/x86/cpu/mcheck/mcaction.c @@ -87,7 +87,7 @@ mc_memerr_dhandler(struct mca_binfo *binfo, BUG_ON( bank->mc_domid == DOMID_COW ); if ( bank->mc_domid != DOMID_XEN ) { - d = get_domain_by_id(bank->mc_domid); + d = rcu_lock_domain_by_id(bank->mc_domid); ASSERT(d); gfn = get_gpfn_from_mfn((bank->mc_addr) >> PAGE_SHIFT); @@ -132,6 +132,8 @@ mc_memerr_dhandler(struct mca_binfo *binfo, goto vmce_failed; } + rcu_unlock_domain(d); + /* * Impacted domain go on with domain's recovery job * if the domain has its own MCA handler. @@ -139,12 +141,11 @@ mc_memerr_dhandler(struct mca_binfo *binfo, * its own recovery job. */ *result = MCER_RECOVERED; - put_domain(d); return; vmce_failed: - put_domain(d); domain_crash(d); + rcu_unlock_domain(d); } } } diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 0e84368ae2..3a92e9db4e 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1497,7 +1497,6 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) if ( mc_msrinject->mcinj_flags & MC_MSRINJ_F_GPADDR ) { - domid_t domid; struct domain *d; struct mcinfo_msr *msr; unsigned int i; @@ -1505,17 +1504,17 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) unsigned long gfn, mfn; p2m_type_t t; - domid = (mc_msrinject->mcinj_domid == DOMID_SELF) ? - current->domain->domain_id : mc_msrinject->mcinj_domid; - if ( domid >= DOMID_FIRST_RESERVED ) - return x86_mcerr("do_mca inject: incompatible flag " - "MC_MSRINJ_F_GPADDR with domain %d", - -EINVAL, domid); - - d = get_domain_by_id(domid); + d = rcu_lock_domain_by_any_id(mc_msrinject->mcinj_domid); if ( d == NULL ) + { + if ( mc_msrinject->mcinj_domid >= DOMID_FIRST_RESERVED ) + return x86_mcerr("do_mca inject: incompatible flag " + "MC_MSRINJ_F_GPADDR with domain %d", + -EINVAL, domid); + return x86_mcerr("do_mca inject: bad domain id %d", -EINVAL, domid); + } for ( i = 0, msr = &mc_msrinject->mcinj_msr[0]; i < mc_msrinject->mcinj_count; @@ -1528,7 +1527,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) if ( mfn == mfn_x(INVALID_MFN) ) { put_gfn(d, gfn); - put_domain(d); + rcu_unlock_domain(d); return x86_mcerr("do_mca inject: bad gfn %#lx of domain %d", -EINVAL, gfn, domid); } @@ -1538,7 +1537,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) put_gfn(d, gfn); } - put_domain(d); + rcu_unlock_domain(d); } if ( !x86_mc_msrinject_verify(mc_msrinject) ) diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index 5d8acdad71..4356039ed2 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -164,13 +164,13 @@ unsigned int dbg_rw_mem(void * __user addr, void * __user buf, unsigned int len, domid_t domid, bool toaddr, uint64_t pgd3) { - struct domain *d = get_domain_by_id(domid); + struct domain *d = rcu_lock_domain_by_id(domid); if ( d ) { if ( !d->is_dying ) len = dbg_rw_guest_mem(d, addr, buf, len, toaddr, pgd3); - put_domain(d); + rcu_unlock_domain(d); } return len; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index e315fef4a6..13b1af57f3 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -323,7 +323,7 @@ void destroy_irq(unsigned int irq) if ( desc->arch.creator_domid != DOMID_INVALID ) { - struct domain *d = get_domain_by_id(desc->arch.creator_domid); + struct domain *d = rcu_lock_domain_by_id(desc->arch.creator_domid); if ( d ) { @@ -334,7 +334,7 @@ void destroy_irq(unsigned int irq) "Could not revoke %pd access to IRQ%u (error %d)\n", d, irq, err); - put_domain(d); + rcu_unlock_domain(d); } desc->arch.creator_domid = DOMID_INVALID; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:27:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:27:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67400.120239 (Exim 4.92) (envelope-from ) id 1l05T4-0003rX-UE; Thu, 14 Jan 2021 16:27:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67400.120239; Thu, 14 Jan 2021 16:27:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05T4-0003rP-RB; Thu, 14 Jan 2021 16:27:26 +0000 Received: by outflank-mailman (input) for mailman id 67400; Thu, 14 Jan 2021 16:27:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05T3-0003rI-Ri for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05T3-00087T-Qz for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05T3-00069i-QE for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BDbRESSHpWLjmTl0hWPYr04KNr/LDiGkAAxzuf7cYco=; b=kHTaJ+F661SFfGhbSaXfiHiPgM Tm8SEfu+INiAwy9JJsDIq8co15DDR7OPw1kkkZJc3swubbQrDZ2Q30fBHoDPz91Xpj6i+ydIyAQbW wO1NTt7ynczTfQhH+v9ELCaEhF09ad6nSVAe5+Xxicfz6K/c3d2wLE7/I47MbAVZE9C0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mem-sharing: don't pointlessly use get_domain_by_id() Message-Id: Date: Thu, 14 Jan 2021 16:27:25 +0000 commit 1977cd74ff545e0b68540d21c19c7e9282689420 Author: Jan Beulich AuthorDate: Thu Jan 7 15:09:20 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:09:20 2021 +0100 x86/mem-sharing: don't pointlessly use get_domain_by_id() For short-lived references rcu_lock_domain_by_id() is the better (slightly cheaper) alternative. Signed-off-by: Jan Beulich Acked-by: Tamas K Lengyel Acked-by: Andrew Cooper --- xen/arch/x86/mm/mem_sharing.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index fc7b2a4102..ad9d495110 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -537,7 +537,7 @@ static int audit(void) p2m_type_t t; mfn_t o_mfn; - d = get_domain_by_id(g->domain); + d = rcu_lock_domain_by_id(g->domain); if ( d == NULL ) { gdprintk(XENLOG_ERR, @@ -562,7 +562,7 @@ static int audit(void) d, g->gfn, mfn_x(mfn), p2m_ram_shared, t); errors++; } - put_domain(d); + rcu_unlock_domain(d); nr_gfns++; } /* The type count has an extra ref because we have locked the page */ @@ -1043,10 +1043,10 @@ static int share_pages(struct domain *sd, gfn_t sgfn, shr_handle_t sh, rmap_del(gfn, cpage, 0); rmap_add(gfn, spage); put_count++; - d = get_domain_by_id(gfn->domain); + d = rcu_lock_domain_by_id(gfn->domain); BUG_ON(!d); BUG_ON(set_shared_p2m_entry(d, gfn->gfn, smfn)); - put_domain(d); + rcu_unlock_domain(d); } ASSERT(list_empty(&cpage->sharing->gfns)); BUG_ON(!put_count); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:27:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:27:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67401.120242 (Exim 4.92) (envelope-from ) id 1l05TE-0003t1-Vq; Thu, 14 Jan 2021 16:27:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67401.120242; Thu, 14 Jan 2021 16:27:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05TE-0003st-St; Thu, 14 Jan 2021 16:27:36 +0000 Received: by outflank-mailman (input) for mailman id 67401; Thu, 14 Jan 2021 16:27:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05TD-0003sh-Ug for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05TD-00087b-U0 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05TD-0006AW-TM for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RqsvFKUDMot40ZqRbZB5fq6Sf2avB7rlPzL+SSJd+8M=; b=4gSqGyXnfo0EIQqbGfKs5iEpPK ENj+Vqrqb2Lynyweo/JYAeiHGZe6eijU36W02J5lPh74UN3YxnmsXrLJIYUfKHPnHENKj7tY9Qomg KblrAHg4O7eZegCJi8k2nuDa0AyiJtZ3GqVSv13eXHiGAw3TR77nP69+EcqKN5egANg4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: drop use of E801 memory "map" (and alike) Message-Id: Date: Thu, 14 Jan 2021 16:27:35 +0000 commit 925fdb0870f7c211c00caabbe9e4dae35cc19a01 Author: Jan Beulich AuthorDate: Thu Jan 7 15:09:47 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:09:47 2021 +0100 x86: drop use of E801 memory "map" (and alike) ACPI mandates use of E820 (or newer, e.g. EFI), and in fact firmware has been observed to include E820_ACPI ranges in what E801 reports as available (really "configured") memory. Since all 64-bit systems ought to support ACPI, drop our use of older BIOS and boot loader interfaces. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/boot/mem.S | 45 ++++----------------------------------------- xen/arch/x86/setup.c | 22 ---------------------- xen/include/asm-x86/e820.h | 1 - 3 files changed, 4 insertions(+), 64 deletions(-) diff --git a/xen/arch/x86/boot/mem.S b/xen/arch/x86/boot/mem.S index 5b9ab5c1de..a2db7b5d4d 100644 --- a/xen/arch/x86/boot/mem.S +++ b/xen/arch/x86/boot/mem.S @@ -4,8 +4,6 @@ #define E820_BIOS_MAX 128 get_memory_map: - -.Lmeme820: xorl %ebx, %ebx # continuation counter movw $bootsym(bios_e820map), %di # point into the whitelist # so we can have the bios @@ -17,14 +15,14 @@ get_memory_map: pushw %ds # data record. popw %es int $0x15 - jc .Lmem88 + jc .Ldone cmpl $SMAP,%eax # check the return is `SMAP' - jne .Lmem88 + jne .Ldone incw bootsym(bios_e820nr) cmpw $E820_BIOS_MAX, bootsym(bios_e820nr) # up to this many entries - jae .Lmem88 + jae .Ldone movw %di,%ax addw $20,%ax @@ -32,38 +30,7 @@ get_memory_map: testl %ebx,%ebx # check to see if jnz 1b # %ebx is set to EOF -.Lmem88: - movb $0x88, %ah - int $0x15 - movw %ax,bootsym(highmem_kb) - -.Lmeme801: - stc # fix to work around buggy - xorw %cx,%cx # BIOSes which don't clear/set - xorw %dx,%dx # carry on pass/error of - # e801h memory size call - # or merely pass cx,dx though - # without changing them. - movw $0xe801, %ax - int $0x15 - jc .Lint12 - - testw %cx, %cx # Kludge to handle BIOSes - jnz 1f # which report their extended - testw %dx, %dx # memory in AX/BX rather than - jnz 1f # CX/DX. The spec I have read - movw %ax, %cx # seems to indicate AX/BX - movw %bx, %dx # are more reasonable anyway... -1: movzwl %dx, %edx - shll $6,%edx # and go from 64k to 1k chunks - movzwl %cx, %ecx - addl %ecx, %edx # add in lower memory - movl %edx,bootsym(highmem_kb) # store extended memory size - -.Lint12: - int $0x12 - movw %ax,bootsym(lowmem_kb) - +.Ldone: ret .align 4 @@ -71,7 +38,3 @@ GLOBAL(bios_e820map) .fill E820_BIOS_MAX*20,1,0 GLOBAL(bios_e820nr) .long 0 -GLOBAL(lowmem_kb) - .long 0 -GLOBAL(highmem_kb) - .long 0 diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 5cdb0f0f92..ad65167864 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1059,28 +1059,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) bytes += map->size + 4; } } - else if ( bootsym(lowmem_kb) ) - { - memmap_type = "Xen-e801"; - e820_raw.map[0].addr = 0; - e820_raw.map[0].size = bootsym(lowmem_kb) << 10; - e820_raw.map[0].type = E820_RAM; - e820_raw.map[1].addr = 0x100000; - e820_raw.map[1].size = bootsym(highmem_kb) << 10; - e820_raw.map[1].type = E820_RAM; - e820_raw.nr_map = 2; - } - else if ( mbi->flags & MBI_MEMLIMITS ) - { - memmap_type = "Multiboot-e801"; - e820_raw.map[0].addr = 0; - e820_raw.map[0].size = mbi->mem_lower << 10; - e820_raw.map[0].type = E820_RAM; - e820_raw.map[1].addr = 0x100000; - e820_raw.map[1].size = mbi->mem_upper << 10; - e820_raw.map[1].type = E820_RAM; - e820_raw.nr_map = 2; - } else panic("Bootloader provided no memory information\n"); diff --git a/xen/include/asm-x86/e820.h b/xen/include/asm-x86/e820.h index 52916fb75d..9d8f1ba960 100644 --- a/xen/include/asm-x86/e820.h +++ b/xen/include/asm-x86/e820.h @@ -36,7 +36,6 @@ extern struct e820map e820; extern struct e820map e820_raw; /* These symbols live in the boot trampoline. */ -extern unsigned int lowmem_kb, highmem_kb; extern struct e820map bios_e820map[]; extern unsigned int bios_e820nr; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:27:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:27:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67402.120247 (Exim 4.92) (envelope-from ) id 1l05TP-0003uR-14; Thu, 14 Jan 2021 16:27:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67402.120247; Thu, 14 Jan 2021 16:27: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 1l05TO-0003uJ-UO; Thu, 14 Jan 2021 16:27:46 +0000 Received: by outflank-mailman (input) for mailman id 67402; Thu, 14 Jan 2021 16:27:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05TO-0003uA-1m for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05TO-00087j-0s for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05TO-0006BA-07 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z5Buz34XlhHgzErDs9wYB9RIoQylTObObTQy7+PciSU=; b=HHHprWCtTKtDJpkWUmixEfoTb9 XYIcTFNcXlpB2n5EDF+Eqct5O3x+jzDSZG+OwuokvfCXvptAADwzglUJ3vjUoXWbZaVP2JkrtLrcv lSnItZCG0DIA0qiXfQVYb7ozGiLcDxt03hdQz9Agd5YZN1TGKPvg8plhORzvmityGtZY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/dpci: EOI interrupt regardless of its masking status Message-Id: Date: Thu, 14 Jan 2021 16:27:46 +0000 commit eb298f32fac5ac362eef30a66a9c9c42724d4ce6 Author: Roger Pau Monné AuthorDate: Thu Jan 7 15:10:29 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:10:29 2021 +0100 x86/dpci: EOI interrupt regardless of its masking status Modify hvm_pirq_eoi to always EOI the interrupt if required, instead of not doing such EOI if the interrupt is routed through the vIO-APIC and the entry is masked at the time the EOI is performed. Further unmask of the vIO-APIC pin won't EOI the interrupt, and thus the guest OS has to wait for the timeout to expire and the automatic EOI to be performed. This allows to simplify the helpers and drop the vioapic_redir_entry parameter from all of them. Fixes: ccfe4e08455 ('Intel vt-d specific changes in arch/x86/hvm/vmx/vtd.') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/vioapic.c | 2 +- xen/arch/x86/hvm/vpic.c | 3 +-- xen/drivers/passthrough/x86/hvm.c | 21 ++++++++------------- xen/include/asm-x86/hvm/io.h | 3 +-- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index 7c462a44d4..eb6c143f74 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -521,7 +521,7 @@ void vioapic_update_EOI(struct domain *d, u8 vector) if ( is_iommu_enabled(d) ) { spin_unlock(&d->arch.hvm.irq_lock); - hvm_dpci_eoi(d, vioapic->base_gsi + pin, ent); + hvm_dpci_eoi(d, vioapic->base_gsi + pin); spin_lock(&d->arch.hvm.irq_lock); } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 3cf12581e9..c1c1de7fd0 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -263,8 +263,7 @@ static void vpic_ioport_write( vpic_update_int_output(vpic); vpic_unlock(vpic); hvm_dpci_eoi(current->domain, - hvm_isa_irq_to_gsi((addr >> 7) ? (pin | 8) : pin), - NULL); + hvm_isa_irq_to_gsi((addr >> 7) ? (pin | 8) : pin)); return; /* bail immediately */ case 6: /* Set Priority */ vpic->priority_add = (val + 1) & 7; diff --git a/xen/drivers/passthrough/x86/hvm.c b/xen/drivers/passthrough/x86/hvm.c index 41cfa2e200..edc8059518 100644 --- a/xen/drivers/passthrough/x86/hvm.c +++ b/xen/drivers/passthrough/x86/hvm.c @@ -950,8 +950,7 @@ static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) spin_unlock(&d->event_lock); } -static void hvm_pirq_eoi(struct pirq *pirq, - const union vioapic_redir_entry *ent) +static void hvm_pirq_eoi(struct pirq *pirq) { struct hvm_pirq_dpci *pirq_dpci; @@ -968,7 +967,6 @@ static void hvm_pirq_eoi(struct pirq *pirq, * since interrupt is still not EOIed */ if ( --pirq_dpci->pending || - (ent && ent->fields.mask) || !pt_irq_need_timer(pirq_dpci->flags) ) return; @@ -977,19 +975,17 @@ static void hvm_pirq_eoi(struct pirq *pirq, } static void __hvm_dpci_eoi(struct domain *d, - const struct hvm_girq_dpci_mapping *girq, - const union vioapic_redir_entry *ent) + const struct hvm_girq_dpci_mapping *girq) { struct pirq *pirq = pirq_info(d, girq->machine_gsi); if ( !hvm_domain_use_pirq(d, pirq) ) hvm_pci_intx_deassert(d, girq->device, girq->intx); - hvm_pirq_eoi(pirq, ent); + hvm_pirq_eoi(pirq); } -static void hvm_gsi_eoi(struct domain *d, unsigned int gsi, - const union vioapic_redir_entry *ent) +static void hvm_gsi_eoi(struct domain *d, unsigned int gsi) { struct pirq *pirq = pirq_info(d, gsi); @@ -998,11 +994,10 @@ static void hvm_gsi_eoi(struct domain *d, unsigned int gsi, return; hvm_gsi_deassert(d, gsi); - hvm_pirq_eoi(pirq, ent); + hvm_pirq_eoi(pirq); } -void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, - const union vioapic_redir_entry *ent) +void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi) { const struct hvm_irq_dpci *hvm_irq_dpci; const struct hvm_girq_dpci_mapping *girq; @@ -1013,7 +1008,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, if ( is_hardware_domain(d) ) { spin_lock(&d->event_lock); - hvm_gsi_eoi(d, guest_gsi, ent); + hvm_gsi_eoi(d, guest_gsi); goto unlock; } @@ -1030,7 +1025,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, goto unlock; list_for_each_entry ( girq, &hvm_irq_dpci->girq[guest_gsi], list ) - __hvm_dpci_eoi(d, girq, ent); + __hvm_dpci_eoi(d, girq); unlock: spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 558426b772..9453b9b2b7 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -118,8 +118,7 @@ bool handle_mmio_with_translation(unsigned long gla, unsigned long gpfn, struct npfec); bool handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); -void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, - const union vioapic_redir_entry *ent); +void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq); void msix_write_completion(struct vcpu *); #ifdef CONFIG_HVM -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:27:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:27:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67403.120251 (Exim 4.92) (envelope-from ) id 1l05TZ-0003vk-36; Thu, 14 Jan 2021 16:27:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67403.120251; Thu, 14 Jan 2021 16:27: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 1l05TY-0003vc-WA; Thu, 14 Jan 2021 16:27:56 +0000 Received: by outflank-mailman (input) for mailman id 67403; Thu, 14 Jan 2021 16:27:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05TY-0003vV-5D for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05TY-00088F-3m for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05TY-0006Bo-37 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:27:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3jnFY0ZBp3egDt4y9gAzy3P7RmhzfaxhtJa9lN1stJI=; b=PLfh8k42x9t1KmhU6ym4tiBLAW CMZj+O/xKnGFvUzF+Mg0t2/n3N+rBoP0YeqCi/ie4CFBDYbOoUOBlB4WI5lqFNueO3pD30jT5xvLG NapvpFuPQ1p/HlOwt9LH46koKUCKyP03iamPnckrKvm4SB7ygqndMmmQEGBEXttj+En8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm/dummy: harden against speculative abuse Message-Id: Date: Thu, 14 Jan 2021 16:27:56 +0000 commit 994f6478a48a60e3b407c7defc2d36a80f880b04 Author: Jan Beulich AuthorDate: Thu Jan 7 15:11:25 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 7 15:11:25 2021 +0100 xsm/dummy: harden against speculative abuse First of all don't open-code is_control_domain(), which is already suitably using evaluate_nospec(). Then also apply this construct to the other paths of xsm_default_action(). Also guard two paths not using this function. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu --- xen/include/xsm/dummy.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 7ae3c40eb5..fa40e880ba 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -76,20 +76,20 @@ static always_inline int xsm_default_action( case XSM_HOOK: return 0; case XSM_TARGET: - if ( src == target ) + if ( evaluate_nospec(src == target) ) { return 0; case XSM_XS_PRIV: - if ( is_xenstore_domain(src) ) + if ( evaluate_nospec(is_xenstore_domain(src)) ) return 0; } /* fall through */ case XSM_DM_PRIV: - if ( target && src->target == target ) + if ( target && evaluate_nospec(src->target == target) ) return 0; /* fall through */ case XSM_PRIV: - if ( src->is_privileged ) + if ( is_control_domain(src) ) return 0; return -EPERM; default: @@ -656,7 +656,7 @@ static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct do XSM_ASSERT_ACTION(XSM_TARGET); if ( f != dom_io ) rc = xsm_default_action(action, d, f); - if ( t && !rc ) + if ( evaluate_nospec(t) && !rc ) rc = xsm_default_action(action, d, t); return rc; } @@ -750,6 +750,7 @@ static XSM_INLINE int xsm_xen_version (XSM_DEFAULT_ARG uint32_t op) case XENVER_platform_parameters: case XENVER_get_features: /* These sub-ops ignore the permission checks and return data. */ + block_speculation(); return 0; case XENVER_extraversion: case XENVER_compile_info: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:28:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:28:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67404.120255 (Exim 4.92) (envelope-from ) id 1l05Tj-0003x2-4R; Thu, 14 Jan 2021 16:28:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67404.120255; Thu, 14 Jan 2021 16:28: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 1l05Tj-0003wu-1O; Thu, 14 Jan 2021 16:28:07 +0000 Received: by outflank-mailman (input) for mailman id 67404; Thu, 14 Jan 2021 16:28:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Ti-0003wl-7t for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Ti-00088a-7A for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Ti-0006Cu-5y for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rv9L979HhRXpLeqPKt5h4lcIKKd4Mo3mDRZxuQQZv+k=; b=l79BbtdWlm9jeh3sMZVZG/SYrp GvIXEDAoNAS3n60ayviBh8xrm6CzZuKh1SMTC5qRR2/edkKKZYiqsQ6OWE6Zt29kIPCBSeg3YlvBF g8EMIkDlsUtsdXQr+fkIPpGmXaUxcNVNMH/4hKIcSBQBS9RQw60QltWLfae8GY+IlXIE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: optee: The function identifier is always 32-bit Message-Id: Date: Thu, 14 Jan 2021 16:28:06 +0000 commit ede2583fa1a28a969c5609b86aa82a7ba9f19a26 Author: Roman Skakun AuthorDate: Wed Jan 6 13:26:57 2021 +0200 Commit: Julien Grall CommitDate: Fri Jan 8 10:24:23 2021 +0000 xen/arm: optee: The function identifier is always 32-bit Per the SMCCC specification (see section 3.1 in ARM DEN 0028D), the function identifier is only stored in the least significant 32-bits. The most significant 32-bits should be ignored. Signed-off-by: Roman Skakun Acked-by: Volodymyr Babchyk [jgrall: Reword the commit message and comment] Acked-by: Julien Grall --- xen/arch/arm/tee/optee.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/tee/optee.c b/xen/arch/arm/tee/optee.c index ee85359742..9570dc6771 100644 --- a/xen/arch/arm/tee/optee.c +++ b/xen/arch/arm/tee/optee.c @@ -1643,7 +1643,11 @@ static bool optee_handle_call(struct cpu_user_regs *regs) if ( !ctx ) return false; - switch ( get_user_reg(regs, 0) ) + /* + * The function identifier is always stored in the least significant + * 32-bit (see section ARM DEN 0028D). + */ + switch ( (uint32_t)get_user_reg(regs, 0) ) { case OPTEE_SMC_CALLS_COUNT: set_user_reg(regs, 0, OPTEE_MEDIATOR_SMC_COUNT); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:28:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:28:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67405.120258 (Exim 4.92) (envelope-from ) id 1l05Tt-0003yI-5n; Thu, 14 Jan 2021 16:28:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67405.120258; Thu, 14 Jan 2021 16:28: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 1l05Tt-0003yB-2q; Thu, 14 Jan 2021 16:28:17 +0000 Received: by outflank-mailman (input) for mailman id 67405; Thu, 14 Jan 2021 16:28:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Ts-0003y3-BJ for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Ts-00088i-AX for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Ts-0006Df-9U for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PL+s2Gkv2cgKtpNU6p5ZR+3pu2ulkoG2euCGQvVw/wA=; b=5LJmTkSUaS898GOkQK46nRLErQ +Ty5EJ8oeXw3cuSV7EvaRLkapgAoUuBHgeSlFw0p8VweQKJXzn2rRgMA+yNZxo5mOdkTBPVYNBgcs RyU6lWn3M/DTx8c9B1pRRmkk9g1tHnNPIipAk4Rs2XA9rSJKBBDeLMUbhVfODVtHgetM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: replace __ASM_{CL,ST}AC Message-Id: Date: Thu, 14 Jan 2021 16:28:16 +0000 commit 6721f01ba1ccb7a32778e485d15e58d2eb6184f2 Author: Jan Beulich AuthorDate: Fri Jan 8 11:45:07 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 11:45:07 2021 +0100 x86: replace __ASM_{CL,ST}AC Introduce proper assembler macros instead, enabled only when the assembler itself doesn't support the insns. To avoid duplicating the macros for assembly and C files, have them processed into asm-macros.h. This in turn requires adding a multiple inclusion guard when generating that header. No change to generated code. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/Makefile | 3 +++ xen/arch/x86/arch.mk | 1 + xen/arch/x86/asm-macros.c | 1 + xen/include/asm-x86/asm-defns.h | 9 +++++++++ xen/include/asm-x86/asm_defns.h | 17 ++++++----------- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 7f4f5ed96f..7769bb40d7 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -250,7 +250,10 @@ $(BASEDIR)/include/asm-x86/asm-macros.h: asm-macros.i Makefile echo '#if 0' >$@.new echo '.if 0' >>$@.new echo '#endif' >>$@.new + echo '#ifndef __ASM_MACROS_H__' >>$@.new + echo '#define __ASM_MACROS_H__' >>$@.new echo 'asm ( ".include \"$@\"" );' >>$@.new + echo '#endif /* __ASM_MACROS_H__ */' >>$@.new echo '#if 0' >>$@.new echo '.endif' >>$@.new cat $< >>$@.new diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 04e967436b..ce0c1a0e7f 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -20,6 +20,7 @@ $(call as-option-add,CFLAGS,CC,"rdrand %eax",-DHAVE_AS_RDRAND) $(call as-option-add,CFLAGS,CC,"rdfsbase %rax",-DHAVE_AS_FSGSBASE) $(call as-option-add,CFLAGS,CC,"xsaveopt (%rax)",-DHAVE_AS_XSAVEOPT) $(call as-option-add,CFLAGS,CC,"rdseed %eax",-DHAVE_AS_RDSEED) +$(call as-option-add,CFLAGS,CC,"clac",-DHAVE_AS_CLAC_STAC) $(call as-option-add,CFLAGS,CC,"clwb (%rax)",-DHAVE_AS_CLWB) $(call as-option-add,CFLAGS,CC,".equ \"x\"$$(comma)1",-DHAVE_AS_QUOTED_SYM) $(call as-option-add,CFLAGS,CC,"invpcid (%rax)$$(comma)%rax",-DHAVE_AS_INVPCID) diff --git a/xen/arch/x86/asm-macros.c b/xen/arch/x86/asm-macros.c index b963d56a56..7e536b0d82 100644 --- a/xen/arch/x86/asm-macros.c +++ b/xen/arch/x86/asm-macros.c @@ -1 +1,2 @@ +#include #include diff --git a/xen/include/asm-x86/asm-defns.h b/xen/include/asm-x86/asm-defns.h new file mode 100644 index 0000000000..e070f3814f --- /dev/null +++ b/xen/include/asm-x86/asm-defns.h @@ -0,0 +1,9 @@ +#ifndef HAVE_AS_CLAC_STAC +.macro clac + .byte 0x0f, 0x01, 0xca +.endm + +.macro stac + .byte 0x0f, 0x01, 0xcb +.endm +#endif diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 774a294d15..901fb89cef 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -13,10 +13,12 @@ #include #ifdef __ASSEMBLY__ +#include #ifndef CONFIG_INDIRECT_THUNK .equ CONFIG_INDIRECT_THUNK, 0 #endif #else +#include asm ( "\t.equ CONFIG_INDIRECT_THUNK, " __stringify(IS_ENABLED(CONFIG_INDIRECT_THUNK)) ); #endif @@ -199,34 +201,27 @@ register unsigned long current_stack_pointer asm("rsp"); #endif -/* "Raw" instruction opcodes */ -#define __ASM_CLAC ".byte 0x0f,0x01,0xca" -#define __ASM_STAC ".byte 0x0f,0x01,0xcb" - #ifdef __ASSEMBLY__ .macro ASM_STAC - ALTERNATIVE "", __ASM_STAC, X86_FEATURE_XEN_SMAP + ALTERNATIVE "", stac, X86_FEATURE_XEN_SMAP .endm .macro ASM_CLAC - ALTERNATIVE "", __ASM_CLAC, X86_FEATURE_XEN_SMAP + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP .endm #else static always_inline void clac(void) { /* Note: a barrier is implicit in alternative() */ - alternative("", __ASM_CLAC, X86_FEATURE_XEN_SMAP); + alternative("", "clac", X86_FEATURE_XEN_SMAP); } static always_inline void stac(void) { /* Note: a barrier is implicit in alternative() */ - alternative("", __ASM_STAC, X86_FEATURE_XEN_SMAP); + alternative("", "stac", X86_FEATURE_XEN_SMAP); } #endif -#undef __ASM_STAC -#undef __ASM_CLAC - #ifdef __ASSEMBLY__ .macro SAVE_ALL op, compat=0 .ifeqs "\op", "CLAC" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:28:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:28:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67406.120263 (Exim 4.92) (envelope-from ) id 1l05U4-0003zo-8x; Thu, 14 Jan 2021 16:28:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67406.120263; Thu, 14 Jan 2021 16:28:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05U4-0003zg-5m; Thu, 14 Jan 2021 16:28:28 +0000 Received: by outflank-mailman (input) for mailman id 67406; Thu, 14 Jan 2021 16:28:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05U2-0003zV-F2 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05U2-00088q-Dq for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05U2-0006EO-Cx for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28: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=tMoWWaK1tPSTwyKevCKXAZL19LhikCwh0K9Mh5/5OVE=; b=FD1w4X55m7btWear7GifrOUY6M pUtdvOhXFyouXwOPZ4QfNmc0gkf4lC6GkVpzwusZGzmXAySJxZxNphdI1hv47czXQSoxhPztSDz94 zFFosIm8KOz8ASeS0qOGm+Z/ohlXDkUgcQ51KEUaaPQtWt9N4NeTFJuII1fU+/ThTN2Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: drop ASM_{CL,ST}AC Message-Id: Date: Thu, 14 Jan 2021 16:28:26 +0000 commit 5fa9a14436af81c3263f9ac31b64972416a59307 Author: Jan Beulich AuthorDate: Fri Jan 8 11:48:09 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 11:48:09 2021 +0100 x86: drop ASM_{CL,ST}AC Use ALTERNATIVE directly, such that at the use sites it is visible that alternative code patching is in use. Similarly avoid hiding the fact in SAVE_ALL. No change to generated code. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/traps.c | 5 ++--- xen/arch/x86/x86_64/compat/entry.S | 8 ++++---- xen/arch/x86/x86_64/entry.S | 24 ++++++++++++++---------- xen/include/asm-x86/asm_defns.h | 23 +---------------------- 4 files changed, 21 insertions(+), 39 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0459cee9fb..4bd2cb6a1a 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2200,9 +2200,8 @@ void activate_debugregs(const struct vcpu *curr) void asm_domain_crash_synchronous(unsigned long addr) { /* - * We need clear AC bit here because in entry.S AC is set - * by ASM_STAC to temporarily allow accesses to user pages - * which is prevented by SMAP by default. + * We need to clear the AC bit here because the exception fixup logic + * may leave user accesses enabled. * * For some code paths, where this function is called, clac() * is not needed, but adding clac() here instead of each place diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 16a2f439a7..c2c73cc732 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -14,7 +14,7 @@ #ifdef CONFIG_PV32 ENTRY(entry_int82) - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP pushq $0 movl $HYPERCALL_VECTOR, 4(%rsp) SAVE_ALL compat=1 /* DPL1 gate, restricted to 32bit PV guests only. */ @@ -290,7 +290,7 @@ ENTRY(compat_int80_direct_trap) compat_create_bounce_frame: ASSERT_INTERRUPTS_ENABLED mov %fs,%edi - ASM_STAC + ALTERNATIVE "", stac, X86_FEATURE_XEN_SMAP testb $2,UREGS_cs+8(%rsp) jz 1f /* Push new frame at registered guest-OS stack base. */ @@ -337,7 +337,7 @@ compat_create_bounce_frame: movl TRAPBOUNCE_error_code(%rdx),%eax .Lft8: movl %eax,%fs:(%rsi) # ERROR CODE 1: - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP /* Rewrite our stack frame and return to guest-OS mode. */ /* IA32 Ref. Vol. 3: TF, VM, RF and NT flags are cleared on trap. */ andl $~(X86_EFLAGS_VM|X86_EFLAGS_RF|\ @@ -383,7 +383,7 @@ compat_crash_page_fault_4: addl $4,%esi compat_crash_page_fault: .Lft14: mov %edi,%fs - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP movl %esi,%edi call show_page_walk jmp dom_crash_sync_extable diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index c16b3c90be..7292ae8493 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -280,7 +280,7 @@ ENTRY(sysenter_entry) pushq $0 pushfq GLOBAL(sysenter_eflags_saved) - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP pushq $3 /* ring 3 null cs */ pushq $0 /* null rip */ pushq $0 @@ -333,7 +333,7 @@ UNLIKELY_END(sysenter_gpf) jmp .Lbounce_exception ENTRY(int80_direct_trap) - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP pushq $0 movl $0x80, 4(%rsp) SAVE_ALL @@ -452,7 +452,7 @@ __UNLIKELY_END(create_bounce_frame_bad_sp) subq $7*8,%rsi movq UREGS_ss+8(%rsp),%rax - ASM_STAC + ALTERNATIVE "", stac, X86_FEATURE_XEN_SMAP movq VCPU_domain(%rbx),%rdi STORE_GUEST_STACK(rax,6) # SS movq UREGS_rsp+8(%rsp),%rax @@ -490,7 +490,7 @@ __UNLIKELY_END(create_bounce_frame_bad_sp) STORE_GUEST_STACK(rax,1) # R11 movq UREGS_rcx+8(%rsp),%rax STORE_GUEST_STACK(rax,0) # RCX - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP #undef STORE_GUEST_STACK @@ -532,11 +532,11 @@ domain_crash_page_fault_2x8: domain_crash_page_fault_1x8: addq $8,%rsi domain_crash_page_fault_0x8: - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP movq %rsi,%rdi call show_page_walk ENTRY(dom_crash_sync_extable) - ASM_CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP # Get out of the guest-save area of the stack. GET_STACK_END(ax) leaq STACK_CPUINFO_FIELD(guest_cpu_user_regs)(%rax),%rsp @@ -597,7 +597,8 @@ UNLIKELY_END(exit_cr3) iretq ENTRY(common_interrupt) - SAVE_ALL CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP + SAVE_ALL GET_STACK_END(14) @@ -629,7 +630,8 @@ ENTRY(page_fault) movl $TRAP_page_fault,4(%rsp) /* No special register assumptions. */ GLOBAL(handle_exception) - SAVE_ALL CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP + SAVE_ALL GET_STACK_END(14) @@ -834,7 +836,8 @@ ENTRY(entry_CP) ENTRY(double_fault) movl $TRAP_double_fault,4(%rsp) /* Set AC to reduce chance of further SMAP faults */ - SAVE_ALL STAC + ALTERNATIVE "", stac, X86_FEATURE_XEN_SMAP + SAVE_ALL GET_STACK_END(14) @@ -867,7 +870,8 @@ ENTRY(nmi) pushq $0 movl $TRAP_nmi,4(%rsp) handle_ist_exception: - SAVE_ALL CLAC + ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP + SAVE_ALL GET_STACK_END(14) diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 901fb89cef..f8de679feb 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -199,16 +199,6 @@ register unsigned long current_stack_pointer asm("rsp"); UNLIKELY_END_SECTION "\n" \ ".Llikely." #tag ".%=:" -#endif - -#ifdef __ASSEMBLY__ -.macro ASM_STAC - ALTERNATIVE "", stac, X86_FEATURE_XEN_SMAP -.endm -.macro ASM_CLAC - ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP -.endm -#else static always_inline void clac(void) { /* Note: a barrier is implicit in alternative() */ @@ -223,18 +213,7 @@ static always_inline void stac(void) #endif #ifdef __ASSEMBLY__ -.macro SAVE_ALL op, compat=0 -.ifeqs "\op", "CLAC" - ASM_CLAC -.else -.ifeqs "\op", "STAC" - ASM_STAC -.else -.ifnb \op - .err -.endif -.endif -.endif +.macro SAVE_ALL compat=0 addq $-(UREGS_error_code-UREGS_r15), %rsp cld movq %rdi,UREGS_rdi(%rsp) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:28:38 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:28:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67407.120266 (Exim 4.92) (envelope-from ) id 1l05UE-000411-AP; Thu, 14 Jan 2021 16:28:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67407.120266; Thu, 14 Jan 2021 16:28:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05UE-00040v-7U; Thu, 14 Jan 2021 16:28:38 +0000 Received: by outflank-mailman (input) for mailman id 67407; Thu, 14 Jan 2021 16:28:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05UC-00040k-HP for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05UC-00088y-Gh for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05UC-0006F4-G5 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28: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=BZOkGDv4pZrmD5wS70RiJlapeG73FLfB+TKkm1Phjwk=; b=6S5CI4154f1vNZRLYDD3g6jN2G EuTk1c3tgg6sQPsZGHLRRmFMo9i7YHJ9U737WosTFno8Zx/TR/C+4Ws7iGYBmhcWMJjj4FprRwKHf l5HIIDUMfEnAd/emJXwZPbcEAlyDSLn/BsDERoESDJs3PaUcproQLAgRnGwutY38DmvM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: fold indirect_thunk_asm.h into asm-defns.h Message-Id: Date: Thu, 14 Jan 2021 16:28:36 +0000 commit 762c3890c89f70687fad1130e61ac99e671b2a6d Author: Jan Beulich AuthorDate: Fri Jan 8 11:50:32 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 11:50:32 2021 +0100 x86: fold indirect_thunk_asm.h into asm-defns.h There's little point in having two separate headers both getting included by asm_defns.h. This in particular reduces the number of instances of guarding asm(".include ...") suitably in such dual use headers. No change to generated code. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/Makefile | 2 +- xen/include/asm-x86/asm-defns.h | 37 ++++++++++++++++++++++ xen/include/asm-x86/asm_defns.h | 1 - xen/include/asm-x86/indirect_thunk_asm.h | 53 -------------------------------- 4 files changed, 38 insertions(+), 55 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 73bdc326c5..544cc0995d 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -139,7 +139,7 @@ ifeq ($(TARGET_ARCH),x86) t1 = $(call as-insn,$(CC),".L0: .L1: .skip (.L1 - .L0)",,-no-integrated-as) # Check whether clang asm()-s support .include. -t2 = $(call as-insn,$(CC) -I$(BASEDIR)/include,".include \"asm-x86/indirect_thunk_asm.h\"",,-no-integrated-as) +t2 = $(call as-insn,$(CC) -I$(BASEDIR)/include,".include \"asm-x86/asm-defns.h\"",,-no-integrated-as) # Check whether clang keeps .macro-s between asm()-s: # https://bugs.llvm.org/show_bug.cgi?id=36110 diff --git a/xen/include/asm-x86/asm-defns.h b/xen/include/asm-x86/asm-defns.h index e070f3814f..43f4868d40 100644 --- a/xen/include/asm-x86/asm-defns.h +++ b/xen/include/asm-x86/asm-defns.h @@ -7,3 +7,40 @@ .byte 0x0f, 0x01, 0xcb .endm #endif + +.macro INDIRECT_BRANCH insn:req arg:req +/* + * Create an indirect branch. insn is one of call/jmp, arg is a single + * register. + * + * With no compiler support, this degrades into a plain indirect call/jmp. + * With compiler support, dispatch to the correct __x86_indirect_thunk_* + */ + .if CONFIG_INDIRECT_THUNK == 1 + + $done = 0 + .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 + .ifeqs "\arg", "%r\reg" + \insn __x86_indirect_thunk_r\reg + $done = 1 + .exitm + .endif + .endr + + .if $done != 1 + .error "Bad register arg \arg" + .endif + + .else + \insn *\arg + .endif +.endm + +/* Convenience wrappers. */ +.macro INDIRECT_CALL arg:req + INDIRECT_BRANCH call \arg +.endm + +.macro INDIRECT_JMP arg:req + INDIRECT_BRANCH jmp \arg +.endm diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index f8de679feb..d480a4461b 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -22,7 +22,6 @@ asm ( "\t.equ CONFIG_INDIRECT_THUNK, " __stringify(IS_ENABLED(CONFIG_INDIRECT_THUNK)) ); #endif -#include #ifndef __ASSEMBLY__ diff --git a/xen/include/asm-x86/indirect_thunk_asm.h b/xen/include/asm-x86/indirect_thunk_asm.h deleted file mode 100644 index 71e6de5bf7..0000000000 --- a/xen/include/asm-x86/indirect_thunk_asm.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Trickery to allow this header to be included at the C level, to permit - * proper dependency tracking in .*.o.d files, while still having it contain - * assembler only macros. - */ -#ifndef __ASSEMBLY__ -# if 0 - .if 0 -# endif -asm ( "\t.include \"asm/indirect_thunk_asm.h\"" ); -# if 0 - .endif -# endif -#else - -.macro INDIRECT_BRANCH insn:req arg:req -/* - * Create an indirect branch. insn is one of call/jmp, arg is a single - * register. - * - * With no compiler support, this degrades into a plain indirect call/jmp. - * With compiler support, dispatch to the correct __x86_indirect_thunk_* - */ - .if CONFIG_INDIRECT_THUNK == 1 - - $done = 0 - .irp reg, ax, cx, dx, bx, bp, si, di, 8, 9, 10, 11, 12, 13, 14, 15 - .ifeqs "\arg", "%r\reg" - \insn __x86_indirect_thunk_r\reg - $done = 1 - .exitm - .endif - .endr - - .if $done != 1 - .error "Bad register arg \arg" - .endif - - .else - \insn *\arg - .endif -.endm - -/* Convenience wrappers. */ -.macro INDIRECT_CALL arg:req - INDIRECT_BRANCH call \arg -.endm - -.macro INDIRECT_JMP arg:req - INDIRECT_BRANCH jmp \arg -.endm - -#endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:28:48 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:28:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67408.120271 (Exim 4.92) (envelope-from ) id 1l05UO-00042c-Bw; Thu, 14 Jan 2021 16:28:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67408.120271; Thu, 14 Jan 2021 16:28:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05UO-00042U-92; Thu, 14 Jan 2021 16:28:48 +0000 Received: by outflank-mailman (input) for mailman id 67408; Thu, 14 Jan 2021 16:28:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05UM-00042K-LG for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05UM-000896-Ji for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05UM-0006G9-J1 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tqa1pvbsVlr4FuUGxJw3SH7KMn27uKl+C9jgFmqTQyU=; b=5OEQy/M+uVR7SoIqYkTUlWU5cm FKGkog0Lv7FzdyUARtB0l0TExyrUBBB24j2h79N6k3O1NVB2q4A7clU41DuOaCy6EnIRP8C9eLXrR 90zfNJZMXqmgVrK2txkwtjnqFYH5Z5IT4Y5yzdE2EX5EFGiNqWd3WwGotVMaCRUiplvQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mem_sharing: resolve mm-lock order violations when forking VMs with nested p2m Message-Id: Date: Thu, 14 Jan 2021 16:28:46 +0000 commit 3e6c560ea1931ff579fc2c9504a6e46e5c4572c9 Author: Tamas K Lengyel AuthorDate: Fri Jan 8 11:51:36 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 11:51:36 2021 +0100 x86/mem_sharing: resolve mm-lock order violations when forking VMs with nested p2m Several lock-order violations have been encountered while attempting to fork VMs with nestedhvm=1 set. This patch resolves the issues. The order violations stems from a call to p2m_flush_nestedp2m being performed whenever the hostp2m changes. This functions always takes the p2m lock for the nested_p2m. However, with sharing the p2m locks always have to be taken before the sharing lock. To resolve this issue we avoid taking the sharing lock where possible (and was actually unecessary to begin with). But we also make p2m_flush_nestedp2m aware that the p2m lock may have already been taken and preemptively take all nested_p2m locks before unsharing a page where taking the sharing lock is necessary. Signed-off-by: Tamas K Lengyel Acked-by: Jan Beulich --- xen/arch/x86/mm/mem_sharing.c | 44 +++++++++++++++++++++++++++++-------------- xen/arch/x86/mm/p2m.c | 12 ++++++++++-- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index ad9d495110..a98a1709c2 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -893,13 +894,11 @@ static int nominate_page(struct domain *d, gfn_t gfn, goto out; /* - * Now that the page is validated, we can lock it. There is no - * race because we're holding the p2m entry, so no one else - * could be nominating this gfn. + * Now that the page is validated, we can make it shared. There is no race + * because we're holding the p2m entry, so no one else could be nominating + * this gfn & and it is evidently not yet shared with any other VM, thus we + * don't need to take the mem_sharing_page_lock here. */ - ret = -ENOENT; - if ( !mem_sharing_page_lock(page) ) - goto out; /* Initialize the shared state */ ret = -ENOMEM; @@ -935,7 +934,6 @@ static int nominate_page(struct domain *d, gfn_t gfn, *phandle = page->sharing->handle; audit_add_list(page); - mem_sharing_page_unlock(page); ret = 0; out: @@ -1214,7 +1212,8 @@ int __mem_sharing_unshare_page(struct domain *d, p2m_type_t p2mt; mfn_t mfn; struct page_info *page, *old_page; - int last_gfn; + bool last_gfn; + int rc = 0; gfn_info_t *gfn_info = NULL; mfn = get_gfn(d, gfn, &p2mt); @@ -1226,6 +1225,15 @@ int __mem_sharing_unshare_page(struct domain *d, return 0; } + /* lock nested p2ms to avoid lock-order violation with sharing lock */ + if ( unlikely(nestedhvm_enabled(d)) ) + { + unsigned int i; + + for ( i = 0; i < MAX_NESTEDP2M; i++ ) + p2m_lock(d->arch.nested_p2m[i]); + } + page = __grab_shared_page(mfn); if ( page == NULL ) { @@ -1276,9 +1284,7 @@ int __mem_sharing_unshare_page(struct domain *d, put_page_alloc_ref(page); put_page_and_type(page); - put_gfn(d, gfn); - - return 0; + goto out; } if ( last_gfn ) @@ -1295,12 +1301,12 @@ int __mem_sharing_unshare_page(struct domain *d, /* Undo dec of nr_saved_mfns, as the retry will decrease again. */ atomic_inc(&nr_saved_mfns); mem_sharing_page_unlock(old_page); - put_gfn(d, gfn); /* * Caller is responsible for placing an event * in the ring. */ - return -ENOMEM; + rc = -ENOMEM; + goto out; } copy_domain_page(page_to_mfn(page), page_to_mfn(old_page)); @@ -1327,8 +1333,18 @@ int __mem_sharing_unshare_page(struct domain *d, */ paging_mark_dirty(d, page_to_mfn(page)); /* We do not need to unlock a private page */ + + out: + if ( unlikely(nestedhvm_enabled(d)) ) + { + unsigned int i; + + for ( i = 0; i < MAX_NESTEDP2M; i++ ) + p2m_unlock(d->arch.nested_p2m[i]); + } + put_gfn(d, gfn); - return 0; + return rc; } int relinquish_shared_pages(struct domain *d) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index ad4bb94514..a32301c343 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1597,9 +1597,17 @@ p2m_flush(struct vcpu *v, struct p2m_domain *p2m) void p2m_flush_nestedp2m(struct domain *d) { - int i; + unsigned int i; + for ( i = 0; i < MAX_NESTEDP2M; i++ ) - p2m_flush_table(d->arch.nested_p2m[i]); + { + struct p2m_domain *p2m = d->arch.nested_p2m[i]; + + if ( p2m_locked_by_me(p2m) ) + p2m_flush_table_locked(p2m); + else + p2m_flush_table(p2m); + } } void np2m_flush_base(struct vcpu *v, unsigned long np2m_base) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:28:58 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:28:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67409.120274 (Exim 4.92) (envelope-from ) id 1l05UY-00044M-DS; Thu, 14 Jan 2021 16:28:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67409.120274; Thu, 14 Jan 2021 16:28:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05UY-00044E-AY; Thu, 14 Jan 2021 16:28:58 +0000 Received: by outflank-mailman (input) for mailman id 67409; Thu, 14 Jan 2021 16:28:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05UW-000445-Nr for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05UW-00089b-N8 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05UW-0006Gt-Lt for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:28:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ah4DvwX5dMTJbs/LrMComTYNnjU4Kg8NXI76Ph+9jDM=; b=6xsvYM9rYtPVOGdFaB422NDaj7 UNGm2Mbb0aCLStOswDiomEQzborTG+u/vYDBAvioqBDPCSo+bTh4pM8Ox5e2XAvY3dShmS8Yy/1In W2MU7ysa4nkElAt4SAR0XQSJBnDDUai71ujDtErp9+gsE367OFdBATRzTbsZKSnLOoH8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/p2m: avoid unnecessary calls of write_p2m_entry_pre() hook Message-Id: Date: Thu, 14 Jan 2021 16:28:56 +0000 commit 570065b9d5a8a00c5c1aab9e13e9e1ad3e35ce7d Author: Jan Beulich AuthorDate: Fri Jan 8 16:49:23 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 16:49:23 2021 +0100 x86/p2m: avoid unnecessary calls of write_p2m_entry_pre() hook When shattering a large page, we first construct the new page table page and only then hook it up. The "pre" hook in this case does nothing, for the page starting out all blank. Avoid 512 calls into shadow code in this case by passing in INVALID_GFN, indicating the page being updated is (not yet) associated with any GFN. (The alternative to this change would be to actually pass in a correct GFN, which can't be all the same on every loop iteration.) Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/mm/p2m-pt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 5fa0d30ce7..848773e1cd 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -134,7 +134,7 @@ static int write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn, paging_lock(d); - if ( p2m->write_p2m_entry_pre ) + if ( p2m->write_p2m_entry_pre && gfn != gfn_x(INVALID_GFN) ) p2m->write_p2m_entry_pre(d, gfn, p, new, level); oflags = l1e_get_flags(*p); @@ -290,7 +290,8 @@ p2m_next_level(struct p2m_domain *p2m, void **table, { new_entry = l1e_from_pfn(pfn | (i << ((level - 1) * PAGETABLE_ORDER)), flags); - rc = write_p2m_entry(p2m, gfn, l1_entry + i, new_entry, level); + rc = write_p2m_entry(p2m, gfn_x(INVALID_GFN), l1_entry + i, + new_entry, level); if ( rc ) { unmap_domain_page(l1_entry); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:29:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:29:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67410.120281 (Exim 4.92) (envelope-from ) id 1l05Ui-000474-Gm; Thu, 14 Jan 2021 16:29:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67410.120281; Thu, 14 Jan 2021 16:29:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Ui-00046w-CD; Thu, 14 Jan 2021 16:29:08 +0000 Received: by outflank-mailman (input) for mailman id 67410; Thu, 14 Jan 2021 16:29:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Ug-00046n-RD for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Ug-00089u-QP for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Ug-0006Hg-Pf for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vMvhUeJgblmP8Y7EZRvlz0E/fLgeobKXfuFQS5SD+Dg=; b=K7fQbzVatQIzlIgRpNcKO2cCLr AbqgGnEvICMqlqCCpF9jbl1lpf29D+AUB+P1KTPsocHPuqEyhMNYdkE5FPQ2zt+RLs4p8sZnfdZH3 yAKW73yofZges1LVAx5A5ytwBDj8FwNECkXtJWYZQVyNP2KPWPnIRZhwsCqgTEmCUn0c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/p2m: pass old PTE directly to write_p2m_entry_pre() hook Message-Id: Date: Thu, 14 Jan 2021 16:29:06 +0000 commit 8511cc9eac78fa2d0f6ffc76ba80e55a06d02e78 Author: Jan Beulich AuthorDate: Fri Jan 8 16:50:11 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 16:50:11 2021 +0100 x86/p2m: pass old PTE directly to write_p2m_entry_pre() hook In no case is a pointer to non-const needed. Since no pointer arithmetic is done by the sole user of the hook, passing in the PTE itself is quite fine. While doing this adjustment also - drop the intermediate sh_write_p2m_entry_pre(): sh_unshadow_for_p2m_change() can itself be used as the hook function, moving the conditional into there, - introduce a local variable holding the flags of the old entry. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/p2m-pt.c | 2 +- xen/arch/x86/mm/shadow/common.c | 39 +++++++++++++++++++-------------------- xen/include/asm-x86/p2m.h | 2 +- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 848773e1cd..c43d5d0413 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -135,7 +135,7 @@ static int write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn, paging_lock(d); if ( p2m->write_p2m_entry_pre && gfn != gfn_x(INVALID_GFN) ) - p2m->write_p2m_entry_pre(d, gfn, p, new, level); + p2m->write_p2m_entry_pre(d, gfn, *p, new, level); oflags = l1e_get_flags(*p); omfn = l1e_get_mfn(*p); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 3298711972..e2ed049f14 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3086,19 +3086,28 @@ static int shadow_test_disable(struct domain *d) */ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, - l1_pgentry_t *p, l1_pgentry_t new, + l1_pgentry_t old, l1_pgentry_t new, unsigned int level) { + unsigned int oflags = l1e_get_flags(old); + + /* + * If there are any shadows, update them. But if shadow_teardown() + * has already been called then it's not safe to try. + */ + if ( unlikely(!d->arch.paging.shadow.total_pages) ) + return; + /* The following assertion is to make sure we don't step on 1GB host * page support of HVM guest. */ - ASSERT(!(level > 2 && (l1e_get_flags(*p) & _PAGE_PRESENT) && - (l1e_get_flags(*p) & _PAGE_PSE))); + ASSERT(!(level > 2 && (oflags & _PAGE_PRESENT) && (oflags & _PAGE_PSE))); /* If we're removing an MFN from the p2m, remove it from the shadows too */ if ( level == 1 ) { - mfn_t mfn = l1e_get_mfn(*p); - p2m_type_t p2mt = p2m_flags_to_type(l1e_get_flags(*p)); + mfn_t mfn = l1e_get_mfn(old); + p2m_type_t p2mt = p2m_flags_to_type(oflags); + if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(mfn) ) { sh_remove_all_shadows_and_parents(d, mfn); @@ -3110,15 +3119,15 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, /* If we're removing a superpage mapping from the p2m, we need to check * all the pages covered by it. If they're still there in the new * scheme, that's OK, but otherwise they must be unshadowed. */ - if ( level == 2 && (l1e_get_flags(*p) & _PAGE_PRESENT) && - (l1e_get_flags(*p) & _PAGE_PSE) ) + if ( level == 2 && (oflags & _PAGE_PRESENT) && (oflags & _PAGE_PSE) ) { unsigned int i; cpumask_t flushmask; - mfn_t omfn = l1e_get_mfn(*p); + mfn_t omfn = l1e_get_mfn(old); mfn_t nmfn = l1e_get_mfn(new); l1_pgentry_t *npte = NULL; - p2m_type_t p2mt = p2m_flags_to_type(l1e_get_flags(*p)); + p2m_type_t p2mt = p2m_flags_to_type(oflags); + if ( p2m_is_valid(p2mt) && mfn_valid(omfn) ) { cpumask_clear(&flushmask); @@ -3152,16 +3161,6 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, } } -static void -sh_write_p2m_entry_pre(struct domain *d, unsigned long gfn, l1_pgentry_t *p, - l1_pgentry_t new, unsigned int level) -{ - /* If there are any shadows, update them. But if shadow_teardown() - * has already been called then it's not safe to try. */ - if ( likely(d->arch.paging.shadow.total_pages != 0) ) - sh_unshadow_for_p2m_change(d, gfn, p, new, level); -} - #if (SHADOW_OPTIMIZATIONS & SHOPT_FAST_FAULT_PATH) static void sh_write_p2m_entry_post(struct p2m_domain *p2m, unsigned int oflags) @@ -3186,7 +3185,7 @@ sh_write_p2m_entry_post(struct p2m_domain *p2m, unsigned int oflags) void shadow_p2m_init(struct p2m_domain *p2m) { - p2m->write_p2m_entry_pre = sh_write_p2m_entry_pre; + p2m->write_p2m_entry_pre = sh_unshadow_for_p2m_change; p2m->write_p2m_entry_post = sh_write_p2m_entry_post; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 6447696bcd..6acbd1e390 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -274,7 +274,7 @@ struct p2m_domain { void (*memory_type_changed)(struct p2m_domain *p2m); void (*write_p2m_entry_pre)(struct domain *d, unsigned long gfn, - l1_pgentry_t *p, + l1_pgentry_t old, l1_pgentry_t new, unsigned int level); void (*write_p2m_entry_post)(struct p2m_domain *p2m, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:29:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:29:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67411.120284 (Exim 4.92) (envelope-from ) id 1l05Us-00048Z-Iv; Thu, 14 Jan 2021 16:29:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67411.120284; Thu, 14 Jan 2021 16:29:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Us-00048R-Fb; Thu, 14 Jan 2021 16:29:18 +0000 Received: by outflank-mailman (input) for mailman id 67411; Thu, 14 Jan 2021 16:29:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Uq-00048I-VD for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Uq-0008A2-Te for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Uq-0006IW-Ss for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JUOCfRcc5bjE9UQ8R+2q7oDtwPmCtX06mtCC3yKqPsA=; b=pT5aCWrQWJforJ5rP3dX5oA9qA GCTdB4Y1noaD/vXWIeUjfO9TVnIuj8IhObXcP5p0PvrKJ9SpvcoVut2b3X0pZRFWrO2Dl+81+2hIa siGoc5DSEsgYyCfHiEA22bY0Kb/Rc2uV2AAECT9otOq5WGJl7MmT6kX4ZtsLLUiW5XXc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: cosmetics to sh_unshadow_for_p2m_change() Message-Id: Date: Thu, 14 Jan 2021 16:29:16 +0000 commit 1806d0875daebe600061fc94451401b19f5b6f2a Author: Jan Beulich AuthorDate: Fri Jan 8 16:50:47 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 16:50:47 2021 +0100 x86/shadow: cosmetics to sh_unshadow_for_p2m_change() Besides the adjustments for style - use switch(), - widen scope of commonly used variables, - narrow scope of other variables. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 64 +++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index e2ed049f14..d09c940585 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3089,7 +3089,9 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, l1_pgentry_t old, l1_pgentry_t new, unsigned int level) { + mfn_t omfn = l1e_get_mfn(old); unsigned int oflags = l1e_get_flags(old); + p2m_type_t p2mt = p2m_flags_to_type(oflags); /* * If there are any shadows, update them. But if shadow_teardown() @@ -3098,53 +3100,57 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, if ( unlikely(!d->arch.paging.shadow.total_pages) ) return; - /* The following assertion is to make sure we don't step on 1GB host - * page support of HVM guest. */ - ASSERT(!(level > 2 && (oflags & _PAGE_PRESENT) && (oflags & _PAGE_PSE))); - - /* If we're removing an MFN from the p2m, remove it from the shadows too */ - if ( level == 1 ) + switch ( level ) { - mfn_t mfn = l1e_get_mfn(old); - p2m_type_t p2mt = p2m_flags_to_type(oflags); + default: + /* + * The following assertion is to make sure we don't step on 1GB host + * page support of HVM guest. + */ + ASSERT(!((oflags & _PAGE_PRESENT) && (oflags & _PAGE_PSE))); + break; - if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(mfn) ) + /* If we're removing an MFN from the p2m, remove it from the shadows too */ + case 1: + if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(omfn) ) { - sh_remove_all_shadows_and_parents(d, mfn); - if ( sh_remove_all_mappings(d, mfn, _gfn(gfn)) ) + sh_remove_all_shadows_and_parents(d, omfn); + if ( sh_remove_all_mappings(d, omfn, _gfn(gfn)) ) guest_flush_tlb_mask(d, d->dirty_cpumask); } - } + break; - /* If we're removing a superpage mapping from the p2m, we need to check + /* + * If we're removing a superpage mapping from the p2m, we need to check * all the pages covered by it. If they're still there in the new - * scheme, that's OK, but otherwise they must be unshadowed. */ - if ( level == 2 && (oflags & _PAGE_PRESENT) && (oflags & _PAGE_PSE) ) - { - unsigned int i; - cpumask_t flushmask; - mfn_t omfn = l1e_get_mfn(old); - mfn_t nmfn = l1e_get_mfn(new); - l1_pgentry_t *npte = NULL; - p2m_type_t p2mt = p2m_flags_to_type(oflags); + * scheme, that's OK, but otherwise they must be unshadowed. + */ + case 2: + if ( !(oflags & _PAGE_PRESENT) || !(oflags & _PAGE_PSE) ) + break; if ( p2m_is_valid(p2mt) && mfn_valid(omfn) ) { + unsigned int i; + cpumask_t flushmask; + mfn_t nmfn = l1e_get_mfn(new); + l1_pgentry_t *npte = NULL; + cpumask_clear(&flushmask); /* If we're replacing a superpage with a normal L1 page, map it */ - if ( (l1e_get_flags(new) & _PAGE_PRESENT) - && !(l1e_get_flags(new) & _PAGE_PSE) - && mfn_valid(nmfn) ) + if ( (l1e_get_flags(new) & _PAGE_PRESENT) && + !(l1e_get_flags(new) & _PAGE_PSE) && + mfn_valid(nmfn) ) npte = map_domain_page(nmfn); gfn &= ~(L1_PAGETABLE_ENTRIES - 1); for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ ) { - if ( !npte - || !p2m_is_ram(p2m_flags_to_type(l1e_get_flags(npte[i]))) - || !mfn_eq(l1e_get_mfn(npte[i]), omfn) ) + if ( !npte || + !p2m_is_ram(p2m_flags_to_type(l1e_get_flags(npte[i]))) || + !mfn_eq(l1e_get_mfn(npte[i]), omfn) ) { /* This GFN->MFN mapping has gone away */ sh_remove_all_shadows_and_parents(d, omfn); @@ -3158,6 +3164,8 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, if ( npte ) unmap_domain_page(npte); } + + break; } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:29:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:29:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67412.120287 (Exim 4.92) (envelope-from ) id 1l05V2-00049m-K7; Thu, 14 Jan 2021 16:29:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67412.120287; Thu, 14 Jan 2021 16:29:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05V2-00049e-H7; Thu, 14 Jan 2021 16:29:28 +0000 Received: by outflank-mailman (input) for mailman id 67412; Thu, 14 Jan 2021 16:29:27 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05V1-00049V-1c for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05V1-0008AC-0u for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:27 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05V0-0006Kg-W5 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29: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=IvdkiwpQ9H5jCwa6blT2o0VW1whHyhBwe5skZ3ATN7w=; b=amMIdVKzox//CIT+QP/QvEtkNQ XqAFIqgFnnFtPXTsiaBkFxi34q78E/2TMH/NFIIzGlgmKL1ZnC6NaIfLTku02UQ25mUoISulEHL0p /eOimABUAcuXyVmPTKNLNq8KobvYSFiF0w7NrTjUasdNpTADi1NK02g83E/sE63pTo/I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: adjust TLB flushing in sh_unshadow_for_p2m_change() Message-Id: Date: Thu, 14 Jan 2021 16:29:26 +0000 commit 5b772457e8e549908d6a3fae6412e55c0f7258fb Author: Jan Beulich AuthorDate: Fri Jan 8 16:51:19 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 16:51:19 2021 +0100 x86/shadow: adjust TLB flushing in sh_unshadow_for_p2m_change() Accumulating transient state of d->dirty_cpumask in a local variable is unnecessary here: The flush is fine to make with the dirty set at the time of the call. With this, move the invocation to a central place at the end of the function. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index d09c940585..df95c4db11 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3092,6 +3092,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, mfn_t omfn = l1e_get_mfn(old); unsigned int oflags = l1e_get_flags(old); p2m_type_t p2mt = p2m_flags_to_type(oflags); + bool flush = false; /* * If there are any shadows, update them. But if shadow_teardown() @@ -3116,7 +3117,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, { sh_remove_all_shadows_and_parents(d, omfn); if ( sh_remove_all_mappings(d, omfn, _gfn(gfn)) ) - guest_flush_tlb_mask(d, d->dirty_cpumask); + flush = true; } break; @@ -3132,12 +3133,9 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, if ( p2m_is_valid(p2mt) && mfn_valid(omfn) ) { unsigned int i; - cpumask_t flushmask; mfn_t nmfn = l1e_get_mfn(new); l1_pgentry_t *npte = NULL; - cpumask_clear(&flushmask); - /* If we're replacing a superpage with a normal L1 page, map it */ if ( (l1e_get_flags(new) & _PAGE_PRESENT) && !(l1e_get_flags(new) & _PAGE_PSE) && @@ -3155,11 +3153,10 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, /* This GFN->MFN mapping has gone away */ sh_remove_all_shadows_and_parents(d, omfn); if ( sh_remove_all_mappings(d, omfn, _gfn(gfn + i)) ) - cpumask_or(&flushmask, &flushmask, d->dirty_cpumask); + flush = true; } omfn = mfn_add(omfn, 1); } - guest_flush_tlb_mask(d, &flushmask); if ( npte ) unmap_domain_page(npte); @@ -3167,6 +3164,9 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, break; } + + if ( flush ) + guest_flush_tlb_mask(d, d->dirty_cpumask); } #if (SHADOW_OPTIMIZATIONS & SHOPT_FAST_FAULT_PATH) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:29:38 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:29:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67413.120291 (Exim 4.92) (envelope-from ) id 1l05VC-0004B9-Li; Thu, 14 Jan 2021 16:29:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67413.120291; Thu, 14 Jan 2021 16:29:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05VC-0004B1-If; Thu, 14 Jan 2021 16:29:38 +0000 Received: by outflank-mailman (input) for mailman id 67413; Thu, 14 Jan 2021 16:29:37 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05VB-0004Aq-4y for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:37 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05VB-0008AK-4A for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:37 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05VB-0006LZ-39 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:37 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZcYr04VlvytVVNAm6qXEEir/ne84vC+m28Ab/ozDHPs=; b=5l1KAGKo5hrgccx8FCTeYhLDay MaIZ1T0q+p3VF0RWIQgqpq/FXOyoVLh9gXY81dipGcFlSgecVRCv+JF2Dzgby7HuCYlVW5X8+TrI0 LBa4lriSGw4b3RZyXhdTHJVQ9kvN4QsT/gT1cAnNl3YybReq8hJP4fgaTz/B7CpkHlWY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hypercall: fix gnttab hypercall args conditional build on pvshim Message-Id: Date: Thu, 14 Jan 2021 16:29:37 +0000 commit b468b464c89e92629bd52cec58e9f51eee2e950a Author: Roger Pau Monné AuthorDate: Fri Jan 8 16:51:52 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 8 16:51:52 2021 +0100 x86/hypercall: fix gnttab hypercall args conditional build on pvshim A pvshim build doesn't require the grant table functionality built in, but it does require knowing the number of arguments the hypercall has so the hypercall parameter clobbering works properly. Instead of also setting the argument count for the gnttab case if PV shim functionality is enabled, just drop all of the conditionals from hypercall_args_table, as a hypercall having a NULL handler won't get to use that information anyway. Note this hasn't been detected by osstest because the tools pvshim build is done without debug enabled, so the hypercall parameter clobbering doesn't happen. Fixes: d2151152dd2 ('xen: make grant table support configurable') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hypercall.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c index dd00983005..14da9bc4ad 100644 --- a/xen/arch/x86/hypercall.c +++ b/xen/arch/x86/hypercall.c @@ -47,9 +47,7 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(xen_version, 2), ARGS(console_io, 3), ARGS(physdev_op_compat, 1), -#ifdef CONFIG_GRANT_TABLE ARGS(grant_table_op, 3), -#endif ARGS(vm_assist, 2), COMP(update_va_mapping_otherdomain, 4, 5), ARGS(vcpu_op, 3), @@ -65,17 +63,11 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(sysctl, 1), ARGS(domctl, 1), ARGS(kexec_op, 2), -#ifdef CONFIG_ARGO ARGS(argo_op, 5), -#endif ARGS(xenpmu_op, 2), -#ifdef CONFIG_HVM ARGS(hvm_op, 2), ARGS(dm_op, 3), -#endif -#ifdef CONFIG_HYPFS ARGS(hypfs_op, 5), -#endif ARGS(mca, 1), ARGS(arch_1, 1), }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:29:48 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:29:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67414.120295 (Exim 4.92) (envelope-from ) id 1l05VM-0004Cj-N9; Thu, 14 Jan 2021 16:29:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67414.120295; Thu, 14 Jan 2021 16:29:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05VM-0004Cb-K8; Thu, 14 Jan 2021 16:29:48 +0000 Received: by outflank-mailman (input) for mailman id 67414; Thu, 14 Jan 2021 16:29:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05VL-0004CR-8b for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:47 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05VL-0008AS-7u for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:47 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05VL-0006MO-6M for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:47 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iQ2v4kQKzoW3axDEV0ATzUwdJLiYK+2Xg5n3zYupIbw=; b=ipAvn9+IkFpgD5pDUKbjptq6zs W/M579vKO45r4/NxBdneNshhH5TSvoEgVWQmb5uQcdlC2BiXbzgutKDJ4JkVnWAvqdJUJWPlFeB6g E71TUW1+u9N6Ynap+SzwQRc2/GGgjmJ79Bv6n8yuhNTC8/glk/sTfiyUc9cb8OjlPT+w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: do not read MVFR2 when is not defined Message-Id: Date: Thu, 14 Jan 2021 16:29:47 +0000 commit ce59e3dda5f99afbe7257e1e9a22dffd5c4d033c Author: Stefano Stabellini AuthorDate: Tue Jan 5 11:05:48 2021 -0800 Commit: Stefano Stabellini CommitDate: Fri Jan 8 15:35:51 2021 -0800 xen/arm: do not read MVFR2 when is not defined MVFR2 is not available on ARMv7. It is available on ARMv8 aarch32 and aarch64. If Xen reads MVFR2 on ARMv7 it could crash. Avoid the issue by doing the following: - define MVFR2_MAYBE_UNDEFINED on arm32 - if MVFR2_MAYBE_UNDEFINED, do not attempt to read MVFR2 in Xen - keep the 3rd register_t in struct cpuinfo_arm.mvfr on arm32 so that a guest read to the register returns '0' instead of crashing the guest. '0' is an appropriate value to return to the guest because it is defined as "no support for miscellaneous features". Aarch64 Xen is not affected by this patch. Fixes: 9cfdb489af81 ("xen/arm: Add ID registers and complete cpuinfo") Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/cpufeature.c | 2 ++ xen/include/asm-arm/arm32/sysregs.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 1f6a85aafe..698bfa0201 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -150,7 +150,9 @@ void identify_cpu(struct cpuinfo_arm *c) c->mvfr.bits[0] = READ_SYSREG(MVFR0_EL1); c->mvfr.bits[1] = READ_SYSREG(MVFR1_EL1); +#ifndef MVFR2_MAYBE_UNDEFINED c->mvfr.bits[2] = READ_SYSREG(MVFR2_EL1); +#endif } /* diff --git a/xen/include/asm-arm/arm32/sysregs.h b/xen/include/asm-arm/arm32/sysregs.h index 25cdcbfa4e..6841d5de43 100644 --- a/xen/include/asm-arm/arm32/sysregs.h +++ b/xen/include/asm-arm/arm32/sysregs.h @@ -62,6 +62,9 @@ #define READ_SYSREG(R...) READ_SYSREG32(R) #define WRITE_SYSREG(V, R...) WRITE_SYSREG32(V, R) +/* MVFR2 is not defined on ARMv7 */ +#define MVFR2_MAYBE_UNDEFINED + #endif /* __ASSEMBLY__ */ #endif /* __ASM_ARM_ARM32_SYSREGS_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:29:58 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:29:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67415.120299 (Exim 4.92) (envelope-from ) id 1l05VW-0004Dz-Oo; Thu, 14 Jan 2021 16:29:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67415.120299; Thu, 14 Jan 2021 16:29:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05VW-0004Dq-Lf; Thu, 14 Jan 2021 16:29:58 +0000 Received: by outflank-mailman (input) for mailman id 67415; Thu, 14 Jan 2021 16:29:57 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05VV-0004Dh-DL for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:57 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05VV-0008As-Ca for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05VV-0006NT-A8 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:29:57 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ExFHnWdSBTMjJ0yoYkYB603hOwl97x6TR6lubTFQ3xE=; b=UX5i+p9gc0xfCMz/uP52Org5G8 cyH/LKxPG+t04q9UIaV+MeiPyJDRIrLccAiDJbKngD+/dP7HufMY9UeqBr7KvuEvtLN2WgJaBeor5 hsF06qBcU2tF0aBGTMjaDJSmDnZucZFU0i7tbJ2BDvvR0vWsW3DOvSIBGJRp+3vRJsZ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PV: consistently inline {,un}adjust_guest_le() Message-Id: Date: Thu, 14 Jan 2021 16:29:57 +0000 commit 4e70f31a5bb979016eae341fcf4a0f136d451115 Author: Jan Beulich AuthorDate: Mon Jan 11 14:50:38 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:50:38 2021 +0100 x86/PV: consistently inline {,un}adjust_guest_le() Commit 8a74707a7c ("x86/nospec: Use always_inline to fix code gen for evaluate_nospec") converted inline to always_inline for adjust_guest_l[134]e(), but left adjust_guest_l2e() and unadjust_guest_l3e() alone without saying why these two would differ in the needed / wanted treatment. Adjust these two as well. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/pv/mm.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/pv/mm.h b/xen/arch/x86/pv/mm.h index 62b1194e87..a11cc88e5a 100644 --- a/xen/arch/x86/pv/mm.h +++ b/xen/arch/x86/pv/mm.h @@ -110,8 +110,8 @@ static always_inline l1_pgentry_t adjust_guest_l1e(l1_pgentry_t l1e, return l1e; } -static inline l2_pgentry_t adjust_guest_l2e(l2_pgentry_t l2e, - const struct domain *d) +static always_inline l2_pgentry_t adjust_guest_l2e(l2_pgentry_t l2e, + const struct domain *d) { if ( likely(l2e_get_flags(l2e) & _PAGE_PRESENT) && likely(!is_pv_32bit_domain(d)) ) @@ -130,8 +130,8 @@ static always_inline l3_pgentry_t adjust_guest_l3e(l3_pgentry_t l3e, return l3e; } -static inline l3_pgentry_t unadjust_guest_l3e(l3_pgentry_t l3e, - const struct domain *d) +static always_inline l3_pgentry_t unadjust_guest_l3e(l3_pgentry_t l3e, + const struct domain *d) { if ( unlikely(is_pv_32bit_domain(d)) && likely(l3e_get_flags(l3e) & _PAGE_PRESENT) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:30:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:30:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67416.120302 (Exim 4.92) (envelope-from ) id 1l05Vg-0004vk-Q8; Thu, 14 Jan 2021 16:30:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67416.120302; Thu, 14 Jan 2021 16:30:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Vg-0004vd-NH; Thu, 14 Jan 2021 16:30:08 +0000 Received: by outflank-mailman (input) for mailman id 67416; Thu, 14 Jan 2021 16:30:07 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Vf-0004ug-GS for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:07 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Vf-0008BT-Fh for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:07 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Vf-0006OL-Ey for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:07 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+LMFh+qslA+WbXrQMG25O3InJ3x74og1GoYmACE+zT8=; b=dNeGCel5R0ZQ38QtS7zSvpIldx gX2zZstIKBThYrpatsoyemKpDroS44YF7g21ODSNvvx+j3uDy1iFGsmBh7OAOhW5ktxxk+UKKO70y dRfNkcJnzWA6VkKDS0qR0UcB8Vak08uc+c03nsZLDhFdm1ONDKm/KWkd9ummZZBF8VQM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PV: fold redundant calls to adjust_guest_le() Message-Id: Date: Thu, 14 Jan 2021 16:30:07 +0000 commit 2039ebfd59eef01176f5d26e83654f8bfbe0a949 Author: Jan Beulich AuthorDate: Mon Jan 11 14:51:39 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:51:39 2021 +0100 x86/PV: fold redundant calls to adjust_guest_le() At least from an abstract perspective it is quite odd for us to compare adjusted old and unadjusted new page table entries when determining whether the fast path can be used. This is largely benign because FASTPATH_FLAG_WHITELIST covers most of the flags which the adjustments may set, and the flags getting set don't affect the outcome of get_page_from_le(). There's one exception: 32-bit L3 entries get _PAGE_RW set, but get_page_from_l3e() doesn't allow linear page tables to be created at this level for such guests. Apart from this _PAGE_RW is unused by get_page_from_le() (for N > 1), and hence forcing the bit on early has no functional effect. The main reason for the change, however, is that adjust_guest_le() aren't exactly cheap - both in terms of pure code size and because each one has at least one evaluate_nospec() by way of containing is_pv_32bit_domain() conditionals. Call the functions once ahead of the fast path checks, instead of twice after. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/mm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 79acf20c4e..63e9fae919 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2195,10 +2195,11 @@ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t nl1e, nl1e = l1e_from_page(page, l1e_get_flags(nl1e)); } + nl1e = adjust_guest_l1e(nl1e, pt_dom); + /* Fast path for sufficiently-similar mappings. */ if ( !l1e_has_changed(ol1e, nl1e, ~FASTPATH_FLAG_WHITELIST) ) { - nl1e = adjust_guest_l1e(nl1e, pt_dom); rc = UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, pt_vcpu, preserve_ad); if ( page ) @@ -2223,7 +2224,6 @@ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t nl1e, if ( page ) put_page(page); - nl1e = adjust_guest_l1e(nl1e, pt_dom); if ( unlikely(!UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, pt_vcpu, preserve_ad)) ) { @@ -2275,10 +2275,11 @@ static int mod_l2_entry(l2_pgentry_t *pl2e, return -EINVAL; } + nl2e = adjust_guest_l2e(nl2e, d); + /* Fast path for sufficiently-similar mappings. */ if ( !l2e_has_changed(ol2e, nl2e, ~FASTPATH_FLAG_WHITELIST) ) { - nl2e = adjust_guest_l2e(nl2e, d); if ( UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, mfn, vcpu, preserve_ad) ) return 0; return -EBUSY; @@ -2287,7 +2288,6 @@ static int mod_l2_entry(l2_pgentry_t *pl2e, if ( unlikely((rc = get_page_from_l2e(nl2e, mfn, d, 0)) < 0) ) return rc; - nl2e = adjust_guest_l2e(nl2e, d); if ( unlikely(!UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, mfn, vcpu, preserve_ad)) ) { @@ -2337,10 +2337,11 @@ static int mod_l3_entry(l3_pgentry_t *pl3e, return -EINVAL; } + nl3e = adjust_guest_l3e(nl3e, d); + /* Fast path for sufficiently-similar mappings. */ if ( !l3e_has_changed(ol3e, nl3e, ~FASTPATH_FLAG_WHITELIST) ) { - nl3e = adjust_guest_l3e(nl3e, d); rc = UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, mfn, vcpu, preserve_ad); return rc ? 0 : -EFAULT; } @@ -2350,7 +2351,6 @@ static int mod_l3_entry(l3_pgentry_t *pl3e, return rc; rc = 0; - nl3e = adjust_guest_l3e(nl3e, d); if ( unlikely(!UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, mfn, vcpu, preserve_ad)) ) { @@ -2399,10 +2399,11 @@ static int mod_l4_entry(l4_pgentry_t *pl4e, return -EINVAL; } + nl4e = adjust_guest_l4e(nl4e, d); + /* Fast path for sufficiently-similar mappings. */ if ( !l4e_has_changed(ol4e, nl4e, ~FASTPATH_FLAG_WHITELIST) ) { - nl4e = adjust_guest_l4e(nl4e, d); rc = UPDATE_ENTRY(l4, pl4e, ol4e, nl4e, mfn, vcpu, preserve_ad); return rc ? 0 : -EFAULT; } @@ -2412,7 +2413,6 @@ static int mod_l4_entry(l4_pgentry_t *pl4e, return rc; rc = 0; - nl4e = adjust_guest_l4e(nl4e, d); if ( unlikely(!UPDATE_ENTRY(l4, pl4e, ol4e, nl4e, mfn, vcpu, preserve_ad)) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:30:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:30:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67417.120307 (Exim 4.92) (envelope-from ) id 1l05Vq-0004xC-Tg; Thu, 14 Jan 2021 16:30:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67417.120307; Thu, 14 Jan 2021 16:30:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Vq-0004x4-QR; Thu, 14 Jan 2021 16:30:18 +0000 Received: by outflank-mailman (input) for mailman id 67417; Thu, 14 Jan 2021 16:30:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Vp-0004wt-JN for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:17 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Vp-0008Bb-If for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:17 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Vp-0006Ou-Hz for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:17 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PJJ2JnyfV9DK09UDwn+C0HgbKGLaSasgzi+7sOLWp54=; b=AZuAnx8GxcHqsJEvkXp8vy2Gr1 s7EdO/3xtDVBstCS+PxRB5ktO21LMBZ2B98Mgi3Ubf8EbIccVAVs6fM9h5FnaWJLlcJ6WRUkXOhzB Z+QzmZoOpIDsBNGVLXn99vFkf0fVtS+utAUKegf0+9ZnJvWcA3f5YF6DD6/qiK44DBhU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] evtchn: don't call Xen consumer callback with per-channel lock held Message-Id: Date: Thu, 14 Jan 2021 16:30:17 +0000 commit 1376ef90d31c971df79de331911bf861a9a11a44 Author: Jan Beulich AuthorDate: Mon Jan 11 14:53:02 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:53:02 2021 +0100 evtchn: don't call Xen consumer callback with per-channel lock held While there don't look to be any problems with this right now, the lock order implications from holding the lock can be very difficult to follow (and may be easy to violate unknowingly). The present callbacks don't (and no such callback should) have any need for the lock to be held. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/common/event_channel.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 3aa4189d7a..37592028c8 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -775,9 +775,18 @@ int evtchn_send(struct domain *ld, unsigned int lport) rport = lchn->u.interdomain.remote_port; rchn = evtchn_from_port(rd, rport); if ( consumer_is_xen(rchn) ) - xen_notification_fn(rchn)(rd->vcpu[rchn->notify_vcpu_id], rport); - else - evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); + { + /* Don't keep holding the lock for the call below. */ + xen_event_channel_notification_t fn = xen_notification_fn(rchn); + struct vcpu *rv = rd->vcpu[rchn->notify_vcpu_id]; + + rcu_lock_domain(rd); + evtchn_read_unlock(lchn); + fn(rv, rport); + rcu_unlock_domain(rd); + return 0; + } + evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); break; case ECS_IPI: evtchn_port_set_pending(ld, lchn->notify_vcpu_id, lchn); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:30:30 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:30:30 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67418.120311 (Exim 4.92) (envelope-from ) id 1l05W1-0004yV-Vo; Thu, 14 Jan 2021 16:30:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67418.120311; Thu, 14 Jan 2021 16:30:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05W1-0004yN-SF; Thu, 14 Jan 2021 16:30:29 +0000 Received: by outflank-mailman (input) for mailman id 67418; Thu, 14 Jan 2021 16:30:27 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Vz-0004yA-N0 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Vz-0008Bj-LU for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:27 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Vz-0006PV-Kr for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:27 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LQHiTf2tlrz977VRzDqm2uKaHOE7/SKlN3VUCsJYjH4=; b=oq7cGT/E16K6NWhZObb1zR+Fbq bf//C/1a7N23ZWF8OdyYju0CgyrADS09yfsFLfLtKqg+p8r0wK7Nk8OJPJlj00x0HsPrSWTGYKyMp vcmyeY4P+kj8WcDKD6rST5bqU9huCi8AfyRIwuwSsRkxO2RF2npp8UBjmG6qpjmzgXko=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] evtchn: closing of vIRQ-s doesn't require looping over all vCPU-s Message-Id: Date: Thu, 14 Jan 2021 16:30:27 +0000 commit 7cf8a2d0ec5cf1ec84a213c54fd14aa18d1609ac Author: Jan Beulich AuthorDate: Mon Jan 11 14:53:55 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:53:55 2021 +0100 evtchn: closing of vIRQ-s doesn't require looping over all vCPU-s Global vIRQ-s have their event channel association tracked on vCPU 0. Per-vCPU vIRQ-s can't have their notify_vcpu_id changed. Hence it is well-known which vCPU's virq_to_evtchn[] needs updating. Signed-off-by: Jan Beulich Reviewed-by: Julien Grall --- xen/common/event_channel.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 37592028c8..d590ddad99 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -606,7 +606,6 @@ static long evtchn_bind_pirq(evtchn_bind_pirq_t *bind) int evtchn_close(struct domain *d1, int port1, bool guest) { struct domain *d2 = NULL; - struct vcpu *v; struct evtchn *chn1, *chn2; int port2; long rc = 0; @@ -657,17 +656,19 @@ int evtchn_close(struct domain *d1, int port1, bool guest) break; } - case ECS_VIRQ: - for_each_vcpu ( d1, v ) - { - unsigned long flags; + case ECS_VIRQ: { + struct vcpu *v; + unsigned long flags; + + v = d1->vcpu[virq_is_global(chn1->u.virq) ? 0 : chn1->notify_vcpu_id]; + + write_lock_irqsave(&v->virq_lock, flags); + ASSERT(read_atomic(&v->virq_to_evtchn[chn1->u.virq]) == port1); + write_atomic(&v->virq_to_evtchn[chn1->u.virq], 0); + write_unlock_irqrestore(&v->virq_lock, flags); - write_lock_irqsave(&v->virq_lock, flags); - if ( read_atomic(&v->virq_to_evtchn[chn1->u.virq]) == port1 ) - write_atomic(&v->virq_to_evtchn[chn1->u.virq], 0); - write_unlock_irqrestore(&v->virq_lock, flags); - } break; + } case ECS_IPI: break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:30:39 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:30:39 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67419.120315 (Exim 4.92) (envelope-from ) id 1l05WB-0004zh-0n; Thu, 14 Jan 2021 16:30:39 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67419.120315; Thu, 14 Jan 2021 16:30:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05WA-0004zZ-U2; Thu, 14 Jan 2021 16:30:38 +0000 Received: by outflank-mailman (input) for mailman id 67419; Thu, 14 Jan 2021 16:30:37 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05W9-0004zT-QE for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:37 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05W9-0008DY-PX for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:37 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05W9-0006Pt-O3 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:37 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Bo3u6X7SoPzAML8IeUOqjxXlHhPUyfo6VcMZ19KaceI=; b=XRIDzfPTDCQeG3VFYPXMchcLFO P6Z+NVFiJ6X8dp+R07AdQjWyQmVKbG+dwfOdTdD8NID4nSrpxxHSJX8JbaIDQrqA3f+0el6mk9rB8 k+VU8zT8K/fnENkbA3kLGfyXjme2FKPOEcSijDzVldWqAnZ8DyMfU5BWrLy++LIu37MY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ACPI: reduce verbosity by default Message-Id: Date: Thu, 14 Jan 2021 16:30:37 +0000 commit b4b0a8609c42d9e01dd51fd59ab2859f7df2a961 Author: Jan Beulich AuthorDate: Mon Jan 11 14:55:16 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:55:16 2021 +0100 ACPI: reduce verbosity by default While they're KERN_INFO messages and hence not visible by default, we still have had reports that the amount of output is too large, not the least because - the command line controlled resizing of the console ring buffer happens only after SRAT parsing (which may alone produce more than 16k of output), - the default resizing of the console ring buffer happens only after ACPI table parsing, since the default size gets calculated depending on the number or processors found. Gate all per-processor logging behind a new "acpi=verbose", making sure we wouldn't unintentionally pass this on to Dom0. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- docs/misc/xen-command-line.pandoc | 12 ++++++------ xen/arch/x86/setup.c | 12 +++++++++--- xen/arch/x86/srat.c | 12 ++++++++---- xen/drivers/acpi/tables.c | 7 +++++++ xen/include/xen/acpi.h | 2 ++ 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 1cb1aee5ed..7ec1e804b7 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -75,13 +75,10 @@ of Boolean and String. These are noted in the relevant sections. ## Parameter details ### acpi -> `= force | ht | noirq | ` +> `= force | ht | noirq | | verbose` **String**, or **Boolean** to disable. -The **acpi** option is used to control a set of four related boolean -flags; `acpi_force`, `acpi_ht`, `acpi_noirq` and `acpi_disabled`. - By default, Xen will scan the DMI data and blacklist certain systems which are known to have broken ACPI setups. Providing `acpi=force` will cause Xen to ignore the blacklist and attempt to use all ACPI @@ -97,12 +94,15 @@ which requires this option to function should be blacklisted. Additionally, this will not prevent Xen from finding IO-APIC entries from the MP tables. -Finally, any of the boolean false options can be used to disable ACPI +Further, any of the boolean false options can be used to disable ACPI usage entirely. Because responsibility for ACPI processing is shared between Xen and the domain 0 kernel this option is automatically propagated to the -domain 0 command line +domain 0 command line. + +Finally, `acpi=verbose` will enable per-processor information logging +which may otherwise be too noisy in particular on large systems. ### acpi_apic_instance > `= ` diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index ad65167864..23bbb6e8c1 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -78,6 +78,7 @@ unsigned long __read_mostly cr4_pv32_mask; /* "acpi=force": Override the disable blacklist. */ /* "acpi=ht": Limit ACPI just to boot-time to enable HT. */ /* "acpi=noirq": Disables ACPI interrupt routing. */ +/* "acpi=verbose": Enables more verbose ACPI boot time logging. */ static int parse_acpi_param(const char *s); custom_param("acpi", parse_acpi_param); @@ -216,9 +217,6 @@ static char __initdata acpi_param[10] = ""; static int __init parse_acpi_param(const char *s) { - /* Save the parameter so it can be propagated to domain0. */ - safe_strcpy(acpi_param, s); - /* Interpret the parameter for use within Xen. */ if ( !parse_bool(s, NULL) ) { @@ -240,9 +238,17 @@ static int __init parse_acpi_param(const char *s) { acpi_noirq_set(); } + else if ( !strcmp(s, "verbose") ) + { + opt_acpi_verbose = true; + return 0; + } else return -EINVAL; + /* Save the parameter so it can be propagated to domain0. */ + safe_strcpy(acpi_param, s); + return 0; } diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 506a56d66b..6b77b98201 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -230,8 +230,10 @@ acpi_numa_x2apic_affinity_init(const struct acpi_srat_x2apic_cpu_affinity *pa) apicid_to_node[pa->apic_id] = node; node_set(node, processor_nodes_parsed); acpi_numa = 1; - printk(KERN_INFO "SRAT: PXM %u -> APIC %08x -> Node %u\n", - pxm, pa->apic_id, node); + + if (opt_acpi_verbose) + printk(KERN_INFO "SRAT: PXM %u -> APIC %08x -> Node %u\n", + pxm, pa->apic_id, node); } /* Callback for Proximity Domain -> LAPIC mapping */ @@ -263,8 +265,10 @@ acpi_numa_processor_affinity_init(const struct acpi_srat_cpu_affinity *pa) apicid_to_node[pa->apic_id] = node; node_set(node, processor_nodes_parsed); acpi_numa = 1; - printk(KERN_INFO "SRAT: PXM %u -> APIC %02x -> Node %u\n", - pxm, pa->apic_id, node); + + if (opt_acpi_verbose) + printk(KERN_INFO "SRAT: PXM %u -> APIC %02x -> Node %u\n", + pxm, pa->apic_id, node); } /* Callback for parsing of the Proximity Domain <-> Memory Area mappings */ diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index 8c2a279e18..789deef3c1 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -36,6 +36,8 @@ #define ACPI_MAX_TABLES 128 +bool __initdata opt_acpi_verbose; + static const char *__initdata mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" }; static const char *__initdata @@ -51,6 +53,7 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) switch (header->type) { case ACPI_MADT_TYPE_LOCAL_APIC: + if (opt_acpi_verbose) { struct acpi_madt_local_apic *p = (struct acpi_madt_local_apic *)header; @@ -62,6 +65,7 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) break; case ACPI_MADT_TYPE_LOCAL_X2APIC: + if (opt_acpi_verbose) { struct acpi_madt_local_x2apic *p = (struct acpi_madt_local_x2apic *)header; @@ -115,6 +119,7 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) break; case ACPI_MADT_TYPE_LOCAL_APIC_NMI: + if (opt_acpi_verbose) { struct acpi_madt_local_apic_nmi *p = (struct acpi_madt_local_apic_nmi *)header; @@ -128,6 +133,7 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) break; case ACPI_MADT_TYPE_LOCAL_X2APIC_NMI: + if (opt_acpi_verbose) { u16 polarity, trigger; struct acpi_madt_local_x2apic_nmi *p = @@ -167,6 +173,7 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) break; case ACPI_MADT_TYPE_LOCAL_SAPIC: + if (opt_acpi_verbose) { struct acpi_madt_local_sapic *p = (struct acpi_madt_local_sapic *)header; diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index 21d5e9feb5..088c238a50 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -53,6 +53,8 @@ extern acpi_physical_address rsdp_hint; +extern bool opt_acpi_verbose; + enum acpi_interrupt_id { ACPI_INTERRUPT_PMI = 1, ACPI_INTERRUPT_INIT, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:30:49 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:30:49 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67420.120319 (Exim 4.92) (envelope-from ) id 1l05WL-00051F-2l; Thu, 14 Jan 2021 16:30:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67420.120319; Thu, 14 Jan 2021 16:30:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05WK-000516-Vf; Thu, 14 Jan 2021 16:30:48 +0000 Received: by outflank-mailman (input) for mailman id 67420; Thu, 14 Jan 2021 16:30:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05WJ-00050y-T8 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:47 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05WJ-0008Dk-SP for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:47 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05WJ-0006Qe-Rj for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:47 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NiX/M1ajZDPexJ8y9ziRkssn9otJHzIB36k6okG9YkA=; b=B3tZLyWmevLex72adSyHvlCCOC bq7dOtr3EhgpAdtN79kohQCHXll9iQ/+IcATXiOL4yz/SohSq0QQIWVhXqdmN10CtM7SGbJ9z81/d TVDI+MoHVEGP3jy14IdBgL8ejU72my4O6/hdR5ZrPCd7YJlcvYEhqs/iUQIo1RT5c8Zs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ACPI: don't overwrite FADT Message-Id: Date: Thu, 14 Jan 2021 16:30:47 +0000 commit 654c917d94d24587bb6b4a8d862baf04b25cbe33 Author: Jan Beulich AuthorDate: Mon Jan 11 14:55:52 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:55:52 2021 +0100 x86/ACPI: don't overwrite FADT When marking fields invalid for our own purposes, we should do so in our local copy (so we will notice later on), not in the firmware provided one (which another entity may want to look at again, e.g. after kexec). Also mark the function parameter const to notice such issues right away. Instead use the pointer at the firmware copy for specifying an adjacent printk()'s arguments. If nothing else this at least reduces the number of relocations the assembler hasto emit and the linker has to process. Fixes: 62d1a69a4e9f ("ACPI: support v5 (reduced HW) sleep interface") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 6345490f93..9e857c3ab1 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -349,7 +349,7 @@ static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) /* Get pm1x_cnt and pm1x_evt information for ACPI sleep */ static void __init -acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) +acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt) { struct acpi_table_facs *facs = NULL; uint64_t facs_pa; @@ -362,10 +362,10 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) printk(KERN_INFO PREFIX "v5 SLEEP INFO: control[%d:%"PRIx64"]," " status[%d:%"PRIx64"]\n", - acpi_sinfo.sleep_control.space_id, - acpi_sinfo.sleep_control.address, - acpi_sinfo.sleep_status.space_id, - acpi_sinfo.sleep_status.address); + fadt->sleep_control.space_id, + fadt->sleep_control.address, + fadt->sleep_status.space_id, + fadt->sleep_status.address); if ((fadt->sleep_control.address && (fadt->sleep_control.bit_offset || @@ -384,8 +384,8 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) fadt->sleep_status.bit_offset, fadt->sleep_status.bit_width, fadt->sleep_status.access_width); - fadt->sleep_control.address = 0; - fadt->sleep_status.address = 0; + acpi_sinfo.sleep_control.address = 0; + acpi_sinfo.sleep_status.address = 0; } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:30:59 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:30:59 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67421.120322 (Exim 4.92) (envelope-from ) id 1l05WV-00052T-3v; Thu, 14 Jan 2021 16:30:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67421.120322; Thu, 14 Jan 2021 16:30:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05WV-00052M-0z; Thu, 14 Jan 2021 16:30:59 +0000 Received: by outflank-mailman (input) for mailman id 67421; Thu, 14 Jan 2021 16:30:58 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05WU-00052E-0F for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:58 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05WT-0008E8-Vj for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05WT-0006RL-Ua for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:30:57 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iM4w8NyrBP6AyB3EWm5EQJChbw2MQmT7FdROHgQB1ik=; b=5NiFPx2V/2r1hnEj8wl/w3vS3T P/PSV5qc34LvGvsQsvneOtayZply4dC5B0qrp7CXaICH3IVACWsEPQURHio1xs70psI8g3FvfFgeV //zkMwzdj1lFl7BVV9GfVjaF3+Oo9BPgRfdtbMmurJ5LMGZQf+EVEVo5gqIrl7z+xKhw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ACPI: replace casts by container_of() Message-Id: Date: Thu, 14 Jan 2021 16:30:57 +0000 commit e945fcf84321547fac36e0d6ad6916daff578fdc Author: Jan Beulich AuthorDate: Mon Jan 11 14:56:23 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:56:23 2021 +0100 ACPI: replace casts by container_of() The latter is slightly more type-safe. Also add const where possible, including without need to touch further code. Additionally replace an adjacent unnecessary use of u16. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 11 +++++---- xen/drivers/acpi/tables.c | 60 +++++++++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 9e857c3ab1..d8c355a02f 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -63,9 +63,8 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; static int __init acpi_parse_madt(struct acpi_table_header *table) { - struct acpi_table_madt *madt; - - madt = (struct acpi_table_madt *)table; + struct acpi_table_madt *madt = + container_of(table, struct acpi_table_madt, header); if (madt->address) { acpi_lapic_addr = (u64) madt->address; @@ -277,7 +276,8 @@ acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end static int __init acpi_parse_hpet(struct acpi_table_header *table) { - struct acpi_table_hpet *hpet_tbl = (struct acpi_table_hpet *)table; + const struct acpi_table_hpet *hpet_tbl = + container_of(table, const struct acpi_table_hpet, header); if (hpet_tbl->address.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) { printk(KERN_WARNING PREFIX "HPET timers must be located in " @@ -471,7 +471,8 @@ acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt) static int __init acpi_parse_fadt(struct acpi_table_header *table) { - struct acpi_table_fadt *fadt = (struct acpi_table_fadt *)table; + const struct acpi_table_fadt *fadt = + container_of(table, const struct acpi_table_fadt, header); #ifdef CONFIG_ACPI_INTERPRETER /* initialize sci_int early for INT_SRC_OVR MADT parsing */ diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index 789deef3c1..f39cd5eaac 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -55,8 +55,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_LOCAL_APIC: if (opt_acpi_verbose) { - struct acpi_madt_local_apic *p = - (struct acpi_madt_local_apic *)header; + const struct acpi_madt_local_apic *p = + container_of(header, const struct acpi_madt_local_apic, header); + printk(KERN_INFO PREFIX "LAPIC (acpi_id[0x%02x] lapic_id[0x%02x] %s)\n", p->processor_id, p->id, @@ -67,8 +68,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_LOCAL_X2APIC: if (opt_acpi_verbose) { - struct acpi_madt_local_x2apic *p = - (struct acpi_madt_local_x2apic *)header; + const struct acpi_madt_local_x2apic *p = + container_of(header, const struct acpi_madt_local_x2apic, header); + printk(KERN_INFO PREFIX "X2APIC (apic_id[0x%02x] uid[0x%02x] %s)\n", p->local_apic_id, p->uid, @@ -79,8 +81,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_IO_APIC: { - struct acpi_madt_io_apic *p = - (struct acpi_madt_io_apic *)header; + const struct acpi_madt_io_apic *p = + container_of(header, const struct acpi_madt_io_apic, header); + printk(KERN_INFO PREFIX "IOAPIC (id[0x%02x] address[0x%08x] gsi_base[%d])\n", p->id, p->address, p->global_irq_base); @@ -89,8 +92,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_INTERRUPT_OVERRIDE: { - struct acpi_madt_interrupt_override *p = - (struct acpi_madt_interrupt_override *)header; + const struct acpi_madt_interrupt_override *p = + container_of(header, const struct acpi_madt_interrupt_override, header); + printk(KERN_INFO PREFIX "INT_SRC_OVR (bus %d bus_irq %d global_irq %d %s %s)\n", p->bus, p->source_irq, p->global_irq, @@ -108,8 +112,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_NMI_SOURCE: { - struct acpi_madt_nmi_source *p = - (struct acpi_madt_nmi_source *)header; + const struct acpi_madt_nmi_source *p = + container_of(header, const struct acpi_madt_nmi_source, header); + printk(KERN_INFO PREFIX "NMI_SRC (%s %s global_irq %d)\n", mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK], @@ -121,8 +126,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_LOCAL_APIC_NMI: if (opt_acpi_verbose) { - struct acpi_madt_local_apic_nmi *p = - (struct acpi_madt_local_apic_nmi *)header; + const struct acpi_madt_local_apic_nmi *p = + container_of(header, const struct acpi_madt_local_apic_nmi, header); + printk(KERN_INFO PREFIX "LAPIC_NMI (acpi_id[0x%02x] %s %s lint[%#x])\n", p->processor_id, @@ -135,12 +141,10 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_LOCAL_X2APIC_NMI: if (opt_acpi_verbose) { - u16 polarity, trigger; - struct acpi_madt_local_x2apic_nmi *p = - (struct acpi_madt_local_x2apic_nmi *)header; - - polarity = p->inti_flags & ACPI_MADT_POLARITY_MASK; - trigger = (p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2; + const struct acpi_madt_local_x2apic_nmi *p = + container_of(header, const struct acpi_madt_local_x2apic_nmi, header); + unsigned int polarity = MASK_EXTR(p->inti_flags, ACPI_MADT_POLARITY_MASK); + unsigned int trigger = MASK_EXTR(p->inti_flags, ACPI_MADT_TRIGGER_MASK); printk(KERN_INFO PREFIX "X2APIC_NMI (uid[0x%02x] %s %s lint[%#x])\n", @@ -153,8 +157,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE: { - struct acpi_madt_local_apic_override *p = - (struct acpi_madt_local_apic_override *)header; + const struct acpi_madt_local_apic_override *p = + container_of(header, const struct acpi_madt_local_apic_override, header); + printk(KERN_INFO PREFIX "LAPIC_ADDR_OVR (address[%p])\n", (void *)(unsigned long)p->address); @@ -163,8 +168,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_IO_SAPIC: { - struct acpi_madt_io_sapic *p = - (struct acpi_madt_io_sapic *)header; + const struct acpi_madt_io_sapic *p = + container_of(header, const struct acpi_madt_io_sapic, header); + printk(KERN_INFO PREFIX "IOSAPIC (id[%#x] address[%p] gsi_base[%d])\n", p->id, (void *)(unsigned long)p->address, @@ -175,8 +181,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_LOCAL_SAPIC: if (opt_acpi_verbose) { - struct acpi_madt_local_sapic *p = - (struct acpi_madt_local_sapic *)header; + const struct acpi_madt_local_sapic *p = + container_of(header, const struct acpi_madt_local_sapic, header); + printk(KERN_INFO PREFIX "LSAPIC (acpi_id[0x%02x] lsapic_id[0x%02x] lsapic_eid[0x%02x] %s)\n", p->processor_id, p->id, p->eid, @@ -186,8 +193,9 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) case ACPI_MADT_TYPE_INTERRUPT_SOURCE: { - struct acpi_madt_interrupt_source *p = - (struct acpi_madt_interrupt_source *)header; + const struct acpi_madt_interrupt_source *p = + container_of(header, const struct acpi_madt_interrupt_source, header); + printk(KERN_INFO PREFIX "PLAT_INT_SRC (%s %s type[%#x] id[0x%04x] eid[%#x] iosapic_vector[%#x] global_irq[%#x]\n", mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK], -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:31:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:31:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67422.120328 (Exim 4.92) (envelope-from ) id 1l05Wf-00053x-7Q; Thu, 14 Jan 2021 16:31:09 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67422.120328; Thu, 14 Jan 2021 16:31:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Wf-00053l-45; Thu, 14 Jan 2021 16:31:09 +0000 Received: by outflank-mailman (input) for mailman id 67422; Thu, 14 Jan 2021 16:31:08 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05We-00053f-3E for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:08 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05We-0008ET-2R for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:08 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05We-0006S8-1g for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:08 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Iply1YDh1RT8QJ///WUGicdyA73xADG8FjErXp1ZOYs=; b=nX9jQ3Bd2wZ5R78cNX5LkEzDtV wEBW+t16XBOtYiaiAVIGnxqEy0CHy67v8GtETMt/xT6A+3bZXN3CSAHIDsjt3vNCtCiF7mkgzGGJQ 6aY+V1lyKhkB0aiKZw93hJVnvGx5ZPizUlKuGh3T48/q1vd/12829onW5yf70FqBOqvU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: drop fake CONFIG_{HPET,X86_PM}_TIMER Message-Id: Date: Thu, 14 Jan 2021 16:31:08 +0000 commit 8fc9852324a9d91c7aa0b9d733c501f2138e1a27 Author: Jan Beulich AuthorDate: Mon Jan 11 14:56:53 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:56:53 2021 +0100 x86: drop fake CONFIG_{HPET,X86_PM}_TIMER I don't think we mean to ever make them real Kconfig options, so let's just do away with them. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 9 --------- xen/include/asm-x86/config.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index d8c355a02f..0999af9d9d 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -37,9 +37,7 @@ #include #include #include -#ifdef CONFIG_HPET_TIMER #include /* for hpet_address */ -#endif #include #include @@ -272,8 +270,6 @@ acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end return 0; } -#ifdef CONFIG_HPET_TIMER - static int __init acpi_parse_hpet(struct acpi_table_header *table) { const struct acpi_table_hpet *hpet_tbl = @@ -309,9 +305,6 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table) return 0; } -#else -#define acpi_parse_hpet NULL -#endif static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) { @@ -484,7 +477,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) fadt->force_apic_physical_destination_mode; #endif -#ifdef CONFIG_X86_PM_TIMER /* detect the location of the ACPI PM Timer */ if (fadt->header.revision >= FADT2_REVISION_ID && fadt->xpm_timer_block.space_id == ACPI_ADR_SPACE_SYSTEM_IO) { @@ -517,7 +509,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) if (pmtmr_ioport) printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x (%u bits)\n", pmtmr_ioport, pmtmr_width); -#endif acpi_smi_cmd = fadt->smi_command; acpi_enable_value = fadt->acpi_enable; diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index eb25fc4758..74406f0239 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -19,8 +19,6 @@ #define BITS_PER_XEN_ULONG BITS_PER_LONG -#define CONFIG_X86_PM_TIMER 1 -#define CONFIG_HPET_TIMER 1 #define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:31:19 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:31:19 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67423.120331 (Exim 4.92) (envelope-from ) id 1l05Wp-00055F-8b; Thu, 14 Jan 2021 16:31:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67423.120331; Thu, 14 Jan 2021 16:31:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Wp-000557-5j; Thu, 14 Jan 2021 16:31:19 +0000 Received: by outflank-mailman (input) for mailman id 67423; Thu, 14 Jan 2021 16:31:18 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Wo-000550-6m for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:18 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Wo-0008Eb-5y for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:18 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Wo-0006T1-4b for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:18 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DCMZEpxADlPOyIlWovtH2KPlrePmsjM77SVZC8zYOro=; b=1VPF2IOL4FX+BGrSVCM8UH3QVz 1as40iO/JVXU50bQdyIAQ4EAJkEplyT1WSQsvUrSenis7osQ+W+yu2CZrU1F8y3BJNrvTdbkbc7yw uPFQQ7yOPWEDCA3H0+jOg0A06NV2w9xIUZoMOtgA/dG8zv6+tMurxOYLjKKd1T3nsUGc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/acpi: remove dead code Message-Id: Date: Thu, 14 Jan 2021 16:31:18 +0000 commit faa0ab2a1df0381e00d85312247024b32d60a7b9 Author: Roger Pau Monné AuthorDate: Mon Jan 11 14:58:00 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 11 14:58:00 2021 +0100 x86/acpi: remove dead code After the recent changes to acpi_fadt_parse_sleep_info the bad label can never be called with facs mapped, and hence the unmap can be removed. Additionally remove the whole label, since it was used by a single caller. Move the relevant code from the label. No functional change intended. CID: 1471722 Fixes: 16ca5b3f873 ('x86/ACPI: don't invalidate S5 data when S3 wakeup vector cannot be determined') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/boot.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 0999af9d9d..ff4685279f 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -382,8 +382,14 @@ acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt) } } - if (fadt->flags & ACPI_FADT_HW_REDUCED) - goto bad; + if (fadt->flags & ACPI_FADT_HW_REDUCED) { + memset(&acpi_sinfo, 0, + offsetof(struct acpi_sleep_info, sleep_control)); + memset(&acpi_sinfo.sleep_status + 1, 0, + (long)(&acpi_sinfo + 1) - + (long)(&acpi_sinfo.sleep_status + 1)); + return; + } acpi_fadt_copy_address(pm1a_cnt, pm1a_control, pm1_control); acpi_fadt_copy_address(pm1b_cnt, pm1b_control, pm1_control); @@ -451,15 +457,6 @@ acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt) printk(KERN_INFO PREFIX " wakeup_vec[%"PRIx64"], vec_size[%x]\n", acpi_sinfo.wakeup_vector, acpi_sinfo.vector_width); - return; - - bad: - if (facs) - acpi_os_unmap_memory(facs, sizeof(*facs)); - memset(&acpi_sinfo, 0, - offsetof(struct acpi_sleep_info, sleep_control)); - memset(&acpi_sinfo.sleep_status + 1, 0, - (long)(&acpi_sinfo + 1) - (long)(&acpi_sinfo.sleep_status + 1)); } static int __init acpi_parse_fadt(struct acpi_table_header *table) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:31:29 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:31:29 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67424.120335 (Exim 4.92) (envelope-from ) id 1l05Wz-00056O-AM; Thu, 14 Jan 2021 16:31:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67424.120335; Thu, 14 Jan 2021 16:31:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Wz-00056H-7S; Thu, 14 Jan 2021 16:31:29 +0000 Received: by outflank-mailman (input) for mailman id 67424; Thu, 14 Jan 2021 16:31:28 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Wy-000569-9g for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:28 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Wy-0008Ek-8r for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:28 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Wy-0006Td-8E for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:28 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YBshdu91TpffwfNbZvl3+6Xq63EtgwHHwjvX3A+ff0o=; b=3V8UTz19SGqyKcNbL10B306yYy 9Ih0NPkszJXsSjn0WYYfJTvUgvEPk+hfN1pSbJ8QIz40eUYWcr0NhxjxLKcRTLn5BDGUMGW0WXL5x eqxj6OCLngDyIlZ42aJpoH3EQAE4d8AlB33a4CaCO6lBYudceds5kWTDd4LlhiKMdwH0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/iommu: smmu: Use 1U << 31 rather than 1 << 31 Message-Id: Date: Thu, 14 Jan 2021 16:31:28 +0000 commit 17b2ddf07a1b31c8c7ed96014772a0729e1460ac Author: Julien Grall AuthorDate: Thu Dec 24 15:24:19 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 11 16:24:12 2021 -0800 xen/iommu: smmu: Use 1U << 31 rather than 1 << 31 Replace all the use of 1 << 31 with 1U << 31 to prevent undefined behavior in the SMMU driver. Signed-off-by: Julien Grall Reviewed-by: Jan Beulich [stefano: fix title and description] Signed-off-by: Stefano Stabellini Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index ed04d85e05..3e8aa37866 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -405,7 +405,7 @@ static struct iommu_group *iommu_group_get(struct device *dev) #define ID0_NUMSMRG_SHIFT 0 #define ID0_NUMSMRG_MASK 0xff -#define ID1_PAGESIZE (1 << 31) +#define ID1_PAGESIZE (1U << 31) #define ID1_NUMPAGENDXB_SHIFT 28 #define ID1_NUMPAGENDXB_MASK 7 #define ID1_NUMS2CB_SHIFT 16 @@ -438,7 +438,7 @@ static struct iommu_group *iommu_group_get(struct device *dev) /* Stream mapping registers */ #define ARM_SMMU_GR0_SMR(n) (0x800 + ((n) << 2)) -#define SMR_VALID (1 << 31) +#define SMR_VALID (1U << 31) #define SMR_MASK_SHIFT 16 #define SMR_MASK_MASK 0x7fff #define SMR_ID_SHIFT 0 @@ -506,7 +506,7 @@ static struct iommu_group *iommu_group_get(struct device *dev) #define RESUME_RETRY (0 << 0) #define RESUME_TERMINATE (1 << 0) -#define TTBCR_EAE (1 << 31) +#define TTBCR_EAE (1U << 31) #define TTBCR_PASIZE_SHIFT 16 #define TTBCR_PASIZE_MASK 0x7 @@ -562,7 +562,7 @@ static struct iommu_group *iommu_group_get(struct device *dev) #define MAIR_ATTR_IDX_CACHE 1 #define MAIR_ATTR_IDX_DEV 2 -#define FSR_MULTI (1 << 31) +#define FSR_MULTI (1U << 31) #define FSR_SS (1 << 30) #define FSR_UUT (1 << 8) #define FSR_ASF (1 << 7) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:31:39 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:31:39 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67425.120338 (Exim 4.92) (envelope-from ) id 1l05X9-00057m-C2; Thu, 14 Jan 2021 16:31:39 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67425.120338; Thu, 14 Jan 2021 16:31:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05X9-00057e-9D; Thu, 14 Jan 2021 16:31:39 +0000 Received: by outflank-mailman (input) for mailman id 67425; Thu, 14 Jan 2021 16:31:38 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05X8-00057X-CO for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:38 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05X8-0008Es-Bf for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:38 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05X8-0006Ue-B3 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:38 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DBxjQ/qB3BjsEChWaCPzP2f5McpKUy/YinEqE80h/ZY=; b=exmD/0QuMHBNXoNM5zEcd56o2B bMdPhJLfX3aQI9ZA8fXN+8dbCGwQriUcdIJVYzozmJZvE0UDlPUMndGlPXFH6OffS1ieghPbk/xf1 t+RwOE75qQZapjM7WnkYlg/ddQ2M+W/lFUa4ArONENvw00QTIKpovW4SadgUx9iRGUrA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] iommu/arm: ipmmu-vmsa: Use 1U << 31 rather than 1 << 31 Message-Id: Date: Thu, 14 Jan 2021 16:31:38 +0000 commit 0e97d99f0e9fc627f29680d20d2619184c894f14 Author: Oleksandr Tyshchenko AuthorDate: Mon Jan 11 12:33:55 2021 +0200 Commit: Stefano Stabellini CommitDate: Mon Jan 11 16:31:15 2021 -0800 iommu/arm: ipmmu-vmsa: Use 1U << 31 rather than 1 << 31 Replace all the use of 1 << 31 with 1U << 31 to prevent undefined behavior in the IPMMU-VMSA driver. Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Stefano Stabellini --- xen/drivers/passthrough/arm/ipmmu-vmsa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/arm/ipmmu-vmsa.c b/xen/drivers/passthrough/arm/ipmmu-vmsa.c index 346165c3fa..aef358d880 100644 --- a/xen/drivers/passthrough/arm/ipmmu-vmsa.c +++ b/xen/drivers/passthrough/arm/ipmmu-vmsa.c @@ -187,7 +187,7 @@ static DEFINE_SPINLOCK(ipmmu_devices_lock); #define IMCAAR 0x0004 #define IMTTBCR 0x0008 -#define IMTTBCR_EAE (1 << 31) +#define IMTTBCR_EAE (1U << 31) #define IMTTBCR_PMB (1 << 30) #define IMTTBCR_SH1_NON_SHAREABLE (0 << 28) #define IMTTBCR_SH1_OUTER_SHAREABLE (2 << 28) @@ -251,7 +251,7 @@ static DEFINE_SPINLOCK(ipmmu_devices_lock); #define IMUCTR(n) ((n) < 32 ? IMUCTR0(n) : IMUCTR32(n)) #define IMUCTR0(n) (0x0300 + ((n) * 16)) #define IMUCTR32(n) (0x0600 + (((n) - 32) * 16)) -#define IMUCTR_FIXADDEN (1 << 31) +#define IMUCTR_FIXADDEN (1U << 31) #define IMUCTR_FIXADD_MASK (0xff << 16) #define IMUCTR_FIXADD_SHIFT 16 #define IMUCTR_TTSEL_MMU(n) ((n) << 4) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:31:49 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:31:49 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67426.120343 (Exim 4.92) (envelope-from ) id 1l05XJ-00059L-EK; Thu, 14 Jan 2021 16:31:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67426.120343; Thu, 14 Jan 2021 16:31:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05XJ-00059E-Ao; Thu, 14 Jan 2021 16:31:49 +0000 Received: by outflank-mailman (input) for mailman id 67426; Thu, 14 Jan 2021 16:31:48 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05XI-000595-Ev for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:48 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05XI-0008FK-EH for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:48 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05XI-0006VT-Di for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:48 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lrJ7EH9dFOmmYoqBgTdGF1OyeaZ4i38wbHFMfxZrVlE=; b=PLubHcoEZ6Hrqo2niOnTDYuUVp B42pXigADrgdhIdZzEjbRszVhg5gN6gxqHB3thDDgLc6oQ5bfSMU3EtcbI/fvramwcyEu6/xrSzum 27JtbbErajeXJLojC7PasBJdKGU6agUwrGrcJGr2t4OMmtkHPaCKMn0FvcplSpa/hJuM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/serial: scif: Rework how the parameters are found Message-Id: Date: Thu, 14 Jan 2021 16:31:48 +0000 commit edad4c760a1b28abb15836ac4325912203c44905 Author: Julien Grall AuthorDate: Thu Dec 24 16:50:21 2020 +0000 Commit: Stefano Stabellini CommitDate: Mon Jan 11 16:35:13 2021 -0800 xen/serial: scif: Rework how the parameters are found clang 11 will throw the following error while build Xen: scif-uart.c:333:33: error: cast to smaller integer type 'enum port_types' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast] uart->params = &port_params[(enum port_types)match->data]; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ The error can be prevented by directly storing a pointer to the port parameters rather than the a cast of the port type. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/drivers/char/scif-uart.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/char/scif-uart.c b/xen/drivers/char/scif-uart.c index 9d3f66b55b..ee204a11a4 100644 --- a/xen/drivers/char/scif-uart.c +++ b/xen/drivers/char/scif-uart.c @@ -286,8 +286,8 @@ static struct uart_driver __read_mostly scif_uart_driver = { static const struct dt_device_match scif_uart_dt_match[] __initconst = { - { .compatible = "renesas,scif", .data = (void *)SCIF_PORT }, - { .compatible = "renesas,scifa", .data = (void *)SCIFA_PORT }, + { .compatible = "renesas,scif", .data = &port_params[SCIF_PORT] }, + { .compatible = "renesas,scifa", .data = &port_params[SCIFA_PORT] }, { /* sentinel */ }, }; @@ -330,7 +330,7 @@ static int __init scif_uart_init(struct dt_device_node *dev, match = dt_match_node(scif_uart_dt_match, dev); ASSERT( match ); - uart->params = &port_params[(enum port_types)match->data]; + uart->params = match->data; uart->vuart.base_addr = addr; uart->vuart.size = size; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:31:59 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:31:59 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67427.120347 (Exim 4.92) (envelope-from ) id 1l05XT-0005Ae-Fa; Thu, 14 Jan 2021 16:31:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67427.120347; Thu, 14 Jan 2021 16:31:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05XT-0005AW-CT; Thu, 14 Jan 2021 16:31:59 +0000 Received: by outflank-mailman (input) for mailman id 67427; Thu, 14 Jan 2021 16:31:58 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05XS-0005AN-Hl for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:58 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05XS-0008FW-H5 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:58 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05XS-0006WP-GS for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:31:58 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7Zp1JPGI54dTwsdM8L3g1ME2z691CpulGZLtCw+c7QY=; b=NBBIb1ODEBqWqCNSd1QAQK9pdv WsrXxCc8if1BkCgMGEobGQ7YH16+eOMWTgcxG07lHXaMo7DEVBMLJfH2Px9aSqK27AuLG2FaXsYpP F5W4DNga0IpabvDQ00iPFhFSXoheeI9/O7T5GA/zE20quYrwFFt7ZUPMy+E10QDooPQI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/memory: Introduce CONFIG_ARCH_ACQUIRE_RESOURCE Message-Id: Date: Thu, 14 Jan 2021 16:31:58 +0000 commit 0db1ded6b57cb9ebfaefa2682ed817c0a9dd4ae3 Author: Andrew Cooper AuthorDate: Mon Jul 27 12:28:24 2020 +0100 Commit: Andrew Cooper CommitDate: Tue Jan 12 18:17:02 2021 +0000 xen/memory: Introduce CONFIG_ARCH_ACQUIRE_RESOURCE New architectures shouldn't be forced to implement no-op stubs for unused functionality. Introduce CONFIG_ARCH_ACQUIRE_RESOURCE which can be opted in to, and provide compatibility logic in xen/mm.h No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: Paul Durrant Acked-by: Julien Grall --- xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 3 +++ xen/include/asm-arm/mm.h | 8 -------- xen/include/xen/mm.h | 9 +++++++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 24868aa6ad..78f351f94b 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -6,6 +6,7 @@ config X86 select ACPI select ACPI_LEGACY_TABLES_LOOKUP select ARCH_SUPPORTS_INT128 + select ARCH_ACQUIRE_RESOURCE select COMPAT select CORE_PARKING select HAS_ALTERNATIVE diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 0661328a99..b5c91a1664 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -22,6 +22,9 @@ config GRANT_TABLE If unsure, say Y. +config ARCH_ACQUIRE_RESOURCE + bool + config HAS_ALTERNATIVE bool diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index f8ba49b118..0b7de3102e 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -358,14 +358,6 @@ static inline void put_page_and_type(struct page_info *page) void clear_and_clean_page(struct page_info *page); -static inline -int arch_acquire_resource(struct domain *d, unsigned int type, unsigned int id, - unsigned long frame, unsigned int nr_frames, - xen_pfn_t mfn_list[]) -{ - return -EOPNOTSUPP; -} - unsigned int arch_get_dma_bitsize(void); #endif /* __ARCH_ARM_MM__ */ diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 85a8df9948..e62a5b726e 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -702,4 +702,13 @@ static inline void put_page_alloc_ref(struct page_info *page) } } +#ifndef CONFIG_ARCH_ACQUIRE_RESOURCE +static inline int arch_acquire_resource( + struct domain *d, unsigned int type, unsigned int id, unsigned long frame, + unsigned int nr_frames, xen_pfn_t mfn_list[]) +{ + return -EOPNOTSUPP; +} +#endif /* !CONFIG_ARCH_ACQUIRE_RESOURCE */ + #endif /* __XEN_MM_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:32:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:32:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67428.120351 (Exim 4.92) (envelope-from ) id 1l05Xd-0005Bt-H9; Thu, 14 Jan 2021 16:32:09 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67428.120351; Thu, 14 Jan 2021 16:32:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Xd-0005Bj-E0; Thu, 14 Jan 2021 16:32:09 +0000 Received: by outflank-mailman (input) for mailman id 67428; Thu, 14 Jan 2021 16:32:08 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Xc-0005Bb-ON for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:08 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Xc-0008Fr-KI for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:08 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Xc-0006X6-JE for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:08 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NIXjQO3jBpgQ54BWmzkQJh6IeO+iskH1tSMC98jkxgk=; b=bwlYKGzH1sPtD+owKlAnTVB2VO VoMFcMWKPvP1/IRDlVb/iBdJFDrgaOQHUA8PojVUOJ7tON17Vbl6n/F3MpV2/ElFwNBF9muCLWbfH 0RelA9N17wcucDYjysoHrLsrI6jjxJK+GjqBwIaRPoi4U4cxSmX2JzOz6LuTflNqWncM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/memory: Fix compat XENMEM_acquire_resource for size requests Message-Id: Date: Thu, 14 Jan 2021 16:32:08 +0000 commit 414be7b66349e7dca42bc1fd47c2b2f5b2d27432 Author: Andrew Cooper AuthorDate: Tue Jul 28 11:23:54 2020 +0100 Commit: Andrew Cooper CommitDate: Tue Jan 12 18:17:02 2021 +0000 xen/memory: Fix compat XENMEM_acquire_resource for size requests Copy the nr_frames from the structure which actually has the correct value, so the caller doesn't unconditionally receive 0. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant --- xen/common/compat/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 3851f756c7..ed92e05b08 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -599,7 +599,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) if ( __copy_field_to_guest( guest_handle_cast(compat, compat_mem_acquire_resource_t), - &cmp.mar, nr_frames) ) + nat.mar, nr_frames) ) return -EFAULT; } else -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:32:21 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:32:21 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67429.120354 (Exim 4.92) (envelope-from ) id 1l05Xn-0005D6-IU; Thu, 14 Jan 2021 16:32:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67429.120354; Thu, 14 Jan 2021 16:32:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Xn-0005Cy-FX; Thu, 14 Jan 2021 16:32:19 +0000 Received: by outflank-mailman (input) for mailman id 67429; Thu, 14 Jan 2021 16:32:18 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Xm-0005Cq-No for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:18 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Xm-0008Fz-N5 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:18 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Xm-0006Xu-MR for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:18 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=z9tc+BJvPFIkijFSMdZLFolTZPGtt6uCn8iMMx+ipFU=; b=lDPQ3DuWf4AaLO01J3JMgOskps RdON7l3/aa8IKkZzgjS4MrZqUH2ljGahbxj6NZWTwphC6A9CHms2r9nGi6ozj2U3QS6cans5ebr9E d4FHWauwmVUwj9cqzECDbqBSsi7HHkBIjEHJudwSE+zCnxsspixj+15GFvilKfOUH5pA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/tests: Drop obsolete running scripts Message-Id: Date: Thu, 14 Jan 2021 16:32:18 +0000 commit ec6c5d39982f230851278a2512e04bad6397f6ce Author: Andrew Cooper AuthorDate: Tue Jan 12 18:33:39 2021 +0000 Commit: Andrew Cooper CommitDate: Wed Jan 13 19:30:50 2021 +0000 tools/tests: Drop obsolete running scripts The python unit tests were dropped in Xen 4.12 due to being obsolete, but the scripts to run the tests were missed. Clean up .gitignore as well. Also drop the libxenctrl {C,LD}FLAGS adjustments in the Makefile. This logic isn't used, and isn't appropriate even in principle, as there are tests in here which don't want to use libxenctrl. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- .gitignore | 3 -- tools/tests/Makefile | 3 -- tools/tests/run_tests.sh | 61 ------------------------------------- tools/tests/utests/run_all_tests.py | 23 -------------- 4 files changed, 90 deletions(-) diff --git a/.gitignore b/.gitignore index b169d78ed7..1b54ea3111 100644 --- a/.gitignore +++ b/.gitignore @@ -274,9 +274,6 @@ tools/tests/x86_emulator/x86_emulate tools/tests/x86_emulator/xop*.[ch] tools/tests/xen-access/xen-access tools/tests/xenstore/xs-test -tools/tests/regression/installed/* -tools/tests/regression/build/* -tools/tests/regression/downloads/* tools/tests/mem-sharing/memshrtool tools/tests/mce-test/tools/xen-mceinj tools/tests/vpci/list.h diff --git a/tools/tests/Makefile b/tools/tests/Makefile index ed3bed404b..9077fa14d3 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -1,9 +1,6 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += $(CFLAGS_libxenctrl) -LDLIBS += $(LDLIBS_libxenctrl) - SUBDIRS-y := SUBDIRS-$(CONFIG_X86) += cpu-policy SUBDIRS-$(CONFIG_X86) += mce-test diff --git a/tools/tests/run_tests.sh b/tools/tests/run_tests.sh deleted file mode 100644 index c492876b4b..0000000000 --- a/tools/tests/run_tests.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -# -# This runs the available unit-tests with all different supported -# python versions. -# -# To run this this must be 'cd'ed to the tests directory. -# - -ENABLE_UNSUPPORTED=0 - -function usage() -{ - printf "Usage: %s: [-u]\n" $0 - printf " -u: run test with unsupported python versions also\n" -} - -function run_one_test() -{ - PYTHON=$1 - PYTHON_EXECUTABLE=`echo $PYTHON | tr -d "-"` - echo "+++ Running tests with $PYTHON" - export LD_LIBRARY_PATH=./regression/installed/$PYTHON/lib - ./regression/installed/$PYTHON/bin/$PYTHON_EXECUTABLE \ - utests/run_all_tests.py - echo "--- Finished tests with $PYTHON" -} - -function run_all_tests() -{ - for PYTHON in $@; - do - run_one_test $PYTHON - done -} - -while getopts u name -do - case $name in - h) usage; exit 0;; - u) ENABLE_UNSUPPORTED=1;; - ?) usage; exit 2;; - esac -done - -# Build the different python versions -(cd regression && make -j4 runtime-environment) - -# Supported: when an unit test fails this should be seen as an error -PYTHON_SUPPORTED="python-2.4 python-2.5 python-2.6" -# Unsupported: failure should be seen as a hint -PYTHON_UNSUPPORTED="python-3.1" - -export PYTHONPATH=`echo $PWD/../python/build/lib.*`:$PWD - -set -e -run_all_tests $PYTHON_SUPPORTED - -if test $ENABLE_UNSUPPORTED -eq 1 -then - run_all_tests $PYTHON_UNSUPPORTED -fi diff --git a/tools/tests/utests/run_all_tests.py b/tools/tests/utests/run_all_tests.py deleted file mode 100644 index 7318c81ff2..0000000000 --- a/tools/tests/utests/run_all_tests.py +++ /dev/null @@ -1,23 +0,0 @@ -#============================================================================ -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# 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 . -#============================================================================ -# Copyright (C) 2009 flonatel GmbH & Co. KG -#============================================================================ - -import unittest - -suite = unittest.TestSuite([]) - -if __name__ == "__main__": - testresult = unittest.TextTestRunner(verbosity=3).run(suite) - -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:32:29 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:32:29 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67430.120359 (Exim 4.92) (envelope-from ) id 1l05Xx-0005Ea-MB; Thu, 14 Jan 2021 16:32:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67430.120359; Thu, 14 Jan 2021 16:32:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Xx-0005ET-IK; Thu, 14 Jan 2021 16:32:29 +0000 Received: by outflank-mailman (input) for mailman id 67430; Thu, 14 Jan 2021 16:32:28 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Xw-0005EO-Qw for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:28 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Xw-0008G7-QA for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:28 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Xw-0006Yf-PX for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:28 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=P+1oCjhSBVYzc24M2++2RFIPrOVjA33shb2DwT0V5Ts=; b=gjPHWaUOkUqPGdj/0J4Nm8qZ9g VMwoWfkfVMCaPYGAfhTHDUftN/TKHrq95oNl3+4ymb1FeHRtzp2usaHUqbcPajxIcKyHH3b8Z/xot XLODs/n+XkeKfhL8sPknZsIuua78vRsTkclQCZdx9a73925pGwRra1mvYdMa7rm54CWM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: Move xen-access from tests/ to misc/ Message-Id: Date: Thu, 14 Jan 2021 16:32:28 +0000 commit 2de267435687b9ee73f9a89213d13d647ba01689 Author: Andrew Cooper AuthorDate: Tue Jan 12 18:37:53 2021 +0000 Commit: Andrew Cooper CommitDate: Wed Jan 13 19:30:50 2021 +0000 tools: Move xen-access from tests/ to misc/ xen-access is a tool for a human to use, rather than a test. Move it into misc/ as a more appropriate location to live. Move the -DXC_WANT_COMPAT_DEVICEMODEL_API from CFLAGS into xen-access.c itself to avoid adding Makefile complexity. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson Acked-by: Tamas K Lengyel --- .gitignore | 1 - MAINTAINERS | 2 +- tools/misc/.gitignore | 1 + tools/misc/Makefile | 4 + tools/misc/xen-access.c | 947 ++++++++++++++++++++++++++++++++++++ tools/tests/Makefile | 1 - tools/tests/xen-access/Makefile | 33 -- tools/tests/xen-access/xen-access.c | 946 ----------------------------------- 8 files changed, 953 insertions(+), 982 deletions(-) diff --git a/.gitignore b/.gitignore index 1b54ea3111..630bdf5b99 100644 --- a/.gitignore +++ b/.gitignore @@ -272,7 +272,6 @@ tools/tests/x86_emulator/*sse*.[ch] tools/tests/x86_emulator/test_x86_emulator tools/tests/x86_emulator/x86_emulate tools/tests/x86_emulator/xop*.[ch] -tools/tests/xen-access/xen-access tools/tests/xenstore/xs-test tools/tests/mem-sharing/memshrtool tools/tests/mce-test/tools/xen-mceinj diff --git a/MAINTAINERS b/MAINTAINERS index 6dbd99aff4..5079b834c2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -486,7 +486,7 @@ M: Tamas K Lengyel R: Alexandru Isaila R: Petre Pircalabu S: Supported -F: tools/tests/xen-access +F: tools/misc/xen-access.c F: xen/arch/*/monitor.c F: xen/arch/*/vm_event.c F: xen/arch/arm/mem_access.c diff --git a/tools/misc/.gitignore b/tools/misc/.gitignore index c5fe2cfccd..e332ed4ec7 100644 --- a/tools/misc/.gitignore +++ b/tools/misc/.gitignore @@ -1 +1,2 @@ +xen-access xen-ucode diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 7d37f297a9..612b7002e5 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -30,6 +30,7 @@ INSTALL_SBIN += xenlockprof INSTALL_SBIN += xenperf INSTALL_SBIN += xenpm INSTALL_SBIN += xenwatchdogd +INSTALL_SBIN += xen-access INSTALL_SBIN += xen-livepatch INSTALL_SBIN += xen-diag INSTALL_SBIN += $(INSTALL_SBIN-y) @@ -73,6 +74,9 @@ clean: .PHONY: distclean distclean: clean +xen-access: xen-access.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenevtchn) $(APPEND_LDFLAGS) + xen-cpuid: xen-cpuid.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) diff --git a/tools/misc/xen-access.c b/tools/misc/xen-access.c new file mode 100644 index 0000000000..4bbef0bd2e --- /dev/null +++ b/tools/misc/xen-access.c @@ -0,0 +1,947 @@ +/* + * xen-access.c + * + * Exercises the basic per-page access mechanisms + * + * Copyright (c) 2011 Virtuata, Inc. + * Copyright (c) 2009 by Citrix Systems, Inc. (Patrick Colp), based on + * xenpaging.c + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define XC_WANT_COMPAT_DEVICEMODEL_API +#include +#include +#include + +#include + +#if defined(__arm__) || defined(__aarch64__) +#include +#define START_PFN (GUEST_RAM0_BASE >> 12) +#elif defined(__i386__) || defined(__x86_64__) +#define START_PFN 0ULL +#endif + +#define DPRINTF(a, b...) fprintf(stderr, a, ## b) +#define ERROR(a, b...) fprintf(stderr, a "\n", ## b) +#define PERROR(a, b...) fprintf(stderr, a ": %s\n", ## b, strerror(errno)) + +/* From xen/include/asm-x86/processor.h */ +#define X86_TRAP_DEBUG 1 +#define X86_TRAP_INT3 3 + +/* From xen/include/asm-x86/x86-defns.h */ +#define X86_CR4_PGE 0x00000080 /* enable global pages */ + +typedef struct vm_event { + domid_t domain_id; + xenevtchn_handle *xce_handle; + int port; + vm_event_back_ring_t back_ring; + uint32_t evtchn_port; + void *ring_page; +} vm_event_t; + +typedef struct xenaccess { + xc_interface *xc_handle; + + xen_pfn_t max_gpfn; + + vm_event_t vm_event; +} xenaccess_t; + +static int interrupted; +bool evtchn_bind = 0, evtchn_open = 0, mem_access_enable = 0; + +static void close_handler(int sig) +{ + interrupted = sig; +} + +int xc_wait_for_event_or_timeout(xc_interface *xch, xenevtchn_handle *xce, unsigned long ms) +{ + struct pollfd fd = { .fd = xenevtchn_fd(xce), .events = POLLIN | POLLERR }; + int port; + int rc; + + rc = poll(&fd, 1, ms); + if ( rc == -1 ) + { + if (errno == EINTR) + return 0; + + ERROR("Poll exited with an error"); + goto err; + } + + if ( rc == 1 ) + { + port = xenevtchn_pending(xce); + if ( port == -1 ) + { + ERROR("Failed to read port from event channel"); + goto err; + } + + rc = xenevtchn_unmask(xce, port); + if ( rc != 0 ) + { + ERROR("Failed to unmask event channel port"); + goto err; + } + } + else + port = -1; + + return port; + + err: + return -errno; +} + +int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) +{ + int rc; + + if ( xenaccess == NULL ) + return 0; + + /* Tear down domain xenaccess in Xen */ + if ( xenaccess->vm_event.ring_page ) + munmap(xenaccess->vm_event.ring_page, XC_PAGE_SIZE); + + if ( mem_access_enable ) + { + rc = xc_monitor_disable(xenaccess->xc_handle, + xenaccess->vm_event.domain_id); + if ( rc != 0 ) + { + ERROR("Error tearing down domain xenaccess in xen"); + return rc; + } + } + + /* Unbind VIRQ */ + if ( evtchn_bind ) + { + rc = xenevtchn_unbind(xenaccess->vm_event.xce_handle, + xenaccess->vm_event.port); + if ( rc != 0 ) + { + ERROR("Error unbinding event port"); + return rc; + } + } + + /* Close event channel */ + if ( evtchn_open ) + { + rc = xenevtchn_close(xenaccess->vm_event.xce_handle); + if ( rc != 0 ) + { + ERROR("Error closing event channel"); + return rc; + } + } + + /* Close connection to Xen */ + rc = xc_interface_close(xenaccess->xc_handle); + if ( rc != 0 ) + { + ERROR("Error closing connection to xen"); + return rc; + } + xenaccess->xc_handle = NULL; + + free(xenaccess); + + return 0; +} + +xenaccess_t *xenaccess_init(xc_interface **xch_r, domid_t domain_id) +{ + xenaccess_t *xenaccess = 0; + xc_interface *xch; + int rc; + + xch = xc_interface_open(NULL, NULL, 0); + if ( !xch ) + goto err_iface; + + DPRINTF("xenaccess init\n"); + *xch_r = xch; + + /* Allocate memory */ + xenaccess = malloc(sizeof(xenaccess_t)); + memset(xenaccess, 0, sizeof(xenaccess_t)); + + /* Open connection to xen */ + xenaccess->xc_handle = xch; + + /* Set domain id */ + xenaccess->vm_event.domain_id = domain_id; + + /* Enable mem_access */ + xenaccess->vm_event.ring_page = + xc_monitor_enable(xenaccess->xc_handle, + xenaccess->vm_event.domain_id, + &xenaccess->vm_event.evtchn_port); + if ( xenaccess->vm_event.ring_page == NULL ) + { + switch ( errno ) { + case EBUSY: + ERROR("xenaccess is (or was) active on this domain"); + break; + case ENODEV: + ERROR("EPT not supported for this guest"); + break; + default: + perror("Error enabling mem_access"); + break; + } + goto err; + } + mem_access_enable = 1; + + /* Open event channel */ + xenaccess->vm_event.xce_handle = xenevtchn_open(NULL, 0); + if ( xenaccess->vm_event.xce_handle == NULL ) + { + ERROR("Failed to open event channel"); + goto err; + } + evtchn_open = 1; + + /* Bind event notification */ + rc = xenevtchn_bind_interdomain(xenaccess->vm_event.xce_handle, + xenaccess->vm_event.domain_id, + xenaccess->vm_event.evtchn_port); + if ( rc < 0 ) + { + ERROR("Failed to bind event channel"); + goto err; + } + evtchn_bind = 1; + xenaccess->vm_event.port = rc; + + /* Initialise ring */ + SHARED_RING_INIT((vm_event_sring_t *)xenaccess->vm_event.ring_page); + BACK_RING_INIT(&xenaccess->vm_event.back_ring, + (vm_event_sring_t *)xenaccess->vm_event.ring_page, + XC_PAGE_SIZE); + + /* Get max_gpfn */ + rc = xc_domain_maximum_gpfn(xenaccess->xc_handle, + xenaccess->vm_event.domain_id, + &xenaccess->max_gpfn); + + if ( rc ) + { + ERROR("Failed to get max gpfn"); + goto err; + } + + DPRINTF("max_gpfn = %"PRI_xen_pfn"\n", xenaccess->max_gpfn); + + return xenaccess; + + err: + rc = xenaccess_teardown(xch, xenaccess); + if ( rc ) + { + ERROR("Failed to teardown xenaccess structure!\n"); + } + + err_iface: + return NULL; +} + +static inline +int control_singlestep( + xc_interface *xch, + domid_t domain_id, + unsigned long vcpu, + bool enable) +{ + uint32_t op = enable ? + XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_ON : XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_OFF; + + return xc_domain_debug_control(xch, domain_id, op, vcpu); +} + +/* + * Note that this function is not thread safe. + */ +static void get_request(vm_event_t *vm_event, vm_event_request_t *req) +{ + vm_event_back_ring_t *back_ring; + RING_IDX req_cons; + + back_ring = &vm_event->back_ring; + req_cons = back_ring->req_cons; + + /* Copy request */ + memcpy(req, RING_GET_REQUEST(back_ring, req_cons), sizeof(*req)); + req_cons++; + + /* Update ring */ + back_ring->req_cons = req_cons; + back_ring->sring->req_event = req_cons + 1; +} + +/* + * X86 control register names + */ +static const char* get_x86_ctrl_reg_name(uint32_t index) +{ + static const char* names[] = { + [VM_EVENT_X86_CR0] = "CR0", + [VM_EVENT_X86_CR3] = "CR3", + [VM_EVENT_X86_CR4] = "CR4", + [VM_EVENT_X86_XCR0] = "XCR0", + }; + + if ( index >= ARRAY_SIZE(names) || names[index] == NULL ) + return ""; + + return names[index]; +} + +/* + * Note that this function is not thread safe. + */ +static void put_response(vm_event_t *vm_event, vm_event_response_t *rsp) +{ + vm_event_back_ring_t *back_ring; + RING_IDX rsp_prod; + + back_ring = &vm_event->back_ring; + rsp_prod = back_ring->rsp_prod_pvt; + + /* Copy response */ + memcpy(RING_GET_RESPONSE(back_ring, rsp_prod), rsp, sizeof(*rsp)); + rsp_prod++; + + /* Update ring */ + back_ring->rsp_prod_pvt = rsp_prod; + RING_PUSH_RESPONSES(back_ring); +} + +void usage(char* progname) +{ + fprintf(stderr, "Usage: %s [-m] write|exec", progname); +#if defined(__i386__) || defined(__x86_64__) + fprintf(stderr, "|breakpoint|altp2m_write|altp2m_exec|debug|cpuid|desc_access|write_ctrlreg_cr4|altp2m_write_no_gpt"); +#elif defined(__arm__) || defined(__aarch64__) + fprintf(stderr, "|privcall"); +#endif + fprintf(stderr, + "\n" + "Logs first page writes, execs, or breakpoint traps that occur on the domain.\n" + "\n" + "-m requires this program to run, or else the domain may pause\n"); +} + +int main(int argc, char *argv[]) +{ + struct sigaction act; + domid_t domain_id; + xenaccess_t *xenaccess; + vm_event_request_t req; + vm_event_response_t rsp; + int rc = -1; + int rc1; + xc_interface *xch; + xenmem_access_t default_access = XENMEM_access_rwx; + xenmem_access_t after_first_access = XENMEM_access_rwx; + int memaccess = 0; + int required = 0; + int breakpoint = 0; + int shutting_down = 0; + int privcall = 0; + int altp2m = 0; + int debug = 0; + int cpuid = 0; + int desc_access = 0; + int write_ctrlreg_cr4 = 0; + int altp2m_write_no_gpt = 0; + uint16_t altp2m_view_id = 0; + + char* progname = argv[0]; + argv++; + argc--; + + if ( argc == 3 && argv[0][0] == '-' ) + { + if ( !strcmp(argv[0], "-m") ) + required = 1; + else + { + usage(progname); + return -1; + } + argv++; + argc--; + } + + if ( argc != 2 ) + { + usage(progname); + return -1; + } + + domain_id = atoi(argv[0]); + argv++; + argc--; + + if ( !strcmp(argv[0], "write") ) + { + default_access = XENMEM_access_rx; + after_first_access = XENMEM_access_rwx; + memaccess = 1; + } + else if ( !strcmp(argv[0], "exec") ) + { + default_access = XENMEM_access_rw; + after_first_access = XENMEM_access_rwx; + memaccess = 1; + } +#if defined(__i386__) || defined(__x86_64__) + else if ( !strcmp(argv[0], "breakpoint") ) + { + breakpoint = 1; + } + else if ( !strcmp(argv[0], "altp2m_write") ) + { + default_access = XENMEM_access_rx; + altp2m = 1; + memaccess = 1; + } + else if ( !strcmp(argv[0], "altp2m_exec") ) + { + default_access = XENMEM_access_rw; + altp2m = 1; + memaccess = 1; + } + else if ( !strcmp(argv[0], "altp2m_write_no_gpt") ) + { + default_access = XENMEM_access_rw; + altp2m_write_no_gpt = 1; + memaccess = 1; + altp2m = 1; + } + else if ( !strcmp(argv[0], "debug") ) + { + debug = 1; + } + else if ( !strcmp(argv[0], "cpuid") ) + { + cpuid = 1; + } + else if ( !strcmp(argv[0], "desc_access") ) + { + desc_access = 1; + } + else if ( !strcmp(argv[0], "write_ctrlreg_cr4") ) + { + write_ctrlreg_cr4 = 1; + } +#elif defined(__arm__) || defined(__aarch64__) + else if ( !strcmp(argv[0], "privcall") ) + { + privcall = 1; + } +#endif + else + { + usage(argv[0]); + return -1; + } + + xenaccess = xenaccess_init(&xch, domain_id); + if ( xenaccess == NULL ) + { + ERROR("Error initialising xenaccess"); + return 1; + } + + DPRINTF("starting %s %u\n", argv[0], domain_id); + + /* ensure that if we get a signal, we'll do cleanup, then exit */ + act.sa_handler = close_handler; + act.sa_flags = 0; + sigemptyset(&act.sa_mask); + sigaction(SIGHUP, &act, NULL); + sigaction(SIGTERM, &act, NULL); + sigaction(SIGINT, &act, NULL); + sigaction(SIGALRM, &act, NULL); + + /* Set whether the access listener is required */ + rc = xc_domain_set_access_required(xch, domain_id, required); + if ( rc < 0 ) + { + ERROR("Error %d setting mem_access listener required\n", rc); + goto exit; + } + + /* With altp2m we just create a new, restricted view of the memory */ + if ( memaccess && altp2m ) + { + xen_pfn_t gfn = 0; + unsigned long perm_set = 0; + + if( altp2m_write_no_gpt ) + { + rc = xc_monitor_inguest_pagefault(xch, domain_id, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting inguest pagefault\n", rc); + goto exit; + } + rc = xc_monitor_emul_unimplemented(xch, domain_id, 1); + if ( rc < 0 ) + { + ERROR("Error %d failed to enable emul unimplemented\n", rc); + goto exit; + } + } + + rc = xc_altp2m_set_domain_state( xch, domain_id, 1 ); + if ( rc < 0 ) + { + ERROR("Error %d enabling altp2m on domain!\n", rc); + goto exit; + } + + rc = xc_altp2m_create_view( xch, domain_id, default_access, &altp2m_view_id ); + if ( rc < 0 ) + { + ERROR("Error %d creating altp2m view!\n", rc); + goto exit; + } + + DPRINTF("altp2m view created with id %u\n", altp2m_view_id); + DPRINTF("Setting altp2m mem_access permissions.. "); + + for(; gfn < xenaccess->max_gpfn; ++gfn) + { + rc = xc_altp2m_set_mem_access( xch, domain_id, altp2m_view_id, gfn, + default_access); + if ( !rc ) + perm_set++; + } + + DPRINTF("done! Permissions set on %lu pages.\n", perm_set); + + rc = xc_altp2m_switch_to_view( xch, domain_id, altp2m_view_id ); + if ( rc < 0 ) + { + ERROR("Error %d switching to altp2m view!\n", rc); + goto exit; + } + + rc = xc_monitor_singlestep( xch, domain_id, 1 ); + if ( rc < 0 ) + { + ERROR("Error %d failed to enable singlestep monitoring!\n", rc); + goto exit; + } + } + + if ( memaccess && !altp2m ) + { + /* Set the default access type and convert all pages to it */ + rc = xc_set_mem_access(xch, domain_id, default_access, ~0ull, 0); + if ( rc < 0 ) + { + ERROR("Error %d setting default mem access type\n", rc); + goto exit; + } + + rc = xc_set_mem_access(xch, domain_id, default_access, START_PFN, + (xenaccess->max_gpfn - START_PFN) ); + + if ( rc < 0 ) + { + ERROR("Error %d setting all memory to access type %d\n", rc, + default_access); + goto exit; + } + } + + if ( breakpoint ) + { + rc = xc_monitor_software_breakpoint(xch, domain_id, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting breakpoint trapping with vm_event\n", rc); + goto exit; + } + } + + if ( debug ) + { + rc = xc_monitor_debug_exceptions(xch, domain_id, 1, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting debug exception listener with vm_event\n", rc); + goto exit; + } + } + + if ( cpuid ) + { + rc = xc_monitor_cpuid(xch, domain_id, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting cpuid listener with vm_event\n", rc); + goto exit; + } + } + + if ( desc_access ) + { + rc = xc_monitor_descriptor_access(xch, domain_id, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting descriptor access listener with vm_event\n", rc); + goto exit; + } + } + + if ( privcall ) + { + rc = xc_monitor_privileged_call(xch, domain_id, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting privileged call trapping with vm_event\n", rc); + goto exit; + } + } + + if ( write_ctrlreg_cr4 ) + { + /* Mask the CR4.PGE bit so no events will be generated for global TLB flushes. */ + rc = xc_monitor_write_ctrlreg(xch, domain_id, VM_EVENT_X86_CR4, 1, 1, + X86_CR4_PGE, 1); + if ( rc < 0 ) + { + ERROR("Error %d setting write control register trapping with vm_event\n", rc); + goto exit; + } + } + + /* Wait for access */ + for (;;) + { + if ( interrupted ) + { + /* Unregister for every event */ + DPRINTF("xenaccess shutting down on signal %d\n", interrupted); + + if ( breakpoint ) + rc = xc_monitor_software_breakpoint(xch, domain_id, 0); + if ( debug ) + rc = xc_monitor_debug_exceptions(xch, domain_id, 0, 0); + if ( cpuid ) + rc = xc_monitor_cpuid(xch, domain_id, 0); + if ( desc_access ) + rc = xc_monitor_descriptor_access(xch, domain_id, 0); + if ( write_ctrlreg_cr4 ) + rc = xc_monitor_write_ctrlreg(xch, domain_id, VM_EVENT_X86_CR4, 0, 0, 0, 0); + + if ( privcall ) + rc = xc_monitor_privileged_call(xch, domain_id, 0); + + if ( altp2m ) + { + rc = xc_altp2m_switch_to_view( xch, domain_id, 0 ); + rc = xc_altp2m_destroy_view(xch, domain_id, altp2m_view_id); + rc = xc_altp2m_set_domain_state(xch, domain_id, 0); + rc = xc_monitor_singlestep(xch, domain_id, 0); + } else { + rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, ~0ull, 0); + rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, START_PFN, + (xenaccess->max_gpfn - START_PFN) ); + } + + shutting_down = 1; + } + + rc = xc_wait_for_event_or_timeout(xch, xenaccess->vm_event.xce_handle, 100); + if ( rc < -1 ) + { + ERROR("Error getting event"); + interrupted = -1; + continue; + } + else if ( rc != -1 ) + { + DPRINTF("Got event from Xen\n"); + } + + while ( RING_HAS_UNCONSUMED_REQUESTS(&xenaccess->vm_event.back_ring) ) + { + get_request(&xenaccess->vm_event, &req); + + if ( req.version != VM_EVENT_INTERFACE_VERSION ) + { + ERROR("Error: vm_event interface version mismatch!\n"); + interrupted = -1; + continue; + } + + memset( &rsp, 0, sizeof (rsp) ); + rsp.version = VM_EVENT_INTERFACE_VERSION; + rsp.vcpu_id = req.vcpu_id; + rsp.flags = (req.flags & VM_EVENT_FLAG_VCPU_PAUSED); + rsp.reason = req.reason; + + switch (req.reason) { + case VM_EVENT_REASON_MEM_ACCESS: + if ( !shutting_down ) + { + /* + * This serves no other purpose here then demonstrating the use of the API. + * At shutdown we have already reset all the permissions so really no use getting it again. + */ + xenmem_access_t access; + rc = xc_get_mem_access(xch, domain_id, req.u.mem_access.gfn, &access); + if (rc < 0) + { + ERROR("Error %d getting mem_access event\n", rc); + interrupted = -1; + continue; + } + } + + printf("PAGE ACCESS: %c%c%c for GFN %"PRIx64" (offset %06" + PRIx64") gla %016"PRIx64" (valid: %c; fault in gpt: %c; fault with gla: %c) (vcpu %u [%c], altp2m view %u)\n", + (req.u.mem_access.flags & MEM_ACCESS_R) ? 'r' : '-', + (req.u.mem_access.flags & MEM_ACCESS_W) ? 'w' : '-', + (req.u.mem_access.flags & MEM_ACCESS_X) ? 'x' : '-', + req.u.mem_access.gfn, + req.u.mem_access.offset, + req.u.mem_access.gla, + (req.u.mem_access.flags & MEM_ACCESS_GLA_VALID) ? 'y' : 'n', + (req.u.mem_access.flags & MEM_ACCESS_FAULT_IN_GPT) ? 'y' : 'n', + (req.u.mem_access.flags & MEM_ACCESS_FAULT_WITH_GLA) ? 'y': 'n', + req.vcpu_id, + (req.flags & VM_EVENT_FLAG_VCPU_PAUSED) ? 'p' : 'r', + req.altp2m_idx); + + if ( altp2m && req.flags & VM_EVENT_FLAG_ALTERNATE_P2M) + { + DPRINTF("\tSwitching back to default view!\n"); + + rsp.flags |= (VM_EVENT_FLAG_ALTERNATE_P2M | VM_EVENT_FLAG_TOGGLE_SINGLESTEP); + rsp.altp2m_idx = 0; + } + else if ( default_access != after_first_access ) + { + rc = xc_set_mem_access(xch, domain_id, after_first_access, + req.u.mem_access.gfn, 1); + if (rc < 0) + { + ERROR("Error %d setting gfn to access_type %d\n", rc, + after_first_access); + interrupted = -1; + continue; + } + } + + rsp.u.mem_access = req.u.mem_access; + break; + case VM_EVENT_REASON_SOFTWARE_BREAKPOINT: + printf("Breakpoint: rip=%016"PRIx64", gfn=%"PRIx64" (vcpu %d)\n", + req.data.regs.x86.rip, + req.u.software_breakpoint.gfn, + req.vcpu_id); + + /* Reinject */ + rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, + X86_TRAP_INT3, + req.u.software_breakpoint.type, -1, + req.u.software_breakpoint.insn_length, 0); + if (rc < 0) + { + ERROR("Error %d injecting breakpoint\n", rc); + interrupted = -1; + continue; + } + break; + case VM_EVENT_REASON_PRIVILEGED_CALL: + printf("Privileged call: pc=%"PRIx64" (vcpu %d)\n", + req.data.regs.arm.pc, + req.vcpu_id); + + rsp.data.regs.arm = req.data.regs.arm; + rsp.data.regs.arm.pc += 4; + rsp.flags |= VM_EVENT_FLAG_SET_REGISTERS; + break; + case VM_EVENT_REASON_SINGLESTEP: + printf("Singlestep: rip=%016"PRIx64", vcpu %d, altp2m %u\n", + req.data.regs.x86.rip, + req.vcpu_id, + req.altp2m_idx); + + if ( altp2m ) + { + printf("\tSwitching altp2m to view %u!\n", altp2m_view_id); + + rsp.flags |= VM_EVENT_FLAG_ALTERNATE_P2M; + rsp.altp2m_idx = altp2m_view_id; + } + + rsp.flags |= VM_EVENT_FLAG_TOGGLE_SINGLESTEP; + + break; + case VM_EVENT_REASON_DEBUG_EXCEPTION: + printf("Debug exception: rip=%016"PRIx64", vcpu %d. Type: %u. Length: %u. Pending dbg 0x%08"PRIx64"\n", + req.data.regs.x86.rip, + req.vcpu_id, + req.u.debug_exception.type, + req.u.debug_exception.insn_length, + req.u.debug_exception.pending_dbg); + + /* Reinject */ + rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, + X86_TRAP_DEBUG, + req.u.debug_exception.type, -1, + req.u.debug_exception.insn_length, + req.u.debug_exception.pending_dbg); + if (rc < 0) + { + ERROR("Error %d injecting breakpoint\n", rc); + interrupted = -1; + continue; + } + + break; + case VM_EVENT_REASON_CPUID: + printf("CPUID executed: rip=%016"PRIx64", vcpu %d. Insn length: %"PRIu32" " \ + "0x%"PRIx32" 0x%"PRIx32": EAX=0x%"PRIx64" EBX=0x%"PRIx64" ECX=0x%"PRIx64" EDX=0x%"PRIx64"\n", + req.data.regs.x86.rip, + req.vcpu_id, + req.u.cpuid.insn_length, + req.u.cpuid.leaf, + req.u.cpuid.subleaf, + req.data.regs.x86.rax, + req.data.regs.x86.rbx, + req.data.regs.x86.rcx, + req.data.regs.x86.rdx); + rsp.flags |= VM_EVENT_FLAG_SET_REGISTERS; + rsp.data = req.data; + rsp.data.regs.x86.rip += req.u.cpuid.insn_length; + break; + case VM_EVENT_REASON_DESCRIPTOR_ACCESS: + printf("Descriptor access: rip=%016"PRIx64", vcpu %d: "\ + "VMExit info=0x%"PRIx32", descriptor=%d, is write=%d\n", + req.data.regs.x86.rip, + req.vcpu_id, + req.u.desc_access.arch.vmx.instr_info, + req.u.desc_access.descriptor, + req.u.desc_access.is_write); + rsp.flags |= VM_EVENT_FLAG_EMULATE; + break; + case VM_EVENT_REASON_WRITE_CTRLREG: + printf("Control register written: rip=%016"PRIx64", vcpu %d: " + "reg=%s, old_value=%016"PRIx64", new_value=%016"PRIx64"\n", + req.data.regs.x86.rip, + req.vcpu_id, + get_x86_ctrl_reg_name(req.u.write_ctrlreg.index), + req.u.write_ctrlreg.old_value, + req.u.write_ctrlreg.new_value); + break; + case VM_EVENT_REASON_EMUL_UNIMPLEMENTED: + if ( altp2m_write_no_gpt && req.flags & VM_EVENT_FLAG_ALTERNATE_P2M ) + { + DPRINTF("\tSwitching back to default view!\n"); + + rsp.flags |= (VM_EVENT_FLAG_ALTERNATE_P2M | + VM_EVENT_FLAG_TOGGLE_SINGLESTEP); + rsp.altp2m_idx = 0; + } + break; + default: + fprintf(stderr, "UNKNOWN REASON CODE %d\n", req.reason); + } + + /* Put the response on the ring */ + put_response(&xenaccess->vm_event, &rsp); + } + + /* Tell Xen page is ready */ + rc = xenevtchn_notify(xenaccess->vm_event.xce_handle, + xenaccess->vm_event.port); + + if ( rc != 0 ) + { + ERROR("Error resuming page"); + interrupted = -1; + } + + if ( shutting_down ) + break; + } + DPRINTF("xenaccess shut down on signal %d\n", interrupted); + +exit: + if ( altp2m ) + { + uint32_t vcpu_id; + for ( vcpu_id = 0; vcpu_id -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include - -#if defined(__arm__) || defined(__aarch64__) -#include -#define START_PFN (GUEST_RAM0_BASE >> 12) -#elif defined(__i386__) || defined(__x86_64__) -#define START_PFN 0ULL -#endif - -#define DPRINTF(a, b...) fprintf(stderr, a, ## b) -#define ERROR(a, b...) fprintf(stderr, a "\n", ## b) -#define PERROR(a, b...) fprintf(stderr, a ": %s\n", ## b, strerror(errno)) - -/* From xen/include/asm-x86/processor.h */ -#define X86_TRAP_DEBUG 1 -#define X86_TRAP_INT3 3 - -/* From xen/include/asm-x86/x86-defns.h */ -#define X86_CR4_PGE 0x00000080 /* enable global pages */ - -typedef struct vm_event { - domid_t domain_id; - xenevtchn_handle *xce_handle; - int port; - vm_event_back_ring_t back_ring; - uint32_t evtchn_port; - void *ring_page; -} vm_event_t; - -typedef struct xenaccess { - xc_interface *xc_handle; - - xen_pfn_t max_gpfn; - - vm_event_t vm_event; -} xenaccess_t; - -static int interrupted; -bool evtchn_bind = 0, evtchn_open = 0, mem_access_enable = 0; - -static void close_handler(int sig) -{ - interrupted = sig; -} - -int xc_wait_for_event_or_timeout(xc_interface *xch, xenevtchn_handle *xce, unsigned long ms) -{ - struct pollfd fd = { .fd = xenevtchn_fd(xce), .events = POLLIN | POLLERR }; - int port; - int rc; - - rc = poll(&fd, 1, ms); - if ( rc == -1 ) - { - if (errno == EINTR) - return 0; - - ERROR("Poll exited with an error"); - goto err; - } - - if ( rc == 1 ) - { - port = xenevtchn_pending(xce); - if ( port == -1 ) - { - ERROR("Failed to read port from event channel"); - goto err; - } - - rc = xenevtchn_unmask(xce, port); - if ( rc != 0 ) - { - ERROR("Failed to unmask event channel port"); - goto err; - } - } - else - port = -1; - - return port; - - err: - return -errno; -} - -int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) -{ - int rc; - - if ( xenaccess == NULL ) - return 0; - - /* Tear down domain xenaccess in Xen */ - if ( xenaccess->vm_event.ring_page ) - munmap(xenaccess->vm_event.ring_page, XC_PAGE_SIZE); - - if ( mem_access_enable ) - { - rc = xc_monitor_disable(xenaccess->xc_handle, - xenaccess->vm_event.domain_id); - if ( rc != 0 ) - { - ERROR("Error tearing down domain xenaccess in xen"); - return rc; - } - } - - /* Unbind VIRQ */ - if ( evtchn_bind ) - { - rc = xenevtchn_unbind(xenaccess->vm_event.xce_handle, - xenaccess->vm_event.port); - if ( rc != 0 ) - { - ERROR("Error unbinding event port"); - return rc; - } - } - - /* Close event channel */ - if ( evtchn_open ) - { - rc = xenevtchn_close(xenaccess->vm_event.xce_handle); - if ( rc != 0 ) - { - ERROR("Error closing event channel"); - return rc; - } - } - - /* Close connection to Xen */ - rc = xc_interface_close(xenaccess->xc_handle); - if ( rc != 0 ) - { - ERROR("Error closing connection to xen"); - return rc; - } - xenaccess->xc_handle = NULL; - - free(xenaccess); - - return 0; -} - -xenaccess_t *xenaccess_init(xc_interface **xch_r, domid_t domain_id) -{ - xenaccess_t *xenaccess = 0; - xc_interface *xch; - int rc; - - xch = xc_interface_open(NULL, NULL, 0); - if ( !xch ) - goto err_iface; - - DPRINTF("xenaccess init\n"); - *xch_r = xch; - - /* Allocate memory */ - xenaccess = malloc(sizeof(xenaccess_t)); - memset(xenaccess, 0, sizeof(xenaccess_t)); - - /* Open connection to xen */ - xenaccess->xc_handle = xch; - - /* Set domain id */ - xenaccess->vm_event.domain_id = domain_id; - - /* Enable mem_access */ - xenaccess->vm_event.ring_page = - xc_monitor_enable(xenaccess->xc_handle, - xenaccess->vm_event.domain_id, - &xenaccess->vm_event.evtchn_port); - if ( xenaccess->vm_event.ring_page == NULL ) - { - switch ( errno ) { - case EBUSY: - ERROR("xenaccess is (or was) active on this domain"); - break; - case ENODEV: - ERROR("EPT not supported for this guest"); - break; - default: - perror("Error enabling mem_access"); - break; - } - goto err; - } - mem_access_enable = 1; - - /* Open event channel */ - xenaccess->vm_event.xce_handle = xenevtchn_open(NULL, 0); - if ( xenaccess->vm_event.xce_handle == NULL ) - { - ERROR("Failed to open event channel"); - goto err; - } - evtchn_open = 1; - - /* Bind event notification */ - rc = xenevtchn_bind_interdomain(xenaccess->vm_event.xce_handle, - xenaccess->vm_event.domain_id, - xenaccess->vm_event.evtchn_port); - if ( rc < 0 ) - { - ERROR("Failed to bind event channel"); - goto err; - } - evtchn_bind = 1; - xenaccess->vm_event.port = rc; - - /* Initialise ring */ - SHARED_RING_INIT((vm_event_sring_t *)xenaccess->vm_event.ring_page); - BACK_RING_INIT(&xenaccess->vm_event.back_ring, - (vm_event_sring_t *)xenaccess->vm_event.ring_page, - XC_PAGE_SIZE); - - /* Get max_gpfn */ - rc = xc_domain_maximum_gpfn(xenaccess->xc_handle, - xenaccess->vm_event.domain_id, - &xenaccess->max_gpfn); - - if ( rc ) - { - ERROR("Failed to get max gpfn"); - goto err; - } - - DPRINTF("max_gpfn = %"PRI_xen_pfn"\n", xenaccess->max_gpfn); - - return xenaccess; - - err: - rc = xenaccess_teardown(xch, xenaccess); - if ( rc ) - { - ERROR("Failed to teardown xenaccess structure!\n"); - } - - err_iface: - return NULL; -} - -static inline -int control_singlestep( - xc_interface *xch, - domid_t domain_id, - unsigned long vcpu, - bool enable) -{ - uint32_t op = enable ? - XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_ON : XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_OFF; - - return xc_domain_debug_control(xch, domain_id, op, vcpu); -} - -/* - * Note that this function is not thread safe. - */ -static void get_request(vm_event_t *vm_event, vm_event_request_t *req) -{ - vm_event_back_ring_t *back_ring; - RING_IDX req_cons; - - back_ring = &vm_event->back_ring; - req_cons = back_ring->req_cons; - - /* Copy request */ - memcpy(req, RING_GET_REQUEST(back_ring, req_cons), sizeof(*req)); - req_cons++; - - /* Update ring */ - back_ring->req_cons = req_cons; - back_ring->sring->req_event = req_cons + 1; -} - -/* - * X86 control register names - */ -static const char* get_x86_ctrl_reg_name(uint32_t index) -{ - static const char* names[] = { - [VM_EVENT_X86_CR0] = "CR0", - [VM_EVENT_X86_CR3] = "CR3", - [VM_EVENT_X86_CR4] = "CR4", - [VM_EVENT_X86_XCR0] = "XCR0", - }; - - if ( index >= ARRAY_SIZE(names) || names[index] == NULL ) - return ""; - - return names[index]; -} - -/* - * Note that this function is not thread safe. - */ -static void put_response(vm_event_t *vm_event, vm_event_response_t *rsp) -{ - vm_event_back_ring_t *back_ring; - RING_IDX rsp_prod; - - back_ring = &vm_event->back_ring; - rsp_prod = back_ring->rsp_prod_pvt; - - /* Copy response */ - memcpy(RING_GET_RESPONSE(back_ring, rsp_prod), rsp, sizeof(*rsp)); - rsp_prod++; - - /* Update ring */ - back_ring->rsp_prod_pvt = rsp_prod; - RING_PUSH_RESPONSES(back_ring); -} - -void usage(char* progname) -{ - fprintf(stderr, "Usage: %s [-m] write|exec", progname); -#if defined(__i386__) || defined(__x86_64__) - fprintf(stderr, "|breakpoint|altp2m_write|altp2m_exec|debug|cpuid|desc_access|write_ctrlreg_cr4|altp2m_write_no_gpt"); -#elif defined(__arm__) || defined(__aarch64__) - fprintf(stderr, "|privcall"); -#endif - fprintf(stderr, - "\n" - "Logs first page writes, execs, or breakpoint traps that occur on the domain.\n" - "\n" - "-m requires this program to run, or else the domain may pause\n"); -} - -int main(int argc, char *argv[]) -{ - struct sigaction act; - domid_t domain_id; - xenaccess_t *xenaccess; - vm_event_request_t req; - vm_event_response_t rsp; - int rc = -1; - int rc1; - xc_interface *xch; - xenmem_access_t default_access = XENMEM_access_rwx; - xenmem_access_t after_first_access = XENMEM_access_rwx; - int memaccess = 0; - int required = 0; - int breakpoint = 0; - int shutting_down = 0; - int privcall = 0; - int altp2m = 0; - int debug = 0; - int cpuid = 0; - int desc_access = 0; - int write_ctrlreg_cr4 = 0; - int altp2m_write_no_gpt = 0; - uint16_t altp2m_view_id = 0; - - char* progname = argv[0]; - argv++; - argc--; - - if ( argc == 3 && argv[0][0] == '-' ) - { - if ( !strcmp(argv[0], "-m") ) - required = 1; - else - { - usage(progname); - return -1; - } - argv++; - argc--; - } - - if ( argc != 2 ) - { - usage(progname); - return -1; - } - - domain_id = atoi(argv[0]); - argv++; - argc--; - - if ( !strcmp(argv[0], "write") ) - { - default_access = XENMEM_access_rx; - after_first_access = XENMEM_access_rwx; - memaccess = 1; - } - else if ( !strcmp(argv[0], "exec") ) - { - default_access = XENMEM_access_rw; - after_first_access = XENMEM_access_rwx; - memaccess = 1; - } -#if defined(__i386__) || defined(__x86_64__) - else if ( !strcmp(argv[0], "breakpoint") ) - { - breakpoint = 1; - } - else if ( !strcmp(argv[0], "altp2m_write") ) - { - default_access = XENMEM_access_rx; - altp2m = 1; - memaccess = 1; - } - else if ( !strcmp(argv[0], "altp2m_exec") ) - { - default_access = XENMEM_access_rw; - altp2m = 1; - memaccess = 1; - } - else if ( !strcmp(argv[0], "altp2m_write_no_gpt") ) - { - default_access = XENMEM_access_rw; - altp2m_write_no_gpt = 1; - memaccess = 1; - altp2m = 1; - } - else if ( !strcmp(argv[0], "debug") ) - { - debug = 1; - } - else if ( !strcmp(argv[0], "cpuid") ) - { - cpuid = 1; - } - else if ( !strcmp(argv[0], "desc_access") ) - { - desc_access = 1; - } - else if ( !strcmp(argv[0], "write_ctrlreg_cr4") ) - { - write_ctrlreg_cr4 = 1; - } -#elif defined(__arm__) || defined(__aarch64__) - else if ( !strcmp(argv[0], "privcall") ) - { - privcall = 1; - } -#endif - else - { - usage(argv[0]); - return -1; - } - - xenaccess = xenaccess_init(&xch, domain_id); - if ( xenaccess == NULL ) - { - ERROR("Error initialising xenaccess"); - return 1; - } - - DPRINTF("starting %s %u\n", argv[0], domain_id); - - /* ensure that if we get a signal, we'll do cleanup, then exit */ - act.sa_handler = close_handler; - act.sa_flags = 0; - sigemptyset(&act.sa_mask); - sigaction(SIGHUP, &act, NULL); - sigaction(SIGTERM, &act, NULL); - sigaction(SIGINT, &act, NULL); - sigaction(SIGALRM, &act, NULL); - - /* Set whether the access listener is required */ - rc = xc_domain_set_access_required(xch, domain_id, required); - if ( rc < 0 ) - { - ERROR("Error %d setting mem_access listener required\n", rc); - goto exit; - } - - /* With altp2m we just create a new, restricted view of the memory */ - if ( memaccess && altp2m ) - { - xen_pfn_t gfn = 0; - unsigned long perm_set = 0; - - if( altp2m_write_no_gpt ) - { - rc = xc_monitor_inguest_pagefault(xch, domain_id, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting inguest pagefault\n", rc); - goto exit; - } - rc = xc_monitor_emul_unimplemented(xch, domain_id, 1); - if ( rc < 0 ) - { - ERROR("Error %d failed to enable emul unimplemented\n", rc); - goto exit; - } - } - - rc = xc_altp2m_set_domain_state( xch, domain_id, 1 ); - if ( rc < 0 ) - { - ERROR("Error %d enabling altp2m on domain!\n", rc); - goto exit; - } - - rc = xc_altp2m_create_view( xch, domain_id, default_access, &altp2m_view_id ); - if ( rc < 0 ) - { - ERROR("Error %d creating altp2m view!\n", rc); - goto exit; - } - - DPRINTF("altp2m view created with id %u\n", altp2m_view_id); - DPRINTF("Setting altp2m mem_access permissions.. "); - - for(; gfn < xenaccess->max_gpfn; ++gfn) - { - rc = xc_altp2m_set_mem_access( xch, domain_id, altp2m_view_id, gfn, - default_access); - if ( !rc ) - perm_set++; - } - - DPRINTF("done! Permissions set on %lu pages.\n", perm_set); - - rc = xc_altp2m_switch_to_view( xch, domain_id, altp2m_view_id ); - if ( rc < 0 ) - { - ERROR("Error %d switching to altp2m view!\n", rc); - goto exit; - } - - rc = xc_monitor_singlestep( xch, domain_id, 1 ); - if ( rc < 0 ) - { - ERROR("Error %d failed to enable singlestep monitoring!\n", rc); - goto exit; - } - } - - if ( memaccess && !altp2m ) - { - /* Set the default access type and convert all pages to it */ - rc = xc_set_mem_access(xch, domain_id, default_access, ~0ull, 0); - if ( rc < 0 ) - { - ERROR("Error %d setting default mem access type\n", rc); - goto exit; - } - - rc = xc_set_mem_access(xch, domain_id, default_access, START_PFN, - (xenaccess->max_gpfn - START_PFN) ); - - if ( rc < 0 ) - { - ERROR("Error %d setting all memory to access type %d\n", rc, - default_access); - goto exit; - } - } - - if ( breakpoint ) - { - rc = xc_monitor_software_breakpoint(xch, domain_id, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting breakpoint trapping with vm_event\n", rc); - goto exit; - } - } - - if ( debug ) - { - rc = xc_monitor_debug_exceptions(xch, domain_id, 1, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting debug exception listener with vm_event\n", rc); - goto exit; - } - } - - if ( cpuid ) - { - rc = xc_monitor_cpuid(xch, domain_id, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting cpuid listener with vm_event\n", rc); - goto exit; - } - } - - if ( desc_access ) - { - rc = xc_monitor_descriptor_access(xch, domain_id, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting descriptor access listener with vm_event\n", rc); - goto exit; - } - } - - if ( privcall ) - { - rc = xc_monitor_privileged_call(xch, domain_id, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting privileged call trapping with vm_event\n", rc); - goto exit; - } - } - - if ( write_ctrlreg_cr4 ) - { - /* Mask the CR4.PGE bit so no events will be generated for global TLB flushes. */ - rc = xc_monitor_write_ctrlreg(xch, domain_id, VM_EVENT_X86_CR4, 1, 1, - X86_CR4_PGE, 1); - if ( rc < 0 ) - { - ERROR("Error %d setting write control register trapping with vm_event\n", rc); - goto exit; - } - } - - /* Wait for access */ - for (;;) - { - if ( interrupted ) - { - /* Unregister for every event */ - DPRINTF("xenaccess shutting down on signal %d\n", interrupted); - - if ( breakpoint ) - rc = xc_monitor_software_breakpoint(xch, domain_id, 0); - if ( debug ) - rc = xc_monitor_debug_exceptions(xch, domain_id, 0, 0); - if ( cpuid ) - rc = xc_monitor_cpuid(xch, domain_id, 0); - if ( desc_access ) - rc = xc_monitor_descriptor_access(xch, domain_id, 0); - if ( write_ctrlreg_cr4 ) - rc = xc_monitor_write_ctrlreg(xch, domain_id, VM_EVENT_X86_CR4, 0, 0, 0, 0); - - if ( privcall ) - rc = xc_monitor_privileged_call(xch, domain_id, 0); - - if ( altp2m ) - { - rc = xc_altp2m_switch_to_view( xch, domain_id, 0 ); - rc = xc_altp2m_destroy_view(xch, domain_id, altp2m_view_id); - rc = xc_altp2m_set_domain_state(xch, domain_id, 0); - rc = xc_monitor_singlestep(xch, domain_id, 0); - } else { - rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, ~0ull, 0); - rc = xc_set_mem_access(xch, domain_id, XENMEM_access_rwx, START_PFN, - (xenaccess->max_gpfn - START_PFN) ); - } - - shutting_down = 1; - } - - rc = xc_wait_for_event_or_timeout(xch, xenaccess->vm_event.xce_handle, 100); - if ( rc < -1 ) - { - ERROR("Error getting event"); - interrupted = -1; - continue; - } - else if ( rc != -1 ) - { - DPRINTF("Got event from Xen\n"); - } - - while ( RING_HAS_UNCONSUMED_REQUESTS(&xenaccess->vm_event.back_ring) ) - { - get_request(&xenaccess->vm_event, &req); - - if ( req.version != VM_EVENT_INTERFACE_VERSION ) - { - ERROR("Error: vm_event interface version mismatch!\n"); - interrupted = -1; - continue; - } - - memset( &rsp, 0, sizeof (rsp) ); - rsp.version = VM_EVENT_INTERFACE_VERSION; - rsp.vcpu_id = req.vcpu_id; - rsp.flags = (req.flags & VM_EVENT_FLAG_VCPU_PAUSED); - rsp.reason = req.reason; - - switch (req.reason) { - case VM_EVENT_REASON_MEM_ACCESS: - if ( !shutting_down ) - { - /* - * This serves no other purpose here then demonstrating the use of the API. - * At shutdown we have already reset all the permissions so really no use getting it again. - */ - xenmem_access_t access; - rc = xc_get_mem_access(xch, domain_id, req.u.mem_access.gfn, &access); - if (rc < 0) - { - ERROR("Error %d getting mem_access event\n", rc); - interrupted = -1; - continue; - } - } - - printf("PAGE ACCESS: %c%c%c for GFN %"PRIx64" (offset %06" - PRIx64") gla %016"PRIx64" (valid: %c; fault in gpt: %c; fault with gla: %c) (vcpu %u [%c], altp2m view %u)\n", - (req.u.mem_access.flags & MEM_ACCESS_R) ? 'r' : '-', - (req.u.mem_access.flags & MEM_ACCESS_W) ? 'w' : '-', - (req.u.mem_access.flags & MEM_ACCESS_X) ? 'x' : '-', - req.u.mem_access.gfn, - req.u.mem_access.offset, - req.u.mem_access.gla, - (req.u.mem_access.flags & MEM_ACCESS_GLA_VALID) ? 'y' : 'n', - (req.u.mem_access.flags & MEM_ACCESS_FAULT_IN_GPT) ? 'y' : 'n', - (req.u.mem_access.flags & MEM_ACCESS_FAULT_WITH_GLA) ? 'y': 'n', - req.vcpu_id, - (req.flags & VM_EVENT_FLAG_VCPU_PAUSED) ? 'p' : 'r', - req.altp2m_idx); - - if ( altp2m && req.flags & VM_EVENT_FLAG_ALTERNATE_P2M) - { - DPRINTF("\tSwitching back to default view!\n"); - - rsp.flags |= (VM_EVENT_FLAG_ALTERNATE_P2M | VM_EVENT_FLAG_TOGGLE_SINGLESTEP); - rsp.altp2m_idx = 0; - } - else if ( default_access != after_first_access ) - { - rc = xc_set_mem_access(xch, domain_id, after_first_access, - req.u.mem_access.gfn, 1); - if (rc < 0) - { - ERROR("Error %d setting gfn to access_type %d\n", rc, - after_first_access); - interrupted = -1; - continue; - } - } - - rsp.u.mem_access = req.u.mem_access; - break; - case VM_EVENT_REASON_SOFTWARE_BREAKPOINT: - printf("Breakpoint: rip=%016"PRIx64", gfn=%"PRIx64" (vcpu %d)\n", - req.data.regs.x86.rip, - req.u.software_breakpoint.gfn, - req.vcpu_id); - - /* Reinject */ - rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, - X86_TRAP_INT3, - req.u.software_breakpoint.type, -1, - req.u.software_breakpoint.insn_length, 0); - if (rc < 0) - { - ERROR("Error %d injecting breakpoint\n", rc); - interrupted = -1; - continue; - } - break; - case VM_EVENT_REASON_PRIVILEGED_CALL: - printf("Privileged call: pc=%"PRIx64" (vcpu %d)\n", - req.data.regs.arm.pc, - req.vcpu_id); - - rsp.data.regs.arm = req.data.regs.arm; - rsp.data.regs.arm.pc += 4; - rsp.flags |= VM_EVENT_FLAG_SET_REGISTERS; - break; - case VM_EVENT_REASON_SINGLESTEP: - printf("Singlestep: rip=%016"PRIx64", vcpu %d, altp2m %u\n", - req.data.regs.x86.rip, - req.vcpu_id, - req.altp2m_idx); - - if ( altp2m ) - { - printf("\tSwitching altp2m to view %u!\n", altp2m_view_id); - - rsp.flags |= VM_EVENT_FLAG_ALTERNATE_P2M; - rsp.altp2m_idx = altp2m_view_id; - } - - rsp.flags |= VM_EVENT_FLAG_TOGGLE_SINGLESTEP; - - break; - case VM_EVENT_REASON_DEBUG_EXCEPTION: - printf("Debug exception: rip=%016"PRIx64", vcpu %d. Type: %u. Length: %u. Pending dbg 0x%08"PRIx64"\n", - req.data.regs.x86.rip, - req.vcpu_id, - req.u.debug_exception.type, - req.u.debug_exception.insn_length, - req.u.debug_exception.pending_dbg); - - /* Reinject */ - rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, - X86_TRAP_DEBUG, - req.u.debug_exception.type, -1, - req.u.debug_exception.insn_length, - req.u.debug_exception.pending_dbg); - if (rc < 0) - { - ERROR("Error %d injecting breakpoint\n", rc); - interrupted = -1; - continue; - } - - break; - case VM_EVENT_REASON_CPUID: - printf("CPUID executed: rip=%016"PRIx64", vcpu %d. Insn length: %"PRIu32" " \ - "0x%"PRIx32" 0x%"PRIx32": EAX=0x%"PRIx64" EBX=0x%"PRIx64" ECX=0x%"PRIx64" EDX=0x%"PRIx64"\n", - req.data.regs.x86.rip, - req.vcpu_id, - req.u.cpuid.insn_length, - req.u.cpuid.leaf, - req.u.cpuid.subleaf, - req.data.regs.x86.rax, - req.data.regs.x86.rbx, - req.data.regs.x86.rcx, - req.data.regs.x86.rdx); - rsp.flags |= VM_EVENT_FLAG_SET_REGISTERS; - rsp.data = req.data; - rsp.data.regs.x86.rip += req.u.cpuid.insn_length; - break; - case VM_EVENT_REASON_DESCRIPTOR_ACCESS: - printf("Descriptor access: rip=%016"PRIx64", vcpu %d: "\ - "VMExit info=0x%"PRIx32", descriptor=%d, is write=%d\n", - req.data.regs.x86.rip, - req.vcpu_id, - req.u.desc_access.arch.vmx.instr_info, - req.u.desc_access.descriptor, - req.u.desc_access.is_write); - rsp.flags |= VM_EVENT_FLAG_EMULATE; - break; - case VM_EVENT_REASON_WRITE_CTRLREG: - printf("Control register written: rip=%016"PRIx64", vcpu %d: " - "reg=%s, old_value=%016"PRIx64", new_value=%016"PRIx64"\n", - req.data.regs.x86.rip, - req.vcpu_id, - get_x86_ctrl_reg_name(req.u.write_ctrlreg.index), - req.u.write_ctrlreg.old_value, - req.u.write_ctrlreg.new_value); - break; - case VM_EVENT_REASON_EMUL_UNIMPLEMENTED: - if ( altp2m_write_no_gpt && req.flags & VM_EVENT_FLAG_ALTERNATE_P2M ) - { - DPRINTF("\tSwitching back to default view!\n"); - - rsp.flags |= (VM_EVENT_FLAG_ALTERNATE_P2M | - VM_EVENT_FLAG_TOGGLE_SINGLESTEP); - rsp.altp2m_idx = 0; - } - break; - default: - fprintf(stderr, "UNKNOWN REASON CODE %d\n", req.reason); - } - - /* Put the response on the ring */ - put_response(&xenaccess->vm_event, &rsp); - } - - /* Tell Xen page is ready */ - rc = xenevtchn_notify(xenaccess->vm_event.xce_handle, - xenaccess->vm_event.port); - - if ( rc != 0 ) - { - ERROR("Error resuming page"); - interrupted = -1; - } - - if ( shutting_down ) - break; - } - DPRINTF("xenaccess shut down on signal %d\n", interrupted); - -exit: - if ( altp2m ) - { - uint32_t vcpu_id; - for ( vcpu_id = 0; vcpu_id Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:32:39 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67431.120363 (Exim 4.92) (envelope-from ) id 1l05Y7-0005Fy-PS; Thu, 14 Jan 2021 16:32:39 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67431.120363; Thu, 14 Jan 2021 16:32:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Y7-0005Fr-MS; Thu, 14 Jan 2021 16:32:39 +0000 Received: by outflank-mailman (input) for mailman id 67431; Thu, 14 Jan 2021 16:32:38 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Y6-0005Fm-Tr for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:38 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Y6-0008GH-T4 for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:38 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Y6-0006Zn-SO for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:38 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CxIy+qvQ3DExck+XrqVwDRZfcJLtpgb6uRIhXTiYbi4=; b=onf4rqOsgOAG0NofFOdJJyTFVf RkbuUx5ze3iVl0IEl2GQXOzK9tN8lELyzZ3ibeiTHaDlT9WLIC2UoivFG4dgMh8gi517GG2baAw4A SkdqIFUmhIVST7UeItuSnca+fEWgShQIMA2/lbOY4ZYqlhV4rHO3yNYqN+2yECAKx5uE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: Move memshrtool from tests/ to misc/ Message-Id: Date: Thu, 14 Jan 2021 16:32:38 +0000 commit 67848a25515353ccc67d4931bb4311e10dad0d13 Author: Andrew Cooper AuthorDate: Tue Jan 12 18:37:53 2021 +0000 Commit: Andrew Cooper CommitDate: Wed Jan 13 19:30:50 2021 +0000 tools: Move memshrtool from tests/ to misc/ memshrtool is a tool for a human to use, rather than a test. Move it into misc/ as a more appropriate location to live. Also rename it to xen-memshare Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- .gitignore | 1 - tools/misc/.gitignore | 1 + tools/misc/Makefile | 4 + tools/misc/xen-memshare.c | 207 +++++++++++++++++++++++++++++++++++ tools/tests/Makefile | 1 - tools/tests/mem-sharing/Makefile | 31 ------ tools/tests/mem-sharing/memshrtool.c | 207 ----------------------------------- 7 files changed, 212 insertions(+), 240 deletions(-) diff --git a/.gitignore b/.gitignore index 630bdf5b99..35957cc21f 100644 --- a/.gitignore +++ b/.gitignore @@ -273,7 +273,6 @@ tools/tests/x86_emulator/test_x86_emulator tools/tests/x86_emulator/x86_emulate tools/tests/x86_emulator/xop*.[ch] tools/tests/xenstore/xs-test -tools/tests/mem-sharing/memshrtool tools/tests/mce-test/tools/xen-mceinj tools/tests/vpci/list.h tools/tests/vpci/vpci.[hc] diff --git a/tools/misc/.gitignore b/tools/misc/.gitignore index e332ed4ec7..b2c3b21f57 100644 --- a/tools/misc/.gitignore +++ b/tools/misc/.gitignore @@ -1,2 +1,3 @@ xen-access +xen-memshare xen-ucode diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 612b7002e5..912c5d4f0e 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -22,6 +22,7 @@ INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool INSTALL_SBIN-$(CONFIG_X86) += xen-hvmcrash INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx INSTALL_SBIN-$(CONFIG_X86) += xen-lowmemd +INSTALL_SBIN-$(CONFIG_X86) += xen-memshare INSTALL_SBIN-$(CONFIG_X86) += xen-mfndump INSTALL_SBIN-$(CONFIG_X86) += xen-ucode INSTALL_SBIN += xencov @@ -86,6 +87,9 @@ xen-hvmctx: xen-hvmctx.o xen-hvmcrash: xen-hvmcrash.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) +xen-memshare: xen-memshare.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + xenperf: xenperf.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) diff --git a/tools/misc/xen-memshare.c b/tools/misc/xen-memshare.c new file mode 100644 index 0000000000..8e5e22b9e9 --- /dev/null +++ b/tools/misc/xen-memshare.c @@ -0,0 +1,207 @@ +/* + * memshrtool.c + * + * Copyright 2011 GridCentric Inc. (Adin Scannell, Andres Lagar-Cavilla) + */ + +#include +#include +#include +#include +#include +#include + +#define XC_WANT_COMPAT_MAP_FOREIGN_API +#include "xenctrl.h" + +static int usage(const char* prog) +{ + printf("usage: %s [args...]\n", prog); + printf("where may be:\n"); + printf(" info - Display total sharing info.\n"); + printf(" enable - Enable sharing on a domain.\n"); + printf(" disable - Disable sharing on a domain.\n"); + printf(" nominate - Nominate a page for sharing.\n"); + printf(" share \n"); + printf(" - Share two pages.\n"); + printf(" range \n"); + printf(" - Share pages between domains in a range.\n"); + printf(" unshare - Unshare a page by grabbing a writable map.\n"); + printf(" add-to-physmap \n"); + printf(" - Populate a page in a domain with a shared page.\n"); + printf(" debug-gfn - Debug a particular domain and gfn.\n"); + printf(" audit - Audit the sharing subsytem in Xen.\n"); + return 1; +} + +#define R(f) do { \ + int rc = f; \ + if ( rc < 0 ) { \ + printf("error executing %s: %s\n", #f, \ + ((errno * -1) == XENMEM_SHARING_OP_S_HANDLE_INVALID) ? \ + "problem with client handle" :\ + ((errno * -1) == XENMEM_SHARING_OP_C_HANDLE_INVALID) ? \ + "problem with source handle" : strerror(errno)); \ + return rc; \ + } \ +} while(0) + +int main(int argc, const char** argv) +{ + const char* cmd = NULL; + xc_interface *xch = xc_interface_open(0, 0, 0); + + if( argc < 2 ) + return usage(argv[0]); + + cmd = argv[1]; + + if( !strcasecmp(cmd, "info") ) + { + long rc; + if( argc != 2 ) + return usage(argv[0]); + + rc = xc_sharing_freed_pages(xch); + if ( rc < 0 ) + return 1; + + printf("used = %ld\n", rc); + rc = xc_sharing_used_frames(xch); + if ( rc < 0 ) + return 1; + printf("freed = %ld\n", rc); + } + else if( !strcasecmp(cmd, "enable") ) + { + domid_t domid; + + if( argc != 3 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + R(xc_memshr_control(xch, domid, 1)); + } + else if( !strcasecmp(cmd, "disable") ) + { + domid_t domid; + + if( argc != 3 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + R(xc_memshr_control(xch, domid, 0)); + } + else if( !strcasecmp(cmd, "nominate") ) + { + domid_t domid; + unsigned long gfn; + uint64_t handle; + + if( argc != 4 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + R(xc_memshr_nominate_gfn(xch, domid, gfn, &handle)); + printf("handle = 0x%08llx\n", (unsigned long long) handle); + } + else if( !strcasecmp(cmd, "share") ) + { + domid_t domid; + unsigned long gfn; + uint64_t handle; + domid_t source_domid; + unsigned long source_gfn; + uint64_t source_handle; + + if( argc != 8 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + handle = strtol(argv[4], NULL, 0); + source_domid = strtol(argv[5], NULL, 0); + source_gfn = strtol(argv[6], NULL, 0); + source_handle = strtol(argv[7], NULL, 0); + R(xc_memshr_share_gfns(xch, source_domid, source_gfn, source_handle, domid, gfn, handle)); + } + else if( !strcasecmp(cmd, "unshare") ) + { + domid_t domid; + unsigned long gfn; + void *map; + + if( argc != 4 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + map = xc_map_foreign_range(xch, domid, 4096, PROT_WRITE, gfn); + if( map ) + munmap(map, 4096); + R((int)!map); + } + else if( !strcasecmp(cmd, "add-to-physmap") ) + { + domid_t domid; + unsigned long gfn; + domid_t source_domid; + unsigned long source_gfn; + uint64_t source_handle; + + if( argc != 7 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + source_domid = strtol(argv[4], NULL, 0); + source_gfn = strtol(argv[5], NULL, 0); + source_handle = strtol(argv[6], NULL, 0); + R(xc_memshr_add_to_physmap(xch, source_domid, source_gfn, source_handle, domid, gfn)); + } + else if( !strcasecmp(cmd, "debug-gfn") ) + { + domid_t domid; + unsigned long gfn; + + if( argc != 4 ) + return usage(argv[0]); + + domid = strtol(argv[2], NULL, 0); + gfn = strtol(argv[3], NULL, 0); + R(xc_memshr_debug_gfn(xch, domid, gfn)); + } + else if( !strcasecmp(cmd, "audit") ) + { + int rc = xc_memshr_audit(xch); + if ( rc < 0 ) + { + printf("error executing xc_memshr_audit: %s\n", strerror(errno)); + return rc; + } + printf("Audit returned %d errors.\n", rc); + } + else if( !strcasecmp(cmd, "range") ) + { + domid_t sdomid, cdomid; + int rc; + uint64_t first_gfn, last_gfn; + + if ( argc != 6 ) + return usage(argv[0]); + + sdomid = strtol(argv[2], NULL, 0); + cdomid = strtol(argv[3], NULL, 0); + first_gfn = strtoul(argv[4], NULL, 0); + last_gfn = strtoul(argv[5], NULL, 0); + + rc = xc_memshr_range_share(xch, sdomid, cdomid, first_gfn, last_gfn); + if ( rc < 0 ) + { + printf("error executing xc_memshr_range_share: %s\n", strerror(errno)); + return rc; + } + } + return 0; +} diff --git a/tools/tests/Makefile b/tools/tests/Makefile index 771715be0f..fc9b715951 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -4,7 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := SUBDIRS-$(CONFIG_X86) += cpu-policy SUBDIRS-$(CONFIG_X86) += mce-test -SUBDIRS-y += mem-sharing ifneq ($(clang),y) SUBDIRS-$(CONFIG_X86) += x86_emulator endif diff --git a/tools/tests/mem-sharing/Makefile b/tools/tests/mem-sharing/Makefile deleted file mode 100644 index 5cd96e4cc9..0000000000 --- a/tools/tests/mem-sharing/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -XEN_ROOT=$(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -CFLAGS += -Werror - -CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += $(CFLAGS_xeninclude) - -TARGETS-y := -TARGETS-$(CONFIG_X86) += memshrtool -TARGETS := $(TARGETS-y) - -.PHONY: all -all: build - -.PHONY: build -build: $(TARGETS) - -.PHONY: clean -clean: - $(RM) *.o $(TARGETS) *~ $(DEPS_RM) - -.PHONY: distclean -distclean: clean - -memshrtool: memshrtool.o - $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) - --include $(DEPS_INCLUDE) - -install uninstall: diff --git a/tools/tests/mem-sharing/memshrtool.c b/tools/tests/mem-sharing/memshrtool.c deleted file mode 100644 index 8e5e22b9e9..0000000000 --- a/tools/tests/mem-sharing/memshrtool.c +++ /dev/null @@ -1,207 +0,0 @@ -/* - * memshrtool.c - * - * Copyright 2011 GridCentric Inc. (Adin Scannell, Andres Lagar-Cavilla) - */ - -#include -#include -#include -#include -#include -#include - -#define XC_WANT_COMPAT_MAP_FOREIGN_API -#include "xenctrl.h" - -static int usage(const char* prog) -{ - printf("usage: %s [args...]\n", prog); - printf("where may be:\n"); - printf(" info - Display total sharing info.\n"); - printf(" enable - Enable sharing on a domain.\n"); - printf(" disable - Disable sharing on a domain.\n"); - printf(" nominate - Nominate a page for sharing.\n"); - printf(" share \n"); - printf(" - Share two pages.\n"); - printf(" range \n"); - printf(" - Share pages between domains in a range.\n"); - printf(" unshare - Unshare a page by grabbing a writable map.\n"); - printf(" add-to-physmap \n"); - printf(" - Populate a page in a domain with a shared page.\n"); - printf(" debug-gfn - Debug a particular domain and gfn.\n"); - printf(" audit - Audit the sharing subsytem in Xen.\n"); - return 1; -} - -#define R(f) do { \ - int rc = f; \ - if ( rc < 0 ) { \ - printf("error executing %s: %s\n", #f, \ - ((errno * -1) == XENMEM_SHARING_OP_S_HANDLE_INVALID) ? \ - "problem with client handle" :\ - ((errno * -1) == XENMEM_SHARING_OP_C_HANDLE_INVALID) ? \ - "problem with source handle" : strerror(errno)); \ - return rc; \ - } \ -} while(0) - -int main(int argc, const char** argv) -{ - const char* cmd = NULL; - xc_interface *xch = xc_interface_open(0, 0, 0); - - if( argc < 2 ) - return usage(argv[0]); - - cmd = argv[1]; - - if( !strcasecmp(cmd, "info") ) - { - long rc; - if( argc != 2 ) - return usage(argv[0]); - - rc = xc_sharing_freed_pages(xch); - if ( rc < 0 ) - return 1; - - printf("used = %ld\n", rc); - rc = xc_sharing_used_frames(xch); - if ( rc < 0 ) - return 1; - printf("freed = %ld\n", rc); - } - else if( !strcasecmp(cmd, "enable") ) - { - domid_t domid; - - if( argc != 3 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - R(xc_memshr_control(xch, domid, 1)); - } - else if( !strcasecmp(cmd, "disable") ) - { - domid_t domid; - - if( argc != 3 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - R(xc_memshr_control(xch, domid, 0)); - } - else if( !strcasecmp(cmd, "nominate") ) - { - domid_t domid; - unsigned long gfn; - uint64_t handle; - - if( argc != 4 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - gfn = strtol(argv[3], NULL, 0); - R(xc_memshr_nominate_gfn(xch, domid, gfn, &handle)); - printf("handle = 0x%08llx\n", (unsigned long long) handle); - } - else if( !strcasecmp(cmd, "share") ) - { - domid_t domid; - unsigned long gfn; - uint64_t handle; - domid_t source_domid; - unsigned long source_gfn; - uint64_t source_handle; - - if( argc != 8 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - gfn = strtol(argv[3], NULL, 0); - handle = strtol(argv[4], NULL, 0); - source_domid = strtol(argv[5], NULL, 0); - source_gfn = strtol(argv[6], NULL, 0); - source_handle = strtol(argv[7], NULL, 0); - R(xc_memshr_share_gfns(xch, source_domid, source_gfn, source_handle, domid, gfn, handle)); - } - else if( !strcasecmp(cmd, "unshare") ) - { - domid_t domid; - unsigned long gfn; - void *map; - - if( argc != 4 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - gfn = strtol(argv[3], NULL, 0); - map = xc_map_foreign_range(xch, domid, 4096, PROT_WRITE, gfn); - if( map ) - munmap(map, 4096); - R((int)!map); - } - else if( !strcasecmp(cmd, "add-to-physmap") ) - { - domid_t domid; - unsigned long gfn; - domid_t source_domid; - unsigned long source_gfn; - uint64_t source_handle; - - if( argc != 7 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - gfn = strtol(argv[3], NULL, 0); - source_domid = strtol(argv[4], NULL, 0); - source_gfn = strtol(argv[5], NULL, 0); - source_handle = strtol(argv[6], NULL, 0); - R(xc_memshr_add_to_physmap(xch, source_domid, source_gfn, source_handle, domid, gfn)); - } - else if( !strcasecmp(cmd, "debug-gfn") ) - { - domid_t domid; - unsigned long gfn; - - if( argc != 4 ) - return usage(argv[0]); - - domid = strtol(argv[2], NULL, 0); - gfn = strtol(argv[3], NULL, 0); - R(xc_memshr_debug_gfn(xch, domid, gfn)); - } - else if( !strcasecmp(cmd, "audit") ) - { - int rc = xc_memshr_audit(xch); - if ( rc < 0 ) - { - printf("error executing xc_memshr_audit: %s\n", strerror(errno)); - return rc; - } - printf("Audit returned %d errors.\n", rc); - } - else if( !strcasecmp(cmd, "range") ) - { - domid_t sdomid, cdomid; - int rc; - uint64_t first_gfn, last_gfn; - - if ( argc != 6 ) - return usage(argv[0]); - - sdomid = strtol(argv[2], NULL, 0); - cdomid = strtol(argv[3], NULL, 0); - first_gfn = strtoul(argv[4], NULL, 0); - last_gfn = strtoul(argv[5], NULL, 0); - - rc = xc_memshr_range_share(xch, sdomid, cdomid, first_gfn, last_gfn); - if ( rc < 0 ) - { - printf("error executing xc_memshr_range_share: %s\n", strerror(errno)); - return rc; - } - } - return 0; -} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:32:50 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:32:50 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67432.120367 (Exim 4.92) (envelope-from ) id 1l05YI-0005Hl-RQ; Thu, 14 Jan 2021 16:32:50 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67432.120367; Thu, 14 Jan 2021 16:32:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05YI-0005Hc-OL; Thu, 14 Jan 2021 16:32:50 +0000 Received: by outflank-mailman (input) for mailman id 67432; Thu, 14 Jan 2021 16:32:49 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05YH-0005HT-1K for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:49 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05YH-0008Gf-0a for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:49 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05YG-0006aR-VK for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:48 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WA4hANs4LTZr58atUi8+YWp6uccsrobHzTghHK2UH+Y=; b=2gS7nQKF2M/J3/1eonhYX3aWtI zycStKUt1RXwF0Vaa28VFukdy9Y1INf4u0ea5mCfwSvG3g+3tbGESHlL0HhZxV67Ms01k2/378vKO 76pP9vhXmdKypnhie8SkWrOzMUID3AMaYSqXNbSd9VYVoYFZVvDSYJKcQ5CqJfT5cfwM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mem_sharing: fix wrong field name used in 2c5119d Message-Id: Date: Thu, 14 Jan 2021 16:32:48 +0000 commit bc70924c79f154ee453fcf4079e0eabb0452300d Author: Tamas K Lengyel AuthorDate: Tue Jan 12 18:28:45 2021 -0800 Commit: Andrew Cooper CommitDate: Wed Jan 13 19:30:50 2021 +0000 x86/mem_sharing: fix wrong field name used in 2c5119d The arch_domain struct has "msr", not "msrs". Spotted by a TravisCI Randconfig build. Reported-by: Andrew Cooper Signed-off-by: Tamas K Lengyel Acked-by: Andrew Cooper --- xen/arch/x86/mm/mem_sharing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index a98a1709c2..c8a6d11b90 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1781,7 +1781,7 @@ static int fork(struct domain *cd, struct domain *d) domain_pause(d); cd->max_pages = d->max_pages; *cd->arch.cpuid = *d->arch.cpuid; - *cd->arch.msrs = *d->arch.msrs; + *cd->arch.msr = *d->arch.msr; cd->parent = d; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:33:00 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:33:00 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67433.120371 (Exim 4.92) (envelope-from ) id 1l05YS-0005J0-T6; Thu, 14 Jan 2021 16:33:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67433.120371; Thu, 14 Jan 2021 16:33:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05YS-0005Is-Pt; Thu, 14 Jan 2021 16:33:00 +0000 Received: by outflank-mailman (input) for mailman id 67433; Thu, 14 Jan 2021 16:32:59 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05YR-0005Ij-3z for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:59 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05YR-0008Gu-3F for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:59 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05YR-0006ax-2f for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:32:59 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Zbx2nuw/S6199SxMxR5lZ+yJHqAzarD6VGDZRxqKhvg=; b=3vJs/4AZAA/5aqG2e+zzJgh4KA XDBrgDYLFzDoKDxA2PRsftIbCIQRAUHsB6XPUFNtNyuxQWmLMLazFCHQQGZ0rx3x3OYfNpkVWy6BR /JPb9oojxtagUSKEW322qAWBcnLf0HP7m7OmXtj2ea0xSTNkgmh2aSmNkhefwypdg/F4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Correct the coding style of get_cycles Message-Id: Date: Thu, 14 Jan 2021 16:32:59 +0000 commit 896128e9352327c4ff2b5c0c6cfa3856e45e2ca3 Author: Wei Chen AuthorDate: Tue Jan 5 15:19:45 2021 +0800 Commit: Julien Grall CommitDate: Wed Jan 13 19:56:32 2021 +0000 xen/arm: Correct the coding style of get_cycles It seems the arm inline function get_cycles has used 8 spaces for line indent since 2012. This patch correct them to 4 spaces and remove extra space between function name and bracket. Signed-off-by: Wei Chen Acked-by: Julien Grall --- xen/include/asm-arm/time.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index 1b2c13614b..5c4529ebb5 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -11,29 +11,29 @@ typedef uint64_t cycles_t; -static inline cycles_t get_cycles (void) +static inline cycles_t get_cycles(void) { - isb(); + isb(); + /* + * ARM_WORKAROUND_858921: Cortex-A73 (all versions) counter read + * can return a wrong value when the counter crosses a 32bit boundary. + */ + if ( !check_workaround_858921() ) + return READ_SYSREG64(CNTPCT_EL0); + else + { /* - * ARM_WORKAROUND_858921: Cortex-A73 (all versions) counter read - * can return a wrong value when the counter crosses a 32bit boundary. + * A recommended workaround for erratum 858921 is to: + * 1- Read twice CNTPCT. + * 2- Compare bit[32] of the two read values. + * - If bit[32] is different, keep the old value. + * - If bit[32] is the same, keep the new value. */ - if ( !check_workaround_858921() ) - return READ_SYSREG64(CNTPCT_EL0); - else - { - /* - * A recommended workaround for erratum 858921 is to: - * 1- Read twice CNTPCT. - * 2- Compare bit[32] of the two read values. - * - If bit[32] is different, keep the old value. - * - If bit[32] is the same, keep the new value. - */ - cycles_t old, new; - old = READ_SYSREG64(CNTPCT_EL0); - new = READ_SYSREG64(CNTPCT_EL0); - return (((old ^ new) >> 32) & 1) ? old : new; - } + cycles_t old, new; + old = READ_SYSREG64(CNTPCT_EL0); + new = READ_SYSREG64(CNTPCT_EL0); + return (((old ^ new) >> 32) & 1) ? old : new; + } } /* List of timer's IRQ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 14 16:33:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Jan 2021 16:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67434.120375 (Exim 4.92) (envelope-from ) id 1l05Yc-0005KL-UZ; Thu, 14 Jan 2021 16:33:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67434.120375; Thu, 14 Jan 2021 16:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Yc-0005KD-RQ; Thu, 14 Jan 2021 16:33:10 +0000 Received: by outflank-mailman (input) for mailman id 67434; Thu, 14 Jan 2021 16:33:09 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Yb-0005Jx-7f for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:33:09 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l05Yb-0008HI-6x for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:33:09 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l05Yb-0006c1-5Q for xen-changelog@lists.xenproject.org; Thu, 14 Jan 2021 16:33:09 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dvbv7Y66ATuXJgHbTfICt/sWAOivqOjtvnqHlbQoa3c=; b=TqbNfv9nzdoJ9LKnjLi/tSj5Px qoj7VOPX5vuTOt6bqGWxeLqteIETv4liMVeDadfDV8y/Q7mJ2KSqWgSLRylDyigS4U0BnJcIvXinS Vk8DXlVhcFF76bMZ8fTs4H5xN/hy+eJw+1gqd+Cqa16lv6Pk04hxvoPwnB51ICM6Bzvs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: don't read aarch32 regs when aarch32 isn't available Message-Id: Date: Thu, 14 Jan 2021 16:33:09 +0000 commit 0293fd24bbaa2c4fa0acbe2abcd2d41b96ecd7e1 Author: Stefano Stabellini AuthorDate: Tue Jan 12 15:44:50 2021 -0800 Commit: Stefano Stabellini CommitDate: Wed Jan 13 16:00:51 2021 -0800 xen/arm: don't read aarch32 regs when aarch32 isn't available Don't read aarch32 system registers at boot time when the aarch32 state is not available at EL0. They are UNKNOWN, so it is not useful to read them. Moreover, on Cavium ThunderX reading ID_PFR2_EL1 generates an unsupported exception which causes a Xen crash. Instead, only read them when aarch32 is available. Leave the corresponding fields in struct cpuinfo_arm so that they are read-as-zero from a guest. Since we are editing identify_cpu, also fix the indentation: 4 spaces instead of 8. Fixes: 9cfdb489af81 ("xen/arm: Add ID registers and complete cpuinfo") Link: https://lore.kernel.org/xen-devel/f90e40ee-b042-6cc5-a08d-aef41a279527@suse.com/ Suggested-by: Julien Grall Signed-off-by: Stefano Stabellini Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- xen/arch/arm/cpufeature.c | 35 +++++++++++++++++++++-------------- xen/include/asm-arm/cpufeature.h | 2 ++ 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 698bfa0201..99fe4db280 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -101,29 +101,35 @@ int enable_nonboot_cpu_caps(const struct arm_cpu_capabilities *caps) void identify_cpu(struct cpuinfo_arm *c) { - c->midr.bits = READ_SYSREG(MIDR_EL1); - c->mpidr.bits = READ_SYSREG(MPIDR_EL1); + bool aarch32_el0 = true; + + c->midr.bits = READ_SYSREG(MIDR_EL1); + c->mpidr.bits = READ_SYSREG(MPIDR_EL1); #ifdef CONFIG_ARM_64 - c->pfr64.bits[0] = READ_SYSREG(ID_AA64PFR0_EL1); - c->pfr64.bits[1] = READ_SYSREG(ID_AA64PFR1_EL1); + c->pfr64.bits[0] = READ_SYSREG(ID_AA64PFR0_EL1); + c->pfr64.bits[1] = READ_SYSREG(ID_AA64PFR1_EL1); + + c->dbg64.bits[0] = READ_SYSREG(ID_AA64DFR0_EL1); + c->dbg64.bits[1] = READ_SYSREG(ID_AA64DFR1_EL1); - c->dbg64.bits[0] = READ_SYSREG(ID_AA64DFR0_EL1); - c->dbg64.bits[1] = READ_SYSREG(ID_AA64DFR1_EL1); + c->aux64.bits[0] = READ_SYSREG(ID_AA64AFR0_EL1); + c->aux64.bits[1] = READ_SYSREG(ID_AA64AFR1_EL1); - c->aux64.bits[0] = READ_SYSREG(ID_AA64AFR0_EL1); - c->aux64.bits[1] = READ_SYSREG(ID_AA64AFR1_EL1); + c->mm64.bits[0] = READ_SYSREG(ID_AA64MMFR0_EL1); + c->mm64.bits[1] = READ_SYSREG(ID_AA64MMFR1_EL1); + c->mm64.bits[2] = READ_SYSREG(ID_AA64MMFR2_EL1); - c->mm64.bits[0] = READ_SYSREG(ID_AA64MMFR0_EL1); - c->mm64.bits[1] = READ_SYSREG(ID_AA64MMFR1_EL1); - c->mm64.bits[2] = READ_SYSREG(ID_AA64MMFR2_EL1); + c->isa64.bits[0] = READ_SYSREG(ID_AA64ISAR0_EL1); + c->isa64.bits[1] = READ_SYSREG(ID_AA64ISAR1_EL1); - c->isa64.bits[0] = READ_SYSREG(ID_AA64ISAR0_EL1); - c->isa64.bits[1] = READ_SYSREG(ID_AA64ISAR1_EL1); + c->zfr64.bits[0] = READ_SYSREG(ID_AA64ZFR0_EL1); - c->zfr64.bits[0] = READ_SYSREG(ID_AA64ZFR0_EL1); + aarch32_el0 = cpu_feature64_has_el0_32(c); #endif + if ( aarch32_el0 ) + { c->pfr32.bits[0] = READ_SYSREG(ID_PFR0_EL1); c->pfr32.bits[1] = READ_SYSREG(ID_PFR1_EL1); c->pfr32.bits[2] = READ_SYSREG(ID_PFR2_EL1); @@ -153,6 +159,7 @@ void identify_cpu(struct cpuinfo_arm *c) #ifndef MVFR2_MAYBE_UNDEFINED c->mvfr.bits[2] = READ_SYSREG(MVFR2_EL1); #endif + } } /* diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 6058744c18..13a2739a69 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -5,6 +5,8 @@ #define cpu_feature64(c, feat) ((c)->pfr64.feat) #define boot_cpu_feature64(feat) (boot_cpu_data.pfr64.feat) +#define cpu_feature64_has_el0_32(c) (cpu_feature64(c, el0) == 2) + #define cpu_has_el0_32 (boot_cpu_feature64(el0) == 2) #define cpu_has_el0_64 (boot_cpu_feature64(el0) >= 1) #define cpu_has_el1_32 (boot_cpu_feature64(el1) == 2) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 02:22:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 02:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67620.120808 (Exim 4.92) (envelope-from ) id 1l0EkY-0004no-0V; Fri, 15 Jan 2021 02:22:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67620.120808; Fri, 15 Jan 2021 02: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 1l0EkX-0004nf-TJ; Fri, 15 Jan 2021 02:22:05 +0000 Received: by outflank-mailman (input) for mailman id 67620; Fri, 15 Jan 2021 02:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0EkW-0004na-Rh for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 02:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0EkW-0000Go-O0 for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 02:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0EkW-0007Ci-Ky for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 02: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=kItpReFZ27j1CtwuhSzqYpxJyNAo2LD8u6w/8tVpsss=; b=6q7HyH+N/36MtSsSfdiSDZIzKh M3teC5U7EkCN/y+UVoFZ+cL6cEWa7mXmJIvlc+qIfTlvCEeey2/UTfM+bRA/X/0qwDTRi/gt7eHo3 wrgoEXKWzMgnMQoqYVUOH54pdrxC3sDC/MTKOQWpOIlLRgxKGfKZu9OGvLpWqc4zbzPo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: add qemu-system-aarch64 to test-artifacts Message-Id: Date: Fri, 15 Jan 2021 02:22:04 +0000 commit c92c9f84f6c6cc17d0f7ce890011d4ab570089e8 Author: Stefano Stabellini AuthorDate: Tue Jan 5 14:58:43 2021 -0800 Commit: Stefano Stabellini CommitDate: Thu Jan 14 18:14:56 2021 -0800 automation: add qemu-system-aarch64 to test-artifacts Currently we are using Debian's qemu-system-aarch64 for our tests. However, sometimes it crashes. It is hard to debug and even harder to apply any fixes to it. Instead, build our own QEMU as one of our test-artifacts, which are only built once, then imported into each pipeline via phony jobs. Signed-off-by: Stefano Stabellini Acked-by: Wei Liu --- .../qemu-system-aarch64/5.2.0-arm64v8.dockerfile | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile b/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile new file mode 100644 index 0000000000..e105a1c636 --- /dev/null +++ b/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile @@ -0,0 +1,75 @@ +FROM arm64v8/debian:unstable +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV QEMU_VERSION=5.2.0 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + curl \ + python3 \ + ninja-build \ + pkg-config \ + libglib2.0-dev \ + libpixman-1-dev \ + && \ + \ + curl -fsSLO https://download.qemu.org/qemu-"$QEMU_VERSION".tar.xz && \ + tar xvJf qemu-"$QEMU_VERSION".tar.xz && \ + cd qemu-"$QEMU_VERSION" && \ + ./configure \ + --target-list=aarch64-softmmu \ + --enable-system \ + --disable-blobs \ + --disable-bsd-user \ + --disable-debug-info \ + --disable-glusterfs \ + --disable-gtk \ + --disable-guest-agent \ + --disable-linux-user \ + --disable-sdl \ + --disable-spice \ + --disable-tpm \ + --disable-vhost-net \ + --disable-vhost-scsi \ + --disable-vhost-user \ + --disable-vhost-vsock \ + --disable-virtfs \ + --disable-vnc \ + --disable-werror \ + --disable-xen \ + --disable-safe-stack \ + --disable-libssh \ + --disable-opengl \ + --disable-tools \ + --disable-virglrenderer \ + --disable-stack-protector \ + --disable-containers \ + --disable-replication \ + --disable-cloop \ + --disable-dmg \ + --disable-vvfat \ + --disable-vdi \ + --disable-parallels \ + --disable-qed \ + --disable-bochs \ + --disable-qom-cast-debug \ + --disable-vhost-vdpa \ + --disable-vhost-kernel \ + --disable-qcow1 \ + --disable-live-block-migration \ + && \ + make -j$(nproc) && \ + cp ./build/qemu-system-aarch64 / && \ + cd /build && \ + rm -rf qemu-"$QEMU_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 Fri Jan 15 02:22:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 02:22:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67621.120813 (Exim 4.92) (envelope-from ) id 1l0Eki-0004ob-2D; Fri, 15 Jan 2021 02:22:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67621.120813; Fri, 15 Jan 2021 02:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Ekh-0004oT-Uv; Fri, 15 Jan 2021 02:22:15 +0000 Received: by outflank-mailman (input) for mailman id 67621; Fri, 15 Jan 2021 02:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Ekg-0004oN-Tr for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 02:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Ekg-0000Gr-SE for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 02:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0Ekg-0007DR-QC for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 02:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EAc8O3jCF4c/OtPoE0gu05EdTy7utEmq4gxjiQ9JH4o=; b=XfOyiGQWOl6EBsR5DhL8pq0QHZ STgFAbf1soI5oGJ+KGWgecEfQVOYvRj7LfZqL8XC4rxBdP+dKz80AuMrCIjafBk91Mt3TR/xEC52+ DKOUUhWEsXRH5v9GGW/HqwuoM9LwishMMFDzn9YzdOADEvihPlii7mcdzFs584xvV0tc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: add a job to import qemu-system-aarch64 into the pipeline Message-Id: Date: Fri, 15 Jan 2021 02:22:14 +0000 commit 17d02551cf79ad00dc4b5fab61fd32f091333750 Author: Stefano Stabellini AuthorDate: Tue Jan 5 14:58:44 2021 -0800 Commit: Stefano Stabellini CommitDate: Thu Jan 14 18:14:57 2021 -0800 automation: add a job to import qemu-system-aarch64 into the pipeline In order to use the pre-built test-artifacts/qemu-system-aarch64 binary for our tests, first we need to import it into the pipeline. Let's do that the same way we did it for the kernel and Alpine Linux filesystem: by creating a special job for it. Signed-off-by: Stefano Stabellini Acked-by: Wei Liu --- automation/gitlab-ci/build.yaml | 11 +++++++++++ automation/gitlab-ci/test.yaml | 2 ++ 2 files changed, 13 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index e5246828f8..db68dd0b69 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -494,3 +494,14 @@ kernel-5.9.9-arm64-export: tags: - arm64 +qemu-system-aarch64-5.2.0-arm64-export: + stage: build + image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:5.2.0-arm64v8 + script: + - mkdir binaries && cp /qemu-system-aarch64 binaries/qemu-system-aarch64 + artifacts: + paths: + - binaries/qemu-system-aarch64 + tags: + - arm64 + diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 9448651187..91a10febbf 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -33,6 +33,7 @@ qemu-alpine-arm64-gcc: - alpine-3.12-gcc-arm64 - alpine-3.12-arm64-rootfs-export - kernel-5.9.9-arm64-export + - qemu-system-aarch64-5.2.0-arm64-export artifacts: paths: - smoke.serial @@ -56,6 +57,7 @@ qemu-smoke-arm64-gcc: dependencies: - debian-unstable-gcc-arm64 - kernel-5.9.9-arm64-export + - qemu-system-aarch64-5.2.0-arm64-export artifacts: paths: - smoke.serial -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 02:22:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 02:22:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67622.120816 (Exim 4.92) (envelope-from ) id 1l0Eks-0004q6-3B; Fri, 15 Jan 2021 02:22:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67622.120816; Fri, 15 Jan 2021 02:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Eks-0004py-0A; Fri, 15 Jan 2021 02:22:26 +0000 Received: by outflank-mailman (input) for mailman id 67622; Fri, 15 Jan 2021 02:22:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Ekq-0004pp-W5 for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 02:22:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Ekq-0000H4-VD for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 02:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0Ekq-0007E9-UH for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 02:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PnNLkxfukfemmSouks9uVGqzrgaeu3KN5ANMbM9GulE=; b=k7pcGcR7FoWb24Tqix9GJ4IahL b65b3/kQNOXvMJu5m1yWSaioNLNyg415F85/MsmF/XBuxZuCx8Y8ND41WAf21N3U8oNbzRfwXj1Co BsTqYfEV50bhr8xv7Iviwqb2hRE24AXMjpCJgnekqTC2YHjsyFuJuy7HQKysRWEi8tG8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: use test-artifacts/qemu-system-aarch64 instead of Debian's Message-Id: Date: Fri, 15 Jan 2021 02:22:24 +0000 commit f58976544ff40d2488c3e2b05c765916eacf3e7c Author: Stefano Stabellini AuthorDate: Tue Jan 5 14:58:45 2021 -0800 Commit: Stefano Stabellini CommitDate: Thu Jan 14 18:14:58 2021 -0800 automation: use test-artifacts/qemu-system-aarch64 instead of Debian's Instead apt-get'ing Debian's qemu-system-aarch64, simply use the provided QEMU binary under binaries. Signed-off-by: Stefano Stabellini Acked-by: Wei Liu --- automation/scripts/qemu-alpine-arm64.sh | 12 +++++------- automation/scripts/qemu-smoke-arm64.sh | 15 +++++++-------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/automation/scripts/qemu-alpine-arm64.sh b/automation/scripts/qemu-alpine-arm64.sh index b43a654270..e2240f9ab4 100755 --- a/automation/scripts/qemu-alpine-arm64.sh +++ b/automation/scripts/qemu-alpine-arm64.sh @@ -3,8 +3,7 @@ set -ex apt-get -qy update -apt-get -qy install --no-install-recommends qemu-system-aarch64 \ - u-boot-qemu \ +apt-get -qy install --no-install-recommends u-boot-qemu \ u-boot-tools \ device-tree-compiler \ cpio \ @@ -69,10 +68,9 @@ echo "rc_verbose=yes" >> etc/rc.conf find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz cd ../.. -# XXX Silly workaround to get the following QEMU command to work -# QEMU looks for "efi-virtio.rom" even if it is unneeded -cp /usr/share/qemu/pvh.bin /usr/share/qemu/efi-virtio.rom -qemu-system-aarch64 \ +# XXX QEMU looks for "efi-virtio.rom" even if it is unneeded +curl -fsSLO curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom +./binaries/qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ -m 1024 -display none \ @@ -107,7 +105,7 @@ rm -f smoke.serial set +e echo " virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"| \ timeout -k 1 720 \ -qemu-system-aarch64 \ +./binaries/qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ -m 2048 -monitor none -serial stdio \ diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index bdef0717ad..53086a5ac7 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -5,17 +5,16 @@ set -ex # Install QEMU export DEBIAN_FRONTENT=noninteractive apt-get -qy update -apt-get -qy install --no-install-recommends qemu-system-aarch64 \ - u-boot-qemu \ +apt-get -qy install --no-install-recommends u-boot-qemu \ u-boot-tools \ device-tree-compiler \ busybox-static \ - cpio + cpio \ + curl -# XXX Silly workaround to get the following QEMU command to work -# QEMU looks for "efi-virtio.rom" even if it is unneeded -cp /usr/share/qemu/pvh.bin /usr/share/qemu/efi-virtio.rom -qemu-system-aarch64 \ +# XXX QEMU looks for "efi-virtio.rom" even if it is unneeded +curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom +./binaries/qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ -m 1024 -display none \ @@ -79,7 +78,7 @@ rm -f smoke.serial set +e echo " virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"| \ timeout -k 1 240 \ -qemu-system-aarch64 \ +./binaries/qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ -m 1024 -monitor none -serial stdio \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 04:55:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 04:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67639.120847 (Exim 4.92) (envelope-from ) id 1l0H8Z-0002a2-K0; Fri, 15 Jan 2021 04:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67639.120847; Fri, 15 Jan 2021 04: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 1l0H8Z-0002Zu-Gt; Fri, 15 Jan 2021 04:55:03 +0000 Received: by outflank-mailman (input) for mailman id 67639; Fri, 15 Jan 2021 04:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0H8Y-0002Zp-8k for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0H8Y-0002wR-7v for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0H8Y-0007ir-6Q for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04: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=8i7Hs0s00kwMxfvXSUX00sAx737L14loGH0JgCao/l8=; b=cHARN31GvLbO5A+CxTNiZKA7qO kp94pKr96FkHwkx6L7o45YhMXj0rMDtXPIKIX8yUHsi/AZVQjxHnQIHJt6LgYww7Ezky38os11xL7 n0xzAqMttabV+MaOCuODrPxmJVugRBtYp/41c5ZCDnDX+ejHA4JwdLg2/67oq0q+IW/8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] memory: avoid pointless continuation in xenmem_add_to_physmap() Message-Id: Date: Fri, 15 Jan 2021 04:55:02 +0000 commit d9751646697b1e2d337990264068ead3c10b993a Author: Jan Beulich AuthorDate: Thu Jan 14 13:00:26 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 14 13:00:26 2021 +0100 memory: avoid pointless continuation in xenmem_add_to_physmap() Adjust so we uniformly avoid needlessly arranging for a continuation on the last iteration. Fixes: 5777a3742d88 ("IOMMU: hold page ref until after deferred TLB flush") Signed-off-by: Jan Beulich Reviewed-by: Julien Grall --- xen/common/memory.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index b21b6c452d..ccb4d49fc6 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -858,8 +858,9 @@ int xenmem_add_to_physmap(struct domain *d, struct xen_add_to_physmap *xatp, ++extra.ppage; /* Check for continuation if it's not the last iteration. */ - if ( (++done >= ARRAY_SIZE(pages) && extra.ppage) || - (xatp->size > done && hypercall_preempt_check()) ) + if ( xatp->size > ++done && + ((done >= ARRAY_SIZE(pages) && extra.ppage) || + hypercall_preempt_check()) ) { rc = start + done; break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 04:55:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 04:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67640.120852 (Exim 4.92) (envelope-from ) id 1l0H8j-0002at-Mg; Fri, 15 Jan 2021 04:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67640.120852; Fri, 15 Jan 2021 04: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 1l0H8j-0002ah-IY; Fri, 15 Jan 2021 04:55:13 +0000 Received: by outflank-mailman (input) for mailman id 67640; Fri, 15 Jan 2021 04:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0H8i-0002aY-DK for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0H8i-0002wX-CD for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0H8i-0007jM-AM for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04: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=bW9sp8yhHiLmUbsF/zK91UoyonzGpWusLLdJX8BZQ1Y=; b=XFIyNlmO0jKTWMs2w4ksFibbk7 KSpnplp8gmLcMsosIXFYIjjaQpKIb3UzeVFD0IsMn64F2b3stdT0ki0FA/zH/Ydb+Kgk4n1d2OZud FotYuLKRNifHbK4Jf1RXdFqYU91bmaSZSeVAIwTLVyX/57rcG/96KjK6bSr8eoqiJ0IM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] lib: drop (replace) debug_build() Message-Id: Date: Fri, 15 Jan 2021 04:55:12 +0000 commit 1bdd12364e5a3afbd34148477705c6ab8953aa41 Author: Jan Beulich AuthorDate: Thu Jan 14 13:01:14 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 14 13:01:14 2021 +0100 lib: drop (replace) debug_build() Its expansion shouldn't be tied to NDEBUG - down the road we may want to allow enabling assertions independently of CONFIG_DEBUG. Replace the few uses by a new xen_build_info() helper, subsuming gcov_string at the same time (while replacing the stale CONFIG_GCOV used there) and also adding CONFIG_UBSAN indication. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Julien Grall --- xen/arch/arm/traps.c | 4 ++-- xen/arch/x86/x86_64/traps.c | 4 ++-- xen/common/version.c | 24 ++++++++++++++++++++++++ xen/drivers/char/console.c | 6 +++--- xen/include/xen/lib.h | 8 -------- xen/include/xen/version.h | 1 + 6 files changed, 32 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index c1a9ad6056..1af1bb9f1b 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -175,14 +175,14 @@ static void print_xen_info(void) { char taint_str[TAINT_STRING_MAX_LEN]; - printk("----[ Xen-%d.%d%s %s debug=%c " gcov_string " %s ]----\n", + printk("----[ Xen-%d.%d%s %s %s %s ]----\n", xen_major_version(), xen_minor_version(), xen_extra_version(), #ifdef CONFIG_ARM_32 "arm32", #else "arm64", #endif - debug_build() ? 'y' : 'n', print_tainted(taint_str)); + xen_build_info(), print_tainted(taint_str)); } #ifdef CONFIG_ARM_32 diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index b1ef40a846..4116ecb9c0 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -29,9 +29,9 @@ static void print_xen_info(void) { char taint_str[TAINT_STRING_MAX_LEN]; - printk("----[ Xen-%d.%d%s x86_64 debug=%c " gcov_string " %s ]----\n", + printk("----[ Xen-%d.%d%s x86_64 %s %s ]----\n", xen_major_version(), xen_minor_version(), xen_extra_version(), - debug_build() ? 'y' : 'n', print_tainted(taint_str)); + xen_build_info(), print_tainted(taint_str)); } enum context { CTXT_hypervisor, CTXT_pv_guest, CTXT_hvm_guest }; diff --git a/xen/common/version.c b/xen/common/version.c index 937eb1281c..d320135208 100644 --- a/xen/common/version.c +++ b/xen/common/version.c @@ -70,6 +70,30 @@ const char *xen_deny(void) return ""; } +static const char build_info[] = + "debug=" +#ifdef CONFIG_DEBUG + "y" +#else + "n" +#endif +#ifdef CONFIG_COVERAGE +# ifdef __clang__ + " llvmcov=y" +# else + " gcov=y" +# endif +#endif +#ifdef CONFIG_UBSAN + " ubsan=y" +#endif + ""; + +const char *xen_build_info(void) +{ + return build_info; +} + static const void *build_id_p __read_mostly; static unsigned int build_id_len __read_mostly; diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 861ad53a8f..e3c483fd13 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1002,10 +1002,10 @@ void __init console_init_preirq(void) spin_lock(&console_lock); __putstr(xen_banner()); spin_unlock(&console_lock); - printk("Xen version %d.%d%s (%s@%s) (%s) debug=%c " gcov_string " %s\n", + printk("Xen version %d.%d%s (%s@%s) (%s) %s %s\n", xen_major_version(), xen_minor_version(), xen_extra_version(), - xen_compile_by(), xen_compile_domain(), - xen_compiler(), debug_build() ? 'y' : 'n', xen_compile_date()); + xen_compile_by(), xen_compile_domain(), xen_compiler(), + xen_build_info(), xen_compile_date()); printk("Latest ChangeSet: %s\n", xen_changeset()); /* Locate and print the buildid, if applicable. */ diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 5841bd489c..1198c7c0b2 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -48,21 +48,13 @@ #define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) #endif -#ifdef CONFIG_GCOV -#define gcov_string "gcov=y" -#else -#define gcov_string "" -#endif - #ifndef NDEBUG #define ASSERT(p) \ do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0) #define ASSERT_UNREACHABLE() assert_failed("unreachable") -#define debug_build() 1 #else #define ASSERT(p) do { if ( 0 && (p) ) {} } while (0) #define ASSERT_UNREACHABLE() do { } while (0) -#define debug_build() 0 #endif #define ABS(_x) ({ \ diff --git a/xen/include/xen/version.h b/xen/include/xen/version.h index 9ac926d0e1..93c5877363 100644 --- a/xen/include/xen/version.h +++ b/xen/include/xen/version.h @@ -16,6 +16,7 @@ const char *xen_extra_version(void); const char *xen_changeset(void); const char *xen_banner(void); const char *xen_deny(void); +const char *xen_build_info(void); int xen_build_id(const void **p, unsigned int *len); #ifdef BUILD_ID -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 04:55:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 04:55:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67641.120856 (Exim 4.92) (envelope-from ) id 1l0H8u-0002cU-Ot; Fri, 15 Jan 2021 04:55:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67641.120856; Fri, 15 Jan 2021 04:55: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 1l0H8u-0002cG-K9; Fri, 15 Jan 2021 04:55:24 +0000 Received: by outflank-mailman (input) for mailman id 67641; Fri, 15 Jan 2021 04:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0H8s-0002bz-Ij for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0H8s-0002wg-GW for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0H8s-0007jt-EJ for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04: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=Jl+ROyvBX2G3oQ7qvMPb7+KphKFgoM7TGHFD8GOKAu0=; b=DGerpRuh/ZksR8B9+OxMPQPNYL UCDP2ubgTc7gJskwp7PnZ0RS9pszZN5ICNoURf17uiBeCA3FoRar7WIDGWRW81Iz8TG0SVeid78hR mBx/y8WkcehsiWDQIAAuA2tLE0vxC/reOYc7VCQCSmP/8qltwmQLspltuvIuhrRm+x/0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] argo: don't pointlessly use get_domain_by_id() Message-Id: Date: Fri, 15 Jan 2021 04:55:22 +0000 commit ff20706cd7da8de9282cb6c0d37bde80630b0b86 Author: Jan Beulich AuthorDate: Thu Jan 14 13:02:35 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 14 13:02:35 2021 +0100 argo: don't pointlessly use get_domain_by_id() For short-lived references rcu_lock_domain_by_id() is the better (slightly cheaper) alternative. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Christopher Clark --- xen/common/argo.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/xen/common/argo.c b/xen/common/argo.c index aa3443a377..49be715f63 100644 --- a/xen/common/argo.c +++ b/xen/common/argo.c @@ -445,13 +445,13 @@ signal_domain(struct domain *d) static void signal_domid(domid_t domain_id) { - struct domain *d = get_domain_by_id(domain_id); + struct domain *d = rcu_lock_domain_by_id(domain_id); if ( !d ) return; signal_domain(d); - put_domain(d); + rcu_unlock_domain(d); } static void @@ -983,7 +983,7 @@ ringbuf_insert(const struct domain *d, struct argo_ring_info *ring_info, static void wildcard_pending_list_remove(domid_t domain_id, struct pending_ent *ent) { - struct domain *d = get_domain_by_id(domain_id); + struct domain *d = rcu_lock_domain_by_id(domain_id); if ( !d ) return; @@ -996,13 +996,13 @@ wildcard_pending_list_remove(domid_t domain_id, struct pending_ent *ent) list_del(&ent->wildcard_node); spin_unlock(&d->argo->wildcard_L2_lock); } - put_domain(d); + rcu_unlock_domain(d); } static void wildcard_pending_list_insert(domid_t domain_id, struct pending_ent *ent) { - struct domain *d = get_domain_by_id(domain_id); + struct domain *d = rcu_lock_domain_by_id(domain_id); if ( !d ) return; @@ -1015,7 +1015,7 @@ wildcard_pending_list_insert(domid_t domain_id, struct pending_ent *ent) list_add(&ent->wildcard_node, &d->argo->wildcard_pend_list); spin_unlock(&d->argo->wildcard_L2_lock); } - put_domain(d); + rcu_unlock_domain(d); } static void @@ -1283,7 +1283,7 @@ partner_rings_remove(struct domain *src_d) struct argo_send_info, node)) ) { - struct domain *dst_d = get_domain_by_id(send_info->id.domain_id); + struct domain *dst_d = rcu_lock_domain_by_id(send_info->id.domain_id); if ( dst_d && dst_d->argo ) { @@ -1302,7 +1302,7 @@ partner_rings_remove(struct domain *src_d) ASSERT_UNREACHABLE(); if ( dst_d ) - put_domain(dst_d); + rcu_unlock_domain(dst_d); list_del(&send_info->node); xfree(send_info); @@ -1330,7 +1330,7 @@ fill_ring_data(const struct domain *currd, ent.flags = 0; - dst_d = get_domain_by_id(ent.ring.domain_id); + dst_d = rcu_lock_domain_by_id(ent.ring.domain_id); if ( !dst_d || !dst_d->argo ) goto out; @@ -1340,10 +1340,7 @@ fill_ring_data(const struct domain *currd, */ ret = xsm_argo_send(currd, dst_d); if ( ret ) - { - put_domain(dst_d); - return ret; - } + goto out; read_lock(&dst_d->argo->rings_L2_rwlock); @@ -1405,7 +1402,7 @@ fill_ring_data(const struct domain *currd, out: if ( dst_d ) - put_domain(dst_d); + rcu_unlock_domain(dst_d); if ( !ret && (__copy_field_to_guest(data_ent_hnd, &ent, flags) || __copy_field_to_guest(data_ent_hnd, &ent, max_message_size)) ) @@ -1569,7 +1566,7 @@ unregister_ring(struct domain *currd, if ( ring_id.partner_id == XEN_ARGO_DOMID_ANY ) goto out; - dst_d = get_domain_by_id(ring_id.partner_id); + dst_d = rcu_lock_domain_by_id(ring_id.partner_id); if ( !dst_d || !dst_d->argo ) { ASSERT_UNREACHABLE(); @@ -1592,7 +1589,7 @@ unregister_ring(struct domain *currd, read_unlock(&L1_global_argo_rwlock); if ( dst_d ) - put_domain(dst_d); + rcu_unlock_domain(dst_d); xfree(send_info); @@ -1663,7 +1660,7 @@ register_ring(struct domain *currd, } else { - dst_d = get_domain_by_id(reg.partner_id); + dst_d = rcu_lock_domain_by_id(reg.partner_id); if ( !dst_d ) { argo_dprintk("!dst_d, ESRCH\n"); @@ -1845,7 +1842,7 @@ register_ring(struct domain *currd, out: if ( dst_d ) - put_domain(dst_d); + rcu_unlock_domain(dst_d); if ( ret ) xfree(send_info); @@ -1988,7 +1985,7 @@ sendv(struct domain *src_d, xen_argo_addr_t *src_addr, src_id.domain_id = src_d->domain_id; src_id.partner_id = dst_addr->domain_id; - dst_d = get_domain_by_id(dst_addr->domain_id); + dst_d = rcu_lock_domain_by_id(dst_addr->domain_id); if ( !dst_d ) return -ESRCH; @@ -1998,7 +1995,7 @@ sendv(struct domain *src_d, xen_argo_addr_t *src_addr, gprintk(XENLOG_ERR, "argo: XSM REJECTED %i -> %i\n", src_d->domain_id, dst_d->domain_id); - put_domain(dst_d); + rcu_unlock_domain(dst_d); return ret; } @@ -2068,7 +2065,7 @@ sendv(struct domain *src_d, xen_argo_addr_t *src_addr, signal_domain(dst_d); if ( dst_d ) - put_domain(dst_d); + rcu_unlock_domain(dst_d); return ( ret < 0 ) ? ret : len; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 04:55:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 04:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67642.120859 (Exim 4.92) (envelope-from ) id 1l0H93-0002dm-QM; Fri, 15 Jan 2021 04:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67642.120859; Fri, 15 Jan 2021 04: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 1l0H93-0002dc-NG; Fri, 15 Jan 2021 04:55:33 +0000 Received: by outflank-mailman (input) for mailman id 67642; Fri, 15 Jan 2021 04:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0H92-0002dW-KI for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0H92-0002ww-JZ for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0H92-0007kN-Ib for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04: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=qCowPMYLtxnUxkCtMyJ26LsX/dJ6mk12113VoPCgMIc=; b=MClYA1Sxqet9jg0kS0cjPcsnB9 XDjEqQ1uAxPPpBdoXUZHNo6OJYGE4ovmuF6Wd/rvDOfcqiExPa4NFENEtLrjgGy+kG9CcwCDKxbMd qTIkAVOOG9GhjhMyGZz2YVNDK+8oyQmP6UzRXYXsv30tiPWLasWzMomm/hGA76y5g1GA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxenstat: ensure strnlen() declaration is visible Message-Id: Date: Fri, 15 Jan 2021 04:55:32 +0000 commit 01d411fd2d2e5045a32847d6d7729bb574753e05 Author: Jan Beulich AuthorDate: Thu Jan 14 13:03:01 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 14 13:03:01 2021 +0100 tools/libxenstat: ensure strnlen() declaration is visible Its guard was updated such that it is visible by default when POSIX 2008 was adopted by glibc. It's not visible by default on older glibc. Fixes: 40fe714ca424 ("tools/libs/stat: use memcpy instead of strncpy in getBridge") Signed-off-by: Jan Beulich Reviewed-by: Ian Jackson --- tools/libs/stat/xenstat_linux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/libs/stat/xenstat_linux.c b/tools/libs/stat/xenstat_linux.c index e0d242e1bc..c00b26d4d8 100644 --- a/tools/libs/stat/xenstat_linux.c +++ b/tools/libs/stat/xenstat_linux.c @@ -20,6 +20,7 @@ * Use is subject to license terms. */ +#define _GNU_SOURCE #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 04:55:43 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 04:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.67643.120864 (Exim 4.92) (envelope-from ) id 1l0H9D-0002f8-S7; Fri, 15 Jan 2021 04:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 67643.120864; Fri, 15 Jan 2021 04: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 1l0H9D-0002f0-Ok; Fri, 15 Jan 2021 04:55:43 +0000 Received: by outflank-mailman (input) for mailman id 67643; Fri, 15 Jan 2021 04:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0H9C-0002eq-Nt for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0H9C-0002x9-ND for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0H9C-0007kp-LY for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 04: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=MfPAnitejb3BKOL6gIrA00pUrYuGWbtx0aWEGv1zc4w=; b=nbdS4b4Igr2ztUUQXiRjnRFj9l BLtos4Kb45kPBLewPuajFjEqZVlxwyB6P15NluWFpubQJwDZ4W+1sZE/eEjuWYbIePqwfQGFsRAGR rSAuQrGrZ1BlnY03Kf3zfuAiFpt2fxF/rQUBJjUHr5GfP8B3ZjYJR9ZpqFYRA97D9pRU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] stubdom: fix tpm_version Message-Id: Date: Fri, 15 Jan 2021 04:55:42 +0000 commit 84a37d24a9e962e9c2fa8eb4671ea60c0958157d Author: Olaf Hering AuthorDate: Thu Jan 14 13:03:23 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 14 13:03:23 2021 +0100 stubdom: fix tpm_version It is just a declaration, not a variable. ld: /home/abuild/rpmbuild/BUILD/xen-4.14.20200616T103126.3625b04991/non-dbg/stubdom/vtpmmgr/vtpmmgr.a(vtpm_cmd_handler.o):(.bss+0x0): multiple definition of `tpm_version'; /home/abuild/rpmbuild/BUILD/xen-4.14.20200616T103126.3625b04991/non-dbg/stubdom/vtpmmgr/vtpmmgr.a(vtpmmgr.o):(.bss+0x0): first defined here Signed-off-by: Olaf Hering Reviewed-by: Samuel Thibault --- stubdom/vtpmmgr/vtpmmgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubdom/vtpmmgr/vtpmmgr.h b/stubdom/vtpmmgr/vtpmmgr.h index 2e6f8de9e4..f40ca9fd67 100644 --- a/stubdom/vtpmmgr/vtpmmgr.h +++ b/stubdom/vtpmmgr/vtpmmgr.h @@ -53,7 +53,7 @@ enum { TPM1_HARDWARE = 1, TPM2_HARDWARE, -} tpm_version; +}; struct tpm_hardware_version { int hw_version; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 11:55:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 11:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68011.121623 (Exim 4.92) (envelope-from ) id 1l0Nh4-0000TW-GR; Fri, 15 Jan 2021 11:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68011.121623; Fri, 15 Jan 2021 11: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 1l0Nh4-0000TO-DN; Fri, 15 Jan 2021 11:55:06 +0000 Received: by outflank-mailman (input) for mailman id 68011; Fri, 15 Jan 2021 11:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Nh3-0000TJ-2x for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Nh3-0002fu-1q for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0Nh3-0002m0-0y for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sLeOOWd6GWW4p9a0XockXC/ploEzU5uk9rByUdCiPtc=; b=pTtYyJeo5wT5fRPKiWlXyWoqz9 BZnNCwbi06nn+aqmVXGj6wT3W3rHA3Q0y8RfIiGfXhLjKC9aIvNxuRfZG5txZbqF1DGKTaehCoFL0 W/g7SJ2HgZJNnfT5q0klzH1t9sg8XeU2vcacVRoLbMzZ0KyH69zBOh/lRsjhmWDmls4Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenevtchn: switch to standard xen coding style Message-Id: Date: Fri, 15 Jan 2021 11:55:05 +0000 commit 461144c9ad48dce1c1220c95c8706e3fa20f8677 Author: Juergen Gross AuthorDate: Fri Jan 15 09:29:34 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 11:44:47 2021 +0000 tools/libxenevtchn: switch to standard xen coding style There is a mixture of different styles in libxenevtchn. Use the standard xen style only. No functional change. Signed-off-by: Juergen Gross Acked-by: Andrew Cooper --- tools/libs/evtchn/core.c | 24 ++++++----- tools/libs/evtchn/freebsd.c | 25 ++++++++---- tools/libs/evtchn/linux.c | 12 ++++-- tools/libs/evtchn/minios.c | 98 ++++++++++++++++++++++++++++++++------------- tools/libs/evtchn/netbsd.c | 22 ++++++---- tools/libs/evtchn/solaris.c | 12 ++++-- 6 files changed, 135 insertions(+), 58 deletions(-) diff --git a/tools/libs/evtchn/core.c b/tools/libs/evtchn/core.c index aff6ecfaa0..8090d0ce87 100644 --- a/tools/libs/evtchn/core.c +++ b/tools/libs/evtchn/core.c @@ -18,10 +18,11 @@ #include "private.h" -static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { +static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) +{ xenevtchn_handle *xce = CONTAINER_OF(ah, *xce, tc_ah); - if (xce->fd < 0) + if ( xce->fd < 0 ) /* just in case */ return 0; @@ -33,7 +34,8 @@ xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned open_flags) xenevtchn_handle *xce = malloc(sizeof(*xce)); int rc; - if (!xce) return NULL; + if ( !xce ) + return NULL; xce->fd = -1; xce->logger = logger; @@ -42,23 +44,26 @@ xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned open_flags) xce->tc_ah.restrict_callback = all_restrict_cb; xentoolcore__register_active_handle(&xce->tc_ah); - if (!xce->logger) { - xce->logger = xce->logger_tofree = - (xentoollog_logger*) + if ( !xce->logger ) + { + xce->logger = xce->logger_tofree = (xentoollog_logger *) xtl_createlogger_stdiostream(stderr, XTL_PROGRESS, 0); - if (!xce->logger) goto err; + if ( !xce->logger ) + goto err; } rc = osdep_evtchn_open(xce); - if ( rc < 0 ) goto err; + if ( rc < 0 ) + goto err; return xce; -err: + err: xentoolcore__deregister_active_handle(&xce->tc_ah); osdep_evtchn_close(xce); xtl_logger_destroy(xce->logger_tofree); free(xce); + return NULL; } @@ -73,6 +78,7 @@ int xenevtchn_close(xenevtchn_handle *xce) rc = osdep_evtchn_close(xce); xtl_logger_destroy(xce->logger_tofree); free(xce); + return rc; } diff --git a/tools/libs/evtchn/freebsd.c b/tools/libs/evtchn/freebsd.c index 6564ed4c44..554af122c8 100644 --- a/tools/libs/evtchn/freebsd.c +++ b/tools/libs/evtchn/freebsd.c @@ -34,9 +34,12 @@ int osdep_evtchn_open(xenevtchn_handle *xce) { int fd = open(EVTCHN_DEV, O_RDWR|O_CLOEXEC); + if ( fd == -1 ) return -1; + xce->fd = fd; + return 0; } @@ -51,6 +54,7 @@ int osdep_evtchn_close(xenevtchn_handle *xce) int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid) { errno = -EOPNOTSUPP; + return -1; } @@ -69,7 +73,8 @@ int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port) return ioctl(fd, IOCTL_EVTCHN_NOTIFY, ¬ify); } -xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uint32_t domid) +xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, + uint32_t domid) { int ret, fd = xce->fd; struct ioctl_evtchn_bind_unbound_port bind; @@ -77,11 +82,13 @@ xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uin bind.remote_domain = domid; ret = ioctl(fd, IOCTL_EVTCHN_BIND_UNBOUND_PORT, &bind); - return ( ret == 0 ) ? bind.port : ret; + + return ret ?: bind.port; } -xenevtchn_port_or_error_t -xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint32_t domid, evtchn_port_t remote_port) +xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, + uint32_t domid, + evtchn_port_t remote_port) { int ret, fd = xce->fd; struct ioctl_evtchn_bind_interdomain bind; @@ -90,10 +97,12 @@ xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint32_t domid, evtchn_port_t bind.remote_port = remote_port; ret = ioctl(fd, IOCTL_EVTCHN_BIND_INTERDOMAIN, &bind); - return ( ret == 0 ) ? bind.port : ret; + + return ret ?: bind.port; } -xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned int virq) +xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, + unsigned int virq) { int ret, fd = xce->fd; struct ioctl_evtchn_bind_virq bind; @@ -101,7 +110,8 @@ xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned in bind.virq = virq; ret = ioctl(fd, IOCTL_EVTCHN_BIND_VIRQ, &bind); - return ( ret == 0 ) ? bind.port : ret; + + return ret ?: bind.port; } int xenevtchn_unbind(xenevtchn_handle *xce, evtchn_port_t port) @@ -131,6 +141,7 @@ int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port) if ( write(fd, &port, sizeof(port)) != sizeof(port) ) return -1; + return 0; } diff --git a/tools/libs/evtchn/linux.c b/tools/libs/evtchn/linux.c index 17e64aea32..9aaeef0faf 100644 --- a/tools/libs/evtchn/linux.c +++ b/tools/libs/evtchn/linux.c @@ -37,9 +37,12 @@ int osdep_evtchn_open(xenevtchn_handle *xce) { int fd = open("/dev/xen/evtchn", O_RDWR|O_CLOEXEC); + if ( fd == -1 ) return -1; + xce->fd = fd; + return 0; } @@ -74,7 +77,7 @@ int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port) } xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, - uint32_t domid) + uint32_t domid) { int fd = xce->fd; struct ioctl_evtchn_bind_unbound_port bind; @@ -85,8 +88,8 @@ xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, } xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, - uint32_t domid, - evtchn_port_t remote_port) + uint32_t domid, + evtchn_port_t remote_port) { int fd = xce->fd; struct ioctl_evtchn_bind_interdomain bind; @@ -98,7 +101,7 @@ xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, } xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, - unsigned int virq) + unsigned int virq) { int fd = xce->fd; struct ioctl_evtchn_bind_virq bind; @@ -135,6 +138,7 @@ int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port) if ( write(fd, &port, sizeof(port)) != sizeof(port) ) return -1; + return 0; } diff --git a/tools/libs/evtchn/minios.c b/tools/libs/evtchn/minios.c index 9cd7636fc5..b4e09bff3b 100644 --- a/tools/libs/evtchn/minios.c +++ b/tools/libs/evtchn/minios.c @@ -43,22 +43,28 @@ extern void minios_evtchn_close_fd(int fd); extern struct wait_queue_head event_queue; /* XXX Note: This is not threadsafe */ -static struct evtchn_port_info* port_alloc(int fd) { +static struct evtchn_port_info *port_alloc(int fd) +{ struct evtchn_port_info *port_info; + port_info = malloc(sizeof(struct evtchn_port_info)); - if (port_info == NULL) + if ( port_info == NULL ) return NULL; + port_info->pending = 0; port_info->port = -1; port_info->bound = 0; LIST_INSERT_HEAD(&files[fd].evtchn.ports, port_info, list); + return port_info; } -static void port_dealloc(struct evtchn_port_info *port_info) { - if (port_info->bound) +static void port_dealloc(struct evtchn_port_info *port_info) +{ + if ( port_info->bound ) unbind_evtchn(port_info->port); + LIST_REMOVE(port_info, list); free(port_info); } @@ -66,11 +72,14 @@ static void port_dealloc(struct evtchn_port_info *port_info) { int osdep_evtchn_open(xenevtchn_handle *xce) { int fd = alloc_fd(FTYPE_EVTCHN); + if ( fd == -1 ) return -1; + LIST_INIT(&files[fd].evtchn.ports); xce->fd = fd; printf("evtchn_open() -> %d\n", fd); + return 0; } @@ -85,12 +94,14 @@ int osdep_evtchn_close(xenevtchn_handle *xce) int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid) { errno = -EOPNOTSUPP; + return -1; } void minios_evtchn_close_fd(int fd) { struct evtchn_port_info *port_info, *tmp; + LIST_FOREACH_SAFE(port_info, &files[fd].evtchn.ports, list, tmp) port_dealloc(port_info); @@ -108,10 +119,12 @@ int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port) ret = notify_remote_via_evtchn(port); - if (ret < 0) { + if ( ret < 0 ) + { errno = -ret; ret = -1; } + return ret; } @@ -119,12 +132,15 @@ static void evtchn_handler(evtchn_port_t port, struct pt_regs *regs, void *data) { int fd = (int)(intptr_t)data; struct evtchn_port_info *port_info; + assert(files[fd].type == FTYPE_EVTCHN); mask_evtchn(port); - LIST_FOREACH(port_info, &files[fd].evtchn.ports, list) { - if (port_info->port == port) + LIST_FOREACH(port_info, &files[fd].evtchn.ports, list) + { + if ( port_info->port == port ) goto found; } + printk("Unknown port for handle %d\n", fd); return; @@ -134,7 +150,8 @@ static void evtchn_handler(evtchn_port_t port, struct pt_regs *regs, void *data) wake_up(&event_queue); } -xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uint32_t domid) +xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, + uint32_t domid) { int fd = xce->fd; struct evtchn_port_info *port_info; @@ -143,26 +160,31 @@ xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uin assert(get_current() == main_thread); port_info = port_alloc(fd); - if (port_info == NULL) + if ( port_info == NULL ) return -1; printf("xenevtchn_bind_unbound_port(%d)", domid); - ret = evtchn_alloc_unbound(domid, evtchn_handler, (void*)(intptr_t)fd, &port); + ret = evtchn_alloc_unbound(domid, evtchn_handler, + (void *)(intptr_t)fd, &port); printf(" = %d\n", ret); - if (ret < 0) { + if ( ret < 0 ) + { port_dealloc(port_info); errno = -ret; return -1; } + port_info->bound = 1; port_info->port = port; unmask_evtchn(port); + return port; } -xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint32_t domid, - evtchn_port_t remote_port) +xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, + uint32_t domid, + evtchn_port_t remote_port) { int fd = xce->fd; struct evtchn_port_info *port_info; @@ -171,21 +193,25 @@ xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint assert(get_current() == main_thread); port_info = port_alloc(fd); - if (port_info == NULL) + if ( port_info == NULL ) return -1; printf("xenevtchn_bind_interdomain(%d, %"PRId32")", domid, remote_port); - ret = evtchn_bind_interdomain(domid, remote_port, evtchn_handler, (void*)(intptr_t)fd, &local_port); + ret = evtchn_bind_interdomain(domid, remote_port, evtchn_handler, + (void *)(intptr_t)fd, &local_port); printf(" = %d\n", ret); - if (ret < 0) { + if ( ret < 0 ) + { port_dealloc(port_info); errno = -ret; return -1; } + port_info->bound = 1; port_info->port = local_port; unmask_evtchn(local_port); + return local_port; } @@ -194,18 +220,24 @@ int xenevtchn_unbind(xenevtchn_handle *xce, evtchn_port_t port) int fd = xce->fd; struct evtchn_port_info *port_info; - LIST_FOREACH(port_info, &files[fd].evtchn.ports, list) { - if (port_info->port == port) { + LIST_FOREACH(port_info, &files[fd].evtchn.ports, list) + { + if ( port_info->port == port ) + { port_dealloc(port_info); return 0; } } - printf("Warning: couldn't find port %"PRId32" for xc handle %x\n", port, fd); + + printf("Warning: couldn't find port %"PRId32" for xc handle %x\n", + port, fd); errno = EINVAL; + return -1; } -xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned int virq) +xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, + unsigned int virq) { int fd = xce->fd; struct evtchn_port_info *port_info; @@ -213,21 +245,24 @@ xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned in assert(get_current() == main_thread); port_info = port_alloc(fd); - if (port_info == NULL) + if ( port_info == NULL ) return -1; printf("xenevtchn_bind_virq(%d)", virq); - port = bind_virq(virq, evtchn_handler, (void*)(intptr_t)fd); + port = bind_virq(virq, evtchn_handler, (void *)(intptr_t)fd); printf(" = %d\n", port); - if (port < 0) { + if ( port < 0 ) + { port_dealloc(port_info); errno = -port; return -1; } + port_info->bound = 1; port_info->port = port; unmask_evtchn(port); + return port; } @@ -239,26 +274,35 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) evtchn_port_t ret = -1; local_irq_save(flags); + files[fd].read = 0; - LIST_FOREACH(port_info, &files[fd].evtchn.ports, list) { - if (port_info->port != -1 && port_info->pending) { - if (ret == -1) { + LIST_FOREACH(port_info, &files[fd].evtchn.ports, list) + { + if ( port_info->port != -1 && port_info->pending ) + { + if ( ret == -1 ) + { ret = port_info->port; port_info->pending = 0; - } else { + } + else + { files[fd].read = 1; break; } } } + local_irq_restore(flags); + return ret; } int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port) { unmask_evtchn(port); + return 0; } diff --git a/tools/libs/evtchn/netbsd.c b/tools/libs/evtchn/netbsd.c index 8b8545d2f9..53f9299ebb 100644 --- a/tools/libs/evtchn/netbsd.c +++ b/tools/libs/evtchn/netbsd.c @@ -34,9 +34,12 @@ int osdep_evtchn_open(xenevtchn_handle *xce) { int fd = open(EVTCHN_DEV_NAME, O_NONBLOCK|O_RDWR); + if ( fd == -1 ) return -1; + xce->fd = fd; + return 0; } @@ -51,6 +54,7 @@ int osdep_evtchn_close(xenevtchn_handle *xce) int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid) { errno = -EOPNOTSUPP; + return -1; } @@ -69,7 +73,8 @@ int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port) return ioctl(fd, IOCTL_EVTCHN_NOTIFY, ¬ify); } -xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle * xce, uint32_t domid) +xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, + uint32_t domid) { int fd = xce->fd; struct ioctl_evtchn_bind_unbound_port bind; @@ -78,14 +83,15 @@ xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle * xce, ui bind.remote_domain = domid; ret = ioctl(fd, IOCTL_EVTCHN_BIND_UNBOUND_PORT, &bind); - if (ret == 0) + if ( ret == 0 ) return bind.port; else return -1; } -xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint32_t domid, - evtchn_port_t remote_port) +xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, + uint32_t domid, + evtchn_port_t remote_port) { int fd = xce->fd; struct ioctl_evtchn_bind_interdomain bind; @@ -95,7 +101,7 @@ xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint bind.remote_port = remote_port; ret = ioctl(fd, IOCTL_EVTCHN_BIND_INTERDOMAIN, &bind); - if (ret == 0) + if ( ret == 0 ) return bind.port; else return -1; @@ -111,7 +117,8 @@ int xenevtchn_unbind(xenevtchn_handle *xce, evtchn_port_t port) return ioctl(fd, IOCTL_EVTCHN_UNBIND, &unbind); } -xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned int virq) +xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, + unsigned int virq) { int fd = xce->fd; struct ioctl_evtchn_bind_virq bind; @@ -120,7 +127,7 @@ xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned in bind.virq = virq; err = ioctl(fd, IOCTL_EVTCHN_BIND_VIRQ, &bind); - if (err) + if ( err ) return -1; else return bind.port; @@ -140,6 +147,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port) { int fd = xce->fd; + return write_exact(fd, (char *)&port, sizeof(port)); } diff --git a/tools/libs/evtchn/solaris.c b/tools/libs/evtchn/solaris.c index dd41f62a24..d87abc553c 100644 --- a/tools/libs/evtchn/solaris.c +++ b/tools/libs/evtchn/solaris.c @@ -72,7 +72,8 @@ int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port) return ioctl(fd, IOCTL_EVTCHN_NOTIFY, ¬ify); } -xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uint32_t domid) +xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, + uint32_t domid) { int fd = xce->fd; struct ioctl_evtchn_bind_unbound_port bind; @@ -82,8 +83,9 @@ xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uin return ioctl(fd, IOCTL_EVTCHN_BIND_UNBOUND_PORT, &bind); } -xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint32_t domid, - evtchn_port_t remote_port) +xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, + uint32_t domid, + evtchn_port_t remote_port) { int fd = xce->fd; struct ioctl_evtchn_bind_interdomain bind; @@ -94,7 +96,8 @@ xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint return ioctl(fd, IOCTL_EVTCHN_BIND_INTERDOMAIN, &bind); } -xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned int virq) +xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, + unsigned int virq) { int fd = xce->fd; struct ioctl_evtchn_bind_virq bind; @@ -128,6 +131,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port) { int fd = xce->fd; + return write_exact(fd, (char *)&port, sizeof(port)); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 11:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 11:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68012.121627 (Exim 4.92) (envelope-from ) id 1l0NhE-0000UM-Hq; Fri, 15 Jan 2021 11:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68012.121627; Fri, 15 Jan 2021 11: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 1l0NhE-0000UE-Ex; Fri, 15 Jan 2021 11:55:16 +0000 Received: by outflank-mailman (input) for mailman id 68012; Fri, 15 Jan 2021 11:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0NhD-0000U7-7t for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0NhD-0002g0-76 for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0NhD-0002ms-48 for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11: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=Qg7ibKayalCMti6YEECL0IccxGn9jDZoTI9+BogInIU=; b=uSrRFrVF51VskHJQeHLO8Wu3mz gsbjyZwdzkyRY2OueDoG87bw6OK3bHNZ5FN/Ve1/yHyJ/qrgfnQpHA9Ip7kZScJY65c0wGL8U06Ky qaLh+dDvKLVHro3lIGUQN6n8EPpyRA9W9vYuxZFsN2dtAaJqkcVtY7KBp7Tgs9Fukk0o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenevtchn: rename open_flags to flags Message-Id: Date: Fri, 15 Jan 2021 11:55:15 +0000 commit 1997d379dc64a8b86e74a380b8d7b1d43012f440 Author: Juergen Gross AuthorDate: Fri Jan 15 09:29:35 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 11:44:47 2021 +0000 tools/libxenevtchn: rename open_flags to flags Rename the xenevtchn_open() parameter open_flags to flags as it might be used for things not passed on to open(). No functional change. No API/ABI changes. Suggested-by: Andrew Cooper Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper --- tools/include/xenevtchn.h | 2 +- tools/libs/evtchn/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/include/xenevtchn.h b/tools/include/xenevtchn.h index 91821ee56d..3e9b6e7323 100644 --- a/tools/include/xenevtchn.h +++ b/tools/include/xenevtchn.h @@ -67,7 +67,7 @@ struct xentoollog_logger; */ /* Currently no flags are defined */ xenevtchn_handle *xenevtchn_open(struct xentoollog_logger *logger, - unsigned open_flags); + unsigned int flags); /* * Close a handle previously allocated with xenevtchn_open(). diff --git a/tools/libs/evtchn/core.c b/tools/libs/evtchn/core.c index 8090d0ce87..72d92e28bf 100644 --- a/tools/libs/evtchn/core.c +++ b/tools/libs/evtchn/core.c @@ -29,7 +29,7 @@ static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) return xenevtchn_restrict(xce, domid); } -xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned open_flags) +xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) { xenevtchn_handle *xce = malloc(sizeof(*xce)); int rc; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 11:55:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 11:55:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68014.121643 (Exim 4.92) (envelope-from ) id 1l0NhP-0000YD-74; Fri, 15 Jan 2021 11:55:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68014.121643; Fri, 15 Jan 2021 11:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0NhP-0000Y5-3s; Fri, 15 Jan 2021 11:55:27 +0000 Received: by outflank-mailman (input) for mailman id 68014; Fri, 15 Jan 2021 11:55:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0NhN-0000XO-B1 for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0NhN-0002gF-AC for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0NhN-0002nl-9A for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11: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=68XovKxcusDfCDv0ErLXQcdZayK7D2J0s78Hue7g1ZY=; b=YdsPkV/URghbjWfesOCLwtroZd amS21ZMnAnrya9OdWg6RkugF5HGL0DCgP8L2QRkRvT61IuRTfSXAPCMfDLABkDNwaoLV3FzCGCCZx FiG8mc3Dvt/i1jyUkiscNmxu5yWSQPwdd+JOlyCOdMl8ceUapWNS6a22oC3iBWRWX3bw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenevtchn: check xenevtchn_open() flags for not supported bits Message-Id: Date: Fri, 15 Jan 2021 11:55:25 +0000 commit f7918dc8f94c1640ba18341d7812f5c461d064ce Author: Juergen Gross AuthorDate: Fri Jan 15 09:29:36 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 11:44:47 2021 +0000 tools/libxenevtchn: check xenevtchn_open() flags for not supported bits Refuse a call of xenevtchn_open() with unsupported bits in flags being set. This will change behavior for callers passing junk in flags today, but those would otherwise get probably unwanted side effects when the flags they specify today get any meaning. So checking flags is the right thing to do. Suggested-by: Andrew Cooper Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper --- tools/libs/evtchn/core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/libs/evtchn/core.c b/tools/libs/evtchn/core.c index 72d92e28bf..79990d0027 100644 --- a/tools/libs/evtchn/core.c +++ b/tools/libs/evtchn/core.c @@ -13,6 +13,7 @@ * License along with this library; If not, see . */ +#include #include #include @@ -31,9 +32,16 @@ static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) { - xenevtchn_handle *xce = malloc(sizeof(*xce)); + xenevtchn_handle *xce; int rc; + if ( flags ) + { + errno = EINVAL; + return NULL; + } + + xce = malloc(sizeof(*xce)); if ( !xce ) return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 11:55:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 11:55:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68016.121647 (Exim 4.92) (envelope-from ) id 1l0NhY-0000aq-8P; Fri, 15 Jan 2021 11:55:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68016.121647; Fri, 15 Jan 2021 11: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 1l0NhY-0000ai-5R; Fri, 15 Jan 2021 11:55:36 +0000 Received: by outflank-mailman (input) for mailman id 68016; Fri, 15 Jan 2021 11:55:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0NhX-0000aU-EH for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0NhX-0002gY-DS for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0NhX-0002ob-CL for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11: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=9jYXQGsmvKCHebjKQLLSMySGXjJlfixtcNNpFLFkPpk=; b=5WZEy52vzdUBwDfCH1asF/Jq/8 jT+WwRURWh7vWcb7YDtJVmN+wt0Ehos/Qk7i67DfHWXG78rw/0Yhom90BWkzNXt2AraTeCpkluEJH 5ox+KBImHwTxSFXiJRjQsZGHFcpoqRBQfqnCXYi81dOJj8vJdMcpv3eY2V/uSAIYzRkU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenevtchn: propagate xenevtchn_open() flags parameter Message-Id: Date: Fri, 15 Jan 2021 11:55:35 +0000 commit 935e5fb0d5707d7356fb869bb83e27d11269558f Author: Juergen Gross AuthorDate: Fri Jan 15 09:29:37 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 11:44:47 2021 +0000 tools/libxenevtchn: propagate xenevtchn_open() flags parameter Propagate the flags parameter of xenevtchn_open() to the OS-specific handlers in order to enable handling them there. Signed-off-by: Juergen Gross Acked-by: Andrew Cooper --- tools/libs/evtchn/core.c | 2 +- tools/libs/evtchn/freebsd.c | 2 +- tools/libs/evtchn/linux.c | 2 +- tools/libs/evtchn/minios.c | 2 +- tools/libs/evtchn/netbsd.c | 2 +- tools/libs/evtchn/private.h | 2 +- tools/libs/evtchn/solaris.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/libs/evtchn/core.c b/tools/libs/evtchn/core.c index 79990d0027..d3cc93e98f 100644 --- a/tools/libs/evtchn/core.c +++ b/tools/libs/evtchn/core.c @@ -60,7 +60,7 @@ xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) goto err; } - rc = osdep_evtchn_open(xce); + rc = osdep_evtchn_open(xce, flags); if ( rc < 0 ) goto err; diff --git a/tools/libs/evtchn/freebsd.c b/tools/libs/evtchn/freebsd.c index 554af122c8..bb601f350f 100644 --- a/tools/libs/evtchn/freebsd.c +++ b/tools/libs/evtchn/freebsd.c @@ -31,7 +31,7 @@ #define EVTCHN_DEV "/dev/xen/evtchn" -int osdep_evtchn_open(xenevtchn_handle *xce) +int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { int fd = open(EVTCHN_DEV, O_RDWR|O_CLOEXEC); diff --git a/tools/libs/evtchn/linux.c b/tools/libs/evtchn/linux.c index 9aaeef0faf..56b4b50797 100644 --- a/tools/libs/evtchn/linux.c +++ b/tools/libs/evtchn/linux.c @@ -34,7 +34,7 @@ #define O_CLOEXEC 0 #endif -int osdep_evtchn_open(xenevtchn_handle *xce) +int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { int fd = open("/dev/xen/evtchn", O_RDWR|O_CLOEXEC); diff --git a/tools/libs/evtchn/minios.c b/tools/libs/evtchn/minios.c index b4e09bff3b..bd5b7f5e0d 100644 --- a/tools/libs/evtchn/minios.c +++ b/tools/libs/evtchn/minios.c @@ -69,7 +69,7 @@ static void port_dealloc(struct evtchn_port_info *port_info) free(port_info); } -int osdep_evtchn_open(xenevtchn_handle *xce) +int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { int fd = alloc_fd(FTYPE_EVTCHN); diff --git a/tools/libs/evtchn/netbsd.c b/tools/libs/evtchn/netbsd.c index 53f9299ebb..60a9235978 100644 --- a/tools/libs/evtchn/netbsd.c +++ b/tools/libs/evtchn/netbsd.c @@ -31,7 +31,7 @@ #define EVTCHN_DEV_NAME "/dev/xenevt" -int osdep_evtchn_open(xenevtchn_handle *xce) +int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { int fd = open(EVTCHN_DEV_NAME, O_NONBLOCK|O_RDWR); diff --git a/tools/libs/evtchn/private.h b/tools/libs/evtchn/private.h index 31e595bea2..319d1996d7 100644 --- a/tools/libs/evtchn/private.h +++ b/tools/libs/evtchn/private.h @@ -14,7 +14,7 @@ struct xenevtchn_handle { Xentoolcore__Active_Handle tc_ah; }; -int osdep_evtchn_open(xenevtchn_handle *xce); +int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags); int osdep_evtchn_close(xenevtchn_handle *xce); int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid); diff --git a/tools/libs/evtchn/solaris.c b/tools/libs/evtchn/solaris.c index d87abc553c..df9579df17 100644 --- a/tools/libs/evtchn/solaris.c +++ b/tools/libs/evtchn/solaris.c @@ -29,7 +29,7 @@ #include "private.h" -int osdep_evtchn_open(xenevtchn_handle *xce) +int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { int fd; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 11:55:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 11:55:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68018.121651 (Exim 4.92) (envelope-from ) id 1l0Nhi-0000dI-AI; Fri, 15 Jan 2021 11:55:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68018.121651; Fri, 15 Jan 2021 11:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Nhi-0000dA-72; Fri, 15 Jan 2021 11:55:46 +0000 Received: by outflank-mailman (input) for mailman id 68018; Fri, 15 Jan 2021 11:55:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Nhh-0000d2-H5 for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Nhh-0002gp-GL for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0Nhh-0002pB-FT for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11: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=uf1lT6j4UP6p92F2ZGLbWIwTj2PSC60VahkJZ9pBI9A=; b=nWxaD5jtd3dCOLrXL7UPe39+Is sTyVwJ2IgdUm1Q8Dn/kglcLiPKVe4kyhee1HjlToJUDAgV8Fwv75BcdApcJ0KrwCxUjpOnyIDOuYm VOIm7EtKbOc1ghSNLmseUtwK2ktKv7HIPi10x8jHS3x+aTQGCXuvqjkVsPAit3iYyfMA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenevtchn: add possibility to not close file descriptor on exec Message-Id: Date: Fri, 15 Jan 2021 11:55:45 +0000 commit 29a6082f21f2109935fd13eff4c9ce0093c2a26e Author: Juergen Gross AuthorDate: Fri Jan 15 09:29:38 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 11:44:47 2021 +0000 tools/libxenevtchn: add possibility to not close file descriptor on exec Today the file descriptor for the access of the event channel driver is being closed in case of exec(2). For the support of live update of a daemon using libxenevtchn this can be problematic, so add a way to keep that file descriptor open. Add support of a flag XENEVTCHN_NO_CLOEXEC for xenevtchn_open() which will result in _not_ setting O_CLOEXEC when opening the event channel driver node. The caller can then obtain the file descriptor via xenevtchn_fd(). Add an alternative open function xenevtchn_fdopen() which takes that file descriptor as an additional parameter. This allows to allocate a xenevtchn_handle and to associate it with that file descriptor. Signed-off-by: Juergen Gross Reviewed-by: Wei Liu Reviewed-by: Julien Grall --- tools/include/xenevtchn.h | 50 +++++++++++++++++++------------ tools/libs/evtchn/Makefile | 2 +- tools/libs/evtchn/core.c | 60 ++++++++++++++++++++++++++++---------- tools/libs/evtchn/freebsd.c | 7 ++++- tools/libs/evtchn/libxenevtchn.map | 4 +++ tools/libs/evtchn/linux.c | 7 ++++- tools/libs/evtchn/minios.c | 4 +++ 7 files changed, 97 insertions(+), 37 deletions(-) diff --git a/tools/include/xenevtchn.h b/tools/include/xenevtchn.h index 3e9b6e7323..1255c85178 100644 --- a/tools/include/xenevtchn.h +++ b/tools/include/xenevtchn.h @@ -42,35 +42,47 @@ struct xentoollog_logger; */ /* - * Return a handle to the event channel driver, or NULL on failure, in - * which case errno will be set appropriately. + * Opens the evtchn device node. Return a handle to the event channel + * driver, or NULL on failure, in which case errno will be set + * appropriately. * - * Note: After fork(2) a child process must not use any opened evtchn - * handle inherited from their parent, nor access any grant mapped - * areas associated with that handle. + * On fork(2): * - * The child must open a new handle if they want to interact with - * evtchn. + * After fork, a child process must not use any opened evtchn handle + * inherited from their parent. This includes operations such as + * poll() on the underlying file descriptor. Calling xenevtchn_close() + * is the only safe operation on a xenevtchn_handle which has been + * inherited. * - * Calling exec(2) in a child will safely (and reliably) reclaim any - * allocated resources via a xenevtchn_handle in the parent. + * The child must open a new handle if they want to interact with + * evtchn. * - * A child which does not call exec(2) may safely call - * xenevtchn_close() on a xenevtchn_handle inherited from their - * parent. This will attempt to reclaim any resources associated with - * that handle. Note that in some implementations this reclamation may - * not be completely effective, in this case any affected resources - * remain allocated. + * On exec(2): * - * Calling xenevtchn_close() is the only safe operation on a - * xenevtchn_handle which has been inherited. + * Wherever possible, the device node will be opened with O_CLOEXEC, + * so it is not inherited by the subsequent program. + * + * However the XENEVTCHN_NO_CLOEXEC flag may be used to avoid opening + * the device node with O_CLOEXEC. This is intended for use by + * daemons which support a self-reexec method of updating themselves. + * + * In this case, the updated daemon should pass the underlying file + * descriptor it inherited to xenevtchn_fdopen() to reconstruct the + * library handle. */ -/* Currently no flags are defined */ + +/* Don't set O_CLOEXEC when opening event channel driver node. */ +#define XENEVTCHN_NO_CLOEXEC (1 << 0) + xenevtchn_handle *xenevtchn_open(struct xentoollog_logger *logger, unsigned int flags); +/* Flag XENEVTCHN_NO_CLOEXEC is rejected by xenevtchn_fdopen(). */ +xenevtchn_handle *xenevtchn_fdopen(struct xentoollog_logger *logger, + int fd, unsigned open_flags); + /* - * Close a handle previously allocated with xenevtchn_open(). + * Close a handle previously allocated with xenevtchn_{,fd}open(). */ int xenevtchn_close(xenevtchn_handle *xce); diff --git a/tools/libs/evtchn/Makefile b/tools/libs/evtchn/Makefile index ad01a17b3d..b8c37b5b97 100644 --- a/tools/libs/evtchn/Makefile +++ b/tools/libs/evtchn/Makefile @@ -2,7 +2,7 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 -MINOR = 1 +MINOR = 2 SRCS-y += core.c SRCS-$(CONFIG_Linux) += linux.c diff --git a/tools/libs/evtchn/core.c b/tools/libs/evtchn/core.c index d3cc93e98f..c402d9393b 100644 --- a/tools/libs/evtchn/core.c +++ b/tools/libs/evtchn/core.c @@ -30,18 +30,10 @@ static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) return xenevtchn_restrict(xce, domid); } -xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) +static xenevtchn_handle *xenevtchn_alloc_handle(xentoollog_logger *logger) { - xenevtchn_handle *xce; - int rc; - - if ( flags ) - { - errno = EINVAL; - return NULL; - } + xenevtchn_handle *xce = malloc(sizeof(*xce)); - xce = malloc(sizeof(*xce)); if ( !xce ) return NULL; @@ -60,6 +52,28 @@ xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) goto err; } + return xce; + + err: + xenevtchn_close(xce); + return NULL; +} + +xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) +{ + xenevtchn_handle *xce; + int rc; + + if ( flags & ~XENEVTCHN_NO_CLOEXEC ) + { + errno = EINVAL; + return NULL; + } + + xce = xenevtchn_alloc_handle(logger); + if ( !xce ) + return NULL; + rc = osdep_evtchn_open(xce, flags); if ( rc < 0 ) goto err; @@ -67,14 +81,30 @@ xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) return xce; err: - xentoolcore__deregister_active_handle(&xce->tc_ah); - osdep_evtchn_close(xce); - xtl_logger_destroy(xce->logger_tofree); - free(xce); - + xenevtchn_close(xce); return NULL; } +xenevtchn_handle *xenevtchn_fdopen(struct xentoollog_logger *logger, + int fd, unsigned int flags) +{ + xenevtchn_handle *xce; + + if ( flags ) + { + errno = EINVAL; + return NULL; + } + + xce = xenevtchn_alloc_handle(logger); + if ( !xce ) + return NULL; + + xce->fd = fd; + + return xce; +} + int xenevtchn_close(xenevtchn_handle *xce) { int rc; diff --git a/tools/libs/evtchn/freebsd.c b/tools/libs/evtchn/freebsd.c index bb601f350f..7427ab2408 100644 --- a/tools/libs/evtchn/freebsd.c +++ b/tools/libs/evtchn/freebsd.c @@ -33,8 +33,13 @@ int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { - int fd = open(EVTCHN_DEV, O_RDWR|O_CLOEXEC); + int open_flags = O_RDWR; + int fd; + if ( !(flags & XENEVTCHN_NO_CLOEXEC) ) + open_flags |= O_CLOEXEC; + + fd = open(EVTCHN_DEV, open_flags); if ( fd == -1 ) return -1; diff --git a/tools/libs/evtchn/libxenevtchn.map b/tools/libs/evtchn/libxenevtchn.map index 33a38f953a..4c180ea65d 100644 --- a/tools/libs/evtchn/libxenevtchn.map +++ b/tools/libs/evtchn/libxenevtchn.map @@ -21,3 +21,7 @@ VERS_1.1 { global: xenevtchn_restrict; } VERS_1.0; +VERS_1.2 { + global: + xenevtchn_fdopen; +} VERS_1.1; diff --git a/tools/libs/evtchn/linux.c b/tools/libs/evtchn/linux.c index 56b4b50797..f27b6def39 100644 --- a/tools/libs/evtchn/linux.c +++ b/tools/libs/evtchn/linux.c @@ -36,8 +36,13 @@ int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { - int fd = open("/dev/xen/evtchn", O_RDWR|O_CLOEXEC); + int open_flags = O_RDWR; + int fd; + if ( !(flags & XENEVTCHN_NO_CLOEXEC) ) + open_flags |= O_CLOEXEC; + + fd = open("/dev/xen/evtchn", open_flags); if ( fd == -1 ) return -1; diff --git a/tools/libs/evtchn/minios.c b/tools/libs/evtchn/minios.c index bd5b7f5e0d..e5dfdc5ef5 100644 --- a/tools/libs/evtchn/minios.c +++ b/tools/libs/evtchn/minios.c @@ -69,6 +69,10 @@ static void port_dealloc(struct evtchn_port_info *port_info) free(port_info); } +/* + * XENEVTCHN_NO_CLOEXEC is being ignored, as there is no exec() call supported + * in Mini-OS. + */ int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { int fd = alloc_fd(FTYPE_EVTCHN); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 11:55:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 11:55:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68019.121655 (Exim 4.92) (envelope-from ) id 1l0Nhs-0000fA-CE; Fri, 15 Jan 2021 11:55:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68019.121655; Fri, 15 Jan 2021 11:55: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 1l0Nhs-0000f2-8d; Fri, 15 Jan 2021 11:55:56 +0000 Received: by outflank-mailman (input) for mailman id 68019; Fri, 15 Jan 2021 11:55:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Nhr-0000et-L1 for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Nhr-0002gw-Jx for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11:55:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0Nhr-0002qD-Iq for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 11: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=TvmZl0Hfk8K2XSRPdRsN+pca0DxcleyiUiwB/90/2oY=; b=PAsVdXKo/cgXfneuSG7wFjqb9j djATamLJ1txhkI6ljXO1SyeolmN276u7hWt7iUbri0MqQhA82sryNxWNuiWfQJwYmIKxyGbeQ4Ban cejtC1rtNTPp2jqCNg5ET1KkqVQmOyBgcJMVjx02bmhBYVznsIecbuEwN7aRv9JpUpA0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs: update the xenstore migration stream documentation Message-Id: Date: Fri, 15 Jan 2021 11:55:55 +0000 commit 8868a0e3f67436a5fbee750624e24a6533357f52 Author: Juergen Gross AuthorDate: Fri Jan 15 09:29:48 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 11:44:47 2021 +0000 docs: update the xenstore migration stream documentation For live update of Xenstore some records defined in the migration stream document need to be changed: - Support of the read-only socket has been dropped from all Xenstore implementations, so ro-socket-fd in the global record can be removed. - Some guests require the event channel to Xenstore to remain the same on Xenstore side, so Xenstore has to keep the event channel interface open across a live update. For this purpose an evtchn-fd needs to be added to the global record. - With no read-only support the flags field in the connection record can be dropped. - The evtchn field in the connection record needs to be switched to hold the port of the Xenstore side of the event channel. - A flags field needs to be added to permission specifiers in order to be able to mark a permission as stale (XSA-322). Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- docs/designs/xenstore-migration.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/designs/xenstore-migration.md b/docs/designs/xenstore-migration.md index 2ce2c836f5..1a5b94b31d 100644 --- a/docs/designs/xenstore-migration.md +++ b/docs/designs/xenstore-migration.md @@ -116,7 +116,7 @@ xenstored state that needs to be restored. +-------+-------+-------+-------+ | rw-socket-fd | +-------------------------------+ -| ro-socket-fd | +| evtchn-fd | +-------------------------------+ ``` @@ -126,8 +126,8 @@ xenstored state that needs to be restored. | `rw-socket-fd` | The file descriptor of the socket accepting | | | read-write connections | | | | -| `ro-socket-fd` | The file descriptor of the socket accepting | -| | read-only connections | +| `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 @@ -147,7 +147,7 @@ the domain being migrated. ``` 0 1 2 3 4 5 6 7 octet +-------+-------+-------+-------+-------+-------+-------+-------+ -| conn-id | conn-type | flags | +| conn-id | conn-type | | +-------------------------------+---------------+---------------+ | conn-spec ... @@ -169,9 +169,6 @@ the domain being migrated. | | 0x0001: socket | | | 0x0002 - 0xFFFF: reserved for future use | | | | -| `flags` | A bit-wise OR of: | -| | 0001: read-only | -| | | | `conn-spec` | See below | | | | | `in-data-len` | The length (in octets) of any data read | @@ -216,7 +213,7 @@ For `shared ring` connections it is as follows: | | operation [2] or DOMID_INVALID [3] otherwise | | | | | `evtchn` | The port number of the interdomain channel used | -| | by `domid` to communicate with xenstored | +| | by xenstored to communicate with `domid` | | | | Since the ABI guarantees that entry 1 in `domid`'s grant table will always @@ -386,7 +383,7 @@ A node permission specifier has the following format: ``` 0 1 2 3 octet +-------+-------+-------+-------+ -| perm | pad | domid | +| perm | flags | domid | +-------+-------+---------------+ ``` @@ -395,6 +392,10 @@ A node permission specifier has the following format: | `perm` | One of the ASCII values `w`, `r`, `b` or `n` as | | | specified for the `SET_PERMS` operation [2] | | | | +| `flags` | A bit-wise OR of: | +| | 0x01: stale permission, ignore when checking | +| | permissions | +| | | | `domid` | The domain-id to which the permission relates | Note that perm1 defines the domain owning the code. See [4] for more -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 15:11:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 15:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68251.122145 (Exim 4.92) (envelope-from ) id 1l0Qkl-0007iK-7D; Fri, 15 Jan 2021 15:11:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68251.122145; Fri, 15 Jan 2021 15:11:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Qkl-0007iC-47; Fri, 15 Jan 2021 15:11:07 +0000 Received: by outflank-mailman (input) for mailman id 68251; Fri, 15 Jan 2021 15:11:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Qkj-0007i7-N4 for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 15:11:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Qkj-0006BZ-I3 for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 15:11:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0Qkj-0001Dz-G9 for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 15:11:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=khRHMWpWDwU/Oe4vzz1Z3wXHR3Nb2mZ/6HUq/qxMFVE=; b=u+Hg+XOObo3w+4fllqnV3P4K0y K7imwLnfQfgUdXEpW6OtonkpF9z+v+Vp76RIIITpMp+rlaNztehZloV1/gZAFjvI/3ZAUHuGeWsDP ZPYRdzuvBxqOXO6yyMjK88m7ZE5WpdKBWs69xzdZcdZ4vrt277UpdMqvzg3kcZOLl1ZY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] include: don't use asm/page.h from common headers Message-Id: Date: Fri, 15 Jan 2021 15:11:05 +0000 commit aa4b9d1ee6538b5cbe218d4d3fcdf9548130a063 Author: Jan Beulich AuthorDate: Fri Jan 15 16:02:13 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 15 16:02:13 2021 +0100 include: don't use asm/page.h from common headers Doing so limits what can be done in (in particular included by) this per- arch header. Abstract out page shift/size related #define-s, which is all the respective headers care about. Extend the replacement / removal to some x86 headers as well; some others now need to include page.h (and they really should have before). Arm's VADDR_BITS gets dropped altogether: Its current value is clearly wrong for 64-bit, but the constant also isn't used anywhere right now. While Arm used vaddr_t in PAGE_OFFSET(), this use is compatible with that of unsigned long in the new common implementation. Also drop the dead PAGE_FLAG_MASK at this occasion. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/arm64/lib/clear_page.S | 2 ++ xen/include/asm-arm/config.h | 5 ----- xen/include/asm-arm/current.h | 1 + xen/include/asm-arm/page-bits.h | 12 ++++++++++++ xen/include/asm-arm/page.h | 12 +----------- xen/include/asm-x86/current.h | 2 +- xen/include/asm-x86/desc.h | 2 ++ xen/include/asm-x86/fixmap.h | 2 +- xen/include/asm-x86/guest/hyperv-hcall.h | 2 +- xen/include/asm-x86/guest/hyperv-tlfs.h | 2 +- xen/include/asm-x86/io.h | 1 - xen/include/asm-x86/mm.h | 1 + xen/include/asm-x86/page-bits.h | 26 ++++++++++++++++++++++++++ xen/include/asm-x86/page.h | 10 +--------- xen/include/asm-x86/uaccess.h | 1 - xen/include/asm-x86/x86_64/page.h | 23 ----------------------- xen/include/xen/gdbstub.h | 2 +- xen/include/xen/grant_table.h | 1 - xen/include/xen/page-size.h | 18 ++++++++++++++++++ xen/include/xen/pfn.h | 2 +- xen/include/xen/vmap.h | 2 +- 21 files changed, 71 insertions(+), 58 deletions(-) diff --git a/xen/arch/arm/arm64/lib/clear_page.S b/xen/arch/arm/arm64/lib/clear_page.S index 9f8a680e18..a767e63686 100644 --- a/xen/arch/arm/arm64/lib/clear_page.S +++ b/xen/arch/arm/arm64/lib/clear_page.S @@ -14,6 +14,8 @@ * along with this program. If not, see . */ +#include + /* * Clear page @dest * diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index fbb4b23a69..5c10c755db 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -176,11 +176,6 @@ #define FIXMAP_ACPI_BEGIN 2 /* Start mappings of ACPI tables */ #define FIXMAP_ACPI_END (FIXMAP_ACPI_BEGIN + NUM_FIXMAP_ACPI_PAGES - 1) /* End mappings of ACPI tables */ -#define PAGE_SHIFT 12 -#define PAGE_SIZE (_AC(1,L) << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) -#define PAGE_FLAG_MASK (~0) - #define NR_hypercalls 64 #define STACK_ORDER 3 diff --git a/xen/include/asm-arm/current.h b/xen/include/asm-arm/current.h index e7fbf535d2..73e81458e5 100644 --- a/xen/include/asm-arm/current.h +++ b/xen/include/asm-arm/current.h @@ -1,6 +1,7 @@ #ifndef __ARM_CURRENT_H__ #define __ARM_CURRENT_H__ +#include #include #include diff --git a/xen/include/asm-arm/page-bits.h b/xen/include/asm-arm/page-bits.h new file mode 100644 index 0000000000..5d6477e599 --- /dev/null +++ b/xen/include/asm-arm/page-bits.h @@ -0,0 +1,12 @@ +#ifndef __ARM_PAGE_SHIFT_H__ +#define __ARM_PAGE_SHIFT_H__ + +#define PAGE_SHIFT 12 + +#ifdef CONFIG_ARM_64 +#define PADDR_BITS 48 +#else +#define PADDR_BITS 40 +#endif + +#endif /* __ARM_PAGE_SHIFT_H__ */ diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 4ea8e97247..131507a517 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -2,21 +2,11 @@ #define __ARM_PAGE_H__ #include +#include #include #include #include -#ifdef CONFIG_ARM_64 -#define PADDR_BITS 48 -#else -#define PADDR_BITS 40 -#endif -#define PADDR_MASK ((1ULL << PADDR_BITS)-1) -#define PAGE_OFFSET(ptr) ((vaddr_t)(ptr) & ~PAGE_MASK) - -#define VADDR_BITS 32 -#define VADDR_MASK (~0UL) - /* Shareability values for the LPAE entries */ #define LPAE_SH_NON_SHAREABLE 0x0 #define LPAE_SH_UNPREDICTALE 0x1 diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index 5d690ce014..a74ad4bc4c 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -8,8 +8,8 @@ #define __X86_CURRENT_H__ #include +#include #include -#include /* * Xen's cpu stacks are 8 pages (8-page aligned), arranged as: diff --git a/xen/include/asm-x86/desc.h b/xen/include/asm-x86/desc.h index dfa643925f..225a864c48 100644 --- a/xen/include/asm-x86/desc.h +++ b/xen/include/asm-x86/desc.h @@ -1,6 +1,8 @@ #ifndef __ARCH_DESC_H #define __ARCH_DESC_H +#include + /* * Xen reserves a memory page of GDT entries. * No guest GDT entries exist beyond the Xen reserved area. diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 83b2b7634d..0db314baeb 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -12,7 +12,7 @@ #ifndef _ASM_FIXMAP_H #define _ASM_FIXMAP_H -#include +#include #define FIXADDR_TOP (VMAP_VIRT_END - PAGE_SIZE) #define FIXADDR_X_TOP (XEN_VIRT_END - PAGE_SIZE) diff --git a/xen/include/asm-x86/guest/hyperv-hcall.h b/xen/include/asm-x86/guest/hyperv-hcall.h index 4d3b131b3a..423ca0860b 100644 --- a/xen/include/asm-x86/guest/hyperv-hcall.h +++ b/xen/include/asm-x86/guest/hyperv-hcall.h @@ -20,12 +20,12 @@ #define __X86_HYPERV_HCALL_H__ #include +#include #include #include #include #include -#include static inline uint64_t hv_do_hypercall(uint64_t control, paddr_t input_addr, paddr_t output_addr) diff --git a/xen/include/asm-x86/guest/hyperv-tlfs.h b/xen/include/asm-x86/guest/hyperv-tlfs.h index 0a0f3398c1..03b71af82f 100644 --- a/xen/include/asm-x86/guest/hyperv-tlfs.h +++ b/xen/include/asm-x86/guest/hyperv-tlfs.h @@ -10,8 +10,8 @@ #define _ASM_X86_HYPERV_TLFS_H #include +#include #include -#include /* * While not explicitly listed in the TLFS, Hyper-V always runs with a page size diff --git a/xen/include/asm-x86/io.h b/xen/include/asm-x86/io.h index 5afe68239d..82ca7d47f4 100644 --- a/xen/include/asm-x86/io.h +++ b/xen/include/asm-x86/io.h @@ -3,7 +3,6 @@ #include #include -#include #define readb(x) (*(volatile uint8_t *)(x)) #define readw(x) (*(volatile uint16_t *)(x)) diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index deeba75a1c..1fdb4eb835 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include diff --git a/xen/include/asm-x86/page-bits.h b/xen/include/asm-x86/page-bits.h new file mode 100644 index 0000000000..6f7fc7d035 --- /dev/null +++ b/xen/include/asm-x86/page-bits.h @@ -0,0 +1,26 @@ +#ifndef __X86_PAGE_SHIFT_H__ +#define __X86_PAGE_SHIFT_H__ + +#define L1_PAGETABLE_SHIFT 12 +#define L2_PAGETABLE_SHIFT 21 +#define L3_PAGETABLE_SHIFT 30 +#define L4_PAGETABLE_SHIFT 39 +#define PAGE_SHIFT L1_PAGETABLE_SHIFT +#define SUPERPAGE_SHIFT L2_PAGETABLE_SHIFT +#define ROOT_PAGETABLE_SHIFT L4_PAGETABLE_SHIFT + +#define PAGETABLE_ORDER 9 +#define L1_PAGETABLE_ENTRIES (1 << PAGETABLE_ORDER) +#define L2_PAGETABLE_ENTRIES (1 << PAGETABLE_ORDER) +#define L3_PAGETABLE_ENTRIES (1 << PAGETABLE_ORDER) +#define L4_PAGETABLE_ENTRIES (1 << PAGETABLE_ORDER) +#define ROOT_PAGETABLE_ENTRIES L4_PAGETABLE_ENTRIES + +#define SUPERPAGE_ORDER PAGETABLE_ORDER +#define SUPERPAGE_PAGES (1 << SUPERPAGE_ORDER) + +/* These are architectural limits. */ +#define PADDR_BITS 52 +#define VADDR_BITS 48 + +#endif /* __X86_PAGE_SHIFT_H__ */ diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 082c14a662..4c7f2cb70c 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -2,15 +2,7 @@ #define __X86_PAGE_H__ #include - -/* - * It is important that the masks are signed quantities. This ensures that - * the compiler sign-extends a 32-bit mask to 64 bits if that is required. - */ -#define PAGE_SIZE (_AC(1,L) << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) -#define PAGE_FLAG_MASK (~0) -#define PAGE_OFFSET(ptr) ((unsigned long)(ptr) & ~PAGE_MASK) +#include #define PAGE_ORDER_4K 0 #define PAGE_ORDER_2M 9 diff --git a/xen/include/asm-x86/uaccess.h b/xen/include/asm-x86/uaccess.h index 3501038077..8411fb9586 100644 --- a/xen/include/asm-x86/uaccess.h +++ b/xen/include/asm-x86/uaccess.h @@ -6,7 +6,6 @@ #include #include #include -#include #include diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index 60db28f4e7..f9faf7f383 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -2,31 +2,8 @@ #ifndef __X86_64_PAGE_H__ #define __X86_64_PAGE_H__ -#define L1_PAGETABLE_SHIFT 12 -#define L2_PAGETABLE_SHIFT 21 -#define L3_PAGETABLE_SHIFT 30 -#define L4_PAGETABLE_SHIFT 39 -#define PAGE_SHIFT L1_PAGETABLE_SHIFT -#define SUPERPAGE_SHIFT L2_PAGETABLE_SHIFT -#define ROOT_PAGETABLE_SHIFT L4_PAGETABLE_SHIFT - -#define PAGETABLE_ORDER 9 -#define L1_PAGETABLE_ENTRIES (1< #include -#include #ifdef CONFIG_CRASH_DEBUG diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 98603604b8..cb5d325da8 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -26,7 +26,6 @@ #include #include #include -#include #include #ifdef CONFIG_GRANT_TABLE diff --git a/xen/include/xen/page-size.h b/xen/include/xen/page-size.h new file mode 100644 index 0000000000..dc5ade107b --- /dev/null +++ b/xen/include/xen/page-size.h @@ -0,0 +1,18 @@ +#ifndef __XEN_PAGE_SIZE_H__ +#define __XEN_PAGE_SIZE_H__ + +#include +#include + +/* + * It is important that the masks are signed quantities. This ensures that + * the compiler sign-extends a 32-bit mask to 64 bits if that is required. + */ +#define PAGE_SIZE (_AC(1,L) << PAGE_SHIFT) +#define PAGE_MASK (~(PAGE_SIZE-1)) +#define PAGE_OFFSET(ptr) ((unsigned long)(ptr) & ~PAGE_MASK) + +#define PADDR_MASK ((_AC(1,ULL) << PADDR_BITS) - 1) +#define VADDR_MASK (~_AC(0,UL) >> (BITS_PER_LONG - VADDR_BITS)) + +#endif /* __XEN_PAGE_SIZE__ */ diff --git a/xen/include/xen/pfn.h b/xen/include/xen/pfn.h index 24a4c2ff7c..1ca9b095e0 100644 --- a/xen/include/xen/pfn.h +++ b/xen/include/xen/pfn.h @@ -1,7 +1,7 @@ #ifndef __XEN_PFN_H__ #define __XEN_PFN_H__ -#include +#include #define PFN_DOWN(x) ((x) >> PAGE_SHIFT) #define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index 369560e620..eb9eed3ba2 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -2,7 +2,7 @@ #define __XEN_VMAP_H__ #include -#include +#include enum vmap_region { VMAP_DEFAULT, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 15:11:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 15:11:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68252.122149 (Exim 4.92) (envelope-from ) id 1l0Qkv-0007jP-8h; Fri, 15 Jan 2021 15:11:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68252.122149; Fri, 15 Jan 2021 15:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Qkv-0007jH-5g; Fri, 15 Jan 2021 15:11:17 +0000 Received: by outflank-mailman (input) for mailman id 68252; Fri, 15 Jan 2021 15:11:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Qkt-0007j5-Mu for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 15:11:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Qkt-0006Bf-Ll for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 15:11:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0Qkt-0001Er-KW for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 15:11:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6u1QnzWDifXiBZdSsR2riUj5BISwDABXklcIi4hzZTk=; b=suui/WKu+lRAiW4p6BgydH+VLu ePpLya4my4ftnpdKyXHUU9R7Yf62lnI6Pwm6l1hjNnxB5rU9io/wM+fKpJ3OXUmMlfKMs4ydxByQH ueeVRbIBR9jWBjFFhKExachtyHl4G054R0OtSWMPEov1/C9i+MkhWH9cfgpvlpi8U9Sw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] mm: split out mfn_t / gfn_t / pfn_t definitions and helpers Message-Id: Date: Fri, 15 Jan 2021 15:11:15 +0000 commit ced9795c6cb4165b6d231a732e5351933dbd8b38 Author: Jan Beulich AuthorDate: Fri Jan 15 16:03:56 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 15 16:03:56 2021 +0100 mm: split out mfn_t / gfn_t / pfn_t definitions and helpers xen/mm.h has heavy dependencies, while in a number of cases only these type definitions are needed. This separation then also allows pulling in these definitions when including xen/mm.h would cause cyclic dependencies. Replace xen/mm.h inclusion where possible in include/xen/. (In xen/iommu.h also take the opportunity and correct the few remaining sorting issues.) While the change could be dropped, remove an unnecessary asm/io.h inclusion from xen/arch/x86/acpi/power.c. This was the initial attempt to address build issues with it, until it became clear that the header itself needs adjustment. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/x86/acpi/power.c | 1 - xen/drivers/char/meson-uart.c | 2 + xen/drivers/char/mvebu-uart.c | 2 + xen/include/asm-x86/io.h | 1 + xen/include/xen/grant_table.h | 2 +- xen/include/xen/iommu.h | 7 ++-- xen/include/xen/mm-frame.h | 96 +++++++++++++++++++++++++++++++++++++++++++ xen/include/xen/mm.h | 92 +---------------------------------------- xen/include/xen/p2m-common.h | 2 +- xen/include/xen/vmap.h | 2 +- 10 files changed, 108 insertions(+), 99 deletions(-) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index ad9b8733f3..91a8c4d0bd 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -10,7 +10,6 @@ * Slimmed with Xen specific support. */ -#include #include #include #include diff --git a/xen/drivers/char/meson-uart.c b/xen/drivers/char/meson-uart.c index 3174a6571f..b1e25e0468 100644 --- a/xen/drivers/char/meson-uart.c +++ b/xen/drivers/char/meson-uart.c @@ -18,7 +18,9 @@ * License along with this program; If not, see . */ +#include #include +#include #include #include #include diff --git a/xen/drivers/char/mvebu-uart.c b/xen/drivers/char/mvebu-uart.c index 248f4e91be..835d1ace3c 100644 --- a/xen/drivers/char/mvebu-uart.c +++ b/xen/drivers/char/mvebu-uart.c @@ -18,7 +18,9 @@ * License along with this program; If not, see . */ +#include #include +#include #include #include #include diff --git a/xen/include/asm-x86/io.h b/xen/include/asm-x86/io.h index 82ca7d47f4..92b784a861 100644 --- a/xen/include/asm-x86/io.h +++ b/xen/include/asm-x86/io.h @@ -49,6 +49,7 @@ __OUT(l,,int) /* Function pointer used to handle platform specific I/O port emulation. */ #define IOEMUL_QUIRK_STUB_BYTES 9 +struct cpu_user_regs; extern unsigned int (*ioemul_handle_quirk)( u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs); diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index cb5d325da8..8876f1f28e 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -23,7 +23,7 @@ #ifndef __XEN_GRANT_TABLE_H__ #define __XEN_GRANT_TABLE_H__ -#include +#include #include #include #include diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index f0295fd6c3..863a68fe16 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -19,14 +19,13 @@ #ifndef _IOMMU_H_ #define _IOMMU_H_ +#include #include #include -#include #include -#include -#include -#include +#include #include +#include #include TYPE_SAFE(uint64_t, dfn); diff --git a/xen/include/xen/mm-frame.h b/xen/include/xen/mm-frame.h new file mode 100644 index 0000000000..f3b1dac3d6 --- /dev/null +++ b/xen/include/xen/mm-frame.h @@ -0,0 +1,96 @@ +#ifndef __XEN_FRAME_NUM_H__ +#define __XEN_FRAME_NUM_H__ + +#include +#include + +TYPE_SAFE(unsigned long, mfn); +#define PRI_mfn "05lx" +#define INVALID_MFN _mfn(~0UL) +/* + * To be used for global variable initialization. This workaround a bug + * in GCC < 5.0. + */ +#define INVALID_MFN_INITIALIZER { ~0UL } + +#ifndef mfn_t +#define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above */ +#define _mfn +#define mfn_x +#undef mfn_t +#undef _mfn +#undef mfn_x +#endif + +static inline mfn_t mfn_add(mfn_t mfn, unsigned long i) +{ + return _mfn(mfn_x(mfn) + i); +} + +static inline mfn_t mfn_max(mfn_t x, mfn_t y) +{ + return _mfn(max(mfn_x(x), mfn_x(y))); +} + +static inline mfn_t mfn_min(mfn_t x, mfn_t y) +{ + return _mfn(min(mfn_x(x), mfn_x(y))); +} + +static inline bool_t mfn_eq(mfn_t x, mfn_t y) +{ + return mfn_x(x) == mfn_x(y); +} + +TYPE_SAFE(unsigned long, gfn); +#define PRI_gfn "05lx" +#define INVALID_GFN _gfn(~0UL) +/* + * To be used for global variable initialization. This workaround a bug + * in GCC < 5.0 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64856 + */ +#define INVALID_GFN_INITIALIZER { ~0UL } + +#ifndef gfn_t +#define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above */ +#define _gfn +#define gfn_x +#undef gfn_t +#undef _gfn +#undef gfn_x +#endif + +static inline gfn_t gfn_add(gfn_t gfn, unsigned long i) +{ + return _gfn(gfn_x(gfn) + i); +} + +static inline gfn_t gfn_max(gfn_t x, gfn_t y) +{ + return _gfn(max(gfn_x(x), gfn_x(y))); +} + +static inline gfn_t gfn_min(gfn_t x, gfn_t y) +{ + return _gfn(min(gfn_x(x), gfn_x(y))); +} + +static inline bool_t gfn_eq(gfn_t x, gfn_t y) +{ + return gfn_x(x) == gfn_x(y); +} + +TYPE_SAFE(unsigned long, pfn); +#define PRI_pfn "05lx" +#define INVALID_PFN (~0UL) + +#ifndef pfn_t +#define pfn_t /* Grep fodder: pfn_t, _pfn() and pfn_x() are defined above */ +#define _pfn +#define pfn_x +#undef pfn_t +#undef _pfn +#undef pfn_x +#endif + +#endif /* __XEN_FRAME_NUM_H__ */ diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index e62a5b726e..636a1254ae 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -51,103 +51,13 @@ #define __XEN_MM_H__ #include +#include #include #include #include -#include -#include #include #include -TYPE_SAFE(unsigned long, mfn); -#define PRI_mfn "05lx" -#define INVALID_MFN _mfn(~0UL) -/* - * To be used for global variable initialization. This workaround a bug - * in GCC < 5.0. - */ -#define INVALID_MFN_INITIALIZER { ~0UL } - -#ifndef mfn_t -#define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above */ -#define _mfn -#define mfn_x -#undef mfn_t -#undef _mfn -#undef mfn_x -#endif - -static inline mfn_t mfn_add(mfn_t mfn, unsigned long i) -{ - return _mfn(mfn_x(mfn) + i); -} - -static inline mfn_t mfn_max(mfn_t x, mfn_t y) -{ - return _mfn(max(mfn_x(x), mfn_x(y))); -} - -static inline mfn_t mfn_min(mfn_t x, mfn_t y) -{ - return _mfn(min(mfn_x(x), mfn_x(y))); -} - -static inline bool_t mfn_eq(mfn_t x, mfn_t y) -{ - return mfn_x(x) == mfn_x(y); -} - -TYPE_SAFE(unsigned long, gfn); -#define PRI_gfn "05lx" -#define INVALID_GFN _gfn(~0UL) -/* - * To be used for global variable initialization. This workaround a bug - * in GCC < 5.0 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64856 - */ -#define INVALID_GFN_INITIALIZER { ~0UL } - -#ifndef gfn_t -#define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above */ -#define _gfn -#define gfn_x -#undef gfn_t -#undef _gfn -#undef gfn_x -#endif - -static inline gfn_t gfn_add(gfn_t gfn, unsigned long i) -{ - return _gfn(gfn_x(gfn) + i); -} - -static inline gfn_t gfn_max(gfn_t x, gfn_t y) -{ - return _gfn(max(gfn_x(x), gfn_x(y))); -} - -static inline gfn_t gfn_min(gfn_t x, gfn_t y) -{ - return _gfn(min(gfn_x(x), gfn_x(y))); -} - -static inline bool_t gfn_eq(gfn_t x, gfn_t y) -{ - return gfn_x(x) == gfn_x(y); -} - -TYPE_SAFE(unsigned long, pfn); -#define PRI_pfn "05lx" -#define INVALID_PFN (~0UL) - -#ifndef pfn_t -#define pfn_t /* Grep fodder: pfn_t, _pfn() and pfn_x() are defined above */ -#define _pfn -#define pfn_x -#undef pfn_t -#undef _pfn -#undef pfn_x -#endif - struct page_info; void put_page(struct page_info *); diff --git a/xen/include/xen/p2m-common.h b/xen/include/xen/p2m-common.h index 58031a6ea8..3753bc0b05 100644 --- a/xen/include/xen/p2m-common.h +++ b/xen/include/xen/p2m-common.h @@ -1,7 +1,7 @@ #ifndef _XEN_P2M_COMMON_H #define _XEN_P2M_COMMON_H -#include +#include /* Remove a page from a domain's p2m table */ int __must_check diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index eb9eed3ba2..b0f7632e89 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -1,7 +1,7 @@ #if !defined(__XEN_VMAP_H__) && defined(VMAP_VIRT_START) #define __XEN_VMAP_H__ -#include +#include #include enum vmap_region { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 15:11:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 15:11:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68253.122153 (Exim 4.92) (envelope-from ) id 1l0Ql5-0007kp-B0; Fri, 15 Jan 2021 15:11:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68253.122153; Fri, 15 Jan 2021 15:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Ql5-0007kZ-7B; Fri, 15 Jan 2021 15:11:27 +0000 Received: by outflank-mailman (input) for mailman id 68253; Fri, 15 Jan 2021 15:11:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Ql3-0007kO-Qb for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 15:11:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Ql3-0006Bt-Po for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 15:11:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0Ql3-0001FR-Nx for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 15: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=zDu9sxfFUP0ieEyLB7oF4l/M9ZHgMlxeHEzcSmHNx2k=; b=CdKjUXxMAn4Q63y4MIBfSYK7OY +Z704I39PlTFPP7OonPNLI4cSkSqZga1bcM226IDJFvtp8cB9Q0R61/8xIS0ezK3jEk7uDJ3lV/fp 3ub7iyO+P4/Oaiuh+mU1l+5/EPtAv+3iTdFgpHoiVI7shEkzqwj/SqtTDLVTWyxRd5TU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Arm: don't hard-code grant table limits in create_domUs() Message-Id: Date: Fri, 15 Jan 2021 15:11:25 +0000 commit 36457d76ec11df9a798809f4bac3cddd76764158 Author: Jan Beulich AuthorDate: Fri Jan 15 16:05:03 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 15 16:05:03 2021 +0100 Arm: don't hard-code grant table limits in create_domUs() I can only assume that f2ae59bc4b9b ("Rationalize max_grant_frames and max_maptrack_frames handling") unintentionally left Arm's create_domUs() set limits to explicit values, as at least some of the same constraints apply here. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e824ba34b0..374bf655ee 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2480,8 +2480,8 @@ void __init create_domUs(void) .arch.gic_version = XEN_DOMCTL_CONFIG_GIC_NATIVE, .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, .max_evtchn_port = -1, - .max_grant_frames = 64, - .max_maptrack_frames = 1024, + .max_grant_frames = -1, + .max_maptrack_frames = -1, }; if ( !dt_device_is_compatible(node, "xen,domain") ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 15:33:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 15:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68356.122376 (Exim 4.92) (envelope-from ) id 1l0R62-0003Mc-Bp; Fri, 15 Jan 2021 15:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68356.122376; Fri, 15 Jan 2021 15: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 1l0R62-0003MT-8V; Fri, 15 Jan 2021 15:33:06 +0000 Received: by outflank-mailman (input) for mailman id 68356; Fri, 15 Jan 2021 15:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0R60-0003ML-RP for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 15:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0R60-0006ek-OG for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 15:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0R60-0002zA-My for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 15:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cHtHlow/ntTgKDwYwOL0Q8xDICMjC1WAJnVoRKkf1Q0=; b=oBtxAoW+TIRxEDBoAWqFSU5qJO HH7LwWxGGY4q1miCV6Pl8wufntj4jWsBOvtmj/DxXNT7koCF/hz47jHZtQazWD0roxrJkzYPY8J06 DsmM0pLFPIuy45L5ACorBOYCFmqEjWHwvUmOlYJCfnQZDBBqpoxWxbWEp/CVpNfgSqFA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] NetBSD: Fix lock directory path Message-Id: Date: Fri, 15 Jan 2021 15:33:04 +0000 commit cc83ee4c6c3790dd98a91cc0d34162dab067bca7 Author: Manuel Bouyer AuthorDate: Tue Jan 12 19:12:22 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 15:31:56 2021 +0000 NetBSD: Fix lock directory path On NetBSD the lock directory is in /var/run/ Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- m4/paths.m4 | 2 +- tools/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/paths.m4 b/m4/paths.m4 index 89d3bb8312..1c107b1a61 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -142,7 +142,7 @@ AC_SUBST(XEN_SCRIPT_DIR) case "$host_os" in *freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; -*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +*netbsd*) XEN_LOCK_DIR=$rundir_path ;; *) XEN_LOCK_DIR=$localstatedir/lock ;; esac AC_SUBST(XEN_LOCK_DIR) diff --git a/tools/configure b/tools/configure index 8a708e9baa..131112c41e 100755 --- a/tools/configure +++ b/tools/configure @@ -4030,7 +4030,7 @@ XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts case "$host_os" in *freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; -*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +*netbsd*) XEN_LOCK_DIR=$localstatedir/run ;; *) XEN_LOCK_DIR=$localstatedir/lock ;; esac -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 15 20:11:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Jan 2021 20:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68612.122830 (Exim 4.92) (envelope-from ) id 1l0VR3-00015p-MB; Fri, 15 Jan 2021 20:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68612.122830; Fri, 15 Jan 2021 20: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 1l0VR3-00015h-JG; Fri, 15 Jan 2021 20:11:05 +0000 Received: by outflank-mailman (input) for mailman id 68612; Fri, 15 Jan 2021 20:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0VR2-00015a-OG for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 20:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0VR2-0003cP-Kr for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 20:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0VR2-00029r-IY for xen-changelog@lists.xenproject.org; Fri, 15 Jan 2021 20: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=TZyZ73QcDHVegfnZ+4lHoucbOLjvw/S0aw53VxcXLvU=; b=zLxGx6yR0jwWlCNCBdu7ocgj1f JadX03m+swPAuAt1fNzEam+l9frRoYgjRvFUEbcZZgtMbtm7ytOIQOrX4kZgUMMHqGd5kNXTYht07 WIZ2Knx/anwPxOByavsHsghSqyn6kAPcPwJgfqfecOUm4XQgPBKsAUjpWZTQ/fgDk5c8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: livepatch: Include xen/mm.h rather than asm/mm.h Message-Id: Date: Fri, 15 Jan 2021 20:11:04 +0000 commit db9c4ad1b1abaef3c38027b9b2700d9250d13125 Author: Julien Grall AuthorDate: Fri Jan 15 19:29:47 2021 +0000 Commit: Stefano Stabellini CommitDate: Fri Jan 15 12:05:29 2021 -0800 xen/arm: livepatch: Include xen/mm.h rather than asm/mm.h Livepatch fails to build on Arm after commit ced9795c6cb4 "mm: split out mfn_t / gfn_t / pfn_t definitions and helpers": In file included from livepatch.c:13:0: /oss/xen/xen/include/asm/mm.h:32:28: error: field ‘list’ has incomplete type struct page_list_entry list; ^~~~ /oss/xen/xen/include/asm/mm.h:53:43: error: ‘MAX_ORDER’ undeclared here (not in a function); did you mean ‘PFN_ORDER’? unsigned long first_dirty:MAX_ORDER + 1; ^~~~~~~~~ PFN_ORDER /oss/xen/xen/include/asm/mm.h:53:31: error: bit-field ‘first_dirty’ width not an integer constant unsigned long first_dirty:MAX_ORDER + 1; ^~~~~~~~~~~ This is happening because asm/mm.h is included directly by livepatch.c. Yet it depends on xen/mm.h to be included first so MAX_ORDER is defined. Resolve the build failure by including xen/mm.h rather than asm/mm.h. Fixes: ced9795c6cb4 ("mm: split out mfn_t / gfn_t / pfn_t definitions and helpers") Signed-off-by: Julien Grall Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Stefano Stabellini --- xen/arch/arm/livepatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/livepatch.c b/xen/arch/arm/livepatch.c index 915e9d926a..75e8adcfd6 100644 --- a/xen/arch/arm/livepatch.c +++ b/xen/arch/arm/livepatch.c @@ -6,11 +6,11 @@ #include #include #include +#include #include #include #include -#include /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 02:55:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 02:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68897.123466 (Exim 4.92) (envelope-from ) id 1l0bk0-00020J-5b; Sat, 16 Jan 2021 02:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68897.123466; Sat, 16 Jan 2021 02:55: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 1l0bk0-00020B-2T; Sat, 16 Jan 2021 02:55:04 +0000 Received: by outflank-mailman (input) for mailman id 68897; Sat, 16 Jan 2021 02:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bjy-000206-F1 for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bjy-0000no-Br for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0bjy-00058X-Am for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02: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=x2kXi+IqBUQMhnTo1JeT0MWm+6OXyj15QvCeaBb7W3c=; b=1jo7n6aoXuciuLAVfTLMjcXf0Q 0nKBWVeyFRYTKeCBUZoQLHrNM4MD3K4q0my40P/Z8ITKjR/xudzfjHYmR1+HinmrlQbff3bsn1vrY 6mHfLo8UPCTiN+ma4oJKr6TI+v1hzlCNIvFNiiBgZ09NIaP9aCOeLZuQwMem1V7ydckU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: add qemu-system-aarch64 to test-artifacts Message-Id: Date: Sat, 16 Jan 2021 02:55:02 +0000 commit c92c9f84f6c6cc17d0f7ce890011d4ab570089e8 Author: Stefano Stabellini AuthorDate: Tue Jan 5 14:58:43 2021 -0800 Commit: Stefano Stabellini CommitDate: Thu Jan 14 18:14:56 2021 -0800 automation: add qemu-system-aarch64 to test-artifacts Currently we are using Debian's qemu-system-aarch64 for our tests. However, sometimes it crashes. It is hard to debug and even harder to apply any fixes to it. Instead, build our own QEMU as one of our test-artifacts, which are only built once, then imported into each pipeline via phony jobs. Signed-off-by: Stefano Stabellini Acked-by: Wei Liu --- .../qemu-system-aarch64/5.2.0-arm64v8.dockerfile | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile b/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile new file mode 100644 index 0000000000..e105a1c636 --- /dev/null +++ b/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile @@ -0,0 +1,75 @@ +FROM arm64v8/debian:unstable +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV QEMU_VERSION=5.2.0 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + curl \ + python3 \ + ninja-build \ + pkg-config \ + libglib2.0-dev \ + libpixman-1-dev \ + && \ + \ + curl -fsSLO https://download.qemu.org/qemu-"$QEMU_VERSION".tar.xz && \ + tar xvJf qemu-"$QEMU_VERSION".tar.xz && \ + cd qemu-"$QEMU_VERSION" && \ + ./configure \ + --target-list=aarch64-softmmu \ + --enable-system \ + --disable-blobs \ + --disable-bsd-user \ + --disable-debug-info \ + --disable-glusterfs \ + --disable-gtk \ + --disable-guest-agent \ + --disable-linux-user \ + --disable-sdl \ + --disable-spice \ + --disable-tpm \ + --disable-vhost-net \ + --disable-vhost-scsi \ + --disable-vhost-user \ + --disable-vhost-vsock \ + --disable-virtfs \ + --disable-vnc \ + --disable-werror \ + --disable-xen \ + --disable-safe-stack \ + --disable-libssh \ + --disable-opengl \ + --disable-tools \ + --disable-virglrenderer \ + --disable-stack-protector \ + --disable-containers \ + --disable-replication \ + --disable-cloop \ + --disable-dmg \ + --disable-vvfat \ + --disable-vdi \ + --disable-parallels \ + --disable-qed \ + --disable-bochs \ + --disable-qom-cast-debug \ + --disable-vhost-vdpa \ + --disable-vhost-kernel \ + --disable-qcow1 \ + --disable-live-block-migration \ + && \ + make -j$(nproc) && \ + cp ./build/qemu-system-aarch64 / && \ + cd /build && \ + rm -rf qemu-"$QEMU_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 Jan 16 02:55:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 02:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68898.123471 (Exim 4.92) (envelope-from ) id 1l0bkA-00021T-7g; Sat, 16 Jan 2021 02:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68898.123471; Sat, 16 Jan 2021 02:55: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 1l0bkA-00021J-4S; Sat, 16 Jan 2021 02:55:14 +0000 Received: by outflank-mailman (input) for mailman id 68898; Sat, 16 Jan 2021 02:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bk8-000218-GK for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bk8-0000oA-Fb for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0bk8-00059C-Dx for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02: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=PRiOjhuHYwDqaZQdSJ7aJDFh8Uama89+5JtD2O8HZVg=; b=CSe9IES+SK0N21pSaUibQHD7LL 5rFaqdZ7uL0m6vAezioXHzf2QPtXbjp0B3+eJCeQddt3lkJWWFo+aGK+1ptf82LM/L6S1gu+DAMrp OgXRpa6Rtks9ObWuKXmDXAC44Ie2ttrdgg/CNOVqyk4gqwgpPdsrmBizuKDQw2dsy9OM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: add a job to import qemu-system-aarch64 into the pipeline Message-Id: Date: Sat, 16 Jan 2021 02:55:12 +0000 commit 17d02551cf79ad00dc4b5fab61fd32f091333750 Author: Stefano Stabellini AuthorDate: Tue Jan 5 14:58:44 2021 -0800 Commit: Stefano Stabellini CommitDate: Thu Jan 14 18:14:57 2021 -0800 automation: add a job to import qemu-system-aarch64 into the pipeline In order to use the pre-built test-artifacts/qemu-system-aarch64 binary for our tests, first we need to import it into the pipeline. Let's do that the same way we did it for the kernel and Alpine Linux filesystem: by creating a special job for it. Signed-off-by: Stefano Stabellini Acked-by: Wei Liu --- automation/gitlab-ci/build.yaml | 11 +++++++++++ automation/gitlab-ci/test.yaml | 2 ++ 2 files changed, 13 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index e5246828f8..db68dd0b69 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -494,3 +494,14 @@ kernel-5.9.9-arm64-export: tags: - arm64 +qemu-system-aarch64-5.2.0-arm64-export: + stage: build + image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:5.2.0-arm64v8 + script: + - mkdir binaries && cp /qemu-system-aarch64 binaries/qemu-system-aarch64 + artifacts: + paths: + - binaries/qemu-system-aarch64 + tags: + - arm64 + diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 9448651187..91a10febbf 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -33,6 +33,7 @@ qemu-alpine-arm64-gcc: - alpine-3.12-gcc-arm64 - alpine-3.12-arm64-rootfs-export - kernel-5.9.9-arm64-export + - qemu-system-aarch64-5.2.0-arm64-export artifacts: paths: - smoke.serial @@ -56,6 +57,7 @@ qemu-smoke-arm64-gcc: dependencies: - debian-unstable-gcc-arm64 - kernel-5.9.9-arm64-export + - qemu-system-aarch64-5.2.0-arm64-export artifacts: paths: - smoke.serial -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 02:55:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 02:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68899.123475 (Exim 4.92) (envelope-from ) id 1l0bkJ-00022r-96; Sat, 16 Jan 2021 02:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68899.123475; Sat, 16 Jan 2021 02: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 1l0bkJ-00022j-65; Sat, 16 Jan 2021 02:55:23 +0000 Received: by outflank-mailman (input) for mailman id 68899; Sat, 16 Jan 2021 02:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bkI-00022c-Jx for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bkI-0000oJ-If for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0bkI-0005A5-Hn for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02: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=aqy/l3F/Dgv/lPmLIgRVeAcVgeY4pa13ahupU3l7LbE=; b=T4SUAunLWEIQxwAsiQspGTQSn0 x4K8GyOC7EDeZ2B7Mpx/AJL2o5eECyhc0gMuYkzVXY1A3bbO0nptQmyy/4dnQeglmGnEQY8aTkYNH nopnTedIx7qJu/aPdTnWi1i8+iOYpzmYJTz88uudZ/OX8QbR+jiKlyzWTZQEXKcoJXOY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: use test-artifacts/qemu-system-aarch64 instead of Debian's Message-Id: Date: Sat, 16 Jan 2021 02:55:22 +0000 commit f58976544ff40d2488c3e2b05c765916eacf3e7c Author: Stefano Stabellini AuthorDate: Tue Jan 5 14:58:45 2021 -0800 Commit: Stefano Stabellini CommitDate: Thu Jan 14 18:14:58 2021 -0800 automation: use test-artifacts/qemu-system-aarch64 instead of Debian's Instead apt-get'ing Debian's qemu-system-aarch64, simply use the provided QEMU binary under binaries. Signed-off-by: Stefano Stabellini Acked-by: Wei Liu --- automation/scripts/qemu-alpine-arm64.sh | 12 +++++------- automation/scripts/qemu-smoke-arm64.sh | 15 +++++++-------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/automation/scripts/qemu-alpine-arm64.sh b/automation/scripts/qemu-alpine-arm64.sh index b43a654270..e2240f9ab4 100755 --- a/automation/scripts/qemu-alpine-arm64.sh +++ b/automation/scripts/qemu-alpine-arm64.sh @@ -3,8 +3,7 @@ set -ex apt-get -qy update -apt-get -qy install --no-install-recommends qemu-system-aarch64 \ - u-boot-qemu \ +apt-get -qy install --no-install-recommends u-boot-qemu \ u-boot-tools \ device-tree-compiler \ cpio \ @@ -69,10 +68,9 @@ echo "rc_verbose=yes" >> etc/rc.conf find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz cd ../.. -# XXX Silly workaround to get the following QEMU command to work -# QEMU looks for "efi-virtio.rom" even if it is unneeded -cp /usr/share/qemu/pvh.bin /usr/share/qemu/efi-virtio.rom -qemu-system-aarch64 \ +# XXX QEMU looks for "efi-virtio.rom" even if it is unneeded +curl -fsSLO curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom +./binaries/qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ -m 1024 -display none \ @@ -107,7 +105,7 @@ rm -f smoke.serial set +e echo " virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"| \ timeout -k 1 720 \ -qemu-system-aarch64 \ +./binaries/qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ -m 2048 -monitor none -serial stdio \ diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index bdef0717ad..53086a5ac7 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -5,17 +5,16 @@ set -ex # Install QEMU export DEBIAN_FRONTENT=noninteractive apt-get -qy update -apt-get -qy install --no-install-recommends qemu-system-aarch64 \ - u-boot-qemu \ +apt-get -qy install --no-install-recommends u-boot-qemu \ u-boot-tools \ device-tree-compiler \ busybox-static \ - cpio + cpio \ + curl -# XXX Silly workaround to get the following QEMU command to work -# QEMU looks for "efi-virtio.rom" even if it is unneeded -cp /usr/share/qemu/pvh.bin /usr/share/qemu/efi-virtio.rom -qemu-system-aarch64 \ +# XXX QEMU looks for "efi-virtio.rom" even if it is unneeded +curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom +./binaries/qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ -m 1024 -display none \ @@ -79,7 +78,7 @@ rm -f smoke.serial set +e echo " virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"| \ timeout -k 1 240 \ -qemu-system-aarch64 \ +./binaries/qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ -m 1024 -monitor none -serial stdio \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 02:55:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 02:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68900.123479 (Exim 4.92) (envelope-from ) id 1l0bkT-00024E-Au; Sat, 16 Jan 2021 02:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68900.123479; Sat, 16 Jan 2021 02: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 1l0bkT-000246-7m; Sat, 16 Jan 2021 02:55:33 +0000 Received: by outflank-mailman (input) for mailman id 68900; Sat, 16 Jan 2021 02:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bkS-000240-OZ for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bkS-0000og-Mw for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0bkS-0005Aj-L9 for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02: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=dNhyK3PzD7ocAAh6a0QnkpJoJ/wUMGIt67O5Te6doSY=; b=EzIvGEZOxFm3C7yEbCLmK5HKOH +GjQBHFakKbj2RzsSwNOOc2i4dF0ffa71NZtXfUOHyyK6G4VLrzCixeN3XCi4stDqETKMewOaYRRO osQKPXnp46Cyomm1wwRE96JlEZDsQZbuopCnw0ZXDMm39dXFeAczN5hzne7CrdaZDs8M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxenevtchn: switch to standard xen coding style Message-Id: Date: Sat, 16 Jan 2021 02:55:32 +0000 commit 461144c9ad48dce1c1220c95c8706e3fa20f8677 Author: Juergen Gross AuthorDate: Fri Jan 15 09:29:34 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 11:44:47 2021 +0000 tools/libxenevtchn: switch to standard xen coding style There is a mixture of different styles in libxenevtchn. Use the standard xen style only. No functional change. Signed-off-by: Juergen Gross Acked-by: Andrew Cooper --- tools/libs/evtchn/core.c | 24 ++++++----- tools/libs/evtchn/freebsd.c | 25 ++++++++---- tools/libs/evtchn/linux.c | 12 ++++-- tools/libs/evtchn/minios.c | 98 ++++++++++++++++++++++++++++++++------------- tools/libs/evtchn/netbsd.c | 22 ++++++---- tools/libs/evtchn/solaris.c | 12 ++++-- 6 files changed, 135 insertions(+), 58 deletions(-) diff --git a/tools/libs/evtchn/core.c b/tools/libs/evtchn/core.c index aff6ecfaa0..8090d0ce87 100644 --- a/tools/libs/evtchn/core.c +++ b/tools/libs/evtchn/core.c @@ -18,10 +18,11 @@ #include "private.h" -static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { +static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) +{ xenevtchn_handle *xce = CONTAINER_OF(ah, *xce, tc_ah); - if (xce->fd < 0) + if ( xce->fd < 0 ) /* just in case */ return 0; @@ -33,7 +34,8 @@ xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned open_flags) xenevtchn_handle *xce = malloc(sizeof(*xce)); int rc; - if (!xce) return NULL; + if ( !xce ) + return NULL; xce->fd = -1; xce->logger = logger; @@ -42,23 +44,26 @@ xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned open_flags) xce->tc_ah.restrict_callback = all_restrict_cb; xentoolcore__register_active_handle(&xce->tc_ah); - if (!xce->logger) { - xce->logger = xce->logger_tofree = - (xentoollog_logger*) + if ( !xce->logger ) + { + xce->logger = xce->logger_tofree = (xentoollog_logger *) xtl_createlogger_stdiostream(stderr, XTL_PROGRESS, 0); - if (!xce->logger) goto err; + if ( !xce->logger ) + goto err; } rc = osdep_evtchn_open(xce); - if ( rc < 0 ) goto err; + if ( rc < 0 ) + goto err; return xce; -err: + err: xentoolcore__deregister_active_handle(&xce->tc_ah); osdep_evtchn_close(xce); xtl_logger_destroy(xce->logger_tofree); free(xce); + return NULL; } @@ -73,6 +78,7 @@ int xenevtchn_close(xenevtchn_handle *xce) rc = osdep_evtchn_close(xce); xtl_logger_destroy(xce->logger_tofree); free(xce); + return rc; } diff --git a/tools/libs/evtchn/freebsd.c b/tools/libs/evtchn/freebsd.c index 6564ed4c44..554af122c8 100644 --- a/tools/libs/evtchn/freebsd.c +++ b/tools/libs/evtchn/freebsd.c @@ -34,9 +34,12 @@ int osdep_evtchn_open(xenevtchn_handle *xce) { int fd = open(EVTCHN_DEV, O_RDWR|O_CLOEXEC); + if ( fd == -1 ) return -1; + xce->fd = fd; + return 0; } @@ -51,6 +54,7 @@ int osdep_evtchn_close(xenevtchn_handle *xce) int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid) { errno = -EOPNOTSUPP; + return -1; } @@ -69,7 +73,8 @@ int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port) return ioctl(fd, IOCTL_EVTCHN_NOTIFY, ¬ify); } -xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uint32_t domid) +xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, + uint32_t domid) { int ret, fd = xce->fd; struct ioctl_evtchn_bind_unbound_port bind; @@ -77,11 +82,13 @@ xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uin bind.remote_domain = domid; ret = ioctl(fd, IOCTL_EVTCHN_BIND_UNBOUND_PORT, &bind); - return ( ret == 0 ) ? bind.port : ret; + + return ret ?: bind.port; } -xenevtchn_port_or_error_t -xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint32_t domid, evtchn_port_t remote_port) +xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, + uint32_t domid, + evtchn_port_t remote_port) { int ret, fd = xce->fd; struct ioctl_evtchn_bind_interdomain bind; @@ -90,10 +97,12 @@ xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint32_t domid, evtchn_port_t bind.remote_port = remote_port; ret = ioctl(fd, IOCTL_EVTCHN_BIND_INTERDOMAIN, &bind); - return ( ret == 0 ) ? bind.port : ret; + + return ret ?: bind.port; } -xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned int virq) +xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, + unsigned int virq) { int ret, fd = xce->fd; struct ioctl_evtchn_bind_virq bind; @@ -101,7 +110,8 @@ xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned in bind.virq = virq; ret = ioctl(fd, IOCTL_EVTCHN_BIND_VIRQ, &bind); - return ( ret == 0 ) ? bind.port : ret; + + return ret ?: bind.port; } int xenevtchn_unbind(xenevtchn_handle *xce, evtchn_port_t port) @@ -131,6 +141,7 @@ int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port) if ( write(fd, &port, sizeof(port)) != sizeof(port) ) return -1; + return 0; } diff --git a/tools/libs/evtchn/linux.c b/tools/libs/evtchn/linux.c index 17e64aea32..9aaeef0faf 100644 --- a/tools/libs/evtchn/linux.c +++ b/tools/libs/evtchn/linux.c @@ -37,9 +37,12 @@ int osdep_evtchn_open(xenevtchn_handle *xce) { int fd = open("/dev/xen/evtchn", O_RDWR|O_CLOEXEC); + if ( fd == -1 ) return -1; + xce->fd = fd; + return 0; } @@ -74,7 +77,7 @@ int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port) } xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, - uint32_t domid) + uint32_t domid) { int fd = xce->fd; struct ioctl_evtchn_bind_unbound_port bind; @@ -85,8 +88,8 @@ xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, } xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, - uint32_t domid, - evtchn_port_t remote_port) + uint32_t domid, + evtchn_port_t remote_port) { int fd = xce->fd; struct ioctl_evtchn_bind_interdomain bind; @@ -98,7 +101,7 @@ xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, } xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, - unsigned int virq) + unsigned int virq) { int fd = xce->fd; struct ioctl_evtchn_bind_virq bind; @@ -135,6 +138,7 @@ int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port) if ( write(fd, &port, sizeof(port)) != sizeof(port) ) return -1; + return 0; } diff --git a/tools/libs/evtchn/minios.c b/tools/libs/evtchn/minios.c index 9cd7636fc5..b4e09bff3b 100644 --- a/tools/libs/evtchn/minios.c +++ b/tools/libs/evtchn/minios.c @@ -43,22 +43,28 @@ extern void minios_evtchn_close_fd(int fd); extern struct wait_queue_head event_queue; /* XXX Note: This is not threadsafe */ -static struct evtchn_port_info* port_alloc(int fd) { +static struct evtchn_port_info *port_alloc(int fd) +{ struct evtchn_port_info *port_info; + port_info = malloc(sizeof(struct evtchn_port_info)); - if (port_info == NULL) + if ( port_info == NULL ) return NULL; + port_info->pending = 0; port_info->port = -1; port_info->bound = 0; LIST_INSERT_HEAD(&files[fd].evtchn.ports, port_info, list); + return port_info; } -static void port_dealloc(struct evtchn_port_info *port_info) { - if (port_info->bound) +static void port_dealloc(struct evtchn_port_info *port_info) +{ + if ( port_info->bound ) unbind_evtchn(port_info->port); + LIST_REMOVE(port_info, list); free(port_info); } @@ -66,11 +72,14 @@ static void port_dealloc(struct evtchn_port_info *port_info) { int osdep_evtchn_open(xenevtchn_handle *xce) { int fd = alloc_fd(FTYPE_EVTCHN); + if ( fd == -1 ) return -1; + LIST_INIT(&files[fd].evtchn.ports); xce->fd = fd; printf("evtchn_open() -> %d\n", fd); + return 0; } @@ -85,12 +94,14 @@ int osdep_evtchn_close(xenevtchn_handle *xce) int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid) { errno = -EOPNOTSUPP; + return -1; } void minios_evtchn_close_fd(int fd) { struct evtchn_port_info *port_info, *tmp; + LIST_FOREACH_SAFE(port_info, &files[fd].evtchn.ports, list, tmp) port_dealloc(port_info); @@ -108,10 +119,12 @@ int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port) ret = notify_remote_via_evtchn(port); - if (ret < 0) { + if ( ret < 0 ) + { errno = -ret; ret = -1; } + return ret; } @@ -119,12 +132,15 @@ static void evtchn_handler(evtchn_port_t port, struct pt_regs *regs, void *data) { int fd = (int)(intptr_t)data; struct evtchn_port_info *port_info; + assert(files[fd].type == FTYPE_EVTCHN); mask_evtchn(port); - LIST_FOREACH(port_info, &files[fd].evtchn.ports, list) { - if (port_info->port == port) + LIST_FOREACH(port_info, &files[fd].evtchn.ports, list) + { + if ( port_info->port == port ) goto found; } + printk("Unknown port for handle %d\n", fd); return; @@ -134,7 +150,8 @@ static void evtchn_handler(evtchn_port_t port, struct pt_regs *regs, void *data) wake_up(&event_queue); } -xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uint32_t domid) +xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, + uint32_t domid) { int fd = xce->fd; struct evtchn_port_info *port_info; @@ -143,26 +160,31 @@ xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uin assert(get_current() == main_thread); port_info = port_alloc(fd); - if (port_info == NULL) + if ( port_info == NULL ) return -1; printf("xenevtchn_bind_unbound_port(%d)", domid); - ret = evtchn_alloc_unbound(domid, evtchn_handler, (void*)(intptr_t)fd, &port); + ret = evtchn_alloc_unbound(domid, evtchn_handler, + (void *)(intptr_t)fd, &port); printf(" = %d\n", ret); - if (ret < 0) { + if ( ret < 0 ) + { port_dealloc(port_info); errno = -ret; return -1; } + port_info->bound = 1; port_info->port = port; unmask_evtchn(port); + return port; } -xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint32_t domid, - evtchn_port_t remote_port) +xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, + uint32_t domid, + evtchn_port_t remote_port) { int fd = xce->fd; struct evtchn_port_info *port_info; @@ -171,21 +193,25 @@ xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint assert(get_current() == main_thread); port_info = port_alloc(fd); - if (port_info == NULL) + if ( port_info == NULL ) return -1; printf("xenevtchn_bind_interdomain(%d, %"PRId32")", domid, remote_port); - ret = evtchn_bind_interdomain(domid, remote_port, evtchn_handler, (void*)(intptr_t)fd, &local_port); + ret = evtchn_bind_interdomain(domid, remote_port, evtchn_handler, + (void *)(intptr_t)fd, &local_port); printf(" = %d\n", ret); - if (ret < 0) { + if ( ret < 0 ) + { port_dealloc(port_info); errno = -ret; return -1; } + port_info->bound = 1; port_info->port = local_port; unmask_evtchn(local_port); + return local_port; } @@ -194,18 +220,24 @@ int xenevtchn_unbind(xenevtchn_handle *xce, evtchn_port_t port) int fd = xce->fd; struct evtchn_port_info *port_info; - LIST_FOREACH(port_info, &files[fd].evtchn.ports, list) { - if (port_info->port == port) { + LIST_FOREACH(port_info, &files[fd].evtchn.ports, list) + { + if ( port_info->port == port ) + { port_dealloc(port_info); return 0; } } - printf("Warning: couldn't find port %"PRId32" for xc handle %x\n", port, fd); + + printf("Warning: couldn't find port %"PRId32" for xc handle %x\n", + port, fd); errno = EINVAL; + return -1; } -xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned int virq) +xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, + unsigned int virq) { int fd = xce->fd; struct evtchn_port_info *port_info; @@ -213,21 +245,24 @@ xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned in assert(get_current() == main_thread); port_info = port_alloc(fd); - if (port_info == NULL) + if ( port_info == NULL ) return -1; printf("xenevtchn_bind_virq(%d)", virq); - port = bind_virq(virq, evtchn_handler, (void*)(intptr_t)fd); + port = bind_virq(virq, evtchn_handler, (void *)(intptr_t)fd); printf(" = %d\n", port); - if (port < 0) { + if ( port < 0 ) + { port_dealloc(port_info); errno = -port; return -1; } + port_info->bound = 1; port_info->port = port; unmask_evtchn(port); + return port; } @@ -239,26 +274,35 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) evtchn_port_t ret = -1; local_irq_save(flags); + files[fd].read = 0; - LIST_FOREACH(port_info, &files[fd].evtchn.ports, list) { - if (port_info->port != -1 && port_info->pending) { - if (ret == -1) { + LIST_FOREACH(port_info, &files[fd].evtchn.ports, list) + { + if ( port_info->port != -1 && port_info->pending ) + { + if ( ret == -1 ) + { ret = port_info->port; port_info->pending = 0; - } else { + } + else + { files[fd].read = 1; break; } } } + local_irq_restore(flags); + return ret; } int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port) { unmask_evtchn(port); + return 0; } diff --git a/tools/libs/evtchn/netbsd.c b/tools/libs/evtchn/netbsd.c index 8b8545d2f9..53f9299ebb 100644 --- a/tools/libs/evtchn/netbsd.c +++ b/tools/libs/evtchn/netbsd.c @@ -34,9 +34,12 @@ int osdep_evtchn_open(xenevtchn_handle *xce) { int fd = open(EVTCHN_DEV_NAME, O_NONBLOCK|O_RDWR); + if ( fd == -1 ) return -1; + xce->fd = fd; + return 0; } @@ -51,6 +54,7 @@ int osdep_evtchn_close(xenevtchn_handle *xce) int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid) { errno = -EOPNOTSUPP; + return -1; } @@ -69,7 +73,8 @@ int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port) return ioctl(fd, IOCTL_EVTCHN_NOTIFY, ¬ify); } -xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle * xce, uint32_t domid) +xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, + uint32_t domid) { int fd = xce->fd; struct ioctl_evtchn_bind_unbound_port bind; @@ -78,14 +83,15 @@ xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle * xce, ui bind.remote_domain = domid; ret = ioctl(fd, IOCTL_EVTCHN_BIND_UNBOUND_PORT, &bind); - if (ret == 0) + if ( ret == 0 ) return bind.port; else return -1; } -xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint32_t domid, - evtchn_port_t remote_port) +xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, + uint32_t domid, + evtchn_port_t remote_port) { int fd = xce->fd; struct ioctl_evtchn_bind_interdomain bind; @@ -95,7 +101,7 @@ xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint bind.remote_port = remote_port; ret = ioctl(fd, IOCTL_EVTCHN_BIND_INTERDOMAIN, &bind); - if (ret == 0) + if ( ret == 0 ) return bind.port; else return -1; @@ -111,7 +117,8 @@ int xenevtchn_unbind(xenevtchn_handle *xce, evtchn_port_t port) return ioctl(fd, IOCTL_EVTCHN_UNBIND, &unbind); } -xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned int virq) +xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, + unsigned int virq) { int fd = xce->fd; struct ioctl_evtchn_bind_virq bind; @@ -120,7 +127,7 @@ xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned in bind.virq = virq; err = ioctl(fd, IOCTL_EVTCHN_BIND_VIRQ, &bind); - if (err) + if ( err ) return -1; else return bind.port; @@ -140,6 +147,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port) { int fd = xce->fd; + return write_exact(fd, (char *)&port, sizeof(port)); } diff --git a/tools/libs/evtchn/solaris.c b/tools/libs/evtchn/solaris.c index dd41f62a24..d87abc553c 100644 --- a/tools/libs/evtchn/solaris.c +++ b/tools/libs/evtchn/solaris.c @@ -72,7 +72,8 @@ int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port) return ioctl(fd, IOCTL_EVTCHN_NOTIFY, ¬ify); } -xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uint32_t domid) +xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, + uint32_t domid) { int fd = xce->fd; struct ioctl_evtchn_bind_unbound_port bind; @@ -82,8 +83,9 @@ xenevtchn_port_or_error_t xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uin return ioctl(fd, IOCTL_EVTCHN_BIND_UNBOUND_PORT, &bind); } -xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint32_t domid, - evtchn_port_t remote_port) +xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, + uint32_t domid, + evtchn_port_t remote_port) { int fd = xce->fd; struct ioctl_evtchn_bind_interdomain bind; @@ -94,7 +96,8 @@ xenevtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint return ioctl(fd, IOCTL_EVTCHN_BIND_INTERDOMAIN, &bind); } -xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned int virq) +xenevtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle *xce, + unsigned int virq) { int fd = xce->fd; struct ioctl_evtchn_bind_virq bind; @@ -128,6 +131,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port) { int fd = xce->fd; + return write_exact(fd, (char *)&port, sizeof(port)); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 02:55:43 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 02:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68901.123483 (Exim 4.92) (envelope-from ) id 1l0bkd-00025c-EQ; Sat, 16 Jan 2021 02:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68901.123483; Sat, 16 Jan 2021 02: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 1l0bkd-00025U-BG; Sat, 16 Jan 2021 02:55:43 +0000 Received: by outflank-mailman (input) for mailman id 68901; Sat, 16 Jan 2021 02:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bkc-00025M-Qe for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bkc-0000ou-Px for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0bkc-0005BR-P8 for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02: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=mF1BEakfxOWmnvYKNTVpPVu26cz3XK/M+Mfu7mudjbQ=; b=HAFmx9+GfLFPLSiX0H3qCPulzd gWlHstpflylaBsuz1hYimpWmC/P/7rwKevd1SaEPobfDc80SqtywWYXt7eq9BHrUm9MC7zsiqPBID 9oE+UAaK5EyJRNh5FcgX1ug0g/zAefWPfVZpZiMiDCTAn1xewzz/E1wJyYXqQWK5PnJw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxenevtchn: rename open_flags to flags Message-Id: Date: Sat, 16 Jan 2021 02:55:42 +0000 commit 1997d379dc64a8b86e74a380b8d7b1d43012f440 Author: Juergen Gross AuthorDate: Fri Jan 15 09:29:35 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 11:44:47 2021 +0000 tools/libxenevtchn: rename open_flags to flags Rename the xenevtchn_open() parameter open_flags to flags as it might be used for things not passed on to open(). No functional change. No API/ABI changes. Suggested-by: Andrew Cooper Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper --- tools/include/xenevtchn.h | 2 +- tools/libs/evtchn/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/include/xenevtchn.h b/tools/include/xenevtchn.h index 91821ee56d..3e9b6e7323 100644 --- a/tools/include/xenevtchn.h +++ b/tools/include/xenevtchn.h @@ -67,7 +67,7 @@ struct xentoollog_logger; */ /* Currently no flags are defined */ xenevtchn_handle *xenevtchn_open(struct xentoollog_logger *logger, - unsigned open_flags); + unsigned int flags); /* * Close a handle previously allocated with xenevtchn_open(). diff --git a/tools/libs/evtchn/core.c b/tools/libs/evtchn/core.c index 8090d0ce87..72d92e28bf 100644 --- a/tools/libs/evtchn/core.c +++ b/tools/libs/evtchn/core.c @@ -29,7 +29,7 @@ static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) return xenevtchn_restrict(xce, domid); } -xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned open_flags) +xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) { xenevtchn_handle *xce = malloc(sizeof(*xce)); int rc; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 02:55:53 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 02:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68902.123487 (Exim 4.92) (envelope-from ) id 1l0bkn-00026u-G0; Sat, 16 Jan 2021 02:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68902.123487; Sat, 16 Jan 2021 02:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bkn-00026m-Cx; Sat, 16 Jan 2021 02:55:53 +0000 Received: by outflank-mailman (input) for mailman id 68902; Sat, 16 Jan 2021 02:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bkm-00026g-UO for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bkm-0000p2-Sk for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0bkm-0005C1-Ry for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02: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=YUz3AbHUzppZG+bEnwsZv1q9opaq/gUktSrx3tfEAPo=; b=c9Fkv9mLT8n/0OOAQmYgGLgIAq 9OtWQxWp+mx7RktiUQifNRDK/hDaXb4XTGnHD9JqGT9lskg1O4JS0A0OBiqic/ui8dY6iMXnh2cmk jeMU9rTxbB9rkFMfr/aILQoz4Jf5p1DZhcYL0gNgxNhrjfxmWKFfMXf0AO1eS4mLFEOg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxenevtchn: check xenevtchn_open() flags for not supported bits Message-Id: Date: Sat, 16 Jan 2021 02:55:52 +0000 commit f7918dc8f94c1640ba18341d7812f5c461d064ce Author: Juergen Gross AuthorDate: Fri Jan 15 09:29:36 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 11:44:47 2021 +0000 tools/libxenevtchn: check xenevtchn_open() flags for not supported bits Refuse a call of xenevtchn_open() with unsupported bits in flags being set. This will change behavior for callers passing junk in flags today, but those would otherwise get probably unwanted side effects when the flags they specify today get any meaning. So checking flags is the right thing to do. Suggested-by: Andrew Cooper Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper --- tools/libs/evtchn/core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/libs/evtchn/core.c b/tools/libs/evtchn/core.c index 72d92e28bf..79990d0027 100644 --- a/tools/libs/evtchn/core.c +++ b/tools/libs/evtchn/core.c @@ -13,6 +13,7 @@ * License along with this library; If not, see . */ +#include #include #include @@ -31,9 +32,16 @@ static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) { - xenevtchn_handle *xce = malloc(sizeof(*xce)); + xenevtchn_handle *xce; int rc; + if ( flags ) + { + errno = EINVAL; + return NULL; + } + + xce = malloc(sizeof(*xce)); if ( !xce ) return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 02:56:03 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 02:56:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68903.123491 (Exim 4.92) (envelope-from ) id 1l0bkx-00028F-Hd; Sat, 16 Jan 2021 02:56:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68903.123491; Sat, 16 Jan 2021 02:56:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bkx-000287-EY; Sat, 16 Jan 2021 02:56:03 +0000 Received: by outflank-mailman (input) for mailman id 68903; Sat, 16 Jan 2021 02:56:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bkx-000282-14 for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:56:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bkx-0000pN-0H for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:56:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0bkw-0005Cw-Uu for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02: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=2dgmyeUQPUuFvkXRRCMfKOhBB/VoIst7r5EIelzkNWU=; b=Qim/vWzqFzGlGh0VnHjzWr8ElW lwH2bKi+rLtHiorGAfbAwpoIPjkDg4RdkyYTMWAdG+gu/bfC+beO9m4S3MovSa8eMEQGPauky1pxI R/j5tNKxEW8A44+YdS4ohofDDpB12imuH/GYSuc5I90b3dQFYP5uGt0Dw5tQ6Jf9NVy4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxenevtchn: propagate xenevtchn_open() flags parameter Message-Id: Date: Sat, 16 Jan 2021 02:56:02 +0000 commit 935e5fb0d5707d7356fb869bb83e27d11269558f Author: Juergen Gross AuthorDate: Fri Jan 15 09:29:37 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 11:44:47 2021 +0000 tools/libxenevtchn: propagate xenevtchn_open() flags parameter Propagate the flags parameter of xenevtchn_open() to the OS-specific handlers in order to enable handling them there. Signed-off-by: Juergen Gross Acked-by: Andrew Cooper --- tools/libs/evtchn/core.c | 2 +- tools/libs/evtchn/freebsd.c | 2 +- tools/libs/evtchn/linux.c | 2 +- tools/libs/evtchn/minios.c | 2 +- tools/libs/evtchn/netbsd.c | 2 +- tools/libs/evtchn/private.h | 2 +- tools/libs/evtchn/solaris.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/libs/evtchn/core.c b/tools/libs/evtchn/core.c index 79990d0027..d3cc93e98f 100644 --- a/tools/libs/evtchn/core.c +++ b/tools/libs/evtchn/core.c @@ -60,7 +60,7 @@ xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) goto err; } - rc = osdep_evtchn_open(xce); + rc = osdep_evtchn_open(xce, flags); if ( rc < 0 ) goto err; diff --git a/tools/libs/evtchn/freebsd.c b/tools/libs/evtchn/freebsd.c index 554af122c8..bb601f350f 100644 --- a/tools/libs/evtchn/freebsd.c +++ b/tools/libs/evtchn/freebsd.c @@ -31,7 +31,7 @@ #define EVTCHN_DEV "/dev/xen/evtchn" -int osdep_evtchn_open(xenevtchn_handle *xce) +int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { int fd = open(EVTCHN_DEV, O_RDWR|O_CLOEXEC); diff --git a/tools/libs/evtchn/linux.c b/tools/libs/evtchn/linux.c index 9aaeef0faf..56b4b50797 100644 --- a/tools/libs/evtchn/linux.c +++ b/tools/libs/evtchn/linux.c @@ -34,7 +34,7 @@ #define O_CLOEXEC 0 #endif -int osdep_evtchn_open(xenevtchn_handle *xce) +int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { int fd = open("/dev/xen/evtchn", O_RDWR|O_CLOEXEC); diff --git a/tools/libs/evtchn/minios.c b/tools/libs/evtchn/minios.c index b4e09bff3b..bd5b7f5e0d 100644 --- a/tools/libs/evtchn/minios.c +++ b/tools/libs/evtchn/minios.c @@ -69,7 +69,7 @@ static void port_dealloc(struct evtchn_port_info *port_info) free(port_info); } -int osdep_evtchn_open(xenevtchn_handle *xce) +int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { int fd = alloc_fd(FTYPE_EVTCHN); diff --git a/tools/libs/evtchn/netbsd.c b/tools/libs/evtchn/netbsd.c index 53f9299ebb..60a9235978 100644 --- a/tools/libs/evtchn/netbsd.c +++ b/tools/libs/evtchn/netbsd.c @@ -31,7 +31,7 @@ #define EVTCHN_DEV_NAME "/dev/xenevt" -int osdep_evtchn_open(xenevtchn_handle *xce) +int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { int fd = open(EVTCHN_DEV_NAME, O_NONBLOCK|O_RDWR); diff --git a/tools/libs/evtchn/private.h b/tools/libs/evtchn/private.h index 31e595bea2..319d1996d7 100644 --- a/tools/libs/evtchn/private.h +++ b/tools/libs/evtchn/private.h @@ -14,7 +14,7 @@ struct xenevtchn_handle { Xentoolcore__Active_Handle tc_ah; }; -int osdep_evtchn_open(xenevtchn_handle *xce); +int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags); int osdep_evtchn_close(xenevtchn_handle *xce); int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid); diff --git a/tools/libs/evtchn/solaris.c b/tools/libs/evtchn/solaris.c index d87abc553c..df9579df17 100644 --- a/tools/libs/evtchn/solaris.c +++ b/tools/libs/evtchn/solaris.c @@ -29,7 +29,7 @@ #include "private.h" -int osdep_evtchn_open(xenevtchn_handle *xce) +int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { int fd; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 02:56:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 02:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68904.123495 (Exim 4.92) (envelope-from ) id 1l0bl8-00029p-JT; Sat, 16 Jan 2021 02:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68904.123495; Sat, 16 Jan 2021 02:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bl8-00029h-GC; Sat, 16 Jan 2021 02:56:14 +0000 Received: by outflank-mailman (input) for mailman id 68904; Sat, 16 Jan 2021 02:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bl7-00029Z-4D for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0bl7-0000po-3N for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:56:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0bl7-0005Dn-2Y for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02: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=TRC1II69WvlO3k+1HlabSwjDrvL+jBBJncEssjpvrtY=; b=VqwXS/EETEujPIW62XzzjsVYg0 PlC8b7FhPq8ySlPZSRgol4+ual6lqm5QsEvNoBwq6j2NVavROUCwMNaeV9pVKLstcoSeuCEAUpUgi +w/0YAn1CPO6vC8Pl0dnjgjxGgJRDQuedOaslg48cNkQvZfCaoWuz0+zfSGFucOm5KYI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxenevtchn: add possibility to not close file descriptor on exec Message-Id: Date: Sat, 16 Jan 2021 02:56:13 +0000 commit 29a6082f21f2109935fd13eff4c9ce0093c2a26e Author: Juergen Gross AuthorDate: Fri Jan 15 09:29:38 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 11:44:47 2021 +0000 tools/libxenevtchn: add possibility to not close file descriptor on exec Today the file descriptor for the access of the event channel driver is being closed in case of exec(2). For the support of live update of a daemon using libxenevtchn this can be problematic, so add a way to keep that file descriptor open. Add support of a flag XENEVTCHN_NO_CLOEXEC for xenevtchn_open() which will result in _not_ setting O_CLOEXEC when opening the event channel driver node. The caller can then obtain the file descriptor via xenevtchn_fd(). Add an alternative open function xenevtchn_fdopen() which takes that file descriptor as an additional parameter. This allows to allocate a xenevtchn_handle and to associate it with that file descriptor. Signed-off-by: Juergen Gross Reviewed-by: Wei Liu Reviewed-by: Julien Grall --- tools/include/xenevtchn.h | 50 +++++++++++++++++++------------ tools/libs/evtchn/Makefile | 2 +- tools/libs/evtchn/core.c | 60 ++++++++++++++++++++++++++++---------- tools/libs/evtchn/freebsd.c | 7 ++++- tools/libs/evtchn/libxenevtchn.map | 4 +++ tools/libs/evtchn/linux.c | 7 ++++- tools/libs/evtchn/minios.c | 4 +++ 7 files changed, 97 insertions(+), 37 deletions(-) diff --git a/tools/include/xenevtchn.h b/tools/include/xenevtchn.h index 3e9b6e7323..1255c85178 100644 --- a/tools/include/xenevtchn.h +++ b/tools/include/xenevtchn.h @@ -42,35 +42,47 @@ struct xentoollog_logger; */ /* - * Return a handle to the event channel driver, or NULL on failure, in - * which case errno will be set appropriately. + * Opens the evtchn device node. Return a handle to the event channel + * driver, or NULL on failure, in which case errno will be set + * appropriately. * - * Note: After fork(2) a child process must not use any opened evtchn - * handle inherited from their parent, nor access any grant mapped - * areas associated with that handle. + * On fork(2): * - * The child must open a new handle if they want to interact with - * evtchn. + * After fork, a child process must not use any opened evtchn handle + * inherited from their parent. This includes operations such as + * poll() on the underlying file descriptor. Calling xenevtchn_close() + * is the only safe operation on a xenevtchn_handle which has been + * inherited. * - * Calling exec(2) in a child will safely (and reliably) reclaim any - * allocated resources via a xenevtchn_handle in the parent. + * The child must open a new handle if they want to interact with + * evtchn. * - * A child which does not call exec(2) may safely call - * xenevtchn_close() on a xenevtchn_handle inherited from their - * parent. This will attempt to reclaim any resources associated with - * that handle. Note that in some implementations this reclamation may - * not be completely effective, in this case any affected resources - * remain allocated. + * On exec(2): * - * Calling xenevtchn_close() is the only safe operation on a - * xenevtchn_handle which has been inherited. + * Wherever possible, the device node will be opened with O_CLOEXEC, + * so it is not inherited by the subsequent program. + * + * However the XENEVTCHN_NO_CLOEXEC flag may be used to avoid opening + * the device node with O_CLOEXEC. This is intended for use by + * daemons which support a self-reexec method of updating themselves. + * + * In this case, the updated daemon should pass the underlying file + * descriptor it inherited to xenevtchn_fdopen() to reconstruct the + * library handle. */ -/* Currently no flags are defined */ + +/* Don't set O_CLOEXEC when opening event channel driver node. */ +#define XENEVTCHN_NO_CLOEXEC (1 << 0) + xenevtchn_handle *xenevtchn_open(struct xentoollog_logger *logger, unsigned int flags); +/* Flag XENEVTCHN_NO_CLOEXEC is rejected by xenevtchn_fdopen(). */ +xenevtchn_handle *xenevtchn_fdopen(struct xentoollog_logger *logger, + int fd, unsigned open_flags); + /* - * Close a handle previously allocated with xenevtchn_open(). + * Close a handle previously allocated with xenevtchn_{,fd}open(). */ int xenevtchn_close(xenevtchn_handle *xce); diff --git a/tools/libs/evtchn/Makefile b/tools/libs/evtchn/Makefile index ad01a17b3d..b8c37b5b97 100644 --- a/tools/libs/evtchn/Makefile +++ b/tools/libs/evtchn/Makefile @@ -2,7 +2,7 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 -MINOR = 1 +MINOR = 2 SRCS-y += core.c SRCS-$(CONFIG_Linux) += linux.c diff --git a/tools/libs/evtchn/core.c b/tools/libs/evtchn/core.c index d3cc93e98f..c402d9393b 100644 --- a/tools/libs/evtchn/core.c +++ b/tools/libs/evtchn/core.c @@ -30,18 +30,10 @@ static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) return xenevtchn_restrict(xce, domid); } -xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) +static xenevtchn_handle *xenevtchn_alloc_handle(xentoollog_logger *logger) { - xenevtchn_handle *xce; - int rc; - - if ( flags ) - { - errno = EINVAL; - return NULL; - } + xenevtchn_handle *xce = malloc(sizeof(*xce)); - xce = malloc(sizeof(*xce)); if ( !xce ) return NULL; @@ -60,6 +52,28 @@ xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) goto err; } + return xce; + + err: + xenevtchn_close(xce); + return NULL; +} + +xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) +{ + xenevtchn_handle *xce; + int rc; + + if ( flags & ~XENEVTCHN_NO_CLOEXEC ) + { + errno = EINVAL; + return NULL; + } + + xce = xenevtchn_alloc_handle(logger); + if ( !xce ) + return NULL; + rc = osdep_evtchn_open(xce, flags); if ( rc < 0 ) goto err; @@ -67,14 +81,30 @@ xenevtchn_handle *xenevtchn_open(xentoollog_logger *logger, unsigned int flags) return xce; err: - xentoolcore__deregister_active_handle(&xce->tc_ah); - osdep_evtchn_close(xce); - xtl_logger_destroy(xce->logger_tofree); - free(xce); - + xenevtchn_close(xce); return NULL; } +xenevtchn_handle *xenevtchn_fdopen(struct xentoollog_logger *logger, + int fd, unsigned int flags) +{ + xenevtchn_handle *xce; + + if ( flags ) + { + errno = EINVAL; + return NULL; + } + + xce = xenevtchn_alloc_handle(logger); + if ( !xce ) + return NULL; + + xce->fd = fd; + + return xce; +} + int xenevtchn_close(xenevtchn_handle *xce) { int rc; diff --git a/tools/libs/evtchn/freebsd.c b/tools/libs/evtchn/freebsd.c index bb601f350f..7427ab2408 100644 --- a/tools/libs/evtchn/freebsd.c +++ b/tools/libs/evtchn/freebsd.c @@ -33,8 +33,13 @@ int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { - int fd = open(EVTCHN_DEV, O_RDWR|O_CLOEXEC); + int open_flags = O_RDWR; + int fd; + if ( !(flags & XENEVTCHN_NO_CLOEXEC) ) + open_flags |= O_CLOEXEC; + + fd = open(EVTCHN_DEV, open_flags); if ( fd == -1 ) return -1; diff --git a/tools/libs/evtchn/libxenevtchn.map b/tools/libs/evtchn/libxenevtchn.map index 33a38f953a..4c180ea65d 100644 --- a/tools/libs/evtchn/libxenevtchn.map +++ b/tools/libs/evtchn/libxenevtchn.map @@ -21,3 +21,7 @@ VERS_1.1 { global: xenevtchn_restrict; } VERS_1.0; +VERS_1.2 { + global: + xenevtchn_fdopen; +} VERS_1.1; diff --git a/tools/libs/evtchn/linux.c b/tools/libs/evtchn/linux.c index 56b4b50797..f27b6def39 100644 --- a/tools/libs/evtchn/linux.c +++ b/tools/libs/evtchn/linux.c @@ -36,8 +36,13 @@ int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { - int fd = open("/dev/xen/evtchn", O_RDWR|O_CLOEXEC); + int open_flags = O_RDWR; + int fd; + if ( !(flags & XENEVTCHN_NO_CLOEXEC) ) + open_flags |= O_CLOEXEC; + + fd = open("/dev/xen/evtchn", open_flags); if ( fd == -1 ) return -1; diff --git a/tools/libs/evtchn/minios.c b/tools/libs/evtchn/minios.c index bd5b7f5e0d..e5dfdc5ef5 100644 --- a/tools/libs/evtchn/minios.c +++ b/tools/libs/evtchn/minios.c @@ -69,6 +69,10 @@ static void port_dealloc(struct evtchn_port_info *port_info) free(port_info); } +/* + * XENEVTCHN_NO_CLOEXEC is being ignored, as there is no exec() call supported + * in Mini-OS. + */ int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) { int fd = alloc_fd(FTYPE_EVTCHN); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 02:56:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 02:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.68905.123498 (Exim 4.92) (envelope-from ) id 1l0blI-0002B8-Kj; Sat, 16 Jan 2021 02:56:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68905.123498; Sat, 16 Jan 2021 02:56:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0blI-0002B0-Hi; Sat, 16 Jan 2021 02:56:24 +0000 Received: by outflank-mailman (input) for mailman id 68905; Sat, 16 Jan 2021 02:56:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0blH-0002Ap-78 for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:56:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0blH-0000pw-6J for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02:56:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0blH-0005EU-5W for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 02: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=fr+JU1txeVZlGtqkCKqBm+RepkfMVk8wez8mGuorrns=; b=A6L8lMBVpgyyWHEbh+SRVYZxIN YGsvvhk0onsf8F/uR5EbMVFHDbDgV+iSU9/BKY0HB0anbBnN8jdFCuyAlMZV7o9JVBFiCblbL7Oxq sAenK7x3e7v+3d9c9X/LN+/VxwRRepcuddM5Wj7r4finXds55se3qk3XkQXVCDYrT2Us=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs: update the xenstore migration stream documentation Message-Id: Date: Sat, 16 Jan 2021 02:56:23 +0000 commit 8868a0e3f67436a5fbee750624e24a6533357f52 Author: Juergen Gross AuthorDate: Fri Jan 15 09:29:48 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 11:44:47 2021 +0000 docs: update the xenstore migration stream documentation For live update of Xenstore some records defined in the migration stream document need to be changed: - Support of the read-only socket has been dropped from all Xenstore implementations, so ro-socket-fd in the global record can be removed. - Some guests require the event channel to Xenstore to remain the same on Xenstore side, so Xenstore has to keep the event channel interface open across a live update. For this purpose an evtchn-fd needs to be added to the global record. - With no read-only support the flags field in the connection record can be dropped. - The evtchn field in the connection record needs to be switched to hold the port of the Xenstore side of the event channel. - A flags field needs to be added to permission specifiers in order to be able to mark a permission as stale (XSA-322). Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- docs/designs/xenstore-migration.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/designs/xenstore-migration.md b/docs/designs/xenstore-migration.md index 2ce2c836f5..1a5b94b31d 100644 --- a/docs/designs/xenstore-migration.md +++ b/docs/designs/xenstore-migration.md @@ -116,7 +116,7 @@ xenstored state that needs to be restored. +-------+-------+-------+-------+ | rw-socket-fd | +-------------------------------+ -| ro-socket-fd | +| evtchn-fd | +-------------------------------+ ``` @@ -126,8 +126,8 @@ xenstored state that needs to be restored. | `rw-socket-fd` | The file descriptor of the socket accepting | | | read-write connections | | | | -| `ro-socket-fd` | The file descriptor of the socket accepting | -| | read-only connections | +| `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 @@ -147,7 +147,7 @@ the domain being migrated. ``` 0 1 2 3 4 5 6 7 octet +-------+-------+-------+-------+-------+-------+-------+-------+ -| conn-id | conn-type | flags | +| conn-id | conn-type | | +-------------------------------+---------------+---------------+ | conn-spec ... @@ -169,9 +169,6 @@ the domain being migrated. | | 0x0001: socket | | | 0x0002 - 0xFFFF: reserved for future use | | | | -| `flags` | A bit-wise OR of: | -| | 0001: read-only | -| | | | `conn-spec` | See below | | | | | `in-data-len` | The length (in octets) of any data read | @@ -216,7 +213,7 @@ For `shared ring` connections it is as follows: | | operation [2] or DOMID_INVALID [3] otherwise | | | | | `evtchn` | The port number of the interdomain channel used | -| | by `domid` to communicate with xenstored | +| | by xenstored to communicate with `domid` | | | | Since the ABI guarantees that entry 1 in `domid`'s grant table will always @@ -386,7 +383,7 @@ A node permission specifier has the following format: ``` 0 1 2 3 octet +-------+-------+-------+-------+ -| perm | pad | domid | +| perm | flags | domid | +-------+-------+---------------+ ``` @@ -395,6 +392,10 @@ A node permission specifier has the following format: | `perm` | One of the ASCII values `w`, `r`, `b` or `n` as | | | specified for the `SET_PERMS` operation [2] | | | | +| `flags` | A bit-wise OR of: | +| | 0x01: stale permission, ignore when checking | +| | permissions | +| | | | `domid` | The domain-id to which the permission relates | Note that perm1 defines the domain owning the code. See [4] for more -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 14:00:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 14:00:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69019.123699 (Exim 4.92) (envelope-from ) id 1l0m7X-00017E-N1; Sat, 16 Jan 2021 14:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69019.123699; Sat, 16 Jan 2021 14: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 1l0m7X-000175-IU; Sat, 16 Jan 2021 14:00:03 +0000 Received: by outflank-mailman (input) for mailman id 69019; Sat, 16 Jan 2021 14:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0m7W-000117-Ml for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0m7W-0004Wi-L4 for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0m7W-0006Xy-JZ for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14: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=65i5Ce7XSs7S08oQAOn3F5bOvVL6EEvDEAL7keJv2Hc=; b=xRXJBB4vI5bTT3I/Xzt7Krzg5U i2K3jXZKrH2w3gR4QGXIbT2A11fE0r8D+59wcTUIHFrM/UPDUru8AZ4UeDEruD8SsKOAoekOtSSL0 pILH/oQduljK8klcWCP+0uaHsvGp65A7OVPXsZMNnHdnpZjZOssvMtzXf5MO/ztGFGv4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] include: don't use asm/page.h from common headers Message-Id: Date: Sat, 16 Jan 2021 14:00:02 +0000 commit aa4b9d1ee6538b5cbe218d4d3fcdf9548130a063 Author: Jan Beulich AuthorDate: Fri Jan 15 16:02:13 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 15 16:02:13 2021 +0100 include: don't use asm/page.h from common headers Doing so limits what can be done in (in particular included by) this per- arch header. Abstract out page shift/size related #define-s, which is all the respective headers care about. Extend the replacement / removal to some x86 headers as well; some others now need to include page.h (and they really should have before). Arm's VADDR_BITS gets dropped altogether: Its current value is clearly wrong for 64-bit, but the constant also isn't used anywhere right now. While Arm used vaddr_t in PAGE_OFFSET(), this use is compatible with that of unsigned long in the new common implementation. Also drop the dead PAGE_FLAG_MASK at this occasion. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/arm64/lib/clear_page.S | 2 ++ xen/include/asm-arm/config.h | 5 ----- xen/include/asm-arm/current.h | 1 + xen/include/asm-arm/page-bits.h | 12 ++++++++++++ xen/include/asm-arm/page.h | 12 +----------- xen/include/asm-x86/current.h | 2 +- xen/include/asm-x86/desc.h | 2 ++ xen/include/asm-x86/fixmap.h | 2 +- xen/include/asm-x86/guest/hyperv-hcall.h | 2 +- xen/include/asm-x86/guest/hyperv-tlfs.h | 2 +- xen/include/asm-x86/io.h | 1 - xen/include/asm-x86/mm.h | 1 + xen/include/asm-x86/page-bits.h | 26 ++++++++++++++++++++++++++ xen/include/asm-x86/page.h | 10 +--------- xen/include/asm-x86/uaccess.h | 1 - xen/include/asm-x86/x86_64/page.h | 23 ----------------------- xen/include/xen/gdbstub.h | 2 +- xen/include/xen/grant_table.h | 1 - xen/include/xen/page-size.h | 18 ++++++++++++++++++ xen/include/xen/pfn.h | 2 +- xen/include/xen/vmap.h | 2 +- 21 files changed, 71 insertions(+), 58 deletions(-) diff --git a/xen/arch/arm/arm64/lib/clear_page.S b/xen/arch/arm/arm64/lib/clear_page.S index 9f8a680e18..a767e63686 100644 --- a/xen/arch/arm/arm64/lib/clear_page.S +++ b/xen/arch/arm/arm64/lib/clear_page.S @@ -14,6 +14,8 @@ * along with this program. If not, see . */ +#include + /* * Clear page @dest * diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index fbb4b23a69..5c10c755db 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -176,11 +176,6 @@ #define FIXMAP_ACPI_BEGIN 2 /* Start mappings of ACPI tables */ #define FIXMAP_ACPI_END (FIXMAP_ACPI_BEGIN + NUM_FIXMAP_ACPI_PAGES - 1) /* End mappings of ACPI tables */ -#define PAGE_SHIFT 12 -#define PAGE_SIZE (_AC(1,L) << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) -#define PAGE_FLAG_MASK (~0) - #define NR_hypercalls 64 #define STACK_ORDER 3 diff --git a/xen/include/asm-arm/current.h b/xen/include/asm-arm/current.h index e7fbf535d2..73e81458e5 100644 --- a/xen/include/asm-arm/current.h +++ b/xen/include/asm-arm/current.h @@ -1,6 +1,7 @@ #ifndef __ARM_CURRENT_H__ #define __ARM_CURRENT_H__ +#include #include #include diff --git a/xen/include/asm-arm/page-bits.h b/xen/include/asm-arm/page-bits.h new file mode 100644 index 0000000000..5d6477e599 --- /dev/null +++ b/xen/include/asm-arm/page-bits.h @@ -0,0 +1,12 @@ +#ifndef __ARM_PAGE_SHIFT_H__ +#define __ARM_PAGE_SHIFT_H__ + +#define PAGE_SHIFT 12 + +#ifdef CONFIG_ARM_64 +#define PADDR_BITS 48 +#else +#define PADDR_BITS 40 +#endif + +#endif /* __ARM_PAGE_SHIFT_H__ */ diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 4ea8e97247..131507a517 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -2,21 +2,11 @@ #define __ARM_PAGE_H__ #include +#include #include #include #include -#ifdef CONFIG_ARM_64 -#define PADDR_BITS 48 -#else -#define PADDR_BITS 40 -#endif -#define PADDR_MASK ((1ULL << PADDR_BITS)-1) -#define PAGE_OFFSET(ptr) ((vaddr_t)(ptr) & ~PAGE_MASK) - -#define VADDR_BITS 32 -#define VADDR_MASK (~0UL) - /* Shareability values for the LPAE entries */ #define LPAE_SH_NON_SHAREABLE 0x0 #define LPAE_SH_UNPREDICTALE 0x1 diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index 5d690ce014..a74ad4bc4c 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -8,8 +8,8 @@ #define __X86_CURRENT_H__ #include +#include #include -#include /* * Xen's cpu stacks are 8 pages (8-page aligned), arranged as: diff --git a/xen/include/asm-x86/desc.h b/xen/include/asm-x86/desc.h index dfa643925f..225a864c48 100644 --- a/xen/include/asm-x86/desc.h +++ b/xen/include/asm-x86/desc.h @@ -1,6 +1,8 @@ #ifndef __ARCH_DESC_H #define __ARCH_DESC_H +#include + /* * Xen reserves a memory page of GDT entries. * No guest GDT entries exist beyond the Xen reserved area. diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 83b2b7634d..0db314baeb 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -12,7 +12,7 @@ #ifndef _ASM_FIXMAP_H #define _ASM_FIXMAP_H -#include +#include #define FIXADDR_TOP (VMAP_VIRT_END - PAGE_SIZE) #define FIXADDR_X_TOP (XEN_VIRT_END - PAGE_SIZE) diff --git a/xen/include/asm-x86/guest/hyperv-hcall.h b/xen/include/asm-x86/guest/hyperv-hcall.h index 4d3b131b3a..423ca0860b 100644 --- a/xen/include/asm-x86/guest/hyperv-hcall.h +++ b/xen/include/asm-x86/guest/hyperv-hcall.h @@ -20,12 +20,12 @@ #define __X86_HYPERV_HCALL_H__ #include +#include #include #include #include #include -#include static inline uint64_t hv_do_hypercall(uint64_t control, paddr_t input_addr, paddr_t output_addr) diff --git a/xen/include/asm-x86/guest/hyperv-tlfs.h b/xen/include/asm-x86/guest/hyperv-tlfs.h index 0a0f3398c1..03b71af82f 100644 --- a/xen/include/asm-x86/guest/hyperv-tlfs.h +++ b/xen/include/asm-x86/guest/hyperv-tlfs.h @@ -10,8 +10,8 @@ #define _ASM_X86_HYPERV_TLFS_H #include +#include #include -#include /* * While not explicitly listed in the TLFS, Hyper-V always runs with a page size diff --git a/xen/include/asm-x86/io.h b/xen/include/asm-x86/io.h index 5afe68239d..82ca7d47f4 100644 --- a/xen/include/asm-x86/io.h +++ b/xen/include/asm-x86/io.h @@ -3,7 +3,6 @@ #include #include -#include #define readb(x) (*(volatile uint8_t *)(x)) #define readw(x) (*(volatile uint16_t *)(x)) diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index deeba75a1c..1fdb4eb835 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include diff --git a/xen/include/asm-x86/page-bits.h b/xen/include/asm-x86/page-bits.h new file mode 100644 index 0000000000..6f7fc7d035 --- /dev/null +++ b/xen/include/asm-x86/page-bits.h @@ -0,0 +1,26 @@ +#ifndef __X86_PAGE_SHIFT_H__ +#define __X86_PAGE_SHIFT_H__ + +#define L1_PAGETABLE_SHIFT 12 +#define L2_PAGETABLE_SHIFT 21 +#define L3_PAGETABLE_SHIFT 30 +#define L4_PAGETABLE_SHIFT 39 +#define PAGE_SHIFT L1_PAGETABLE_SHIFT +#define SUPERPAGE_SHIFT L2_PAGETABLE_SHIFT +#define ROOT_PAGETABLE_SHIFT L4_PAGETABLE_SHIFT + +#define PAGETABLE_ORDER 9 +#define L1_PAGETABLE_ENTRIES (1 << PAGETABLE_ORDER) +#define L2_PAGETABLE_ENTRIES (1 << PAGETABLE_ORDER) +#define L3_PAGETABLE_ENTRIES (1 << PAGETABLE_ORDER) +#define L4_PAGETABLE_ENTRIES (1 << PAGETABLE_ORDER) +#define ROOT_PAGETABLE_ENTRIES L4_PAGETABLE_ENTRIES + +#define SUPERPAGE_ORDER PAGETABLE_ORDER +#define SUPERPAGE_PAGES (1 << SUPERPAGE_ORDER) + +/* These are architectural limits. */ +#define PADDR_BITS 52 +#define VADDR_BITS 48 + +#endif /* __X86_PAGE_SHIFT_H__ */ diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 082c14a662..4c7f2cb70c 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -2,15 +2,7 @@ #define __X86_PAGE_H__ #include - -/* - * It is important that the masks are signed quantities. This ensures that - * the compiler sign-extends a 32-bit mask to 64 bits if that is required. - */ -#define PAGE_SIZE (_AC(1,L) << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) -#define PAGE_FLAG_MASK (~0) -#define PAGE_OFFSET(ptr) ((unsigned long)(ptr) & ~PAGE_MASK) +#include #define PAGE_ORDER_4K 0 #define PAGE_ORDER_2M 9 diff --git a/xen/include/asm-x86/uaccess.h b/xen/include/asm-x86/uaccess.h index 3501038077..8411fb9586 100644 --- a/xen/include/asm-x86/uaccess.h +++ b/xen/include/asm-x86/uaccess.h @@ -6,7 +6,6 @@ #include #include #include -#include #include diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index 60db28f4e7..f9faf7f383 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -2,31 +2,8 @@ #ifndef __X86_64_PAGE_H__ #define __X86_64_PAGE_H__ -#define L1_PAGETABLE_SHIFT 12 -#define L2_PAGETABLE_SHIFT 21 -#define L3_PAGETABLE_SHIFT 30 -#define L4_PAGETABLE_SHIFT 39 -#define PAGE_SHIFT L1_PAGETABLE_SHIFT -#define SUPERPAGE_SHIFT L2_PAGETABLE_SHIFT -#define ROOT_PAGETABLE_SHIFT L4_PAGETABLE_SHIFT - -#define PAGETABLE_ORDER 9 -#define L1_PAGETABLE_ENTRIES (1< #include -#include #ifdef CONFIG_CRASH_DEBUG diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 98603604b8..cb5d325da8 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -26,7 +26,6 @@ #include #include #include -#include #include #ifdef CONFIG_GRANT_TABLE diff --git a/xen/include/xen/page-size.h b/xen/include/xen/page-size.h new file mode 100644 index 0000000000..dc5ade107b --- /dev/null +++ b/xen/include/xen/page-size.h @@ -0,0 +1,18 @@ +#ifndef __XEN_PAGE_SIZE_H__ +#define __XEN_PAGE_SIZE_H__ + +#include +#include + +/* + * It is important that the masks are signed quantities. This ensures that + * the compiler sign-extends a 32-bit mask to 64 bits if that is required. + */ +#define PAGE_SIZE (_AC(1,L) << PAGE_SHIFT) +#define PAGE_MASK (~(PAGE_SIZE-1)) +#define PAGE_OFFSET(ptr) ((unsigned long)(ptr) & ~PAGE_MASK) + +#define PADDR_MASK ((_AC(1,ULL) << PADDR_BITS) - 1) +#define VADDR_MASK (~_AC(0,UL) >> (BITS_PER_LONG - VADDR_BITS)) + +#endif /* __XEN_PAGE_SIZE__ */ diff --git a/xen/include/xen/pfn.h b/xen/include/xen/pfn.h index 24a4c2ff7c..1ca9b095e0 100644 --- a/xen/include/xen/pfn.h +++ b/xen/include/xen/pfn.h @@ -1,7 +1,7 @@ #ifndef __XEN_PFN_H__ #define __XEN_PFN_H__ -#include +#include #define PFN_DOWN(x) ((x) >> PAGE_SHIFT) #define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index 369560e620..eb9eed3ba2 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -2,7 +2,7 @@ #define __XEN_VMAP_H__ #include -#include +#include enum vmap_region { VMAP_DEFAULT, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 14:00:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 14:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69020.123701 (Exim 4.92) (envelope-from ) id 1l0m7h-0001a0-N7; Sat, 16 Jan 2021 14:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69020.123701; Sat, 16 Jan 2021 14: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 1l0m7h-0001Zt-KC; Sat, 16 Jan 2021 14:00:13 +0000 Received: by outflank-mailman (input) for mailman id 69020; Sat, 16 Jan 2021 14:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0m7g-0001Zn-PR for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0m7g-0004Wq-OY for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0m7g-0006Ze-NV for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14: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=L9yDI2mceHOxrIkZfg7MeWddVBpDGG73JkDrR2wUqfI=; b=4RYssqn0j1mRoNZSzHnKgBKdIV xmrpTLL8dyDAoE1qwmqomW3N0080GLz4u3/8f1U3MhFg14v30yuQlnfVYwbRNczzrHh6omlEclyUh /He4Mff2Q797S0gX6VR0Xgw4el57399D2Uq4FN0fIzDs+lmSiLhi5FljcFA+1OYLCtRk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] mm: split out mfn_t / gfn_t / pfn_t definitions and helpers Message-Id: Date: Sat, 16 Jan 2021 14:00:12 +0000 commit ced9795c6cb4165b6d231a732e5351933dbd8b38 Author: Jan Beulich AuthorDate: Fri Jan 15 16:03:56 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 15 16:03:56 2021 +0100 mm: split out mfn_t / gfn_t / pfn_t definitions and helpers xen/mm.h has heavy dependencies, while in a number of cases only these type definitions are needed. This separation then also allows pulling in these definitions when including xen/mm.h would cause cyclic dependencies. Replace xen/mm.h inclusion where possible in include/xen/. (In xen/iommu.h also take the opportunity and correct the few remaining sorting issues.) While the change could be dropped, remove an unnecessary asm/io.h inclusion from xen/arch/x86/acpi/power.c. This was the initial attempt to address build issues with it, until it became clear that the header itself needs adjustment. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/x86/acpi/power.c | 1 - xen/drivers/char/meson-uart.c | 2 + xen/drivers/char/mvebu-uart.c | 2 + xen/include/asm-x86/io.h | 1 + xen/include/xen/grant_table.h | 2 +- xen/include/xen/iommu.h | 7 ++-- xen/include/xen/mm-frame.h | 96 +++++++++++++++++++++++++++++++++++++++++++ xen/include/xen/mm.h | 92 +---------------------------------------- xen/include/xen/p2m-common.h | 2 +- xen/include/xen/vmap.h | 2 +- 10 files changed, 108 insertions(+), 99 deletions(-) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index ad9b8733f3..91a8c4d0bd 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -10,7 +10,6 @@ * Slimmed with Xen specific support. */ -#include #include #include #include diff --git a/xen/drivers/char/meson-uart.c b/xen/drivers/char/meson-uart.c index 3174a6571f..b1e25e0468 100644 --- a/xen/drivers/char/meson-uart.c +++ b/xen/drivers/char/meson-uart.c @@ -18,7 +18,9 @@ * License along with this program; If not, see . */ +#include #include +#include #include #include #include diff --git a/xen/drivers/char/mvebu-uart.c b/xen/drivers/char/mvebu-uart.c index 248f4e91be..835d1ace3c 100644 --- a/xen/drivers/char/mvebu-uart.c +++ b/xen/drivers/char/mvebu-uart.c @@ -18,7 +18,9 @@ * License along with this program; If not, see . */ +#include #include +#include #include #include #include diff --git a/xen/include/asm-x86/io.h b/xen/include/asm-x86/io.h index 82ca7d47f4..92b784a861 100644 --- a/xen/include/asm-x86/io.h +++ b/xen/include/asm-x86/io.h @@ -49,6 +49,7 @@ __OUT(l,,int) /* Function pointer used to handle platform specific I/O port emulation. */ #define IOEMUL_QUIRK_STUB_BYTES 9 +struct cpu_user_regs; extern unsigned int (*ioemul_handle_quirk)( u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs); diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index cb5d325da8..8876f1f28e 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -23,7 +23,7 @@ #ifndef __XEN_GRANT_TABLE_H__ #define __XEN_GRANT_TABLE_H__ -#include +#include #include #include #include diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index f0295fd6c3..863a68fe16 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -19,14 +19,13 @@ #ifndef _IOMMU_H_ #define _IOMMU_H_ +#include #include #include -#include #include -#include -#include -#include +#include #include +#include #include TYPE_SAFE(uint64_t, dfn); diff --git a/xen/include/xen/mm-frame.h b/xen/include/xen/mm-frame.h new file mode 100644 index 0000000000..f3b1dac3d6 --- /dev/null +++ b/xen/include/xen/mm-frame.h @@ -0,0 +1,96 @@ +#ifndef __XEN_FRAME_NUM_H__ +#define __XEN_FRAME_NUM_H__ + +#include +#include + +TYPE_SAFE(unsigned long, mfn); +#define PRI_mfn "05lx" +#define INVALID_MFN _mfn(~0UL) +/* + * To be used for global variable initialization. This workaround a bug + * in GCC < 5.0. + */ +#define INVALID_MFN_INITIALIZER { ~0UL } + +#ifndef mfn_t +#define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above */ +#define _mfn +#define mfn_x +#undef mfn_t +#undef _mfn +#undef mfn_x +#endif + +static inline mfn_t mfn_add(mfn_t mfn, unsigned long i) +{ + return _mfn(mfn_x(mfn) + i); +} + +static inline mfn_t mfn_max(mfn_t x, mfn_t y) +{ + return _mfn(max(mfn_x(x), mfn_x(y))); +} + +static inline mfn_t mfn_min(mfn_t x, mfn_t y) +{ + return _mfn(min(mfn_x(x), mfn_x(y))); +} + +static inline bool_t mfn_eq(mfn_t x, mfn_t y) +{ + return mfn_x(x) == mfn_x(y); +} + +TYPE_SAFE(unsigned long, gfn); +#define PRI_gfn "05lx" +#define INVALID_GFN _gfn(~0UL) +/* + * To be used for global variable initialization. This workaround a bug + * in GCC < 5.0 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64856 + */ +#define INVALID_GFN_INITIALIZER { ~0UL } + +#ifndef gfn_t +#define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above */ +#define _gfn +#define gfn_x +#undef gfn_t +#undef _gfn +#undef gfn_x +#endif + +static inline gfn_t gfn_add(gfn_t gfn, unsigned long i) +{ + return _gfn(gfn_x(gfn) + i); +} + +static inline gfn_t gfn_max(gfn_t x, gfn_t y) +{ + return _gfn(max(gfn_x(x), gfn_x(y))); +} + +static inline gfn_t gfn_min(gfn_t x, gfn_t y) +{ + return _gfn(min(gfn_x(x), gfn_x(y))); +} + +static inline bool_t gfn_eq(gfn_t x, gfn_t y) +{ + return gfn_x(x) == gfn_x(y); +} + +TYPE_SAFE(unsigned long, pfn); +#define PRI_pfn "05lx" +#define INVALID_PFN (~0UL) + +#ifndef pfn_t +#define pfn_t /* Grep fodder: pfn_t, _pfn() and pfn_x() are defined above */ +#define _pfn +#define pfn_x +#undef pfn_t +#undef _pfn +#undef pfn_x +#endif + +#endif /* __XEN_FRAME_NUM_H__ */ diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index e62a5b726e..636a1254ae 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -51,103 +51,13 @@ #define __XEN_MM_H__ #include +#include #include #include #include -#include -#include #include #include -TYPE_SAFE(unsigned long, mfn); -#define PRI_mfn "05lx" -#define INVALID_MFN _mfn(~0UL) -/* - * To be used for global variable initialization. This workaround a bug - * in GCC < 5.0. - */ -#define INVALID_MFN_INITIALIZER { ~0UL } - -#ifndef mfn_t -#define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above */ -#define _mfn -#define mfn_x -#undef mfn_t -#undef _mfn -#undef mfn_x -#endif - -static inline mfn_t mfn_add(mfn_t mfn, unsigned long i) -{ - return _mfn(mfn_x(mfn) + i); -} - -static inline mfn_t mfn_max(mfn_t x, mfn_t y) -{ - return _mfn(max(mfn_x(x), mfn_x(y))); -} - -static inline mfn_t mfn_min(mfn_t x, mfn_t y) -{ - return _mfn(min(mfn_x(x), mfn_x(y))); -} - -static inline bool_t mfn_eq(mfn_t x, mfn_t y) -{ - return mfn_x(x) == mfn_x(y); -} - -TYPE_SAFE(unsigned long, gfn); -#define PRI_gfn "05lx" -#define INVALID_GFN _gfn(~0UL) -/* - * To be used for global variable initialization. This workaround a bug - * in GCC < 5.0 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64856 - */ -#define INVALID_GFN_INITIALIZER { ~0UL } - -#ifndef gfn_t -#define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above */ -#define _gfn -#define gfn_x -#undef gfn_t -#undef _gfn -#undef gfn_x -#endif - -static inline gfn_t gfn_add(gfn_t gfn, unsigned long i) -{ - return _gfn(gfn_x(gfn) + i); -} - -static inline gfn_t gfn_max(gfn_t x, gfn_t y) -{ - return _gfn(max(gfn_x(x), gfn_x(y))); -} - -static inline gfn_t gfn_min(gfn_t x, gfn_t y) -{ - return _gfn(min(gfn_x(x), gfn_x(y))); -} - -static inline bool_t gfn_eq(gfn_t x, gfn_t y) -{ - return gfn_x(x) == gfn_x(y); -} - -TYPE_SAFE(unsigned long, pfn); -#define PRI_pfn "05lx" -#define INVALID_PFN (~0UL) - -#ifndef pfn_t -#define pfn_t /* Grep fodder: pfn_t, _pfn() and pfn_x() are defined above */ -#define _pfn -#define pfn_x -#undef pfn_t -#undef _pfn -#undef pfn_x -#endif - struct page_info; void put_page(struct page_info *); diff --git a/xen/include/xen/p2m-common.h b/xen/include/xen/p2m-common.h index 58031a6ea8..3753bc0b05 100644 --- a/xen/include/xen/p2m-common.h +++ b/xen/include/xen/p2m-common.h @@ -1,7 +1,7 @@ #ifndef _XEN_P2M_COMMON_H #define _XEN_P2M_COMMON_H -#include +#include /* Remove a page from a domain's p2m table */ int __must_check diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index eb9eed3ba2..b0f7632e89 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -1,7 +1,7 @@ #if !defined(__XEN_VMAP_H__) && defined(VMAP_VIRT_START) #define __XEN_VMAP_H__ -#include +#include #include enum vmap_region { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 14:00:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 14:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69021.123705 (Exim 4.92) (envelope-from ) id 1l0m7r-0001bc-Or; Sat, 16 Jan 2021 14:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69021.123705; Sat, 16 Jan 2021 14: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 1l0m7r-0001bU-Lx; Sat, 16 Jan 2021 14:00:23 +0000 Received: by outflank-mailman (input) for mailman id 69021; Sat, 16 Jan 2021 14:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0m7q-0001bL-TL for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0m7q-0004XN-S6 for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0m7q-0006aR-Qi for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14: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=zYsyRePCdjv6rwlwmyMoN4IiQf39CB4jYRlKCEtA6j0=; b=bQRc0vnSO/26VVwCSxm3HSRblf 3/fO55wMobSEZP5dK0cNjhFwYzPv0cnV5xmEz6UfmixCxVpAFy5k3zQVG/JN6RQuIm1qIsEYl7BLD EwGTJbnzUZcsm+5rNBodei6gSC7fSxhpGiLbMt32/PXDeqhNgwqOffNGAp8jU1bAQlJ8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Arm: don't hard-code grant table limits in create_domUs() Message-Id: Date: Sat, 16 Jan 2021 14:00:22 +0000 commit 36457d76ec11df9a798809f4bac3cddd76764158 Author: Jan Beulich AuthorDate: Fri Jan 15 16:05:03 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 15 16:05:03 2021 +0100 Arm: don't hard-code grant table limits in create_domUs() I can only assume that f2ae59bc4b9b ("Rationalize max_grant_frames and max_maptrack_frames handling") unintentionally left Arm's create_domUs() set limits to explicit values, as at least some of the same constraints apply here. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e824ba34b0..374bf655ee 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2480,8 +2480,8 @@ void __init create_domUs(void) .arch.gic_version = XEN_DOMCTL_CONFIG_GIC_NATIVE, .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, .max_evtchn_port = -1, - .max_grant_frames = 64, - .max_maptrack_frames = 1024, + .max_grant_frames = -1, + .max_maptrack_frames = -1, }; if ( !dt_device_is_compatible(node, "xen,domain") ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 14:00:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 14:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69022.123710 (Exim 4.92) (envelope-from ) id 1l0m81-0001dK-SL; Sat, 16 Jan 2021 14:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69022.123710; Sat, 16 Jan 2021 14: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 1l0m81-0001dB-Oj; Sat, 16 Jan 2021 14:00:33 +0000 Received: by outflank-mailman (input) for mailman id 69022; Sat, 16 Jan 2021 14:00:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0m81-0001d5-06 for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14:00:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0m80-0004Xh-VU for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0m80-0006b1-Uf for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14: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=2oJJ5tYdQFSarHpbcWVPcTSMG2fR5S8uO5gOhWjagOY=; b=NBHko6Wbt2SPMJj7yD8p83moTe x4wjCNAVblli4CGKsmllz4SSWZcGT9YCibBXb+ylq2CCmgNPGmr1+E3RnrOxfkC60iyQMDApLauQ1 S2BJURPViy9PtwtNmK9mEeeG+g6ZoCPLbO88ru30HZFT38cjpIuzJSMi4BUrtHHfEEWU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] NetBSD: Fix lock directory path Message-Id: Date: Sat, 16 Jan 2021 14:00:32 +0000 commit cc83ee4c6c3790dd98a91cc0d34162dab067bca7 Author: Manuel Bouyer AuthorDate: Tue Jan 12 19:12:22 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 15 15:31:56 2021 +0000 NetBSD: Fix lock directory path On NetBSD the lock directory is in /var/run/ Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- m4/paths.m4 | 2 +- tools/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/paths.m4 b/m4/paths.m4 index 89d3bb8312..1c107b1a61 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -142,7 +142,7 @@ AC_SUBST(XEN_SCRIPT_DIR) case "$host_os" in *freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; -*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +*netbsd*) XEN_LOCK_DIR=$rundir_path ;; *) XEN_LOCK_DIR=$localstatedir/lock ;; esac AC_SUBST(XEN_LOCK_DIR) diff --git a/tools/configure b/tools/configure index 8a708e9baa..131112c41e 100755 --- a/tools/configure +++ b/tools/configure @@ -4030,7 +4030,7 @@ XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts case "$host_os" in *freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; -*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +*netbsd*) XEN_LOCK_DIR=$localstatedir/run ;; *) XEN_LOCK_DIR=$localstatedir/lock ;; esac -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jan 16 14:00:43 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Jan 2021 14:00:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69023.123714 (Exim 4.92) (envelope-from ) id 1l0m8B-0001ew-TO; Sat, 16 Jan 2021 14:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69023.123714; Sat, 16 Jan 2021 14: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 1l0m8B-0001eo-QJ; Sat, 16 Jan 2021 14:00:43 +0000 Received: by outflank-mailman (input) for mailman id 69023; Sat, 16 Jan 2021 14:00:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0m8B-0001ef-3G for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14:00:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0m8B-0004Xu-2Q for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14:00:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l0m8B-0006bl-1C for xen-changelog@lists.xenproject.org; Sat, 16 Jan 2021 14:00:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mLOpi6sgvLLsr67IC+TktyjMVz3izMeEtC3TamN+Bno=; b=sLK5pszqNV59BIDrhU4faCyKS8 LI8qUSPpu78iVFmqH2G1AE9m0+NLC4Aapg2qqhy6kmNPHb6x75hfkDNRZ95HP8Jv7Kcau3FbGVRY0 KTXljn8xIW/jZ4QDkyESOqRrDH6JAqh+jnDMtqHvniqUkHzp7hvT6aAXQmw8LddaeAWc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: livepatch: Include xen/mm.h rather than asm/mm.h Message-Id: Date: Sat, 16 Jan 2021 14:00:43 +0000 commit db9c4ad1b1abaef3c38027b9b2700d9250d13125 Author: Julien Grall AuthorDate: Fri Jan 15 19:29:47 2021 +0000 Commit: Stefano Stabellini CommitDate: Fri Jan 15 12:05:29 2021 -0800 xen/arm: livepatch: Include xen/mm.h rather than asm/mm.h Livepatch fails to build on Arm after commit ced9795c6cb4 "mm: split out mfn_t / gfn_t / pfn_t definitions and helpers": In file included from livepatch.c:13:0: /oss/xen/xen/include/asm/mm.h:32:28: error: field ‘list’ has incomplete type struct page_list_entry list; ^~~~ /oss/xen/xen/include/asm/mm.h:53:43: error: ‘MAX_ORDER’ undeclared here (not in a function); did you mean ‘PFN_ORDER’? unsigned long first_dirty:MAX_ORDER + 1; ^~~~~~~~~ PFN_ORDER /oss/xen/xen/include/asm/mm.h:53:31: error: bit-field ‘first_dirty’ width not an integer constant unsigned long first_dirty:MAX_ORDER + 1; ^~~~~~~~~~~ This is happening because asm/mm.h is included directly by livepatch.c. Yet it depends on xen/mm.h to be included first so MAX_ORDER is defined. Resolve the build failure by including xen/mm.h rather than asm/mm.h. Fixes: ced9795c6cb4 ("mm: split out mfn_t / gfn_t / pfn_t definitions and helpers") Signed-off-by: Julien Grall Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Stefano Stabellini --- xen/arch/arm/livepatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/livepatch.c b/xen/arch/arm/livepatch.c index 915e9d926a..75e8adcfd6 100644 --- a/xen/arch/arm/livepatch.c +++ b/xen/arch/arm/livepatch.c @@ -6,11 +6,11 @@ #include #include #include +#include #include #include #include -#include /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 11:22:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 11:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69601.124704 (Exim 4.92) (envelope-from ) id 1l1Sbl-0002Vj-Vo; Mon, 18 Jan 2021 11:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69601.124704; Mon, 18 Jan 2021 11: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 1l1Sbl-0002Vb-So; Mon, 18 Jan 2021 11:22:05 +0000 Received: by outflank-mailman (input) for mailman id 69601; Mon, 18 Jan 2021 11:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Sbk-0002VI-OX for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Sbk-0008PU-NZ for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1Sbk-0002Sn-Lo for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11: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=g+xe/Kjsgxgtat2zfwx5YbJvun99f0hZHHSae3fiEjk=; b=RL1jU70K/xPqbLnLjuPb0ehlP8 c4sjKP7b4uWgJHoY7hyUQ/EVuHMgXnDKq9zE0i2RGm+tgsiIzhsACMy/0MwJvojiSCHhVPUlmYGWQ mkqOGcZaaHcDFW7EL9OfFkhw0j1M1IGoRV+jLJI7zmSHwfxUdJ+Z3JBieFwFqZcHfo5o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] introduce unaligned.h Message-Id: Date: Mon, 18 Jan 2021 11:22:04 +0000 commit 7c9f81687ad611515474b1c17afc2f79f19faef5 Author: Jan Beulich AuthorDate: Mon Jan 18 12:09:13 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 18 12:09:13 2021 +0100 introduce unaligned.h Rather than open-coding commonly used constructs in yet more places when pulling in zstd decompression support (and its xxhash prereq), pull out the custom bits into a commonly used header (for the hypervisor build; the tool stack and stubdom builds of libxenguest will still remain in need of similarly taking care of). For now this is limited to x86, where custom logic isn't needed (considering this is going to be used in init code only, even using alternatives patching to use MOVBE doesn't seem worthwhile). For Arm64 with CONFIG_ACPI=y (due to efi-dom0.c's re-use of xz/crc32.c) drop the not really necessary inclusion of xz's private.h. No change in generated code. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/common/lz4/defs.h | 9 +++-- xen/common/lzo.c | 7 ++-- xen/common/unlzo.c | 19 +++------- xen/common/xz/crc32.c | 2 -- xen/common/xz/private.h | 23 ++++-------- xen/include/asm-x86/unaligned.h | 6 ++++ xen/include/xen/unaligned.h | 79 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 104 insertions(+), 41 deletions(-) diff --git a/xen/common/lz4/defs.h b/xen/common/lz4/defs.h index d886a4e122..4fbea2ac3d 100644 --- a/xen/common/lz4/defs.h +++ b/xen/common/lz4/defs.h @@ -10,18 +10,21 @@ #ifdef __XEN__ #include -#endif +#include +#else -static inline u16 INIT get_unaligned_le16(const void *p) +static inline u16 get_unaligned_le16(const void *p) { return le16_to_cpup(p); } -static inline u32 INIT get_unaligned_le32(const void *p) +static inline u32 get_unaligned_le32(const void *p) { return le32_to_cpup(p); } +#endif + /* * Detects 64 bits mode */ diff --git a/xen/common/lzo.c b/xen/common/lzo.c index f4c0ad8530..e4841794f4 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -97,13 +97,12 @@ #ifdef __XEN__ #include #include +#include +#else +#define get_unaligned_le16(_p) (*(u16 *)(_p)) #endif #include -#define get_unaligned(_p) (*(_p)) -#define put_unaligned(_val,_p) (*(_p)=_val) -#define get_unaligned_le16(_p) (*(u16 *)(_p)) -#define get_unaligned_le32(_p) (*(u32 *)(_p)) #include "decompress.h" diff --git a/xen/common/unlzo.c b/xen/common/unlzo.c index 5ae6cf911e..11f64fcf3b 100644 --- a/xen/common/unlzo.c +++ b/xen/common/unlzo.c @@ -34,30 +34,19 @@ #ifdef __XEN__ #include -#endif +#include +#else -#if 1 /* ndef CONFIG_??? */ -static inline u16 INIT get_unaligned_be16(void *p) +static inline u16 get_unaligned_be16(const void *p) { return be16_to_cpup(p); } -static inline u32 INIT get_unaligned_be32(void *p) +static inline u32 get_unaligned_be32(const void *p) { return be32_to_cpup(p); } -#else -#include - -static inline u16 INIT get_unaligned_be16(void *p) -{ - return be16_to_cpu(__get_unaligned(p, 2)); -} -static inline u32 INIT get_unaligned_be32(void *p) -{ - return be32_to_cpu(__get_unaligned(p, 4)); -} #endif static const unsigned char lzop_magic[] = { diff --git a/xen/common/xz/crc32.c b/xen/common/xz/crc32.c index af08ae2cf6..0708b61638 100644 --- a/xen/common/xz/crc32.c +++ b/xen/common/xz/crc32.c @@ -15,8 +15,6 @@ * but they are bigger and use more memory for the lookup table. */ -#include "private.h" - XZ_EXTERN uint32_t INITDATA xz_crc32_table[256]; XZ_EXTERN void INIT xz_crc32_init(void) diff --git a/xen/common/xz/private.h b/xen/common/xz/private.h index 7ea2489229..511343fcc2 100644 --- a/xen/common/xz/private.h +++ b/xen/common/xz/private.h @@ -13,34 +13,23 @@ #ifdef __XEN__ #include #include -#endif - -#define get_le32(p) le32_to_cpup((const uint32_t *)(p)) +#include +#else -#if 1 /* ndef CONFIG_??? */ -static inline u32 INIT get_unaligned_le32(void *p) +static inline u32 get_unaligned_le32(const void *p) { return le32_to_cpup(p); } -static inline void INIT put_unaligned_le32(u32 val, void *p) +static inline void put_unaligned_le32(u32 val, void *p) { *(__force __le32*)p = cpu_to_le32(val); } -#else -#include - -static inline u32 INIT get_unaligned_le32(void *p) -{ - return le32_to_cpu(__get_unaligned(p, 4)); -} -static inline void INIT put_unaligned_le32(u32 val, void *p) -{ - __put_unaligned(cpu_to_le32(val), p, 4); -} #endif +#define get_le32(p) le32_to_cpup((const uint32_t *)(p)) + #define false 0 #define true 1 diff --git a/xen/include/asm-x86/unaligned.h b/xen/include/asm-x86/unaligned.h new file mode 100644 index 0000000000..6070801d4a --- /dev/null +++ b/xen/include/asm-x86/unaligned.h @@ -0,0 +1,6 @@ +#ifndef __ASM_UNALIGNED_H__ +#define __ASM_UNALIGNED_H__ + +#include + +#endif /* __ASM_UNALIGNED_H__ */ diff --git a/xen/include/xen/unaligned.h b/xen/include/xen/unaligned.h new file mode 100644 index 0000000000..eef7ec73b6 --- /dev/null +++ b/xen/include/xen/unaligned.h @@ -0,0 +1,79 @@ +/* + * This header can be used by architectures where unaligned accesses work + * without faulting, and at least reasonably efficiently. Other architectures + * will need to have a custom asm/unaligned.h. + */ +#ifndef __ASM_UNALIGNED_H__ +#error "xen/unaligned.h should not be included directly - include asm/unaligned.h instead" +#endif + +#ifndef __XEN_UNALIGNED_H__ +#define __XEN_UNALIGNED_H__ + +#include +#include + +#define get_unaligned(p) (*(p)) +#define put_unaligned(val, p) (*(p) = (val)) + +static inline uint16_t get_unaligned_be16(const void *p) +{ + return be16_to_cpup(p); +} + +static inline void put_unaligned_be16(uint16_t val, void *p) +{ + *(__force __be16*)p = cpu_to_be16(val); +} + +static inline uint32_t get_unaligned_be32(const void *p) +{ + return be32_to_cpup(p); +} + +static inline void put_unaligned_be32(uint32_t val, void *p) +{ + *(__force __be32*)p = cpu_to_be32(val); +} + +static inline uint64_t get_unaligned_be64(const void *p) +{ + return be64_to_cpup(p); +} + +static inline void put_unaligned_be64(uint64_t val, void *p) +{ + *(__force __be64*)p = cpu_to_be64(val); +} + +static inline uint16_t get_unaligned_le16(const void *p) +{ + return le16_to_cpup(p); +} + +static inline void put_unaligned_le16(uint16_t val, void *p) +{ + *(__force __le16*)p = cpu_to_le16(val); +} + +static inline uint32_t get_unaligned_le32(const void *p) +{ + return le32_to_cpup(p); +} + +static inline void put_unaligned_le32(uint32_t val, void *p) +{ + *(__force __le32*)p = cpu_to_le32(val); +} + +static inline uint64_t get_unaligned_le64(const void *p) +{ + return le64_to_cpup(p); +} + +static inline void put_unaligned_le64(uint64_t val, void *p) +{ + *(__force __le64*)p = cpu_to_le64(val); +} + +#endif /* __XEN_UNALIGNED_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 11:22:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 11:22:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69602.124709 (Exim 4.92) (envelope-from ) id 1l1Sbw-0002Xd-12; Mon, 18 Jan 2021 11:22:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69602.124709; Mon, 18 Jan 2021 11: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 1l1Sbv-0002XV-UM; Mon, 18 Jan 2021 11:22:15 +0000 Received: by outflank-mailman (input) for mailman id 69602; Mon, 18 Jan 2021 11:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Sbu-0002XH-SG for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Sbu-0008PX-R4 for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1Sbu-0002TI-Pi for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TF5P5oeOxyX7UFY7BgEFAIb+wJdMp71bVEkhfBgWZ9w=; b=FAT/dLau7/hNz6btx/22gOQ9ch 8KkEvwXb6Un0VN1XlHnQigLc2Co2wmfQ/KiAIU++7KAJIXPdKgEBo+9TDHrcxArwVFKVLfqSbo7fA j1o3//YgB1jJHULZ4eqPIJlaHA2Y5/VWNSMtWlys+kTk+Ehe7368YbHTauHXhby/2+I4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] lib: introduce xxhash Message-Id: Date: Mon, 18 Jan 2021 11:22:14 +0000 commit 35d2960ae65f28106fdc5c2130f5f08fadca0e4c Author: Jan Beulich AuthorDate: Mon Jan 18 12:10:34 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 18 12:10:34 2021 +0100 lib: introduce xxhash Taken from Linux at commit d89775fc929c ("lib/: replace HTTP links with HTTPS ones"), but split into separate 32-bit and 64-bit sources, since the immediate consumer (zstd) will need only the latter. Note that the building of this code is restricted to x86 for now because of the need to sort asm/unaligned.h for Arm. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/include/xen/xxhash.h | 259 +++++++++++++++++++++++++++++++++++++++++ xen/lib/Makefile | 2 + xen/lib/xxhash32.c | 259 +++++++++++++++++++++++++++++++++++++++++ xen/lib/xxhash64.c | 294 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 814 insertions(+) diff --git a/xen/include/xen/xxhash.h b/xen/include/xen/xxhash.h new file mode 100644 index 0000000000..6f2237cbcf --- /dev/null +++ b/xen/include/xen/xxhash.h @@ -0,0 +1,259 @@ +/* + * xxHash - Extremely Fast Hash algorithm + * Copyright (C) 2012-2016, Yann Collet. + * + * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. This program is dual-licensed; you may select + * either version 2 of the GNU General Public License ("GPL") or BSD license + * ("BSD"). + * + * You can contact the author at: + * - xxHash homepage: https://cyan4973.github.io/xxHash/ + * - xxHash source repository: https://github.com/Cyan4973/xxHash + */ + +/* + * Notice extracted from xxHash homepage: + * + * xxHash is an extremely fast Hash algorithm, running at RAM speed limits. + * It also successfully passes all tests from the SMHasher suite. + * + * Comparison (single thread, Windows Seven 32 bits, using SMHasher on a Core 2 + * Duo @3GHz) + * + * Name Speed Q.Score Author + * xxHash 5.4 GB/s 10 + * CrapWow 3.2 GB/s 2 Andrew + * MumurHash 3a 2.7 GB/s 10 Austin Appleby + * SpookyHash 2.0 GB/s 10 Bob Jenkins + * SBox 1.4 GB/s 9 Bret Mulvey + * Lookup3 1.2 GB/s 9 Bob Jenkins + * SuperFastHash 1.2 GB/s 1 Paul Hsieh + * CityHash64 1.05 GB/s 10 Pike & Alakuijala + * FNV 0.55 GB/s 5 Fowler, Noll, Vo + * CRC32 0.43 GB/s 9 + * MD5-32 0.33 GB/s 10 Ronald L. Rivest + * SHA1-32 0.28 GB/s 10 + * + * Q.Score is a measure of quality of the hash function. + * It depends on successfully passing SMHasher test set. + * 10 is a perfect score. + * + * A 64-bits version, named xxh64 offers much better speed, + * but for 64-bits applications only. + * Name Speed on 64 bits Speed on 32 bits + * xxh64 13.8 GB/s 1.9 GB/s + * xxh32 6.8 GB/s 6.0 GB/s + */ + +#ifndef __XENXXHASH_H__ +#define __XENXXHASH_H__ + +#include + +/*-**************************** + * Simple Hash Functions + *****************************/ + +/** + * xxh32() - calculate the 32-bit hash of the input with a given seed. + * + * @input: The data to hash. + * @length: The length of the data to hash. + * @seed: The seed can be used to alter the result predictably. + * + * Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark) : 5.4 GB/s + * + * Return: The 32-bit hash of the data. + */ +uint32_t xxh32(const void *input, size_t length, uint32_t seed); + +/** + * xxh64() - calculate the 64-bit hash of the input with a given seed. + * + * @input: The data to hash. + * @length: The length of the data to hash. + * @seed: The seed can be used to alter the result predictably. + * + * This function runs 2x faster on 64-bit systems, but slower on 32-bit systems. + * + * Return: The 64-bit hash of the data. + */ +uint64_t xxh64(const void *input, size_t length, uint64_t seed); + +/** + * xxhash() - calculate wordsize hash of the input with a given seed + * @input: The data to hash. + * @length: The length of the data to hash. + * @seed: The seed can be used to alter the result predictably. + * + * If the hash does not need to be comparable between machines with + * different word sizes, this function will call whichever of xxh32() + * or xxh64() is faster. + * + * Return: wordsize hash of the data. + */ + +static inline unsigned long xxhash(const void *input, size_t length, + uint64_t seed) +{ +#if BITS_PER_LONG == 64 + return xxh64(input, length, seed); +#else + return xxh32(input, length, seed); +#endif +} + +/*-**************************** + * Streaming Hash Functions + *****************************/ + +/* + * These definitions are only meant to allow allocation of XXH state + * statically, on stack, or in a struct for example. + * Do not use members directly. + */ + +/** + * struct xxh32_state - private xxh32 state, do not use members directly + */ +struct xxh32_state { + uint32_t total_len_32; + uint32_t large_len; + uint32_t v1; + uint32_t v2; + uint32_t v3; + uint32_t v4; + uint32_t mem32[4]; + uint32_t memsize; +}; + +/** + * struct xxh32_state - private xxh64 state, do not use members directly + */ +struct xxh64_state { + uint64_t total_len; + uint64_t v1; + uint64_t v2; + uint64_t v3; + uint64_t v4; + uint64_t mem64[4]; + uint32_t memsize; +}; + +/** + * xxh32_reset() - reset the xxh32 state to start a new hashing operation + * + * @state: The xxh32 state to reset. + * @seed: Initialize the hash state with this seed. + * + * Call this function on any xxh32_state to prepare for a new hashing operation. + */ +void xxh32_reset(struct xxh32_state *state, uint32_t seed); + +/** + * xxh32_update() - hash the data given and update the xxh32 state + * + * @state: The xxh32 state to update. + * @input: The data to hash. + * @length: The length of the data to hash. + * + * After calling xxh32_reset() call xxh32_update() as many times as necessary. + * + * Return: Zero on success, otherwise an error code. + */ +int xxh32_update(struct xxh32_state *state, const void *input, size_t length); + +/** + * xxh32_digest() - produce the current xxh32 hash + * + * @state: Produce the current xxh32 hash of this state. + * + * A hash value can be produced at any time. It is still possible to continue + * inserting input into the hash state after a call to xxh32_digest(), and + * generate new hashes later on, by calling xxh32_digest() again. + * + * Return: The xxh32 hash stored in the state. + */ +uint32_t xxh32_digest(const struct xxh32_state *state); + +/** + * xxh64_reset() - reset the xxh64 state to start a new hashing operation + * + * @state: The xxh64 state to reset. + * @seed: Initialize the hash state with this seed. + */ +void xxh64_reset(struct xxh64_state *state, uint64_t seed); + +/** + * xxh64_update() - hash the data given and update the xxh64 state + * @state: The xxh64 state to update. + * @input: The data to hash. + * @length: The length of the data to hash. + * + * After calling xxh64_reset() call xxh64_update() as many times as necessary. + * + * Return: Zero on success, otherwise an error code. + */ +int xxh64_update(struct xxh64_state *state, const void *input, size_t length); + +/** + * xxh64_digest() - produce the current xxh64 hash + * + * @state: Produce the current xxh64 hash of this state. + * + * A hash value can be produced at any time. It is still possible to continue + * inserting input into the hash state after a call to xxh64_digest(), and + * generate new hashes later on, by calling xxh64_digest() again. + * + * Return: The xxh64 hash stored in the state. + */ +uint64_t xxh64_digest(const struct xxh64_state *state); + +/*-************************** + * Utils + ***************************/ + +/** + * xxh32_copy_state() - copy the source state into the destination state + * + * @src: The source xxh32 state. + * @dst: The destination xxh32 state. + */ +void xxh32_copy_state(struct xxh32_state *dst, const struct xxh32_state *src); + +/** + * xxh64_copy_state() - copy the source state into the destination state + * + * @src: The source xxh64 state. + * @dst: The destination xxh64 state. + */ +void xxh64_copy_state(struct xxh64_state *dst, const struct xxh64_state *src); + +#endif /* __XENXXHASH_H__ */ diff --git a/xen/lib/Makefile b/xen/lib/Makefile index 42cf7a1164..1c2227cbfc 100644 --- a/xen/lib/Makefile +++ b/xen/lib/Makefile @@ -7,3 +7,5 @@ lib-y += list-sort.o lib-y += parse-size.o lib-y += rbtree.o lib-y += sort.o +lib-$(CONFIG_X86) += xxhash32.o +lib-$(CONFIG_X86) += xxhash64.o diff --git a/xen/lib/xxhash32.c b/xen/lib/xxhash32.c new file mode 100644 index 0000000000..e8d403e5ce --- /dev/null +++ b/xen/lib/xxhash32.c @@ -0,0 +1,259 @@ +/* + * xxHash - Extremely Fast Hash algorithm + * Copyright (C) 2012-2016, Yann Collet. + * + * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. This program is dual-licensed; you may select + * either version 2 of the GNU General Public License ("GPL") or BSD license + * ("BSD"). + * + * You can contact the author at: + * - xxHash homepage: https://cyan4973.github.io/xxHash/ + * - xxHash source repository: https://github.com/Cyan4973/xxHash + */ + +#include +#include +#include +#include +#include + +/*-************************************* + * Macros + **************************************/ +#define xxh_rotl32(x, r) ((x << r) | (x >> (32 - r))) + +#ifdef __LITTLE_ENDIAN +# define XXH_CPU_LITTLE_ENDIAN 1 +#else +# define XXH_CPU_LITTLE_ENDIAN 0 +#endif + +/*-************************************* + * Constants + **************************************/ +static const uint32_t PRIME32_1 = 2654435761U; +static const uint32_t PRIME32_2 = 2246822519U; +static const uint32_t PRIME32_3 = 3266489917U; +static const uint32_t PRIME32_4 = 668265263U; +static const uint32_t PRIME32_5 = 374761393U; + +/*-************************** + * Utils + ***************************/ +void xxh32_copy_state(struct xxh32_state *dst, const struct xxh32_state *src) +{ + memcpy(dst, src, sizeof(*dst)); +} + +/*-*************************** + * Simple Hash Functions + ****************************/ +static uint32_t xxh32_round(uint32_t seed, const uint32_t input) +{ + seed += input * PRIME32_2; + seed = xxh_rotl32(seed, 13); + seed *= PRIME32_1; + return seed; +} + +uint32_t xxh32(const void *input, const size_t len, const uint32_t seed) +{ + const uint8_t *p = (const uint8_t *)input; + const uint8_t *b_end = p + len; + uint32_t h32; + + if (len >= 16) { + const uint8_t *const limit = b_end - 16; + uint32_t v1 = seed + PRIME32_1 + PRIME32_2; + uint32_t v2 = seed + PRIME32_2; + uint32_t v3 = seed + 0; + uint32_t v4 = seed - PRIME32_1; + + do { + v1 = xxh32_round(v1, get_unaligned_le32(p)); + p += 4; + v2 = xxh32_round(v2, get_unaligned_le32(p)); + p += 4; + v3 = xxh32_round(v3, get_unaligned_le32(p)); + p += 4; + v4 = xxh32_round(v4, get_unaligned_le32(p)); + p += 4; + } while (p <= limit); + + h32 = xxh_rotl32(v1, 1) + xxh_rotl32(v2, 7) + + xxh_rotl32(v3, 12) + xxh_rotl32(v4, 18); + } else { + h32 = seed + PRIME32_5; + } + + h32 += (uint32_t)len; + + while (p + 4 <= b_end) { + h32 += get_unaligned_le32(p) * PRIME32_3; + h32 = xxh_rotl32(h32, 17) * PRIME32_4; + p += 4; + } + + while (p < b_end) { + h32 += (*p) * PRIME32_5; + h32 = xxh_rotl32(h32, 11) * PRIME32_1; + p++; + } + + h32 ^= h32 >> 15; + h32 *= PRIME32_2; + h32 ^= h32 >> 13; + h32 *= PRIME32_3; + h32 ^= h32 >> 16; + + return h32; +} + +/*-************************************************** + * Advanced Hash Functions + ***************************************************/ +void xxh32_reset(struct xxh32_state *statePtr, const uint32_t seed) +{ + /* use a local state for memcpy() to avoid strict-aliasing warnings */ + struct xxh32_state state; + + memset(&state, 0, sizeof(state)); + state.v1 = seed + PRIME32_1 + PRIME32_2; + state.v2 = seed + PRIME32_2; + state.v3 = seed + 0; + state.v4 = seed - PRIME32_1; + memcpy(statePtr, &state, sizeof(state)); +} + +int xxh32_update(struct xxh32_state *state, const void *input, const size_t len) +{ + const uint8_t *p = (const uint8_t *)input; + const uint8_t *const b_end = p + len; + + if (input == NULL) + return -EINVAL; + + state->total_len_32 += (uint32_t)len; + state->large_len |= (len >= 16) | (state->total_len_32 >= 16); + + if (state->memsize + len < 16) { /* fill in tmp buffer */ + memcpy((uint8_t *)(state->mem32) + state->memsize, input, len); + state->memsize += (uint32_t)len; + return 0; + } + + if (state->memsize) { /* some data left from previous update */ + const uint32_t *p32 = state->mem32; + + memcpy((uint8_t *)(state->mem32) + state->memsize, input, + 16 - state->memsize); + + state->v1 = xxh32_round(state->v1, get_unaligned_le32(p32)); + p32++; + state->v2 = xxh32_round(state->v2, get_unaligned_le32(p32)); + p32++; + state->v3 = xxh32_round(state->v3, get_unaligned_le32(p32)); + p32++; + state->v4 = xxh32_round(state->v4, get_unaligned_le32(p32)); + p32++; + + p += 16-state->memsize; + state->memsize = 0; + } + + if (p <= b_end - 16) { + const uint8_t *const limit = b_end - 16; + uint32_t v1 = state->v1; + uint32_t v2 = state->v2; + uint32_t v3 = state->v3; + uint32_t v4 = state->v4; + + do { + v1 = xxh32_round(v1, get_unaligned_le32(p)); + p += 4; + v2 = xxh32_round(v2, get_unaligned_le32(p)); + p += 4; + v3 = xxh32_round(v3, get_unaligned_le32(p)); + p += 4; + v4 = xxh32_round(v4, get_unaligned_le32(p)); + p += 4; + } while (p <= limit); + + state->v1 = v1; + state->v2 = v2; + state->v3 = v3; + state->v4 = v4; + } + + if (p < b_end) { + memcpy(state->mem32, p, (size_t)(b_end-p)); + state->memsize = (uint32_t)(b_end-p); + } + + return 0; +} + +uint32_t xxh32_digest(const struct xxh32_state *state) +{ + const uint8_t *p = (const uint8_t *)state->mem32; + const uint8_t *const b_end = (const uint8_t *)(state->mem32) + + state->memsize; + uint32_t h32; + + if (state->large_len) { + h32 = xxh_rotl32(state->v1, 1) + xxh_rotl32(state->v2, 7) + + xxh_rotl32(state->v3, 12) + xxh_rotl32(state->v4, 18); + } else { + h32 = state->v3 /* == seed */ + PRIME32_5; + } + + h32 += state->total_len_32; + + while (p + 4 <= b_end) { + h32 += get_unaligned_le32(p) * PRIME32_3; + h32 = xxh_rotl32(h32, 17) * PRIME32_4; + p += 4; + } + + while (p < b_end) { + h32 += (*p) * PRIME32_5; + h32 = xxh_rotl32(h32, 11) * PRIME32_1; + p++; + } + + h32 ^= h32 >> 15; + h32 *= PRIME32_2; + h32 ^= h32 >> 13; + h32 *= PRIME32_3; + h32 ^= h32 >> 16; + + return h32; +} + diff --git a/xen/lib/xxhash64.c b/xen/lib/xxhash64.c new file mode 100644 index 0000000000..ba6bcf152d --- /dev/null +++ b/xen/lib/xxhash64.c @@ -0,0 +1,294 @@ +/* + * xxHash - Extremely Fast Hash algorithm + * Copyright (C) 2012-2016, Yann Collet. + * + * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. This program is dual-licensed; you may select + * either version 2 of the GNU General Public License ("GPL") or BSD license + * ("BSD"). + * + * You can contact the author at: + * - xxHash homepage: https://cyan4973.github.io/xxHash/ + * - xxHash source repository: https://github.com/Cyan4973/xxHash + */ + +#include +#include +#include +#include +#include + +/*-************************************* + * Macros + **************************************/ +#define xxh_rotl64(x, r) ((x << r) | (x >> (64 - r))) + +#ifdef __LITTLE_ENDIAN +# define XXH_CPU_LITTLE_ENDIAN 1 +#else +# define XXH_CPU_LITTLE_ENDIAN 0 +#endif + +/*-************************************* + * Constants + **************************************/ +static const uint64_t PRIME64_1 = 11400714785074694791ULL; +static const uint64_t PRIME64_2 = 14029467366897019727ULL; +static const uint64_t PRIME64_3 = 1609587929392839161ULL; +static const uint64_t PRIME64_4 = 9650029242287828579ULL; +static const uint64_t PRIME64_5 = 2870177450012600261ULL; + +/*-************************** + * Utils + ***************************/ +void xxh64_copy_state(struct xxh64_state *dst, const struct xxh64_state *src) +{ + memcpy(dst, src, sizeof(*dst)); +} + +/*-*************************** + * Simple Hash Functions + ****************************/ +static uint64_t xxh64_round(uint64_t acc, const uint64_t input) +{ + acc += input * PRIME64_2; + acc = xxh_rotl64(acc, 31); + acc *= PRIME64_1; + return acc; +} + +static uint64_t xxh64_merge_round(uint64_t acc, uint64_t val) +{ + val = xxh64_round(0, val); + acc ^= val; + acc = acc * PRIME64_1 + PRIME64_4; + return acc; +} + +uint64_t xxh64(const void *input, const size_t len, const uint64_t seed) +{ + const uint8_t *p = (const uint8_t *)input; + const uint8_t *const b_end = p + len; + uint64_t h64; + + if (len >= 32) { + const uint8_t *const limit = b_end - 32; + uint64_t v1 = seed + PRIME64_1 + PRIME64_2; + uint64_t v2 = seed + PRIME64_2; + uint64_t v3 = seed + 0; + uint64_t v4 = seed - PRIME64_1; + + do { + v1 = xxh64_round(v1, get_unaligned_le64(p)); + p += 8; + v2 = xxh64_round(v2, get_unaligned_le64(p)); + p += 8; + v3 = xxh64_round(v3, get_unaligned_le64(p)); + p += 8; + v4 = xxh64_round(v4, get_unaligned_le64(p)); + p += 8; + } while (p <= limit); + + h64 = xxh_rotl64(v1, 1) + xxh_rotl64(v2, 7) + + xxh_rotl64(v3, 12) + xxh_rotl64(v4, 18); + h64 = xxh64_merge_round(h64, v1); + h64 = xxh64_merge_round(h64, v2); + h64 = xxh64_merge_round(h64, v3); + h64 = xxh64_merge_round(h64, v4); + + } else { + h64 = seed + PRIME64_5; + } + + h64 += (uint64_t)len; + + while (p + 8 <= b_end) { + const uint64_t k1 = xxh64_round(0, get_unaligned_le64(p)); + + h64 ^= k1; + h64 = xxh_rotl64(h64, 27) * PRIME64_1 + PRIME64_4; + p += 8; + } + + if (p + 4 <= b_end) { + h64 ^= (uint64_t)(get_unaligned_le32(p)) * PRIME64_1; + h64 = xxh_rotl64(h64, 23) * PRIME64_2 + PRIME64_3; + p += 4; + } + + while (p < b_end) { + h64 ^= (*p) * PRIME64_5; + h64 = xxh_rotl64(h64, 11) * PRIME64_1; + p++; + } + + h64 ^= h64 >> 33; + h64 *= PRIME64_2; + h64 ^= h64 >> 29; + h64 *= PRIME64_3; + h64 ^= h64 >> 32; + + return h64; +} + +/*-************************************************** + * Advanced Hash Functions + ***************************************************/ +void xxh64_reset(struct xxh64_state *statePtr, const uint64_t seed) +{ + /* use a local state for memcpy() to avoid strict-aliasing warnings */ + struct xxh64_state state; + + memset(&state, 0, sizeof(state)); + state.v1 = seed + PRIME64_1 + PRIME64_2; + state.v2 = seed + PRIME64_2; + state.v3 = seed + 0; + state.v4 = seed - PRIME64_1; + memcpy(statePtr, &state, sizeof(state)); +} + +int xxh64_update(struct xxh64_state *state, const void *input, const size_t len) +{ + const uint8_t *p = (const uint8_t *)input; + const uint8_t *const b_end = p + len; + + if (input == NULL) + return -EINVAL; + + state->total_len += len; + + if (state->memsize + len < 32) { /* fill in tmp buffer */ + memcpy(((uint8_t *)state->mem64) + state->memsize, input, len); + state->memsize += (uint32_t)len; + return 0; + } + + if (state->memsize) { /* tmp buffer is full */ + uint64_t *p64 = state->mem64; + + memcpy(((uint8_t *)p64) + state->memsize, input, + 32 - state->memsize); + + state->v1 = xxh64_round(state->v1, get_unaligned_le64(p64)); + p64++; + state->v2 = xxh64_round(state->v2, get_unaligned_le64(p64)); + p64++; + state->v3 = xxh64_round(state->v3, get_unaligned_le64(p64)); + p64++; + state->v4 = xxh64_round(state->v4, get_unaligned_le64(p64)); + + p += 32 - state->memsize; + state->memsize = 0; + } + + if (p + 32 <= b_end) { + const uint8_t *const limit = b_end - 32; + uint64_t v1 = state->v1; + uint64_t v2 = state->v2; + uint64_t v3 = state->v3; + uint64_t v4 = state->v4; + + do { + v1 = xxh64_round(v1, get_unaligned_le64(p)); + p += 8; + v2 = xxh64_round(v2, get_unaligned_le64(p)); + p += 8; + v3 = xxh64_round(v3, get_unaligned_le64(p)); + p += 8; + v4 = xxh64_round(v4, get_unaligned_le64(p)); + p += 8; + } while (p <= limit); + + state->v1 = v1; + state->v2 = v2; + state->v3 = v3; + state->v4 = v4; + } + + if (p < b_end) { + memcpy(state->mem64, p, (size_t)(b_end-p)); + state->memsize = (uint32_t)(b_end - p); + } + + return 0; +} + +uint64_t xxh64_digest(const struct xxh64_state *state) +{ + const uint8_t *p = (const uint8_t *)state->mem64; + const uint8_t *const b_end = (const uint8_t *)state->mem64 + + state->memsize; + uint64_t h64; + + if (state->total_len >= 32) { + const uint64_t v1 = state->v1; + const uint64_t v2 = state->v2; + const uint64_t v3 = state->v3; + const uint64_t v4 = state->v4; + + h64 = xxh_rotl64(v1, 1) + xxh_rotl64(v2, 7) + + xxh_rotl64(v3, 12) + xxh_rotl64(v4, 18); + h64 = xxh64_merge_round(h64, v1); + h64 = xxh64_merge_round(h64, v2); + h64 = xxh64_merge_round(h64, v3); + h64 = xxh64_merge_round(h64, v4); + } else { + h64 = state->v3 + PRIME64_5; + } + + h64 += (uint64_t)state->total_len; + + while (p + 8 <= b_end) { + const uint64_t k1 = xxh64_round(0, get_unaligned_le64(p)); + + h64 ^= k1; + h64 = xxh_rotl64(h64, 27) * PRIME64_1 + PRIME64_4; + p += 8; + } + + if (p + 4 <= b_end) { + h64 ^= (uint64_t)(get_unaligned_le32(p)) * PRIME64_1; + h64 = xxh_rotl64(h64, 23) * PRIME64_2 + PRIME64_3; + p += 4; + } + + while (p < b_end) { + h64 ^= (*p) * PRIME64_5; + h64 = xxh_rotl64(h64, 11) * PRIME64_1; + p++; + } + + h64 ^= h64 >> 33; + h64 *= PRIME64_2; + h64 ^= h64 >> 29; + h64 *= PRIME64_3; + h64 ^= h64 >> 32; + + return h64; +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 11:22:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 11:22:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69603.124713 (Exim 4.92) (envelope-from ) id 1l1Sc7-0002Zl-6A; Mon, 18 Jan 2021 11:22:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69603.124713; Mon, 18 Jan 2021 11:22: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 1l1Sc7-0002Ze-1s; Mon, 18 Jan 2021 11:22:27 +0000 Received: by outflank-mailman (input) for mailman id 69603; Mon, 18 Jan 2021 11:22:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Sc4-0002ZH-VE for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11:22:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Sc4-0008Pg-UL for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1Sc4-0002Tk-TQ for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NHLaqvOhksM4VObwzHVXFHVG1lP8pnHttMtKJpZBaqc=; b=53BSOX0CVZRk8XS32ie/iE2Lee k/NicH0oK7GQ+b1yLgtYdbBHOTxbH4BIXJo0Bj4KqAIC8dcPQGaBsgjUXi5bAqB4rDUiAOwsAp/pv OMx9vja0rMjanYkPIwXTtVHPtjFRCsLXkDhum9RV5lT+SNEAnEqnx2FkAOJnOFPff2q4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/Dom0: support zstd compressed kernels Message-Id: Date: Mon, 18 Jan 2021 11:22:24 +0000 commit d6627cf1b63ce57a6a7e2c1800dbc50eed742c32 Author: Jan Beulich AuthorDate: Mon Jan 18 12:12:23 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 18 12:12:23 2021 +0100 x86/Dom0: support zstd compressed kernels Taken from Linux at commit 1c4dd334df3a ("lib: decompress_unzstd: Limit output size") for unzstd.c (renamed from decompress_unzstd.c) and 36f9ff9e03de ("lib: Fix fall-through warnings for Clang") for zstd/, with bits from linux/zstd.h merged into suitable other headers. To limit the editing necessary, introduce ptrdiff_t. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/common/Makefile | 2 +- xen/common/decompress.c | 3 + xen/common/unzstd.c | 308 +++++ xen/common/zstd/bitstream.h | 380 ++++++ xen/common/zstd/decompress.c | 2496 ++++++++++++++++++++++++++++++++++++++ xen/common/zstd/entropy_common.c | 243 ++++ xen/common/zstd/error_private.h | 110 ++ xen/common/zstd/fse.h | 575 +++++++++ xen/common/zstd/fse_decompress.c | 324 +++++ xen/common/zstd/huf.h | 212 ++++ xen/common/zstd/huf_decompress.c | 960 +++++++++++++++ xen/common/zstd/mem.h | 151 +++ xen/common/zstd/zstd_common.c | 74 ++ xen/common/zstd/zstd_internal.h | 372 ++++++ xen/include/asm-arm/types.h | 6 + xen/include/asm-x86/types.h | 6 + xen/include/xen/decompress.h | 2 +- 17 files changed, 6222 insertions(+), 2 deletions(-) diff --git a/xen/common/Makefile b/xen/common/Makefile index 7a4e652b57..d751315a87 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -55,7 +55,7 @@ obj-bin-y += warning.init.o obj-$(CONFIG_XENOPROF) += xenoprof.o obj-y += xmalloc_tlsf.o -obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma lzo unlzo unlz4 earlycpio,$(n).init.o) +obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma lzo unlzo unlz4 unzstd earlycpio,$(n).init.o) obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o kernel.o memory.o multicall.o xlat.o) diff --git a/xen/common/decompress.c b/xen/common/decompress.c index 9d6e0c4ab0..79e60f4802 100644 --- a/xen/common/decompress.c +++ b/xen/common/decompress.c @@ -31,5 +31,8 @@ int __init decompress(void *inbuf, unsigned int len, void *outbuf) if ( len >= 2 && !memcmp(inbuf, "\x02\x21", 2) ) return unlz4(inbuf, len, NULL, NULL, outbuf, NULL, error); + if ( len >= 4 && !memcmp(inbuf, "\x28\xb5\x2f\xfd", 4) ) + return unzstd(inbuf, len, NULL, NULL, outbuf, NULL, error); + return 1; } diff --git a/xen/common/unzstd.c b/xen/common/unzstd.c new file mode 100644 index 0000000000..a107616427 --- /dev/null +++ b/xen/common/unzstd.c @@ -0,0 +1,308 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * Important notes about in-place decompression + * + * At least on x86, the kernel is decompressed in place: the compressed data + * is placed to the end of the output buffer, and the decompressor overwrites + * most of the compressed data. There must be enough safety margin to + * guarantee that the write position is always behind the read position. + * + * The safety margin for ZSTD with a 128 KB block size is calculated below. + * Note that the margin with ZSTD is bigger than with GZIP or XZ! + * + * The worst case for in-place decompression is that the beginning of + * the file is compressed extremely well, and the rest of the file is + * uncompressible. Thus, we must look for worst-case expansion when the + * compressor is encoding uncompressible data. + * + * The structure of the .zst file in case of a compresed kernel is as follows. + * Maximum sizes (as bytes) of the fields are in parenthesis. + * + * Frame Header: (18) + * Blocks: (N) + * Checksum: (4) + * + * The frame header and checksum overhead is at most 22 bytes. + * + * ZSTD stores the data in blocks. Each block has a header whose size is + * a 3 bytes. After the block header, there is up to 128 KB of payload. + * The maximum uncompressed size of the payload is 128 KB. The minimum + * uncompressed size of the payload is never less than the payload size + * (excluding the block header). + * + * The assumption, that the uncompressed size of the payload is never + * smaller than the payload itself, is valid only when talking about + * the payload as a whole. It is possible that the payload has parts where + * the decompressor consumes more input than it produces output. Calculating + * the worst case for this would be tricky. Instead of trying to do that, + * let's simply make sure that the decompressor never overwrites any bytes + * of the payload which it is currently reading. + * + * Now we have enough information to calculate the safety margin. We need + * - 22 bytes for the .zst file format headers; + * - 3 bytes per every 128 KiB of uncompressed size (one block header per + * block); and + * - 128 KiB (biggest possible zstd block size) to make sure that the + * decompressor never overwrites anything from the block it is currently + * reading. + * + * We get the following formula: + * + * safety_margin = 22 + uncompressed_size * 3 / 131072 + 131072 + * <= 22 + (uncompressed_size >> 15) + 131072 + */ + +#include "decompress.h" + +#include "zstd/entropy_common.c" +#include "zstd/fse_decompress.c" +#include "zstd/huf_decompress.c" +#include "zstd/zstd_common.c" +#include "zstd/decompress.c" + +/* 128MB is the maximum window size supported by zstd. */ +#define ZSTD_WINDOWSIZE_MAX (1 << ZSTD_WINDOWLOG_MAX) +/* + * Size of the input and output buffers in multi-call mode. + * Pick a larger size because it isn't used during kernel decompression, + * since that is single pass, and we have to allocate a large buffer for + * zstd's window anyway. The larger size speeds up initramfs decompression. + */ +#define ZSTD_IOBUF_SIZE (1 << 17) + +static int INIT handle_zstd_error(size_t ret, void (*error)(const char *x)) +{ + const int err = ZSTD_getErrorCode(ret); + + if (!ZSTD_isError(ret)) + return 0; + + switch (err) { + case ZSTD_error_memory_allocation: + error("ZSTD decompressor ran out of memory"); + break; + case ZSTD_error_prefix_unknown: + error("Input is not in the ZSTD format (wrong magic bytes)"); + break; + case ZSTD_error_dstSize_tooSmall: + case ZSTD_error_corruption_detected: + case ZSTD_error_checksum_wrong: + error("ZSTD-compressed data is corrupt"); + break; + default: + error("ZSTD-compressed data is probably corrupt"); + break; + } + return -1; +} + +/* + * Handle the case where we have the entire input and output in one segment. + * We can allocate less memory (no circular buffer for the sliding window), + * and avoid some memcpy() calls. + */ +static int INIT decompress_single(const u8 *in_buf, long in_len, u8 *out_buf, + long out_len, unsigned int *in_pos, + void (*error)(const char *x)) +{ + const size_t wksp_size = ZSTD_DCtxWorkspaceBound(); + void *wksp = large_malloc(wksp_size); + ZSTD_DCtx *dctx = ZSTD_initDCtx(wksp, wksp_size); + int err; + size_t ret; + + if (dctx == NULL) { + error("Out of memory while allocating ZSTD_DCtx"); + err = -1; + goto out; + } + /* + * Find out how large the frame actually is, there may be junk at + * the end of the frame that ZSTD_decompressDCtx() can't handle. + */ + ret = ZSTD_findFrameCompressedSize(in_buf, in_len); + err = handle_zstd_error(ret, error); + if (err) + goto out; + in_len = (long)ret; + + ret = ZSTD_decompressDCtx(dctx, out_buf, out_len, in_buf, in_len); + err = handle_zstd_error(ret, error); + if (err) + goto out; + + if (in_pos != NULL) + *in_pos = in_len; + + err = 0; +out: + if (wksp != NULL) + large_free(wksp); + return err; +} + +STATIC int INIT unzstd(unsigned char *in_buf, unsigned int in_len, + int (*fill)(void*, unsigned int), + int (*flush)(void*, unsigned int), + unsigned char *out_buf, + unsigned int *in_pos, + void (*error)(const char *x)) +{ + ZSTD_inBuffer in; + ZSTD_outBuffer out; + ZSTD_frameParams params; + void *in_allocated = NULL; + void *out_allocated = NULL; + void *wksp = NULL; + size_t wksp_size; + ZSTD_DStream *dstream; + int err; + size_t ret; + /* + * ZSTD decompression code won't be happy if the buffer size is so big + * that its end address overflows. When the size is not provided, make + * it as big as possible without having the end address overflow. + */ + unsigned long out_len = ULONG_MAX - (unsigned long)out_buf; + + if (fill == NULL && flush == NULL) + /* + * We can decompress faster and with less memory when we have a + * single chunk. + */ + return decompress_single(in_buf, in_len, out_buf, out_len, + in_pos, error); + + /* + * If in_buf is not provided, we must be using fill(), so allocate + * a large enough buffer. If it is provided, it must be at least + * ZSTD_IOBUF_SIZE large. + */ + if (in_buf == NULL) { + in_allocated = large_malloc(ZSTD_IOBUF_SIZE); + if (in_allocated == NULL) { + error("Out of memory while allocating input buffer"); + err = -1; + goto out; + } + in_buf = in_allocated; + in_len = 0; + } + /* Read the first chunk, since we need to decode the frame header. */ + if (fill != NULL) + in_len = fill(in_buf, ZSTD_IOBUF_SIZE); + if ((int)in_len < 0) { + error("ZSTD-compressed data is truncated"); + err = -1; + goto out; + } + /* Set the first non-empty input buffer. */ + in.src = in_buf; + in.pos = 0; + in.size = in_len; + /* Allocate the output buffer if we are using flush(). */ + if (flush != NULL) { + out_allocated = large_malloc(ZSTD_IOBUF_SIZE); + if (out_allocated == NULL) { + error("Out of memory while allocating output buffer"); + err = -1; + goto out; + } + out_buf = out_allocated; + out_len = ZSTD_IOBUF_SIZE; + } + /* Set the output buffer. */ + out.dst = out_buf; + out.pos = 0; + out.size = out_len; + + /* + * We need to know the window size to allocate the ZSTD_DStream. + * Since we are streaming, we need to allocate a buffer for the sliding + * window. The window size varies from 1 KB to ZSTD_WINDOWSIZE_MAX + * (8 MB), so it is important to use the actual value so as not to + * waste memory when it is smaller. + */ + ret = ZSTD_getFrameParams(¶ms, in.src, in.size); + err = handle_zstd_error(ret, error); + if (err) + goto out; + if (ret != 0) { + error("ZSTD-compressed data has an incomplete frame header"); + err = -1; + goto out; + } + if (params.windowSize > ZSTD_WINDOWSIZE_MAX) { + error("ZSTD-compressed data has too large a window size"); + err = -1; + goto out; + } + + /* + * Allocate the ZSTD_DStream now that we know how much memory is + * required. + */ + wksp_size = ZSTD_DStreamWorkspaceBound(params.windowSize); + wksp = large_malloc(wksp_size); + dstream = ZSTD_initDStream(params.windowSize, wksp, wksp_size); + if (dstream == NULL) { + error("Out of memory while allocating ZSTD_DStream"); + err = -1; + goto out; + } + + /* + * Decompression loop: + * Read more data if necessary (error if no more data can be read). + * Call the decompression function, which returns 0 when finished. + * Flush any data produced if using flush(). + */ + if (in_pos != NULL) + *in_pos = 0; + do { + /* + * If we need to reload data, either we have fill() and can + * try to get more data, or we don't and the input is truncated. + */ + if (in.pos == in.size) { + if (in_pos != NULL) + *in_pos += in.pos; + in_len = fill ? fill(in_buf, ZSTD_IOBUF_SIZE) : -1; + if ((int)in_len < 0) { + error("ZSTD-compressed data is truncated"); + err = -1; + goto out; + } + in.pos = 0; + in.size = in_len; + } + /* Returns zero when the frame is complete. */ + ret = ZSTD_decompressStream(dstream, &out, &in); + err = handle_zstd_error(ret, error); + if (err) + goto out; + /* Flush all of the data produced if using flush(). */ + if (flush != NULL && out.pos > 0) { + if (out.pos != flush(out.dst, out.pos)) { + error("Failed to flush()"); + err = -1; + goto out; + } + out.pos = 0; + } + } while (ret != 0); + + if (in_pos != NULL) + *in_pos += in.pos; + + err = 0; +out: + if (in_allocated != NULL) + large_free(in_allocated); + if (out_allocated != NULL) + large_free(out_allocated); + if (wksp != NULL) + large_free(wksp); + return err; +} diff --git a/xen/common/zstd/bitstream.h b/xen/common/zstd/bitstream.h new file mode 100644 index 0000000000..2b06d4551f --- /dev/null +++ b/xen/common/zstd/bitstream.h @@ -0,0 +1,380 @@ +/* + * bitstream + * Part of FSE library + * header file (to include) + * Copyright (C) 2013-2016, Yann Collet. + * + * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. This program is dual-licensed; you may select + * either version 2 of the GNU General Public License ("GPL") or BSD license + * ("BSD"). + * + * You can contact the author at : + * - Source repository : https://github.com/Cyan4973/FiniteStateEntropy + */ +#ifndef BITSTREAM_H_MODULE +#define BITSTREAM_H_MODULE + +/* +* This API consists of small unitary functions, which must be inlined for best performance. +* Since link-time-optimization is not available for all compilers, +* these functions are defined into a .h to be included. +*/ + +/*-**************************************** +* Dependencies +******************************************/ +#include "error_private.h" /* error codes and messages */ +#include "mem.h" /* unaligned access routines */ + +/*========================================= +* Target specific +=========================================*/ +#define STREAM_ACCUMULATOR_MIN_32 25 +#define STREAM_ACCUMULATOR_MIN_64 57 +#define STREAM_ACCUMULATOR_MIN ((U32)(ZSTD_32bits() ? STREAM_ACCUMULATOR_MIN_32 : STREAM_ACCUMULATOR_MIN_64)) + +/*-****************************************** +* bitStream encoding API (write forward) +********************************************/ +/* bitStream can mix input from multiple sources. +* A critical property of these streams is that they encode and decode in **reverse** direction. +* So the first bit sequence you add will be the last to be read, like a LIFO stack. +*/ +typedef struct { + size_t bitContainer; + int bitPos; + char *startPtr; + char *ptr; + char *endPtr; +} BIT_CStream_t; + +ZSTD_STATIC size_t BIT_initCStream(BIT_CStream_t *bitC, void *dstBuffer, size_t dstCapacity); +ZSTD_STATIC void BIT_addBits(BIT_CStream_t *bitC, size_t value, unsigned nbBits); +ZSTD_STATIC void BIT_flushBits(BIT_CStream_t *bitC); +ZSTD_STATIC size_t BIT_closeCStream(BIT_CStream_t *bitC); + +/* Start with initCStream, providing the size of buffer to write into. +* bitStream will never write outside of this buffer. +* `dstCapacity` must be >= sizeof(bitD->bitContainer), otherwise @return will be an error code. +* +* bits are first added to a local register. +* Local register is size_t, hence 64-bits on 64-bits systems, or 32-bits on 32-bits systems. +* Writing data into memory is an explicit operation, performed by the flushBits function. +* Hence keep track how many bits are potentially stored into local register to avoid register overflow. +* After a flushBits, a maximum of 7 bits might still be stored into local register. +* +* Avoid storing elements of more than 24 bits if you want compatibility with 32-bits bitstream readers. +* +* Last operation is to close the bitStream. +* The function returns the final size of CStream in bytes. +* If data couldn't fit into `dstBuffer`, it will return a 0 ( == not storable) +*/ + +/*-******************************************** +* bitStream decoding API (read backward) +**********************************************/ +typedef struct { + size_t bitContainer; + unsigned bitsConsumed; + const char *ptr; + const char *start; +} BIT_DStream_t; + +typedef enum { + BIT_DStream_unfinished = 0, + BIT_DStream_endOfBuffer = 1, + BIT_DStream_completed = 2, + BIT_DStream_overflow = 3 +} BIT_DStream_status; /* result of BIT_reloadDStream() */ +/* 1,2,4,8 would be better for bitmap combinations, but slows down performance a bit ... :( */ + +ZSTD_STATIC size_t BIT_initDStream(BIT_DStream_t *bitD, const void *srcBuffer, size_t srcSize); +ZSTD_STATIC size_t BIT_readBits(BIT_DStream_t *bitD, unsigned nbBits); +ZSTD_STATIC BIT_DStream_status BIT_reloadDStream(BIT_DStream_t *bitD); +ZSTD_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t *bitD); + +/* Start by invoking BIT_initDStream(). +* A chunk of the bitStream is then stored into a local register. +* Local register size is 64-bits on 64-bits systems, 32-bits on 32-bits systems (size_t). +* You can then retrieve bitFields stored into the local register, **in reverse order**. +* Local register is explicitly reloaded from memory by the BIT_reloadDStream() method. +* A reload guarantee a minimum of ((8*sizeof(bitD->bitContainer))-7) bits when its result is BIT_DStream_unfinished. +* Otherwise, it can be less than that, so proceed accordingly. +* Checking if DStream has reached its end can be performed with BIT_endOfDStream(). +*/ + +/*-**************************************** +* unsafe API +******************************************/ +ZSTD_STATIC void BIT_addBitsFast(BIT_CStream_t *bitC, size_t value, unsigned nbBits); +/* faster, but works only if value is "clean", meaning all high bits above nbBits are 0 */ + +ZSTD_STATIC void BIT_flushBitsFast(BIT_CStream_t *bitC); +/* unsafe version; does not check buffer overflow */ + +ZSTD_STATIC size_t BIT_readBitsFast(BIT_DStream_t *bitD, unsigned nbBits); +/* faster, but works only if nbBits >= 1 */ + +/*-************************************************************** +* Internal functions +****************************************************************/ +ZSTD_STATIC unsigned BIT_highbit32(register U32 val) { return 31 - __builtin_clz(val); } + +/*===== Local Constants =====*/ +static const unsigned BIT_mask[] = {0, 1, 3, 7, 0xF, 0x1F, 0x3F, 0x7F, 0xFF, + 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF, 0x1FFFF, + 0x3FFFF, 0x7FFFF, 0xFFFFF, 0x1FFFFF, 0x3FFFFF, 0x7FFFFF, 0xFFFFFF, 0x1FFFFFF, 0x3FFFFFF}; /* up to 26 bits */ + +/*-************************************************************** +* bitStream encoding +****************************************************************/ +/*! BIT_initCStream() : + * `dstCapacity` must be > sizeof(void*) + * @return : 0 if success, + otherwise an error code (can be tested using ERR_isError() ) */ +ZSTD_STATIC size_t BIT_initCStream(BIT_CStream_t *bitC, void *startPtr, size_t dstCapacity) +{ + bitC->bitContainer = 0; + bitC->bitPos = 0; + bitC->startPtr = (char *)startPtr; + bitC->ptr = bitC->startPtr; + bitC->endPtr = bitC->startPtr + dstCapacity - sizeof(bitC->ptr); + if (dstCapacity <= sizeof(bitC->ptr)) + return ERROR(dstSize_tooSmall); + return 0; +} + +/*! BIT_addBits() : + can add up to 26 bits into `bitC`. + Does not check for register overflow ! */ +ZSTD_STATIC void BIT_addBits(BIT_CStream_t *bitC, size_t value, unsigned nbBits) +{ + bitC->bitContainer |= (value & BIT_mask[nbBits]) << bitC->bitPos; + bitC->bitPos += nbBits; +} + +/*! BIT_addBitsFast() : + * works only if `value` is _clean_, meaning all high bits above nbBits are 0 */ +ZSTD_STATIC void BIT_addBitsFast(BIT_CStream_t *bitC, size_t value, unsigned nbBits) +{ + bitC->bitContainer |= value << bitC->bitPos; + bitC->bitPos += nbBits; +} + +/*! BIT_flushBitsFast() : + * unsafe version; does not check buffer overflow */ +ZSTD_STATIC void BIT_flushBitsFast(BIT_CStream_t *bitC) +{ + size_t const nbBytes = bitC->bitPos >> 3; + ZSTD_writeLEST(bitC->ptr, bitC->bitContainer); + bitC->ptr += nbBytes; + bitC->bitPos &= 7; + bitC->bitContainer >>= nbBytes * 8; /* if bitPos >= sizeof(bitContainer)*8 --> undefined behavior */ +} + +/*! BIT_flushBits() : + * safe version; check for buffer overflow, and prevents it. + * note : does not signal buffer overflow. This will be revealed later on using BIT_closeCStream() */ +ZSTD_STATIC void BIT_flushBits(BIT_CStream_t *bitC) +{ + size_t const nbBytes = bitC->bitPos >> 3; + ZSTD_writeLEST(bitC->ptr, bitC->bitContainer); + bitC->ptr += nbBytes; + if (bitC->ptr > bitC->endPtr) + bitC->ptr = bitC->endPtr; + bitC->bitPos &= 7; + bitC->bitContainer >>= nbBytes * 8; /* if bitPos >= sizeof(bitContainer)*8 --> undefined behavior */ +} + +/*! BIT_closeCStream() : + * @return : size of CStream, in bytes, + or 0 if it could not fit into dstBuffer */ +ZSTD_STATIC size_t BIT_closeCStream(BIT_CStream_t *bitC) +{ + BIT_addBitsFast(bitC, 1, 1); /* endMark */ + BIT_flushBits(bitC); + + if (bitC->ptr >= bitC->endPtr) + return 0; /* doesn't fit within authorized budget : cancel */ + + return (bitC->ptr - bitC->startPtr) + (bitC->bitPos > 0); +} + +/*-******************************************************** +* bitStream decoding +**********************************************************/ +/*! BIT_initDStream() : +* Initialize a BIT_DStream_t. +* `bitD` : a pointer to an already allocated BIT_DStream_t structure. +* `srcSize` must be the *exact* size of the bitStream, in bytes. +* @return : size of stream (== srcSize) or an errorCode if a problem is detected +*/ +ZSTD_STATIC size_t BIT_initDStream(BIT_DStream_t *bitD, const void *srcBuffer, size_t srcSize) +{ + if (srcSize < 1) { + memset(bitD, 0, sizeof(*bitD)); + return ERROR(srcSize_wrong); + } + + if (srcSize >= sizeof(bitD->bitContainer)) { /* normal case */ + bitD->start = (const char *)srcBuffer; + bitD->ptr = (const char *)srcBuffer + srcSize - sizeof(bitD->bitContainer); + bitD->bitContainer = ZSTD_readLEST(bitD->ptr); + { + BYTE const lastByte = ((const BYTE *)srcBuffer)[srcSize - 1]; + bitD->bitsConsumed = lastByte ? 8 - BIT_highbit32(lastByte) : 0; /* ensures bitsConsumed is always set */ + if (lastByte == 0) + return ERROR(GENERIC); /* endMark not present */ + } + } else { + bitD->start = (const char *)srcBuffer; + bitD->ptr = bitD->start; + bitD->bitContainer = *(const BYTE *)(bitD->start); + switch (srcSize) { + case 7: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[6]) << (sizeof(bitD->bitContainer) * 8 - 16); + /* fallthrough */ + case 6: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[5]) << (sizeof(bitD->bitContainer) * 8 - 24); + /* fallthrough */ + case 5: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[4]) << (sizeof(bitD->bitContainer) * 8 - 32); + /* fallthrough */ + case 4: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[3]) << 24; + /* fallthrough */ + case 3: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[2]) << 16; + /* fallthrough */ + case 2: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[1]) << 8; + /* fallthrough */ + default:; + } + { + BYTE const lastByte = ((const BYTE *)srcBuffer)[srcSize - 1]; + bitD->bitsConsumed = lastByte ? 8 - BIT_highbit32(lastByte) : 0; + if (lastByte == 0) + return ERROR(GENERIC); /* endMark not present */ + } + bitD->bitsConsumed += (U32)(sizeof(bitD->bitContainer) - srcSize) * 8; + } + + return srcSize; +} + +ZSTD_STATIC size_t BIT_getUpperBits(size_t bitContainer, U32 const start) { return bitContainer >> start; } + +ZSTD_STATIC size_t BIT_getMiddleBits(size_t bitContainer, U32 const start, U32 const nbBits) { return (bitContainer >> start) & BIT_mask[nbBits]; } + +ZSTD_STATIC size_t BIT_getLowerBits(size_t bitContainer, U32 const nbBits) { return bitContainer & BIT_mask[nbBits]; } + +/*! BIT_lookBits() : + * Provides next n bits from local register. + * local register is not modified. + * On 32-bits, maxNbBits==24. + * On 64-bits, maxNbBits==56. + * @return : value extracted + */ +ZSTD_STATIC size_t BIT_lookBits(const BIT_DStream_t *bitD, U32 nbBits) +{ + U32 const bitMask = sizeof(bitD->bitContainer) * 8 - 1; + return ((bitD->bitContainer << (bitD->bitsConsumed & bitMask)) >> 1) >> ((bitMask - nbBits) & bitMask); +} + +/*! BIT_lookBitsFast() : +* unsafe version; only works only if nbBits >= 1 */ +ZSTD_STATIC size_t BIT_lookBitsFast(const BIT_DStream_t *bitD, U32 nbBits) +{ + U32 const bitMask = sizeof(bitD->bitContainer) * 8 - 1; + return (bitD->bitContainer << (bitD->bitsConsumed & bitMask)) >> (((bitMask + 1) - nbBits) & bitMask); +} + +ZSTD_STATIC void BIT_skipBits(BIT_DStream_t *bitD, U32 nbBits) { bitD->bitsConsumed += nbBits; } + +/*! BIT_readBits() : + * Read (consume) next n bits from local register and update. + * Pay attention to not read more than nbBits contained into local register. + * @return : extracted value. + */ +ZSTD_STATIC size_t BIT_readBits(BIT_DStream_t *bitD, U32 nbBits) +{ + size_t const value = BIT_lookBits(bitD, nbBits); + BIT_skipBits(bitD, nbBits); + return value; +} + +/*! BIT_readBitsFast() : +* unsafe version; only works only if nbBits >= 1 */ +ZSTD_STATIC size_t BIT_readBitsFast(BIT_DStream_t *bitD, U32 nbBits) +{ + size_t const value = BIT_lookBitsFast(bitD, nbBits); + BIT_skipBits(bitD, nbBits); + return value; +} + +/*! BIT_reloadDStream() : +* Refill `bitD` from buffer previously set in BIT_initDStream() . +* This function is safe, it guarantees it will not read beyond src buffer. +* @return : status of `BIT_DStream_t` internal register. + if status == BIT_DStream_unfinished, internal register is filled with >= (sizeof(bitD->bitContainer)*8 - 7) bits */ +ZSTD_STATIC BIT_DStream_status BIT_reloadDStream(BIT_DStream_t *bitD) +{ + if (bitD->bitsConsumed > (sizeof(bitD->bitContainer) * 8)) /* should not happen => corruption detected */ + return BIT_DStream_overflow; + + if (bitD->ptr >= bitD->start + sizeof(bitD->bitContainer)) { + bitD->ptr -= bitD->bitsConsumed >> 3; + bitD->bitsConsumed &= 7; + bitD->bitContainer = ZSTD_readLEST(bitD->ptr); + return BIT_DStream_unfinished; + } + if (bitD->ptr == bitD->start) { + if (bitD->bitsConsumed < sizeof(bitD->bitContainer) * 8) + return BIT_DStream_endOfBuffer; + return BIT_DStream_completed; + } + { + U32 nbBytes = bitD->bitsConsumed >> 3; + BIT_DStream_status result = BIT_DStream_unfinished; + if (bitD->ptr - nbBytes < bitD->start) { + nbBytes = (U32)(bitD->ptr - bitD->start); /* ptr > start */ + result = BIT_DStream_endOfBuffer; + } + bitD->ptr -= nbBytes; + bitD->bitsConsumed -= nbBytes * 8; + bitD->bitContainer = ZSTD_readLEST(bitD->ptr); /* reminder : srcSize > sizeof(bitD) */ + return result; + } +} + +/*! BIT_endOfDStream() : +* @return Tells if DStream has exactly reached its end (all bits consumed). +*/ +ZSTD_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t *DStream) +{ + return ((DStream->ptr == DStream->start) && (DStream->bitsConsumed == sizeof(DStream->bitContainer) * 8)); +} + +#endif /* BITSTREAM_H_MODULE */ diff --git a/xen/common/zstd/decompress.c b/xen/common/zstd/decompress.c new file mode 100644 index 0000000000..3d3ef136e5 --- /dev/null +++ b/xen/common/zstd/decompress.c @@ -0,0 +1,2496 @@ +/** + * Copyright (c) 2016-present, Yann Collet, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of https://github.com/facebook/zstd. + * An additional grant of patent rights can be found in the PATENTS file in the + * same directory. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. This program is dual-licensed; you may select + * either version 2 of the GNU General Public License ("GPL") or BSD license + * ("BSD"). + */ + +/* *************************************************************** +* Tuning parameters +*****************************************************************/ +/*! +* MAXWINDOWSIZE_DEFAULT : +* maximum window size accepted by DStream, by default. +* Frames requiring more memory will be rejected. +*/ +#ifndef ZSTD_MAXWINDOWSIZE_DEFAULT +#define ZSTD_MAXWINDOWSIZE_DEFAULT ((1 << ZSTD_WINDOWLOG_MAX) + 1) /* defined within zstd.h */ +#endif + +/*-******************************************************* +* Dependencies +*********************************************************/ +#include "fse.h" +#include "huf.h" +#include "mem.h" /* low level memory routines */ +#include "zstd_internal.h" +#include /* memcpy, memmove, memset */ + +#define ZSTD_PREFETCH(ptr) __builtin_prefetch(ptr, 0, 0) + +/*-************************************* +* Macros +***************************************/ +#define ZSTD_isError ERR_isError /* for inlining */ +#define FSE_isError ERR_isError +#define HUF_isError ERR_isError + +/*_******************************************************* +* Memory operations +**********************************************************/ +static void INIT ZSTD_copy4(void *dst, const void *src) { memcpy(dst, src, 4); } + +/*-************************************************************* +* Context management +***************************************************************/ +typedef enum { + ZSTDds_getFrameHeaderSize, + ZSTDds_decodeFrameHeader, + ZSTDds_decodeBlockHeader, + ZSTDds_decompressBlock, + ZSTDds_decompressLastBlock, + ZSTDds_checkChecksum, + ZSTDds_decodeSkippableHeader, + ZSTDds_skipFrame +} ZSTD_dStage; + +typedef struct { + FSE_DTable LLTable[FSE_DTABLE_SIZE_U32(LLFSELog)]; + FSE_DTable OFTable[FSE_DTABLE_SIZE_U32(OffFSELog)]; + FSE_DTable MLTable[FSE_DTABLE_SIZE_U32(MLFSELog)]; + HUF_DTable hufTable[HUF_DTABLE_SIZE(HufLog)]; /* can accommodate HUF_decompress4X */ + U64 workspace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32 / 2]; + U32 rep[ZSTD_REP_NUM]; +} ZSTD_entropyTables_t; + +struct ZSTD_DCtx_s { + const FSE_DTable *LLTptr; + const FSE_DTable *MLTptr; + const FSE_DTable *OFTptr; + const HUF_DTable *HUFptr; + ZSTD_entropyTables_t entropy; + const void *previousDstEnd; /* detect continuity */ + const void *base; /* start of curr segment */ + const void *vBase; /* virtual start of previous segment if it was just before curr one */ + const void *dictEnd; /* end of previous segment */ + size_t expected; + ZSTD_frameParams fParams; + blockType_e bType; /* used in ZSTD_decompressContinue(), to transfer blockType between header decoding and block decoding stages */ + ZSTD_dStage stage; + U32 litEntropy; + U32 fseEntropy; + struct xxh64_state xxhState; + size_t headerSize; + U32 dictID; + const BYTE *litPtr; + ZSTD_customMem customMem; + size_t litSize; + size_t rleSize; + BYTE litBuffer[ZSTD_BLOCKSIZE_ABSOLUTEMAX + WILDCOPY_OVERLENGTH]; + BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX]; +}; /* typedef'd to ZSTD_DCtx within "zstd.h" */ + +size_t INIT ZSTD_DCtxWorkspaceBound(void) { return ZSTD_ALIGN(sizeof(ZSTD_stack)) + ZSTD_ALIGN(sizeof(ZSTD_DCtx)); } + +size_t INIT ZSTD_decompressBegin(ZSTD_DCtx *dctx) +{ + dctx->expected = ZSTD_frameHeaderSize_prefix; + dctx->stage = ZSTDds_getFrameHeaderSize; + dctx->previousDstEnd = NULL; + dctx->base = NULL; + dctx->vBase = NULL; + dctx->dictEnd = NULL; + dctx->entropy.hufTable[0] = (HUF_DTable)((HufLog)*0x1000001); /* cover both little and big endian */ + dctx->litEntropy = dctx->fseEntropy = 0; + dctx->dictID = 0; + ZSTD_STATIC_ASSERT(sizeof(dctx->entropy.rep) == sizeof(repStartValue)); + memcpy(dctx->entropy.rep, repStartValue, sizeof(repStartValue)); /* initial repcodes */ + dctx->LLTptr = dctx->entropy.LLTable; + dctx->MLTptr = dctx->entropy.MLTable; + dctx->OFTptr = dctx->entropy.OFTable; + dctx->HUFptr = dctx->entropy.hufTable; + return 0; +} + +ZSTD_DCtx *INIT ZSTD_createDCtx_advanced(ZSTD_customMem customMem) +{ + ZSTD_DCtx *dctx; + + if (!customMem.customAlloc || !customMem.customFree) + return NULL; + + dctx = (ZSTD_DCtx *)ZSTD_malloc(sizeof(ZSTD_DCtx), customMem); + if (!dctx) + return NULL; + memcpy(&dctx->customMem, &customMem, sizeof(customMem)); + ZSTD_decompressBegin(dctx); + return dctx; +} + +ZSTD_DCtx *INIT ZSTD_initDCtx(void *workspace, size_t workspaceSize) +{ + ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize); + return ZSTD_createDCtx_advanced(stackMem); +} + +size_t INIT ZSTD_freeDCtx(ZSTD_DCtx *dctx) +{ + if (dctx == NULL) + return 0; /* support free on NULL */ + ZSTD_free(dctx, dctx->customMem); + return 0; /* reserved as a potential error code in the future */ +} + +void INIT ZSTD_copyDCtx(ZSTD_DCtx *dstDCtx, const ZSTD_DCtx *srcDCtx) +{ + size_t const workSpaceSize = (ZSTD_BLOCKSIZE_ABSOLUTEMAX + WILDCOPY_OVERLENGTH) + ZSTD_frameHeaderSize_max; + memcpy(dstDCtx, srcDCtx, sizeof(ZSTD_DCtx) - workSpaceSize); /* no need to copy workspace */ +} + +STATIC size_t ZSTD_findFrameCompressedSize(const void *src, size_t srcSize); +STATIC size_t ZSTD_decompressBegin_usingDict(ZSTD_DCtx *dctx, const void *dict, + size_t dictSize); + +static void ZSTD_refDDict(ZSTD_DCtx *dstDCtx, const ZSTD_DDict *ddict); + +/*-************************************************************* +* Decompression section +***************************************************************/ + +/*! ZSTD_isFrame() : + * Tells if the content of `buffer` starts with a valid Frame Identifier. + * Note : Frame Identifier is 4 bytes. If `size < 4`, @return will always be 0. + * Note 2 : Legacy Frame Identifiers are considered valid only if Legacy Support is enabled. + * Note 3 : Skippable Frame Identifiers are considered valid. */ +unsigned INIT ZSTD_isFrame(const void *buffer, size_t size) +{ + if (size < 4) + return 0; + { + U32 const magic = ZSTD_readLE32(buffer); + if (magic == ZSTD_MAGICNUMBER) + return 1; + if ((magic & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) + return 1; + } + return 0; +} + +/** ZSTD_frameHeaderSize() : +* srcSize must be >= ZSTD_frameHeaderSize_prefix. +* @return : size of the Frame Header */ +static size_t INIT ZSTD_frameHeaderSize(const void *src, size_t srcSize) +{ + if (srcSize < ZSTD_frameHeaderSize_prefix) + return ERROR(srcSize_wrong); + { + BYTE const fhd = ((const BYTE *)src)[4]; + U32 const dictID = fhd & 3; + U32 const singleSegment = (fhd >> 5) & 1; + U32 const fcsId = fhd >> 6; + return ZSTD_frameHeaderSize_prefix + !singleSegment + ZSTD_did_fieldSize[dictID] + ZSTD_fcs_fieldSize[fcsId] + (singleSegment && !fcsId); + } +} + +/** ZSTD_getFrameParams() : +* decode Frame Header, or require larger `srcSize`. +* @return : 0, `fparamsPtr` is correctly filled, +* >0, `srcSize` is too small, result is expected `srcSize`, +* or an error code, which can be tested using ZSTD_isError() */ +size_t INIT ZSTD_getFrameParams(ZSTD_frameParams *fparamsPtr, const void *src, size_t srcSize) +{ + const BYTE *ip = (const BYTE *)src; + + if (srcSize < ZSTD_frameHeaderSize_prefix) + return ZSTD_frameHeaderSize_prefix; + if (ZSTD_readLE32(src) != ZSTD_MAGICNUMBER) { + if ((ZSTD_readLE32(src) & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) { + if (srcSize < ZSTD_skippableHeaderSize) + return ZSTD_skippableHeaderSize; /* magic number + skippable frame length */ + memset(fparamsPtr, 0, sizeof(*fparamsPtr)); + fparamsPtr->frameContentSize = ZSTD_readLE32((const char *)src + 4); + fparamsPtr->windowSize = 0; /* windowSize==0 means a frame is skippable */ + return 0; + } + return ERROR(prefix_unknown); + } + + /* ensure there is enough `srcSize` to fully read/decode frame header */ + { + size_t const fhsize = ZSTD_frameHeaderSize(src, srcSize); + if (srcSize < fhsize) + return fhsize; + } + + { + BYTE const fhdByte = ip[4]; + size_t pos = 5; + U32 const dictIDSizeCode = fhdByte & 3; + U32 const checksumFlag = (fhdByte >> 2) & 1; + U32 const singleSegment = (fhdByte >> 5) & 1; + U32 const fcsID = fhdByte >> 6; + U32 const windowSizeMax = 1U << ZSTD_WINDOWLOG_MAX; + U32 windowSize = 0; + U32 dictID = 0; + U64 frameContentSize = 0; + if ((fhdByte & 0x08) != 0) + return ERROR(frameParameter_unsupported); /* reserved bits, which must be zero */ + if (!singleSegment) { + BYTE const wlByte = ip[pos++]; + U32 const windowLog = (wlByte >> 3) + ZSTD_WINDOWLOG_ABSOLUTEMIN; + if (windowLog > ZSTD_WINDOWLOG_MAX) + return ERROR(frameParameter_windowTooLarge); /* avoids issue with 1 << windowLog */ + windowSize = (1U << windowLog); + windowSize += (windowSize >> 3) * (wlByte & 7); + } + + switch (dictIDSizeCode) { + default: /* impossible */ + case 0: break; + case 1: + dictID = ip[pos]; + pos++; + break; + case 2: + dictID = ZSTD_readLE16(ip + pos); + pos += 2; + break; + case 3: + dictID = ZSTD_readLE32(ip + pos); + pos += 4; + break; + } + switch (fcsID) { + default: /* impossible */ + case 0: + if (singleSegment) + frameContentSize = ip[pos]; + break; + case 1: frameContentSize = ZSTD_readLE16(ip + pos) + 256; break; + case 2: frameContentSize = ZSTD_readLE32(ip + pos); break; + case 3: frameContentSize = ZSTD_readLE64(ip + pos); break; + } + if (!windowSize) + windowSize = (U32)frameContentSize; + if (windowSize > windowSizeMax) + return ERROR(frameParameter_windowTooLarge); + fparamsPtr->frameContentSize = frameContentSize; + fparamsPtr->windowSize = windowSize; + fparamsPtr->dictID = dictID; + fparamsPtr->checksumFlag = checksumFlag; + } + return 0; +} + +/** ZSTD_getFrameContentSize() : +* compatible with legacy mode +* @return : decompressed size of the single frame pointed to be `src` if known, otherwise +* - ZSTD_CONTENTSIZE_UNKNOWN if the size cannot be determined +* - ZSTD_CONTENTSIZE_ERROR if an error occurred (e.g. invalid magic number, srcSize too small) */ +unsigned long long INIT ZSTD_getFrameContentSize(const void *src, size_t srcSize) +{ + { + ZSTD_frameParams fParams; + if (ZSTD_getFrameParams(&fParams, src, srcSize) != 0) + return ZSTD_CONTENTSIZE_ERROR; + if (fParams.windowSize == 0) { + /* Either skippable or empty frame, size == 0 either way */ + return 0; + } else if (fParams.frameContentSize != 0) { + return fParams.frameContentSize; + } else { + return ZSTD_CONTENTSIZE_UNKNOWN; + } + } +} + +/** ZSTD_findDecompressedSize() : + * compatible with legacy mode + * `srcSize` must be the exact length of some number of ZSTD compressed and/or + * skippable frames + * @return : decompressed size of the frames contained */ +unsigned long long INIT ZSTD_findDecompressedSize(const void *src, size_t srcSize) +{ + { + unsigned long long totalDstSize = 0; + while (srcSize >= ZSTD_frameHeaderSize_prefix) { + const U32 magicNumber = ZSTD_readLE32(src); + + if ((magicNumber & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) { + size_t skippableSize; + if (srcSize < ZSTD_skippableHeaderSize) + return ERROR(srcSize_wrong); + skippableSize = ZSTD_readLE32((const BYTE *)src + 4) + ZSTD_skippableHeaderSize; + if (srcSize < skippableSize) { + return ZSTD_CONTENTSIZE_ERROR; + } + + src = (const BYTE *)src + skippableSize; + srcSize -= skippableSize; + continue; + } + + { + unsigned long long const ret = ZSTD_getFrameContentSize(src, srcSize); + if (ret >= ZSTD_CONTENTSIZE_ERROR) + return ret; + + /* check for overflow */ + if (totalDstSize + ret < totalDstSize) + return ZSTD_CONTENTSIZE_ERROR; + totalDstSize += ret; + } + { + size_t const frameSrcSize = ZSTD_findFrameCompressedSize(src, srcSize); + if (ZSTD_isError(frameSrcSize)) { + return ZSTD_CONTENTSIZE_ERROR; + } + + src = (const BYTE *)src + frameSrcSize; + srcSize -= frameSrcSize; + } + } + + if (srcSize) { + return ZSTD_CONTENTSIZE_ERROR; + } + + return totalDstSize; + } +} + +/** ZSTD_decodeFrameHeader() : +* `headerSize` must be the size provided by ZSTD_frameHeaderSize(). +* @return : 0 if success, or an error code, which can be tested using ZSTD_isError() */ +static size_t INIT ZSTD_decodeFrameHeader(ZSTD_DCtx *dctx, const void *src, size_t headerSize) +{ + size_t const result = ZSTD_getFrameParams(&(dctx->fParams), src, headerSize); + if (ZSTD_isError(result)) + return result; /* invalid header */ + if (result > 0) + return ERROR(srcSize_wrong); /* headerSize too small */ + if (dctx->fParams.dictID && (dctx->dictID != dctx->fParams.dictID)) + return ERROR(dictionary_wrong); + if (dctx->fParams.checksumFlag) + xxh64_reset(&dctx->xxhState, 0); + return 0; +} + +typedef struct { + blockType_e blockType; + U32 lastBlock; + U32 origSize; +} blockProperties_t; + +/*! ZSTD_getcBlockSize() : +* Provides the size of compressed block from block header `src` */ +size_t INIT ZSTD_getcBlockSize(const void *src, size_t srcSize, blockProperties_t *bpPtr) +{ + if (srcSize < ZSTD_blockHeaderSize) + return ERROR(srcSize_wrong); + { + U32 const cBlockHeader = ZSTD_readLE24(src); + U32 const cSize = cBlockHeader >> 3; + bpPtr->lastBlock = cBlockHeader & 1; + bpPtr->blockType = (blockType_e)((cBlockHeader >> 1) & 3); + bpPtr->origSize = cSize; /* only useful for RLE */ + if (bpPtr->blockType == bt_rle) + return 1; + if (bpPtr->blockType == bt_reserved) + return ERROR(corruption_detected); + return cSize; + } +} + +static size_t INIT ZSTD_copyRawBlock(void *dst, size_t dstCapacity, const void *src, size_t srcSize) +{ + if (srcSize > dstCapacity) + return ERROR(dstSize_tooSmall); + memcpy(dst, src, srcSize); + return srcSize; +} + +static size_t INIT ZSTD_setRleBlock(void *dst, size_t dstCapacity, const void *src, size_t srcSize, size_t regenSize) +{ + if (srcSize != 1) + return ERROR(srcSize_wrong); + if (regenSize > dstCapacity) + return ERROR(dstSize_tooSmall); + memset(dst, *(const BYTE *)src, regenSize); + return regenSize; +} + +/*! ZSTD_decodeLiteralsBlock() : + @return : nb of bytes read from src (< srcSize ) */ +size_t INIT ZSTD_decodeLiteralsBlock(ZSTD_DCtx *dctx, const void *src, size_t srcSize) /* note : srcSize < BLOCKSIZE */ +{ + if (srcSize < MIN_CBLOCK_SIZE) + return ERROR(corruption_detected); + + { + const BYTE *const istart = (const BYTE *)src; + symbolEncodingType_e const litEncType = (symbolEncodingType_e)(istart[0] & 3); + + switch (litEncType) { + case set_repeat: + if (dctx->litEntropy == 0) + return ERROR(dictionary_corrupted); + /* fallthrough */ + case set_compressed: + if (srcSize < 5) + return ERROR(corruption_detected); /* srcSize >= MIN_CBLOCK_SIZE == 3; here we need up to 5 for case 3 */ + { + size_t lhSize, litSize, litCSize; + U32 singleStream = 0; + U32 const lhlCode = (istart[0] >> 2) & 3; + U32 const lhc = ZSTD_readLE32(istart); + switch (lhlCode) { + case 0: + case 1: + default: /* note : default is impossible, since lhlCode into [0..3] */ + /* 2 - 2 - 10 - 10 */ + singleStream = !lhlCode; + lhSize = 3; + litSize = (lhc >> 4) & 0x3FF; + litCSize = (lhc >> 14) & 0x3FF; + break; + case 2: + /* 2 - 2 - 14 - 14 */ + lhSize = 4; + litSize = (lhc >> 4) & 0x3FFF; + litCSize = lhc >> 18; + break; + case 3: + /* 2 - 2 - 18 - 18 */ + lhSize = 5; + litSize = (lhc >> 4) & 0x3FFFF; + litCSize = (lhc >> 22) + (istart[4] << 10); + break; + } + if (litSize > ZSTD_BLOCKSIZE_ABSOLUTEMAX) + return ERROR(corruption_detected); + if (litCSize + lhSize > srcSize) + return ERROR(corruption_detected); + + if (HUF_isError( + (litEncType == set_repeat) + ? (singleStream ? HUF_decompress1X_usingDTable(dctx->litBuffer, litSize, istart + lhSize, litCSize, dctx->HUFptr) + : HUF_decompress4X_usingDTable(dctx->litBuffer, litSize, istart + lhSize, litCSize, dctx->HUFptr)) + : (singleStream + ? HUF_decompress1X2_DCtx_wksp(dctx->entropy.hufTable, dctx->litBuffer, litSize, istart + lhSize, litCSize, + dctx->entropy.workspace, sizeof(dctx->entropy.workspace)) + : HUF_decompress4X_hufOnly_wksp(dctx->entropy.hufTable, dctx->litBuffer, litSize, istart + lhSize, litCSize, + dctx->entropy.workspace, sizeof(dctx->entropy.workspace))))) + return ERROR(corruption_detected); + + dctx->litPtr = dctx->litBuffer; + dctx->litSize = litSize; + dctx->litEntropy = 1; + if (litEncType == set_compressed) + dctx->HUFptr = dctx->entropy.hufTable; + memset(dctx->litBuffer + dctx->litSize, 0, WILDCOPY_OVERLENGTH); + return litCSize + lhSize; + } + + case set_basic: { + size_t litSize, lhSize; + U32 const lhlCode = ((istart[0]) >> 2) & 3; + switch (lhlCode) { + case 0: + case 2: + default: /* note : default is impossible, since lhlCode into [0..3] */ + lhSize = 1; + litSize = istart[0] >> 3; + break; + case 1: + lhSize = 2; + litSize = ZSTD_readLE16(istart) >> 4; + break; + case 3: + lhSize = 3; + litSize = ZSTD_readLE24(istart) >> 4; + break; + } + + if (lhSize + litSize + WILDCOPY_OVERLENGTH > srcSize) { /* risk reading beyond src buffer with wildcopy */ + if (litSize + lhSize > srcSize) + return ERROR(corruption_detected); + memcpy(dctx->litBuffer, istart + lhSize, litSize); + dctx->litPtr = dctx->litBuffer; + dctx->litSize = litSize; + memset(dctx->litBuffer + dctx->litSize, 0, WILDCOPY_OVERLENGTH); + return lhSize + litSize; + } + /* direct reference into compressed stream */ + dctx->litPtr = istart + lhSize; + dctx->litSize = litSize; + return lhSize + litSize; + } + + case set_rle: { + U32 const lhlCode = ((istart[0]) >> 2) & 3; + size_t litSize, lhSize; + switch (lhlCode) { + case 0: + case 2: + default: /* note : default is impossible, since lhlCode into [0..3] */ + lhSize = 1; + litSize = istart[0] >> 3; + break; + case 1: + lhSize = 2; + litSize = ZSTD_readLE16(istart) >> 4; + break; + case 3: + lhSize = 3; + litSize = ZSTD_readLE24(istart) >> 4; + if (srcSize < 4) + return ERROR(corruption_detected); /* srcSize >= MIN_CBLOCK_SIZE == 3; here we need lhSize+1 = 4 */ + break; + } + if (litSize > ZSTD_BLOCKSIZE_ABSOLUTEMAX) + return ERROR(corruption_detected); + memset(dctx->litBuffer, istart[lhSize], litSize + WILDCOPY_OVERLENGTH); + dctx->litPtr = dctx->litBuffer; + dctx->litSize = litSize; + return lhSize + 1; + } + default: + return ERROR(corruption_detected); /* impossible */ + } + } +} + +typedef union { + FSE_decode_t realData; + U32 alignedBy4; +} FSE_decode_t4; + +static const FSE_decode_t4 LL_defaultDTable[(1 << LL_DEFAULTNORMLOG) + 1] = { + {{LL_DEFAULTNORMLOG, 1, 1}}, /* header : tableLog, fastMode, fastMode */ + {{0, 0, 4}}, /* 0 : base, symbol, bits */ + {{16, 0, 4}}, + {{32, 1, 5}}, + {{0, 3, 5}}, + {{0, 4, 5}}, + {{0, 6, 5}}, + {{0, 7, 5}}, + {{0, 9, 5}}, + {{0, 10, 5}}, + {{0, 12, 5}}, + {{0, 14, 6}}, + {{0, 16, 5}}, + {{0, 18, 5}}, + {{0, 19, 5}}, + {{0, 21, 5}}, + {{0, 22, 5}}, + {{0, 24, 5}}, + {{32, 25, 5}}, + {{0, 26, 5}}, + {{0, 27, 6}}, + {{0, 29, 6}}, + {{0, 31, 6}}, + {{32, 0, 4}}, + {{0, 1, 4}}, + {{0, 2, 5}}, + {{32, 4, 5}}, + {{0, 5, 5}}, + {{32, 7, 5}}, + {{0, 8, 5}}, + {{32, 10, 5}}, + {{0, 11, 5}}, + {{0, 13, 6}}, + {{32, 16, 5}}, + {{0, 17, 5}}, + {{32, 19, 5}}, + {{0, 20, 5}}, + {{32, 22, 5}}, + {{0, 23, 5}}, + {{0, 25, 4}}, + {{16, 25, 4}}, + {{32, 26, 5}}, + {{0, 28, 6}}, + {{0, 30, 6}}, + {{48, 0, 4}}, + {{16, 1, 4}}, + {{32, 2, 5}}, + {{32, 3, 5}}, + {{32, 5, 5}}, + {{32, 6, 5}}, + {{32, 8, 5}}, + {{32, 9, 5}}, + {{32, 11, 5}}, + {{32, 12, 5}}, + {{0, 15, 6}}, + {{32, 17, 5}}, + {{32, 18, 5}}, + {{32, 20, 5}}, + {{32, 21, 5}}, + {{32, 23, 5}}, + {{32, 24, 5}}, + {{0, 35, 6}}, + {{0, 34, 6}}, + {{0, 33, 6}}, + {{0, 32, 6}}, +}; /* LL_defaultDTable */ + +static const FSE_decode_t4 ML_defaultDTable[(1 << ML_DEFAULTNORMLOG) + 1] = { + {{ML_DEFAULTNORMLOG, 1, 1}}, /* header : tableLog, fastMode, fastMode */ + {{0, 0, 6}}, /* 0 : base, symbol, bits */ + {{0, 1, 4}}, + {{32, 2, 5}}, + {{0, 3, 5}}, + {{0, 5, 5}}, + {{0, 6, 5}}, + {{0, 8, 5}}, + {{0, 10, 6}}, + {{0, 13, 6}}, + {{0, 16, 6}}, + {{0, 19, 6}}, + {{0, 22, 6}}, + {{0, 25, 6}}, + {{0, 28, 6}}, + {{0, 31, 6}}, + {{0, 33, 6}}, + {{0, 35, 6}}, + {{0, 37, 6}}, + {{0, 39, 6}}, + {{0, 41, 6}}, + {{0, 43, 6}}, + {{0, 45, 6}}, + {{16, 1, 4}}, + {{0, 2, 4}}, + {{32, 3, 5}}, + {{0, 4, 5}}, + {{32, 6, 5}}, + {{0, 7, 5}}, + {{0, 9, 6}}, + {{0, 12, 6}}, + {{0, 15, 6}}, + {{0, 18, 6}}, + {{0, 21, 6}}, + {{0, 24, 6}}, + {{0, 27, 6}}, + {{0, 30, 6}}, + {{0, 32, 6}}, + {{0, 34, 6}}, + {{0, 36, 6}}, + {{0, 38, 6}}, + {{0, 40, 6}}, + {{0, 42, 6}}, + {{0, 44, 6}}, + {{32, 1, 4}}, + {{48, 1, 4}}, + {{16, 2, 4}}, + {{32, 4, 5}}, + {{32, 5, 5}}, + {{32, 7, 5}}, + {{32, 8, 5}}, + {{0, 11, 6}}, + {{0, 14, 6}}, + {{0, 17, 6}}, + {{0, 20, 6}}, + {{0, 23, 6}}, + {{0, 26, 6}}, + {{0, 29, 6}}, + {{0, 52, 6}}, + {{0, 51, 6}}, + {{0, 50, 6}}, + {{0, 49, 6}}, + {{0, 48, 6}}, + {{0, 47, 6}}, + {{0, 46, 6}}, +}; /* ML_defaultDTable */ + +static const FSE_decode_t4 OF_defaultDTable[(1 << OF_DEFAULTNORMLOG) + 1] = { + {{OF_DEFAULTNORMLOG, 1, 1}}, /* header : tableLog, fastMode, fastMode */ + {{0, 0, 5}}, /* 0 : base, symbol, bits */ + {{0, 6, 4}}, + {{0, 9, 5}}, + {{0, 15, 5}}, + {{0, 21, 5}}, + {{0, 3, 5}}, + {{0, 7, 4}}, + {{0, 12, 5}}, + {{0, 18, 5}}, + {{0, 23, 5}}, + {{0, 5, 5}}, + {{0, 8, 4}}, + {{0, 14, 5}}, + {{0, 20, 5}}, + {{0, 2, 5}}, + {{16, 7, 4}}, + {{0, 11, 5}}, + {{0, 17, 5}}, + {{0, 22, 5}}, + {{0, 4, 5}}, + {{16, 8, 4}}, + {{0, 13, 5}}, + {{0, 19, 5}}, + {{0, 1, 5}}, + {{16, 6, 4}}, + {{0, 10, 5}}, + {{0, 16, 5}}, + {{0, 28, 5}}, + {{0, 27, 5}}, + {{0, 26, 5}}, + {{0, 25, 5}}, + {{0, 24, 5}}, +}; /* OF_defaultDTable */ + +/*! ZSTD_buildSeqTable() : + @return : nb bytes read from src, + or an error code if it fails, testable with ZSTD_isError() +*/ +static size_t INIT ZSTD_buildSeqTable(FSE_DTable *DTableSpace, const FSE_DTable **DTablePtr, + symbolEncodingType_e type, U32 max, U32 maxLog, const void *src, + size_t srcSize, const FSE_decode_t4 *defaultTable, + U32 flagRepeatTable, void *workspace, size_t workspaceSize) +{ + const void *const tmpPtr = defaultTable; /* bypass strict aliasing */ + switch (type) { + case set_rle: + if (!srcSize) + return ERROR(srcSize_wrong); + if ((*(const BYTE *)src) > max) + return ERROR(corruption_detected); + FSE_buildDTable_rle(DTableSpace, *(const BYTE *)src); + *DTablePtr = DTableSpace; + return 1; + case set_basic: *DTablePtr = (const FSE_DTable *)tmpPtr; return 0; + case set_repeat: + if (!flagRepeatTable) + return ERROR(corruption_detected); + return 0; + default: /* impossible */ + case set_compressed: { + U32 tableLog; + S16 *norm = (S16 *)workspace; + size_t const spaceUsed32 = ALIGN(sizeof(S16) * (MaxSeq + 1), sizeof(U32)) >> 2; + + if ((spaceUsed32 << 2) > workspaceSize) + return ERROR(GENERIC); + workspace = (U32 *)workspace + spaceUsed32; + workspaceSize -= (spaceUsed32 << 2); + { + size_t const headerSize = FSE_readNCount(norm, &max, &tableLog, src, srcSize); + if (FSE_isError(headerSize)) + return ERROR(corruption_detected); + if (tableLog > maxLog) + return ERROR(corruption_detected); + FSE_buildDTable_wksp(DTableSpace, norm, max, tableLog, workspace, workspaceSize); + *DTablePtr = DTableSpace; + return headerSize; + } + } + } +} + +size_t INIT ZSTD_decodeSeqHeaders(ZSTD_DCtx *dctx, int *nbSeqPtr, const void *src, size_t srcSize) +{ + const BYTE *const istart = (const BYTE *const)src; + const BYTE *const iend = istart + srcSize; + const BYTE *ip = istart; + + /* check */ + if (srcSize < MIN_SEQUENCES_SIZE) + return ERROR(srcSize_wrong); + + /* SeqHead */ + { + int nbSeq = *ip++; + if (!nbSeq) { + *nbSeqPtr = 0; + return 1; + } + if (nbSeq > 0x7F) { + if (nbSeq == 0xFF) { + if (ip + 2 > iend) + return ERROR(srcSize_wrong); + nbSeq = ZSTD_readLE16(ip) + LONGNBSEQ, ip += 2; + } else { + if (ip >= iend) + return ERROR(srcSize_wrong); + nbSeq = ((nbSeq - 0x80) << 8) + *ip++; + } + } + *nbSeqPtr = nbSeq; + } + + /* FSE table descriptors */ + if (ip + 4 > iend) + return ERROR(srcSize_wrong); /* minimum possible size */ + { + symbolEncodingType_e const LLtype = (symbolEncodingType_e)(*ip >> 6); + symbolEncodingType_e const OFtype = (symbolEncodingType_e)((*ip >> 4) & 3); + symbolEncodingType_e const MLtype = (symbolEncodingType_e)((*ip >> 2) & 3); + ip++; + + /* Build DTables */ + { + size_t const llhSize = ZSTD_buildSeqTable(dctx->entropy.LLTable, &dctx->LLTptr, LLtype, MaxLL, LLFSELog, ip, iend - ip, + LL_defaultDTable, dctx->fseEntropy, dctx->entropy.workspace, sizeof(dctx->entropy.workspace)); + if (ZSTD_isError(llhSize)) + return ERROR(corruption_detected); + ip += llhSize; + } + { + size_t const ofhSize = ZSTD_buildSeqTable(dctx->entropy.OFTable, &dctx->OFTptr, OFtype, MaxOff, OffFSELog, ip, iend - ip, + OF_defaultDTable, dctx->fseEntropy, dctx->entropy.workspace, sizeof(dctx->entropy.workspace)); + if (ZSTD_isError(ofhSize)) + return ERROR(corruption_detected); + ip += ofhSize; + } + { + size_t const mlhSize = ZSTD_buildSeqTable(dctx->entropy.MLTable, &dctx->MLTptr, MLtype, MaxML, MLFSELog, ip, iend - ip, + ML_defaultDTable, dctx->fseEntropy, dctx->entropy.workspace, sizeof(dctx->entropy.workspace)); + if (ZSTD_isError(mlhSize)) + return ERROR(corruption_detected); + ip += mlhSize; + } + } + + return ip - istart; +} + +typedef struct { + size_t litLength; + size_t matchLength; + size_t offset; + const BYTE *match; +} seq_t; + +typedef struct { + BIT_DStream_t DStream; + FSE_DState_t stateLL; + FSE_DState_t stateOffb; + FSE_DState_t stateML; + size_t prevOffset[ZSTD_REP_NUM]; + const BYTE *base; + size_t pos; + uPtrDiff gotoDict; +} seqState_t; + +FORCE_NOINLINE +size_t ZSTD_execSequenceLast7(BYTE *op, BYTE *const oend, seq_t sequence, const BYTE **litPtr, const BYTE *const litLimit, const BYTE *const base, + const BYTE *const vBase, const BYTE *const dictEnd) +{ + BYTE *const oLitEnd = op + sequence.litLength; + size_t const sequenceLength = sequence.litLength + sequence.matchLength; + BYTE *const oMatchEnd = op + sequenceLength; /* risk : address space overflow (32-bits) */ + BYTE *const oend_w = oend - WILDCOPY_OVERLENGTH; + const BYTE *const iLitEnd = *litPtr + sequence.litLength; + const BYTE *match = oLitEnd - sequence.offset; + + /* check */ + if (oMatchEnd > oend) + return ERROR(dstSize_tooSmall); /* last match must start at a minimum distance of WILDCOPY_OVERLENGTH from oend */ + if (iLitEnd > litLimit) + return ERROR(corruption_detected); /* over-read beyond lit buffer */ + if (oLitEnd <= oend_w) + return ERROR(GENERIC); /* Precondition */ + + /* copy literals */ + if (op < oend_w) { + ZSTD_wildcopy(op, *litPtr, oend_w - op); + *litPtr += oend_w - op; + op = oend_w; + } + while (op < oLitEnd) + *op++ = *(*litPtr)++; + + /* copy Match */ + if (sequence.offset > (size_t)(oLitEnd - base)) { + /* offset beyond prefix */ + if (sequence.offset > (size_t)(oLitEnd - vBase)) + return ERROR(corruption_detected); + match = dictEnd - (base - match); + if (match + sequence.matchLength <= dictEnd) { + memmove(oLitEnd, match, sequence.matchLength); + return sequenceLength; + } + /* span extDict & currPrefixSegment */ + { + size_t const length1 = dictEnd - match; + memmove(oLitEnd, match, length1); + op = oLitEnd + length1; + sequence.matchLength -= length1; + match = base; + } + } + while (op < oMatchEnd) + *op++ = *match++; + return sequenceLength; +} + +static seq_t INIT ZSTD_decodeSequence(seqState_t *seqState) +{ + seq_t seq; + + U32 const llCode = FSE_peekSymbol(&seqState->stateLL); + U32 const mlCode = FSE_peekSymbol(&seqState->stateML); + U32 const ofCode = FSE_peekSymbol(&seqState->stateOffb); /* <= maxOff, by table construction */ + + U32 const llBits = LL_bits[llCode]; + U32 const mlBits = ML_bits[mlCode]; + U32 const ofBits = ofCode; + U32 const totalBits = llBits + mlBits + ofBits; + + static const U32 LL_base[MaxLL + 1] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, + 20, 22, 24, 28, 32, 40, 48, 64, 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000, 0x10000}; + + static const U32 ML_base[MaxML + 1] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 39, 41, + 43, 47, 51, 59, 67, 83, 99, 0x83, 0x103, 0x203, 0x403, 0x803, 0x1003, 0x2003, 0x4003, 0x8003, 0x10003}; + + static const U32 OF_base[MaxOff + 1] = {0, 1, 1, 5, 0xD, 0x1D, 0x3D, 0x7D, 0xFD, 0x1FD, + 0x3FD, 0x7FD, 0xFFD, 0x1FFD, 0x3FFD, 0x7FFD, 0xFFFD, 0x1FFFD, 0x3FFFD, 0x7FFFD, + 0xFFFFD, 0x1FFFFD, 0x3FFFFD, 0x7FFFFD, 0xFFFFFD, 0x1FFFFFD, 0x3FFFFFD, 0x7FFFFFD, 0xFFFFFFD}; + + /* sequence */ + { + size_t offset; + if (!ofCode) + offset = 0; + else { + offset = OF_base[ofCode] + BIT_readBitsFast(&seqState->DStream, ofBits); /* <= (ZSTD_WINDOWLOG_MAX-1) bits */ + if (ZSTD_32bits()) + BIT_reloadDStream(&seqState->DStream); + } + + if (ofCode <= 1) { + offset += (llCode == 0); + if (offset) { + size_t temp = (offset == 3) ? seqState->prevOffset[0] - 1 : seqState->prevOffset[offset]; + temp += !temp; /* 0 is not valid; input is corrupted; force offset to 1 */ + if (offset != 1) + seqState->prevOffset[2] = seqState->prevOffset[1]; + seqState->prevOffset[1] = seqState->prevOffset[0]; + seqState->prevOffset[0] = offset = temp; + } else { + offset = seqState->prevOffset[0]; + } + } else { + seqState->prevOffset[2] = seqState->prevOffset[1]; + seqState->prevOffset[1] = seqState->prevOffset[0]; + seqState->prevOffset[0] = offset; + } + seq.offset = offset; + } + + seq.matchLength = ML_base[mlCode] + ((mlCode > 31) ? BIT_readBitsFast(&seqState->DStream, mlBits) : 0); /* <= 16 bits */ + if (ZSTD_32bits() && (mlBits + llBits > 24)) + BIT_reloadDStream(&seqState->DStream); + + seq.litLength = LL_base[llCode] + ((llCode > 15) ? BIT_readBitsFast(&seqState->DStream, llBits) : 0); /* <= 16 bits */ + if (ZSTD_32bits() || (totalBits > 64 - 7 - (LLFSELog + MLFSELog + OffFSELog))) + BIT_reloadDStream(&seqState->DStream); + + /* ANS state update */ + FSE_updateState(&seqState->stateLL, &seqState->DStream); /* <= 9 bits */ + FSE_updateState(&seqState->stateML, &seqState->DStream); /* <= 9 bits */ + if (ZSTD_32bits()) + BIT_reloadDStream(&seqState->DStream); /* <= 18 bits */ + FSE_updateState(&seqState->stateOffb, &seqState->DStream); /* <= 8 bits */ + + seq.match = NULL; + + return seq; +} + +FORCE_INLINE +size_t ZSTD_execSequence(BYTE *op, BYTE *const oend, seq_t sequence, const BYTE **litPtr, const BYTE *const litLimit, const BYTE *const base, + const BYTE *const vBase, const BYTE *const dictEnd) +{ + BYTE *const oLitEnd = op + sequence.litLength; + size_t const sequenceLength = sequence.litLength + sequence.matchLength; + BYTE *const oMatchEnd = op + sequenceLength; /* risk : address space overflow (32-bits) */ + BYTE *const oend_w = oend - WILDCOPY_OVERLENGTH; + const BYTE *const iLitEnd = *litPtr + sequence.litLength; + const BYTE *match = oLitEnd - sequence.offset; + + /* check */ + if (oMatchEnd > oend) + return ERROR(dstSize_tooSmall); /* last match must start at a minimum distance of WILDCOPY_OVERLENGTH from oend */ + if (iLitEnd > litLimit) + return ERROR(corruption_detected); /* over-read beyond lit buffer */ + if (oLitEnd > oend_w) + return ZSTD_execSequenceLast7(op, oend, sequence, litPtr, litLimit, base, vBase, dictEnd); + + /* copy Literals */ + ZSTD_copy8(op, *litPtr); + if (sequence.litLength > 8) + ZSTD_wildcopy(op + 8, (*litPtr) + 8, + sequence.litLength - 8); /* note : since oLitEnd <= oend-WILDCOPY_OVERLENGTH, no risk of overwrite beyond oend */ + op = oLitEnd; + *litPtr = iLitEnd; /* update for next sequence */ + + /* copy Match */ + if (sequence.offset > (size_t)(oLitEnd - base)) { + /* offset beyond prefix */ + if (sequence.offset > (size_t)(oLitEnd - vBase)) + return ERROR(corruption_detected); + match = dictEnd + (match - base); + if (match + sequence.matchLength <= dictEnd) { + memmove(oLitEnd, match, sequence.matchLength); + return sequenceLength; + } + /* span extDict & currPrefixSegment */ + { + size_t const length1 = dictEnd - match; + memmove(oLitEnd, match, length1); + op = oLitEnd + length1; + sequence.matchLength -= length1; + match = base; + if (op > oend_w || sequence.matchLength < MINMATCH) { + U32 i; + for (i = 0; i < sequence.matchLength; ++i) + op[i] = match[i]; + return sequenceLength; + } + } + } + /* Requirement: op <= oend_w && sequence.matchLength >= MINMATCH */ + + /* match within prefix */ + if (sequence.offset < 8) { + /* close range match, overlap */ + static const U32 dec32table[] = {0, 1, 2, 1, 4, 4, 4, 4}; /* added */ + static const int dec64table[] = {8, 8, 8, 7, 8, 9, 10, 11}; /* subtracted */ + int const sub2 = dec64table[sequence.offset]; + op[0] = match[0]; + op[1] = match[1]; + op[2] = match[2]; + op[3] = match[3]; + match += dec32table[sequence.offset]; + ZSTD_copy4(op + 4, match); + match -= sub2; + } else { + ZSTD_copy8(op, match); + } + op += 8; + match += 8; + + if (oMatchEnd > oend - (16 - MINMATCH)) { + if (op < oend_w) { + ZSTD_wildcopy(op, match, oend_w - op); + match += oend_w - op; + op = oend_w; + } + while (op < oMatchEnd) + *op++ = *match++; + } else { + ZSTD_wildcopy(op, match, (ptrdiff_t)sequence.matchLength - 8); /* works even if matchLength < 8 */ + } + return sequenceLength; +} + +static size_t INIT ZSTD_decompressSequences(ZSTD_DCtx *dctx, void *dst, size_t maxDstSize, const void *seqStart, size_t seqSize) +{ + const BYTE *ip = (const BYTE *)seqStart; + const BYTE *const iend = ip + seqSize; + BYTE *const ostart = (BYTE * const)dst; + BYTE *const oend = ostart + maxDstSize; + BYTE *op = ostart; + const BYTE *litPtr = dctx->litPtr; + const BYTE *const litEnd = litPtr + dctx->litSize; + const BYTE *const base = (const BYTE *)(dctx->base); + const BYTE *const vBase = (const BYTE *)(dctx->vBase); + const BYTE *const dictEnd = (const BYTE *)(dctx->dictEnd); + int nbSeq; + + /* Build Decoding Tables */ + { + size_t const seqHSize = ZSTD_decodeSeqHeaders(dctx, &nbSeq, ip, seqSize); + if (ZSTD_isError(seqHSize)) + return seqHSize; + ip += seqHSize; + } + + /* Regen sequences */ + if (nbSeq) { + seqState_t seqState; + dctx->fseEntropy = 1; + { + U32 i; + for (i = 0; i < ZSTD_REP_NUM; i++) + seqState.prevOffset[i] = dctx->entropy.rep[i]; + } + CHECK_E(BIT_initDStream(&seqState.DStream, ip, iend - ip), corruption_detected); + FSE_initDState(&seqState.stateLL, &seqState.DStream, dctx->LLTptr); + FSE_initDState(&seqState.stateOffb, &seqState.DStream, dctx->OFTptr); + FSE_initDState(&seqState.stateML, &seqState.DStream, dctx->MLTptr); + + for (; (BIT_reloadDStream(&(seqState.DStream)) <= BIT_DStream_completed) && nbSeq;) { + nbSeq--; + { + seq_t const sequence = ZSTD_decodeSequence(&seqState); + size_t const oneSeqSize = ZSTD_execSequence(op, oend, sequence, &litPtr, litEnd, base, vBase, dictEnd); + if (ZSTD_isError(oneSeqSize)) + return oneSeqSize; + op += oneSeqSize; + } + } + + /* check if reached exact end */ + if (nbSeq) + return ERROR(corruption_detected); + /* save reps for next block */ + { + U32 i; + for (i = 0; i < ZSTD_REP_NUM; i++) + dctx->entropy.rep[i] = (U32)(seqState.prevOffset[i]); + } + } + + /* last literal segment */ + { + size_t const lastLLSize = litEnd - litPtr; + if (lastLLSize > (size_t)(oend - op)) + return ERROR(dstSize_tooSmall); + memcpy(op, litPtr, lastLLSize); + op += lastLLSize; + } + + return op - ostart; +} + +FORCE_INLINE seq_t ZSTD_decodeSequenceLong_generic(seqState_t *seqState, int const longOffsets) +{ + seq_t seq; + + U32 const llCode = FSE_peekSymbol(&seqState->stateLL); + U32 const mlCode = FSE_peekSymbol(&seqState->stateML); + U32 const ofCode = FSE_peekSymbol(&seqState->stateOffb); /* <= maxOff, by table construction */ + + U32 const llBits = LL_bits[llCode]; + U32 const mlBits = ML_bits[mlCode]; + U32 const ofBits = ofCode; + U32 const totalBits = llBits + mlBits + ofBits; + + static const U32 LL_base[MaxLL + 1] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, + 20, 22, 24, 28, 32, 40, 48, 64, 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000, 0x10000}; + + static const U32 ML_base[MaxML + 1] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 39, 41, + 43, 47, 51, 59, 67, 83, 99, 0x83, 0x103, 0x203, 0x403, 0x803, 0x1003, 0x2003, 0x4003, 0x8003, 0x10003}; + + static const U32 OF_base[MaxOff + 1] = {0, 1, 1, 5, 0xD, 0x1D, 0x3D, 0x7D, 0xFD, 0x1FD, + 0x3FD, 0x7FD, 0xFFD, 0x1FFD, 0x3FFD, 0x7FFD, 0xFFFD, 0x1FFFD, 0x3FFFD, 0x7FFFD, + 0xFFFFD, 0x1FFFFD, 0x3FFFFD, 0x7FFFFD, 0xFFFFFD, 0x1FFFFFD, 0x3FFFFFD, 0x7FFFFFD, 0xFFFFFFD}; + + /* sequence */ + { + size_t offset; + if (!ofCode) + offset = 0; + else { + if (longOffsets) { + int const extraBits = ofBits - MIN(ofBits, STREAM_ACCUMULATOR_MIN); + offset = OF_base[ofCode] + (BIT_readBitsFast(&seqState->DStream, ofBits - extraBits) << extraBits); + if (ZSTD_32bits() || extraBits) + BIT_reloadDStream(&seqState->DStream); + if (extraBits) + offset += BIT_readBitsFast(&seqState->DStream, extraBits); + } else { + offset = OF_base[ofCode] + BIT_readBitsFast(&seqState->DStream, ofBits); /* <= (ZSTD_WINDOWLOG_MAX-1) bits */ + if (ZSTD_32bits()) + BIT_reloadDStream(&seqState->DStream); + } + } + + if (ofCode <= 1) { + offset += (llCode == 0); + if (offset) { + size_t temp = (offset == 3) ? seqState->prevOffset[0] - 1 : seqState->prevOffset[offset]; + temp += !temp; /* 0 is not valid; input is corrupted; force offset to 1 */ + if (offset != 1) + seqState->prevOffset[2] = seqState->prevOffset[1]; + seqState->prevOffset[1] = seqState->prevOffset[0]; + seqState->prevOffset[0] = offset = temp; + } else { + offset = seqState->prevOffset[0]; + } + } else { + seqState->prevOffset[2] = seqState->prevOffset[1]; + seqState->prevOffset[1] = seqState->prevOffset[0]; + seqState->prevOffset[0] = offset; + } + seq.offset = offset; + } + + seq.matchLength = ML_base[mlCode] + ((mlCode > 31) ? BIT_readBitsFast(&seqState->DStream, mlBits) : 0); /* <= 16 bits */ + if (ZSTD_32bits() && (mlBits + llBits > 24)) + BIT_reloadDStream(&seqState->DStream); + + seq.litLength = LL_base[llCode] + ((llCode > 15) ? BIT_readBitsFast(&seqState->DStream, llBits) : 0); /* <= 16 bits */ + if (ZSTD_32bits() || (totalBits > 64 - 7 - (LLFSELog + MLFSELog + OffFSELog))) + BIT_reloadDStream(&seqState->DStream); + + { + size_t const pos = seqState->pos + seq.litLength; + seq.match = seqState->base + pos - seq.offset; /* single memory segment */ + if (seq.offset > pos) + seq.match += seqState->gotoDict; /* separate memory segment */ + seqState->pos = pos + seq.matchLength; + } + + /* ANS state update */ + FSE_updateState(&seqState->stateLL, &seqState->DStream); /* <= 9 bits */ + FSE_updateState(&seqState->stateML, &seqState->DStream); /* <= 9 bits */ + if (ZSTD_32bits()) + BIT_reloadDStream(&seqState->DStream); /* <= 18 bits */ + FSE_updateState(&seqState->stateOffb, &seqState->DStream); /* <= 8 bits */ + + return seq; +} + +static seq_t INIT ZSTD_decodeSequenceLong(seqState_t *seqState, unsigned const windowSize) +{ + if (ZSTD_highbit32(windowSize) > STREAM_ACCUMULATOR_MIN) { + return ZSTD_decodeSequenceLong_generic(seqState, 1); + } else { + return ZSTD_decodeSequenceLong_generic(seqState, 0); + } +} + +FORCE_INLINE +size_t INIT ZSTD_execSequenceLong(BYTE *op, BYTE *const oend, seq_t sequence, const BYTE **litPtr, + const BYTE *const litLimit, const BYTE *const base, + const BYTE *const vBase, const BYTE *const dictEnd) +{ + BYTE *const oLitEnd = op + sequence.litLength; + size_t const sequenceLength = sequence.litLength + sequence.matchLength; + BYTE *const oMatchEnd = op + sequenceLength; /* risk : address space overflow (32-bits) */ + BYTE *const oend_w = oend - WILDCOPY_OVERLENGTH; + const BYTE *const iLitEnd = *litPtr + sequence.litLength; + const BYTE *match = sequence.match; + + /* check */ + if (oMatchEnd > oend) + return ERROR(dstSize_tooSmall); /* last match must start at a minimum distance of WILDCOPY_OVERLENGTH from oend */ + if (iLitEnd > litLimit) + return ERROR(corruption_detected); /* over-read beyond lit buffer */ + if (oLitEnd > oend_w) + return ZSTD_execSequenceLast7(op, oend, sequence, litPtr, litLimit, base, vBase, dictEnd); + + /* copy Literals */ + ZSTD_copy8(op, *litPtr); + if (sequence.litLength > 8) + ZSTD_wildcopy(op + 8, (*litPtr) + 8, + sequence.litLength - 8); /* note : since oLitEnd <= oend-WILDCOPY_OVERLENGTH, no risk of overwrite beyond oend */ + op = oLitEnd; + *litPtr = iLitEnd; /* update for next sequence */ + + /* copy Match */ + if (sequence.offset > (size_t)(oLitEnd - base)) { + /* offset beyond prefix */ + if (sequence.offset > (size_t)(oLitEnd - vBase)) + return ERROR(corruption_detected); + if (match + sequence.matchLength <= dictEnd) { + memmove(oLitEnd, match, sequence.matchLength); + return sequenceLength; + } + /* span extDict & currPrefixSegment */ + { + size_t const length1 = dictEnd - match; + memmove(oLitEnd, match, length1); + op = oLitEnd + length1; + sequence.matchLength -= length1; + match = base; + if (op > oend_w || sequence.matchLength < MINMATCH) { + U32 i; + for (i = 0; i < sequence.matchLength; ++i) + op[i] = match[i]; + return sequenceLength; + } + } + } + /* Requirement: op <= oend_w && sequence.matchLength >= MINMATCH */ + + /* match within prefix */ + if (sequence.offset < 8) { + /* close range match, overlap */ + static const U32 dec32table[] = {0, 1, 2, 1, 4, 4, 4, 4}; /* added */ + static const int dec64table[] = {8, 8, 8, 7, 8, 9, 10, 11}; /* subtracted */ + int const sub2 = dec64table[sequence.offset]; + op[0] = match[0]; + op[1] = match[1]; + op[2] = match[2]; + op[3] = match[3]; + match += dec32table[sequence.offset]; + ZSTD_copy4(op + 4, match); + match -= sub2; + } else { + ZSTD_copy8(op, match); + } + op += 8; + match += 8; + + if (oMatchEnd > oend - (16 - MINMATCH)) { + if (op < oend_w) { + ZSTD_wildcopy(op, match, oend_w - op); + match += oend_w - op; + op = oend_w; + } + while (op < oMatchEnd) + *op++ = *match++; + } else { + ZSTD_wildcopy(op, match, (ptrdiff_t)sequence.matchLength - 8); /* works even if matchLength < 8 */ + } + return sequenceLength; +} + +static size_t INIT ZSTD_decompressSequencesLong(ZSTD_DCtx *dctx, void *dst, size_t maxDstSize, const void *seqStart, size_t seqSize) +{ + const BYTE *ip = (const BYTE *)seqStart; + const BYTE *const iend = ip + seqSize; + BYTE *const ostart = (BYTE * const)dst; + BYTE *const oend = ostart + maxDstSize; + BYTE *op = ostart; + const BYTE *litPtr = dctx->litPtr; + const BYTE *const litEnd = litPtr + dctx->litSize; + const BYTE *const base = (const BYTE *)(dctx->base); + const BYTE *const vBase = (const BYTE *)(dctx->vBase); + const BYTE *const dictEnd = (const BYTE *)(dctx->dictEnd); + unsigned const windowSize = dctx->fParams.windowSize; + int nbSeq; + + /* Build Decoding Tables */ + { + size_t const seqHSize = ZSTD_decodeSeqHeaders(dctx, &nbSeq, ip, seqSize); + if (ZSTD_isError(seqHSize)) + return seqHSize; + ip += seqHSize; + } + + /* Regen sequences */ + if (nbSeq) { +#define STORED_SEQS 4 +#define STOSEQ_MASK (STORED_SEQS - 1) +#define ADVANCED_SEQS 4 + seq_t *sequences = (seq_t *)dctx->entropy.workspace; + int const seqAdvance = MIN(nbSeq, ADVANCED_SEQS); + seqState_t seqState; + int seqNb; + ZSTD_STATIC_ASSERT(sizeof(dctx->entropy.workspace) >= sizeof(seq_t) * STORED_SEQS); + dctx->fseEntropy = 1; + { + U32 i; + for (i = 0; i < ZSTD_REP_NUM; i++) + seqState.prevOffset[i] = dctx->entropy.rep[i]; + } + seqState.base = base; + seqState.pos = (size_t)(op - base); + seqState.gotoDict = (uPtrDiff)dictEnd - (uPtrDiff)base; /* cast to avoid undefined behaviour */ + CHECK_E(BIT_initDStream(&seqState.DStream, ip, iend - ip), corruption_detected); + FSE_initDState(&seqState.stateLL, &seqState.DStream, dctx->LLTptr); + FSE_initDState(&seqState.stateOffb, &seqState.DStream, dctx->OFTptr); + FSE_initDState(&seqState.stateML, &seqState.DStream, dctx->MLTptr); + + /* prepare in advance */ + for (seqNb = 0; (BIT_reloadDStream(&seqState.DStream) <= BIT_DStream_completed) && seqNb < seqAdvance; seqNb++) { + sequences[seqNb] = ZSTD_decodeSequenceLong(&seqState, windowSize); + } + if (seqNb < seqAdvance) + return ERROR(corruption_detected); + + /* decode and decompress */ + for (; (BIT_reloadDStream(&(seqState.DStream)) <= BIT_DStream_completed) && seqNb < nbSeq; seqNb++) { + seq_t const sequence = ZSTD_decodeSequenceLong(&seqState, windowSize); + size_t const oneSeqSize = + ZSTD_execSequenceLong(op, oend, sequences[(seqNb - ADVANCED_SEQS) & STOSEQ_MASK], &litPtr, litEnd, base, vBase, dictEnd); + if (ZSTD_isError(oneSeqSize)) + return oneSeqSize; + ZSTD_PREFETCH(sequence.match); + sequences[seqNb & STOSEQ_MASK] = sequence; + op += oneSeqSize; + } + if (seqNb < nbSeq) + return ERROR(corruption_detected); + + /* finish queue */ + seqNb -= seqAdvance; + for (; seqNb < nbSeq; seqNb++) { + size_t const oneSeqSize = ZSTD_execSequenceLong(op, oend, sequences[seqNb & STOSEQ_MASK], &litPtr, litEnd, base, vBase, dictEnd); + if (ZSTD_isError(oneSeqSize)) + return oneSeqSize; + op += oneSeqSize; + } + + /* save reps for next block */ + { + U32 i; + for (i = 0; i < ZSTD_REP_NUM; i++) + dctx->entropy.rep[i] = (U32)(seqState.prevOffset[i]); + } + } + + /* last literal segment */ + { + size_t const lastLLSize = litEnd - litPtr; + if (lastLLSize > (size_t)(oend - op)) + return ERROR(dstSize_tooSmall); + memcpy(op, litPtr, lastLLSize); + op += lastLLSize; + } + + return op - ostart; +} + +static size_t INIT ZSTD_decompressBlock_internal(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize) +{ /* blockType == blockCompressed */ + const BYTE *ip = (const BYTE *)src; + + if (srcSize >= ZSTD_BLOCKSIZE_ABSOLUTEMAX) + return ERROR(srcSize_wrong); + + /* Decode literals section */ + { + size_t const litCSize = ZSTD_decodeLiteralsBlock(dctx, src, srcSize); + if (ZSTD_isError(litCSize)) + return litCSize; + ip += litCSize; + srcSize -= litCSize; + } + if (sizeof(size_t) > 4) /* do not enable prefetching on 32-bits x86, as it's performance detrimental */ + /* likely because of register pressure */ + /* if that's the correct cause, then 32-bits ARM should be affected differently */ + /* it would be good to test this on ARM real hardware, to see if prefetch version improves speed */ + if (dctx->fParams.windowSize > (1 << 23)) + return ZSTD_decompressSequencesLong(dctx, dst, dstCapacity, ip, srcSize); + return ZSTD_decompressSequences(dctx, dst, dstCapacity, ip, srcSize); +} + +static void INIT ZSTD_checkContinuity(ZSTD_DCtx *dctx, const void *dst) +{ + if (dst != dctx->previousDstEnd) { /* not contiguous */ + dctx->dictEnd = dctx->previousDstEnd; + dctx->vBase = (const char *)dst - ((const char *)(dctx->previousDstEnd) - (const char *)(dctx->base)); + dctx->base = dst; + dctx->previousDstEnd = dst; + } +} + +size_t INIT ZSTD_decompressBlock(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize) +{ + size_t dSize; + ZSTD_checkContinuity(dctx, dst); + dSize = ZSTD_decompressBlock_internal(dctx, dst, dstCapacity, src, srcSize); + dctx->previousDstEnd = (char *)dst + dSize; + return dSize; +} + +/** ZSTD_insertBlock() : + insert `src` block into `dctx` history. Useful to track uncompressed blocks. */ +size_t INIT ZSTD_insertBlock(ZSTD_DCtx *dctx, const void *blockStart, size_t blockSize) +{ + ZSTD_checkContinuity(dctx, blockStart); + dctx->previousDstEnd = (const char *)blockStart + blockSize; + return blockSize; +} + +size_t INIT ZSTD_generateNxBytes(void *dst, size_t dstCapacity, BYTE byte, size_t length) +{ + if (length > dstCapacity) + return ERROR(dstSize_tooSmall); + memset(dst, byte, length); + return length; +} + +/** ZSTD_findFrameCompressedSize() : + * compatible with legacy mode + * `src` must point to the start of a ZSTD frame, ZSTD legacy frame, or skippable frame + * `srcSize` must be at least as large as the frame contained + * @return : the compressed size of the frame starting at `src` */ +size_t INIT ZSTD_findFrameCompressedSize(const void *src, size_t srcSize) +{ + if (srcSize >= ZSTD_skippableHeaderSize && (ZSTD_readLE32(src) & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) { + return ZSTD_skippableHeaderSize + ZSTD_readLE32((const BYTE *)src + 4); + } else { + const BYTE *ip = (const BYTE *)src; + const BYTE *const ipstart = ip; + size_t remainingSize = srcSize; + ZSTD_frameParams fParams; + + size_t const headerSize = ZSTD_frameHeaderSize(ip, remainingSize); + if (ZSTD_isError(headerSize)) + return headerSize; + + /* Frame Header */ + { + size_t const ret = ZSTD_getFrameParams(&fParams, ip, remainingSize); + if (ZSTD_isError(ret)) + return ret; + if (ret > 0) + return ERROR(srcSize_wrong); + } + + ip += headerSize; + remainingSize -= headerSize; + + /* Loop on each block */ + while (1) { + blockProperties_t blockProperties; + size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSize, &blockProperties); + if (ZSTD_isError(cBlockSize)) + return cBlockSize; + + if (ZSTD_blockHeaderSize + cBlockSize > remainingSize) + return ERROR(srcSize_wrong); + + ip += ZSTD_blockHeaderSize + cBlockSize; + remainingSize -= ZSTD_blockHeaderSize + cBlockSize; + + if (blockProperties.lastBlock) + break; + } + + if (fParams.checksumFlag) { /* Frame content checksum */ + if (remainingSize < 4) + return ERROR(srcSize_wrong); + ip += 4; + remainingSize -= 4; + } + + return ip - ipstart; + } +} + +/*! ZSTD_decompressFrame() : +* @dctx must be properly initialized */ +static size_t INIT ZSTD_decompressFrame(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void **srcPtr, size_t *srcSizePtr) +{ + const BYTE *ip = (const BYTE *)(*srcPtr); + BYTE *const ostart = (BYTE * const)dst; + BYTE *const oend = ostart + dstCapacity; + BYTE *op = ostart; + size_t remainingSize = *srcSizePtr; + + /* check */ + if (remainingSize < ZSTD_frameHeaderSize_min + ZSTD_blockHeaderSize) + return ERROR(srcSize_wrong); + + /* Frame Header */ + { + size_t const frameHeaderSize = ZSTD_frameHeaderSize(ip, ZSTD_frameHeaderSize_prefix); + if (ZSTD_isError(frameHeaderSize)) + return frameHeaderSize; + if (remainingSize < frameHeaderSize + ZSTD_blockHeaderSize) + return ERROR(srcSize_wrong); + CHECK_F(ZSTD_decodeFrameHeader(dctx, ip, frameHeaderSize)); + ip += frameHeaderSize; + remainingSize -= frameHeaderSize; + } + + /* Loop on each block */ + while (1) { + size_t decodedSize; + blockProperties_t blockProperties; + size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSize, &blockProperties); + if (ZSTD_isError(cBlockSize)) + return cBlockSize; + + ip += ZSTD_blockHeaderSize; + remainingSize -= ZSTD_blockHeaderSize; + if (cBlockSize > remainingSize) + return ERROR(srcSize_wrong); + + switch (blockProperties.blockType) { + case bt_compressed: decodedSize = ZSTD_decompressBlock_internal(dctx, op, oend - op, ip, cBlockSize); break; + case bt_raw: decodedSize = ZSTD_copyRawBlock(op, oend - op, ip, cBlockSize); break; + case bt_rle: decodedSize = ZSTD_generateNxBytes(op, oend - op, *ip, blockProperties.origSize); break; + case bt_reserved: + default: return ERROR(corruption_detected); + } + + if (ZSTD_isError(decodedSize)) + return decodedSize; + if (dctx->fParams.checksumFlag) + xxh64_update(&dctx->xxhState, op, decodedSize); + op += decodedSize; + ip += cBlockSize; + remainingSize -= cBlockSize; + if (blockProperties.lastBlock) + break; + } + + if (dctx->fParams.checksumFlag) { /* Frame content checksum verification */ + U32 const checkCalc = (U32)xxh64_digest(&dctx->xxhState); + U32 checkRead; + if (remainingSize < 4) + return ERROR(checksum_wrong); + checkRead = ZSTD_readLE32(ip); + if (checkRead != checkCalc) + return ERROR(checksum_wrong); + ip += 4; + remainingSize -= 4; + } + + /* Allow caller to get size read */ + *srcPtr = ip; + *srcSizePtr = remainingSize; + return op - ostart; +} + +static const void *ZSTD_DDictDictContent(const ZSTD_DDict *ddict); +static size_t ZSTD_DDictDictSize(const ZSTD_DDict *ddict); + +static size_t INIT ZSTD_decompressMultiFrame(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize, const void *dict, size_t dictSize, + const ZSTD_DDict *ddict) +{ + void *const dststart = dst; + + if (ddict) { + if (dict) { + /* programmer error, these two cases should be mutually exclusive */ + return ERROR(GENERIC); + } + + dict = ZSTD_DDictDictContent(ddict); + dictSize = ZSTD_DDictDictSize(ddict); + } + + while (srcSize >= ZSTD_frameHeaderSize_prefix) { + U32 magicNumber; + + magicNumber = ZSTD_readLE32(src); + if (magicNumber != ZSTD_MAGICNUMBER) { + if ((magicNumber & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) { + size_t skippableSize; + if (srcSize < ZSTD_skippableHeaderSize) + return ERROR(srcSize_wrong); + skippableSize = ZSTD_readLE32((const BYTE *)src + 4) + ZSTD_skippableHeaderSize; + if (srcSize < skippableSize) { + return ERROR(srcSize_wrong); + } + + src = (const BYTE *)src + skippableSize; + srcSize -= skippableSize; + continue; + } else { + return ERROR(prefix_unknown); + } + } + + if (ddict) { + /* we were called from ZSTD_decompress_usingDDict */ + ZSTD_refDDict(dctx, ddict); + } else { + /* this will initialize correctly with no dict if dict == NULL, so + * use this in all cases but ddict */ + CHECK_F(ZSTD_decompressBegin_usingDict(dctx, dict, dictSize)); + } + ZSTD_checkContinuity(dctx, dst); + + { + const size_t res = ZSTD_decompressFrame(dctx, dst, dstCapacity, &src, &srcSize); + if (ZSTD_isError(res)) + return res; + /* don't need to bounds check this, ZSTD_decompressFrame will have + * already */ + dst = (BYTE *)dst + res; + dstCapacity -= res; + } + } + + if (srcSize) + return ERROR(srcSize_wrong); /* input not entirely consumed */ + + return (BYTE *)dst - (BYTE *)dststart; +} + +size_t INIT ZSTD_decompress_usingDict(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize, const void *dict, size_t dictSize) +{ + return ZSTD_decompressMultiFrame(dctx, dst, dstCapacity, src, srcSize, dict, dictSize, NULL); +} + +size_t INIT ZSTD_decompressDCtx(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize) +{ + return ZSTD_decompress_usingDict(dctx, dst, dstCapacity, src, srcSize, NULL, 0); +} + +/*-************************************** +* Advanced Streaming Decompression API +* Bufferless and synchronous +****************************************/ +size_t INIT ZSTD_nextSrcSizeToDecompress(ZSTD_DCtx *dctx) { return dctx->expected; } + +ZSTD_nextInputType_e INIT ZSTD_nextInputType(ZSTD_DCtx *dctx) +{ + switch (dctx->stage) { + default: /* should not happen */ + case ZSTDds_getFrameHeaderSize: + case ZSTDds_decodeFrameHeader: return ZSTDnit_frameHeader; + case ZSTDds_decodeBlockHeader: return ZSTDnit_blockHeader; + case ZSTDds_decompressBlock: return ZSTDnit_block; + case ZSTDds_decompressLastBlock: return ZSTDnit_lastBlock; + case ZSTDds_checkChecksum: return ZSTDnit_checksum; + case ZSTDds_decodeSkippableHeader: + case ZSTDds_skipFrame: return ZSTDnit_skippableFrame; + } +} + +int INIT ZSTD_isSkipFrame(ZSTD_DCtx *dctx) { return dctx->stage == ZSTDds_skipFrame; } /* for zbuff */ + +/** ZSTD_decompressContinue() : +* @return : nb of bytes generated into `dst` (necessarily <= `dstCapacity) +* or an error code, which can be tested using ZSTD_isError() */ +size_t INIT ZSTD_decompressContinue(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize) +{ + /* Sanity check */ + if (srcSize != dctx->expected) + return ERROR(srcSize_wrong); + if (dstCapacity) + ZSTD_checkContinuity(dctx, dst); + + switch (dctx->stage) { + case ZSTDds_getFrameHeaderSize: + if (srcSize != ZSTD_frameHeaderSize_prefix) + return ERROR(srcSize_wrong); /* impossible */ + if ((ZSTD_readLE32(src) & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) { /* skippable frame */ + memcpy(dctx->headerBuffer, src, ZSTD_frameHeaderSize_prefix); + dctx->expected = ZSTD_skippableHeaderSize - ZSTD_frameHeaderSize_prefix; /* magic number + skippable frame length */ + dctx->stage = ZSTDds_decodeSkippableHeader; + return 0; + } + dctx->headerSize = ZSTD_frameHeaderSize(src, ZSTD_frameHeaderSize_prefix); + if (ZSTD_isError(dctx->headerSize)) + return dctx->headerSize; + memcpy(dctx->headerBuffer, src, ZSTD_frameHeaderSize_prefix); + if (dctx->headerSize > ZSTD_frameHeaderSize_prefix) { + dctx->expected = dctx->headerSize - ZSTD_frameHeaderSize_prefix; + dctx->stage = ZSTDds_decodeFrameHeader; + return 0; + } + dctx->expected = 0; /* not necessary to copy more */ + /* fallthrough */ + + case ZSTDds_decodeFrameHeader: + memcpy(dctx->headerBuffer + ZSTD_frameHeaderSize_prefix, src, dctx->expected); + CHECK_F(ZSTD_decodeFrameHeader(dctx, dctx->headerBuffer, dctx->headerSize)); + dctx->expected = ZSTD_blockHeaderSize; + dctx->stage = ZSTDds_decodeBlockHeader; + return 0; + + case ZSTDds_decodeBlockHeader: { + blockProperties_t bp; + size_t const cBlockSize = ZSTD_getcBlockSize(src, ZSTD_blockHeaderSize, &bp); + if (ZSTD_isError(cBlockSize)) + return cBlockSize; + dctx->expected = cBlockSize; + dctx->bType = bp.blockType; + dctx->rleSize = bp.origSize; + if (cBlockSize) { + dctx->stage = bp.lastBlock ? ZSTDds_decompressLastBlock : ZSTDds_decompressBlock; + return 0; + } + /* empty block */ + if (bp.lastBlock) { + if (dctx->fParams.checksumFlag) { + dctx->expected = 4; + dctx->stage = ZSTDds_checkChecksum; + } else { + dctx->expected = 0; /* end of frame */ + dctx->stage = ZSTDds_getFrameHeaderSize; + } + } else { + dctx->expected = 3; /* go directly to next header */ + dctx->stage = ZSTDds_decodeBlockHeader; + } + return 0; + } + case ZSTDds_decompressLastBlock: + case ZSTDds_decompressBlock: { + size_t rSize; + switch (dctx->bType) { + case bt_compressed: rSize = ZSTD_decompressBlock_internal(dctx, dst, dstCapacity, src, srcSize); break; + case bt_raw: rSize = ZSTD_copyRawBlock(dst, dstCapacity, src, srcSize); break; + case bt_rle: rSize = ZSTD_setRleBlock(dst, dstCapacity, src, srcSize, dctx->rleSize); break; + case bt_reserved: /* should never happen */ + default: return ERROR(corruption_detected); + } + if (ZSTD_isError(rSize)) + return rSize; + if (dctx->fParams.checksumFlag) + xxh64_update(&dctx->xxhState, dst, rSize); + + if (dctx->stage == ZSTDds_decompressLastBlock) { /* end of frame */ + if (dctx->fParams.checksumFlag) { /* another round for frame checksum */ + dctx->expected = 4; + dctx->stage = ZSTDds_checkChecksum; + } else { + dctx->expected = 0; /* ends here */ + dctx->stage = ZSTDds_getFrameHeaderSize; + } + } else { + dctx->stage = ZSTDds_decodeBlockHeader; + dctx->expected = ZSTD_blockHeaderSize; + dctx->previousDstEnd = (char *)dst + rSize; + } + return rSize; + } + case ZSTDds_checkChecksum: { + U32 const h32 = (U32)xxh64_digest(&dctx->xxhState); + U32 const check32 = ZSTD_readLE32(src); /* srcSize == 4, guaranteed by dctx->expected */ + if (check32 != h32) + return ERROR(checksum_wrong); + dctx->expected = 0; + dctx->stage = ZSTDds_getFrameHeaderSize; + return 0; + } + case ZSTDds_decodeSkippableHeader: { + memcpy(dctx->headerBuffer + ZSTD_frameHeaderSize_prefix, src, dctx->expected); + dctx->expected = ZSTD_readLE32(dctx->headerBuffer + 4); + dctx->stage = ZSTDds_skipFrame; + return 0; + } + case ZSTDds_skipFrame: { + dctx->expected = 0; + dctx->stage = ZSTDds_getFrameHeaderSize; + return 0; + } + default: + return ERROR(GENERIC); /* impossible */ + } +} + +static size_t INIT ZSTD_refDictContent(ZSTD_DCtx *dctx, const void *dict, size_t dictSize) +{ + dctx->dictEnd = dctx->previousDstEnd; + dctx->vBase = (const char *)dict - ((const char *)(dctx->previousDstEnd) - (const char *)(dctx->base)); + dctx->base = dict; + dctx->previousDstEnd = (const char *)dict + dictSize; + return 0; +} + +/* ZSTD_loadEntropy() : + * dict : must point at beginning of a valid zstd dictionary + * @return : size of entropy tables read */ +static size_t INIT ZSTD_loadEntropy(ZSTD_entropyTables_t *entropy, const void *const dict, size_t const dictSize) +{ + const BYTE *dictPtr = (const BYTE *)dict; + const BYTE *const dictEnd = dictPtr + dictSize; + + if (dictSize <= 8) + return ERROR(dictionary_corrupted); + dictPtr += 8; /* skip header = magic + dictID */ + + { + size_t const hSize = HUF_readDTableX4_wksp(entropy->hufTable, dictPtr, dictEnd - dictPtr, entropy->workspace, sizeof(entropy->workspace)); + if (HUF_isError(hSize)) + return ERROR(dictionary_corrupted); + dictPtr += hSize; + } + + { + short offcodeNCount[MaxOff + 1]; + U32 offcodeMaxValue = MaxOff, offcodeLog; + size_t const offcodeHeaderSize = FSE_readNCount(offcodeNCount, &offcodeMaxValue, &offcodeLog, dictPtr, dictEnd - dictPtr); + if (FSE_isError(offcodeHeaderSize)) + return ERROR(dictionary_corrupted); + if (offcodeLog > OffFSELog) + return ERROR(dictionary_corrupted); + CHECK_E(FSE_buildDTable_wksp(entropy->OFTable, offcodeNCount, offcodeMaxValue, offcodeLog, entropy->workspace, sizeof(entropy->workspace)), dictionary_corrupted); + dictPtr += offcodeHeaderSize; + } + + { + short matchlengthNCount[MaxML + 1]; + unsigned matchlengthMaxValue = MaxML, matchlengthLog; + size_t const matchlengthHeaderSize = FSE_readNCount(matchlengthNCount, &matchlengthMaxValue, &matchlengthLog, dictPtr, dictEnd - dictPtr); + if (FSE_isError(matchlengthHeaderSize)) + return ERROR(dictionary_corrupted); + if (matchlengthLog > MLFSELog) + return ERROR(dictionary_corrupted); + CHECK_E(FSE_buildDTable_wksp(entropy->MLTable, matchlengthNCount, matchlengthMaxValue, matchlengthLog, entropy->workspace, sizeof(entropy->workspace)), dictionary_corrupted); + dictPtr += matchlengthHeaderSize; + } + + { + short litlengthNCount[MaxLL + 1]; + unsigned litlengthMaxValue = MaxLL, litlengthLog; + size_t const litlengthHeaderSize = FSE_readNCount(litlengthNCount, &litlengthMaxValue, &litlengthLog, dictPtr, dictEnd - dictPtr); + if (FSE_isError(litlengthHeaderSize)) + return ERROR(dictionary_corrupted); + if (litlengthLog > LLFSELog) + return ERROR(dictionary_corrupted); + CHECK_E(FSE_buildDTable_wksp(entropy->LLTable, litlengthNCount, litlengthMaxValue, litlengthLog, entropy->workspace, sizeof(entropy->workspace)), dictionary_corrupted); + dictPtr += litlengthHeaderSize; + } + + if (dictPtr + 12 > dictEnd) + return ERROR(dictionary_corrupted); + { + int i; + size_t const dictContentSize = (size_t)(dictEnd - (dictPtr + 12)); + for (i = 0; i < 3; i++) { + U32 const rep = ZSTD_readLE32(dictPtr); + dictPtr += 4; + if (rep == 0 || rep >= dictContentSize) + return ERROR(dictionary_corrupted); + entropy->rep[i] = rep; + } + } + + return dictPtr - (const BYTE *)dict; +} + +static size_t INIT ZSTD_decompress_insertDictionary(ZSTD_DCtx *dctx, const void *dict, size_t dictSize) +{ + if (dictSize < 8) + return ZSTD_refDictContent(dctx, dict, dictSize); + { + U32 const magic = ZSTD_readLE32(dict); + if (magic != ZSTD_DICT_MAGIC) { + return ZSTD_refDictContent(dctx, dict, dictSize); /* pure content mode */ + } + } + dctx->dictID = ZSTD_readLE32((const char *)dict + 4); + + /* load entropy tables */ + { + size_t const eSize = ZSTD_loadEntropy(&dctx->entropy, dict, dictSize); + if (ZSTD_isError(eSize)) + return ERROR(dictionary_corrupted); + dict = (const char *)dict + eSize; + dictSize -= eSize; + } + dctx->litEntropy = dctx->fseEntropy = 1; + + /* reference dictionary content */ + return ZSTD_refDictContent(dctx, dict, dictSize); +} + +size_t INIT ZSTD_decompressBegin_usingDict(ZSTD_DCtx *dctx, const void *dict, size_t dictSize) +{ + CHECK_F(ZSTD_decompressBegin(dctx)); + if (dict && dictSize) + CHECK_E(ZSTD_decompress_insertDictionary(dctx, dict, dictSize), dictionary_corrupted); + return 0; +} + +/* ====== ZSTD_DDict ====== */ + +struct ZSTD_DDict_s { + void *dictBuffer; + const void *dictContent; + size_t dictSize; + ZSTD_entropyTables_t entropy; + U32 dictID; + U32 entropyPresent; + ZSTD_customMem cMem; +}; /* typedef'd to ZSTD_DDict within "zstd.h" */ + +size_t INIT ZSTD_DDictWorkspaceBound(void) { return ZSTD_ALIGN(sizeof(ZSTD_stack)) + ZSTD_ALIGN(sizeof(ZSTD_DDict)); } + +static const void *INIT ZSTD_DDictDictContent(const ZSTD_DDict *ddict) { return ddict->dictContent; } + +static size_t INIT ZSTD_DDictDictSize(const ZSTD_DDict *ddict) { return ddict->dictSize; } + +static void INIT ZSTD_refDDict(ZSTD_DCtx *dstDCtx, const ZSTD_DDict *ddict) +{ + ZSTD_decompressBegin(dstDCtx); /* init */ + if (ddict) { /* support refDDict on NULL */ + dstDCtx->dictID = ddict->dictID; + dstDCtx->base = ddict->dictContent; + dstDCtx->vBase = ddict->dictContent; + dstDCtx->dictEnd = (const BYTE *)ddict->dictContent + ddict->dictSize; + dstDCtx->previousDstEnd = dstDCtx->dictEnd; + if (ddict->entropyPresent) { + dstDCtx->litEntropy = 1; + dstDCtx->fseEntropy = 1; + dstDCtx->LLTptr = ddict->entropy.LLTable; + dstDCtx->MLTptr = ddict->entropy.MLTable; + dstDCtx->OFTptr = ddict->entropy.OFTable; + dstDCtx->HUFptr = ddict->entropy.hufTable; + dstDCtx->entropy.rep[0] = ddict->entropy.rep[0]; + dstDCtx->entropy.rep[1] = ddict->entropy.rep[1]; + dstDCtx->entropy.rep[2] = ddict->entropy.rep[2]; + } else { + dstDCtx->litEntropy = 0; + dstDCtx->fseEntropy = 0; + } + } +} + +static size_t INIT ZSTD_loadEntropy_inDDict(ZSTD_DDict *ddict) +{ + ddict->dictID = 0; + ddict->entropyPresent = 0; + if (ddict->dictSize < 8) + return 0; + { + U32 const magic = ZSTD_readLE32(ddict->dictContent); + if (magic != ZSTD_DICT_MAGIC) + return 0; /* pure content mode */ + } + ddict->dictID = ZSTD_readLE32((const char *)ddict->dictContent + 4); + + /* load entropy tables */ + CHECK_E(ZSTD_loadEntropy(&ddict->entropy, ddict->dictContent, ddict->dictSize), dictionary_corrupted); + ddict->entropyPresent = 1; + return 0; +} + +static ZSTD_DDict *INIT ZSTD_createDDict_advanced(const void *dict, size_t dictSize, unsigned byReference, ZSTD_customMem customMem) +{ + if (!customMem.customAlloc || !customMem.customFree) + return NULL; + + { + ZSTD_DDict *const ddict = (ZSTD_DDict *)ZSTD_malloc(sizeof(ZSTD_DDict), customMem); + if (!ddict) + return NULL; + ddict->cMem = customMem; + + if ((byReference) || (!dict) || (!dictSize)) { + ddict->dictBuffer = NULL; + ddict->dictContent = dict; + } else { + void *const internalBuffer = ZSTD_malloc(dictSize, customMem); + if (!internalBuffer) { + ZSTD_freeDDict(ddict); + return NULL; + } + memcpy(internalBuffer, dict, dictSize); + ddict->dictBuffer = internalBuffer; + ddict->dictContent = internalBuffer; + } + ddict->dictSize = dictSize; + ddict->entropy.hufTable[0] = (HUF_DTable)((HufLog)*0x1000001); /* cover both little and big endian */ + /* parse dictionary content */ + { + size_t const errorCode = ZSTD_loadEntropy_inDDict(ddict); + if (ZSTD_isError(errorCode)) { + ZSTD_freeDDict(ddict); + return NULL; + } + } + + return ddict; + } +} + +/*! ZSTD_initDDict() : +* Create a digested dictionary, to start decompression without startup delay. +* `dict` content is copied inside DDict. +* Consequently, `dict` can be released after `ZSTD_DDict` creation */ +ZSTD_DDict *INIT ZSTD_initDDict(const void *dict, size_t dictSize, void *workspace, size_t workspaceSize) +{ + ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize); + return ZSTD_createDDict_advanced(dict, dictSize, 1, stackMem); +} + +size_t INIT ZSTD_freeDDict(ZSTD_DDict *ddict) +{ + if (ddict == NULL) + return 0; /* support free on NULL */ + { + ZSTD_customMem const cMem = ddict->cMem; + ZSTD_free(ddict->dictBuffer, cMem); + ZSTD_free(ddict, cMem); + return 0; + } +} + +/*! ZSTD_getDictID_fromDict() : + * Provides the dictID stored within dictionary. + * if @return == 0, the dictionary is not conformant with Zstandard specification. + * It can still be loaded, but as a content-only dictionary. */ +unsigned INIT ZSTD_getDictID_fromDict(const void *dict, size_t dictSize) +{ + if (dictSize < 8) + return 0; + if (ZSTD_readLE32(dict) != ZSTD_DICT_MAGIC) + return 0; + return ZSTD_readLE32((const char *)dict + 4); +} + +/*! ZSTD_getDictID_fromDDict() : + * Provides the dictID of the dictionary loaded into `ddict`. + * If @return == 0, the dictionary is not conformant to Zstandard specification, or empty. + * Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */ +unsigned INIT ZSTD_getDictID_fromDDict(const ZSTD_DDict *ddict) +{ + if (ddict == NULL) + return 0; + return ZSTD_getDictID_fromDict(ddict->dictContent, ddict->dictSize); +} + +/*! ZSTD_getDictID_fromFrame() : + * Provides the dictID required to decompressed the frame stored within `src`. + * If @return == 0, the dictID could not be decoded. + * This could for one of the following reasons : + * - The frame does not require a dictionary to be decoded (most common case). + * - The frame was built with dictID intentionally removed. Whatever dictionary is necessary is a hidden information. + * Note : this use case also happens when using a non-conformant dictionary. + * - `srcSize` is too small, and as a result, the frame header could not be decoded (only possible if `srcSize < ZSTD_FRAMEHEADERSIZE_MAX`). + * - This is not a Zstandard frame. + * When identifying the exact failure cause, it's possible to used ZSTD_getFrameParams(), which will provide a more precise error code. */ +unsigned INIT ZSTD_getDictID_fromFrame(const void *src, size_t srcSize) +{ + ZSTD_frameParams zfp = {0, 0, 0, 0}; + size_t const hError = ZSTD_getFrameParams(&zfp, src, srcSize); + if (ZSTD_isError(hError)) + return 0; + return zfp.dictID; +} + +/*! ZSTD_decompress_usingDDict() : +* Decompression using a pre-digested Dictionary +* Use dictionary without significant overhead. */ +size_t INIT ZSTD_decompress_usingDDict(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize, const ZSTD_DDict *ddict) +{ + /* pass content and size in case legacy frames are encountered */ + return ZSTD_decompressMultiFrame(dctx, dst, dstCapacity, src, srcSize, NULL, 0, ddict); +} + +/*===================================== +* Streaming decompression +*====================================*/ + +typedef enum { zdss_init, zdss_loadHeader, zdss_read, zdss_load, zdss_flush } ZSTD_dStreamStage; + +/* *** Resource management *** */ +struct ZSTD_DStream_s { + ZSTD_DCtx *dctx; + ZSTD_DDict *ddictLocal; + const ZSTD_DDict *ddict; + ZSTD_frameParams fParams; + ZSTD_dStreamStage stage; + char *inBuff; + size_t inBuffSize; + size_t inPos; + size_t maxWindowSize; + char *outBuff; + size_t outBuffSize; + size_t outStart; + size_t outEnd; + size_t blockSize; + BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX]; /* tmp buffer to store frame header */ + size_t lhSize; + ZSTD_customMem customMem; + void *legacyContext; + U32 previousLegacyVersion; + U32 legacyVersion; + U32 hostageByte; +}; /* typedef'd to ZSTD_DStream within "zstd.h" */ + +size_t INIT ZSTD_DStreamWorkspaceBound(size_t maxWindowSize) +{ + size_t const blockSize = MIN(maxWindowSize, ZSTD_BLOCKSIZE_ABSOLUTEMAX); + size_t const inBuffSize = blockSize; + size_t const outBuffSize = maxWindowSize + blockSize + WILDCOPY_OVERLENGTH * 2; + return ZSTD_DCtxWorkspaceBound() + ZSTD_ALIGN(sizeof(ZSTD_DStream)) + ZSTD_ALIGN(inBuffSize) + ZSTD_ALIGN(outBuffSize); +} + +static ZSTD_DStream *INIT ZSTD_createDStream_advanced(ZSTD_customMem customMem) +{ + ZSTD_DStream *zds; + + if (!customMem.customAlloc || !customMem.customFree) + return NULL; + + zds = (ZSTD_DStream *)ZSTD_malloc(sizeof(ZSTD_DStream), customMem); + if (zds == NULL) + return NULL; + memset(zds, 0, sizeof(ZSTD_DStream)); + memcpy(&zds->customMem, &customMem, sizeof(ZSTD_customMem)); + zds->dctx = ZSTD_createDCtx_advanced(customMem); + if (zds->dctx == NULL) { + ZSTD_freeDStream(zds); + return NULL; + } + zds->stage = zdss_init; + zds->maxWindowSize = ZSTD_MAXWINDOWSIZE_DEFAULT; + return zds; +} + +ZSTD_DStream *INIT ZSTD_initDStream(size_t maxWindowSize, void *workspace, size_t workspaceSize) +{ + ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize); + ZSTD_DStream *zds = ZSTD_createDStream_advanced(stackMem); + if (!zds) { + return NULL; + } + From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 11:22:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 11:22:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69605.124717 (Exim 4.92) (envelope-from ) id 1l1ScG-0002bV-Al; Mon, 18 Jan 2021 11:22:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69605.124717; Mon, 18 Jan 2021 11: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 1l1ScG-0002bN-7E; Mon, 18 Jan 2021 11:22:36 +0000 Received: by outflank-mailman (input) for mailman id 69605; Mon, 18 Jan 2021 11:22:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1ScF-0002bD-25 for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11:22:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1ScF-0008Pn-1E for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11:22:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1ScF-0002UW-0F for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11: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=+JynHKDfS9yKpzMr1+L+AWRXEliS+/dqrWT5zv0OZdA=; b=g/eI8HwQLlX1hFn9Q3dwaklcOJ GoXKyHT5/1mcnfcjne6Op603Sy4yPhGBM97NvlGi8ol8TZhktXnXh43IJMCxVj/afaLcQ99ANAv1K ETd0o+OqIar4KuEKHQg9bVWuWkNEqfLAurUatkEb8vgmjqmIz7LKM3Ui0ZXbv7rw59rc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] gnttab: adjust pin count overflow checks Message-Id: Date: Mon, 18 Jan 2021 11:22:35 +0000 commit 8cec5d065c243e54cae97aaa14b0de447883c278 Author: Jan Beulich AuthorDate: Mon Jan 18 12:13:42 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 18 12:13:42 2021 +0100 gnttab: adjust pin count overflow checks It's at least odd to check counters which aren't going to be incremented, resulting in failure just because prior operations may have reached the refcount limit. And it's also not helpful to use open-coded literal numbers in these checks. Calculate the increment values first and derive from them the mask to use in the checks. Also move the pin count checks ahead of the calculation of the status (and for copy also sha2) pointers: They're not needed in the failure cases, and this way the compiler may also have an easier time keeping the variables at least transiently in registers for the subsequent uses. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/common/grant_table.c | 85 ++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 35 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index a5d3ed8bda..3c75116933 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -322,23 +322,38 @@ shared_entry_header(struct grant_table *t, grant_ref_t ref) /* Active grant entry - used for shadowing GTF_permit_access grants. */ struct active_grant_entry { - uint32_t pin; /* Reference count information: */ +/* + * 4x byte-wide reference counts, for {host,device}{read,write} mappings, + * implemented as a single 32-bit (presumably to optimise checking for any + * reference). + */ + uint32_t pin; + /* Width of the individual counter fields. */ +#define GNTPIN_cntr_width 8 +#define GNTPIN_cntr_mask ((1U << GNTPIN_cntr_width) - 1) /* Count of writable host-CPU mappings. */ #define GNTPIN_hstw_shift 0 #define GNTPIN_hstw_inc (1U << GNTPIN_hstw_shift) -#define GNTPIN_hstw_mask (0xFFU << GNTPIN_hstw_shift) +#define GNTPIN_hstw_mask (GNTPIN_cntr_mask << GNTPIN_hstw_shift) /* Count of read-only host-CPU mappings. */ -#define GNTPIN_hstr_shift 8 +#define GNTPIN_hstr_shift (GNTPIN_hstw_shift + GNTPIN_cntr_width) #define GNTPIN_hstr_inc (1U << GNTPIN_hstr_shift) -#define GNTPIN_hstr_mask (0xFFU << GNTPIN_hstr_shift) +#define GNTPIN_hstr_mask (GNTPIN_cntr_mask << GNTPIN_hstr_shift) /* Count of writable device-bus mappings. */ -#define GNTPIN_devw_shift 16 +#define GNTPIN_devw_shift (GNTPIN_hstr_shift + GNTPIN_cntr_width) #define GNTPIN_devw_inc (1U << GNTPIN_devw_shift) -#define GNTPIN_devw_mask (0xFFU << GNTPIN_devw_shift) +#define GNTPIN_devw_mask (GNTPIN_cntr_mask << GNTPIN_devw_shift) /* Count of read-only device-bus mappings. */ -#define GNTPIN_devr_shift 24 +#define GNTPIN_devr_shift (GNTPIN_devw_shift + GNTPIN_cntr_width) #define GNTPIN_devr_inc (1U << GNTPIN_devr_shift) -#define GNTPIN_devr_mask (0xFFU << GNTPIN_devr_shift) +#define GNTPIN_devr_mask (GNTPIN_cntr_mask << GNTPIN_devr_shift) + +/* Convert a combination of GNTPIN_*_inc to an overflow checking mask. */ +#define GNTPIN_incr2oflow_mask(x) ({ \ + ASSERT(!((x) & ~(GNTPIN_hstw_inc | GNTPIN_hstr_inc | \ + GNTPIN_devw_inc | GNTPIN_devr_inc))); \ + (x) << (GNTPIN_cntr_width - 1); \ +}) domid_t domid; /* Domain being granted access. */ unsigned int start:15; /* For sub-page grants, the start offset @@ -988,7 +1003,8 @@ map_grant_ref( mfn_t mfn; struct page_info *pg = NULL; int rc = GNTST_okay; - unsigned int cache_flags, clear_flags = 0, refcnt = 0, typecnt = 0; + unsigned int cache_flags, clear_flags = 0, refcnt = 0, typecnt = 0, + pin_incr = 0; bool host_map_created = false; struct active_grant_entry *act = NULL; struct grant_mapping *mt; @@ -998,7 +1014,14 @@ map_grant_ref( ld = current->domain; - if ( unlikely((op->flags & (GNTMAP_device_map|GNTMAP_host_map)) == 0) ) + if ( op->flags & GNTMAP_device_map ) + pin_incr += (op->flags & GNTMAP_readonly) ? GNTPIN_devr_inc + : GNTPIN_devw_inc; + if ( op->flags & GNTMAP_host_map ) + pin_incr += (op->flags & GNTMAP_readonly) ? GNTPIN_hstr_inc + : GNTPIN_hstw_inc; + + if ( unlikely(!pin_incr) ) { gdprintk(XENLOG_INFO, "Bad flags in grant map op: %x\n", op->flags); op->status = GNTST_bad_gntref; @@ -1052,19 +1075,19 @@ map_grant_ref( shah = shared_entry_header(rgt, ref); act = active_entry_acquire(rgt, ref); - /* Make sure we do not access memory speculatively */ - status = evaluate_nospec(rgt->gt_version == 1) ? &shah->flags - : &status_entry(rgt, ref); - /* If already pinned, check the active domid and avoid refcnt overflow. */ if ( act->pin && ((act->domid != ld->domain_id) || - (act->pin & 0x80808080U) != 0 || + (act->pin & GNTPIN_incr2oflow_mask(pin_incr)) || (act->is_sub_page)) ) PIN_FAIL(act_release_out, GNTST_general_error, "Bad domain (%d != %d), or risk of counter overflow %08x, or subpage %d\n", act->domid, ld->domain_id, act->pin, act->is_sub_page); + /* Make sure we do not access memory speculatively */ + status = evaluate_nospec(rgt->gt_version == 1) ? &shah->flags + : &status_entry(rgt, ref); + if ( !act->pin || (!(op->flags & GNTMAP_readonly) && !(act->pin & (GNTPIN_hstw_mask|GNTPIN_devw_mask))) ) @@ -1095,12 +1118,7 @@ map_grant_ref( } } - if ( op->flags & GNTMAP_device_map ) - act->pin += (op->flags & GNTMAP_readonly) ? - GNTPIN_devr_inc : GNTPIN_devw_inc; - if ( op->flags & GNTMAP_host_map ) - act->pin += (op->flags & GNTMAP_readonly) ? - GNTPIN_hstr_inc : GNTPIN_hstw_inc; + act->pin += pin_incr; mfn = act->mfn; @@ -1275,13 +1293,7 @@ map_grant_ref( grant_read_lock(rgt); act = active_entry_acquire(rgt, op->ref); - - if ( op->flags & GNTMAP_device_map ) - act->pin -= (op->flags & GNTMAP_readonly) ? - GNTPIN_devr_inc : GNTPIN_devw_inc; - if ( op->flags & GNTMAP_host_map ) - act->pin -= (op->flags & GNTMAP_readonly) ? - GNTPIN_hstr_inc : GNTPIN_hstw_inc; + act->pin -= pin_incr; unlock_out_clear: if ( !(op->flags & GNTMAP_readonly) && @@ -2516,6 +2528,7 @@ acquire_grant_for_copy( uint16_t trans_length; bool is_sub_page; s16 rc = GNTST_okay; + unsigned int pin_incr = readonly ? GNTPIN_hstr_inc : GNTPIN_hstw_inc; unsigned int clear_flags = 0; *page = NULL; @@ -2530,6 +2543,14 @@ acquire_grant_for_copy( shah = shared_entry_header(rgt, gref); act = active_entry_acquire(rgt, gref); + /* If already pinned, check the active domid and avoid refcnt overflow. */ + if ( act->pin && + ((act->domid != ldom) || + (act->pin & GNTPIN_incr2oflow_mask(pin_incr))) ) + PIN_FAIL(unlock_out, GNTST_general_error, + "Bad domain (%d != %d), or risk of counter overflow %08x\n", + act->domid, ldom, act->pin); + if ( evaluate_nospec(rgt->gt_version == 1) ) { sha2 = NULL; @@ -2541,12 +2562,6 @@ acquire_grant_for_copy( status = &status_entry(rgt, gref); } - /* If already pinned, check the active domid and avoid refcnt overflow. */ - if ( act->pin && ((act->domid != ldom) || (act->pin & 0x80808080U) != 0) ) - PIN_FAIL(unlock_out, GNTST_general_error, - "Bad domain (%d != %d), or risk of counter overflow %08x\n", - act->domid, ldom, act->pin); - old_pin = act->pin; if ( sha2 && (shah->flags & GTF_type_mask) == GTF_transitive ) { @@ -2728,7 +2743,7 @@ acquire_grant_for_copy( } } - act->pin += readonly ? GNTPIN_hstr_inc : GNTPIN_hstw_inc; + act->pin += pin_incr; *page_off = act->start; *length = act->length; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 11:22:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 11:22:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69607.124720 (Exim 4.92) (envelope-from ) id 1l1ScQ-0002dK-CI; Mon, 18 Jan 2021 11:22:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69607.124720; Mon, 18 Jan 2021 11: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 1l1ScQ-0002dC-97; Mon, 18 Jan 2021 11:22:46 +0000 Received: by outflank-mailman (input) for mailman id 69607; Mon, 18 Jan 2021 11:22:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1ScP-0002cm-5s for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11:22:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1ScP-0008Px-4G for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11:22:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1ScP-0002Uw-3L for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 11: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=anA+46w/v5bxhjF7Pgc9iTZjgSayXNdTW6uV9AEeqr8=; b=JRGQb1/FnzNrV43nScr0i052eK FQiNgq6QZagSDoJqHs3K0lcKNAueNiF4Z+Wek7F0c74YDGlgFbQ8yCSPPsiNMFebPhBv2Tty7MJiP 6hwsofBs/wONR2VxR96WQtRrpYRHvoAEjqxu0WIc9Pn+ZN8Ar62BmGeNgo0rBHPhnZo0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] gnttab: consolidate pin-to-status syncing Message-Id: Date: Mon, 18 Jan 2021 11:22:45 +0000 commit b066d57183548ae199acdf6a0022e012e324a7b2 Author: Jan Beulich AuthorDate: Mon Jan 18 12:14:19 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 18 12:14:19 2021 +0100 gnttab: consolidate pin-to-status syncing Forever since the fix for XSA-230 the 2nd of the comments ahead of fixup_status_for_copy_pin() has been stale - there's nothing specific to transitive grants there anymore. Move the function up, drop the "copy" part from its name again, add a "readonly" parameter, and use it also on other paths having decremented one (or not having got to increment any) of the pin counts. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/common/grant_table.c | 99 +++++++++++++----------------------------------- 1 file changed, 27 insertions(+), 72 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 3c75116933..b24bce0f9f 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -920,6 +920,25 @@ static int _set_status(const grant_entry_header_t *shah, return _set_status_v2(shah, status, rd, act, readonly, mapflag, ldomid); } +/* + * The status for a grant may indicate that we're taking more access than + * the pin requires. Reduce the status to match the pin. Called with the + * domain's grant table lock held at least in read mode and with the active + * entry lock held (iow act->pin can't change behind our backs). + */ +static void reduce_status_for_pin(struct domain *rd, + const struct active_grant_entry *act, + uint16_t *status, bool readonly) +{ + unsigned int clear_flags = act->pin ? 0 : GTF_reading; + + if ( !readonly && !(act->pin & (GNTPIN_hstw_mask | GNTPIN_devw_mask)) ) + clear_flags |= GTF_writing; + + if ( clear_flags ) + gnttab_clear_flags(rd, clear_flags, status); +} + static struct active_grant_entry *grant_map_exists(const struct domain *ld, struct grant_table *rgt, mfn_t mfn, @@ -1003,8 +1022,7 @@ map_grant_ref( mfn_t mfn; struct page_info *pg = NULL; int rc = GNTST_okay; - unsigned int cache_flags, clear_flags = 0, refcnt = 0, typecnt = 0, - pin_incr = 0; + unsigned int cache_flags, refcnt = 0, typecnt = 0, pin_incr = 0; bool host_map_created = false; struct active_grant_entry *act = NULL; struct grant_mapping *mt; @@ -1296,15 +1314,7 @@ map_grant_ref( act->pin -= pin_incr; unlock_out_clear: - if ( !(op->flags & GNTMAP_readonly) && - !(act->pin & (GNTPIN_hstw_mask|GNTPIN_devw_mask)) ) - clear_flags |= GTF_writing; - - if ( !act->pin ) - clear_flags |= GTF_reading; - - if ( clear_flags ) - gnttab_clear_flags(rd, clear_flags, status); + reduce_status_for_pin(rd, act, status, op->flags & GNTMAP_readonly); act_release_out: active_entry_release(act); @@ -1519,7 +1529,6 @@ unmap_common_complete(struct gnttab_unmap_common *op) grant_entry_header_t *sha; struct page_info *pg; uint16_t *status; - unsigned int clear_flags = 0; if ( evaluate_nospec(!op->done) ) { @@ -1578,15 +1587,7 @@ unmap_common_complete(struct gnttab_unmap_common *op) act->pin -= GNTPIN_hstw_inc; } - if ( ((act->pin & (GNTPIN_devw_mask|GNTPIN_hstw_mask)) == 0) && - !(op->done & GNTMAP_readonly) ) - clear_flags |= GTF_writing; - - if ( act->pin == 0 ) - clear_flags |= GTF_reading; - - if ( clear_flags ) - gnttab_clear_flags(rd, clear_flags, status); + reduce_status_for_pin(rd, act, status, op->done & GNTMAP_readonly); active_entry_release(act); grant_read_unlock(rgt); @@ -2426,7 +2427,6 @@ release_grant_for_copy( uint16_t *status; grant_ref_t trans_gref; struct domain *td; - unsigned int clear_flags = 0; grant_read_lock(rgt); @@ -2456,15 +2456,9 @@ release_grant_for_copy( gnttab_mark_dirty(rd, mfn); act->pin -= GNTPIN_hstw_inc; - if ( !(act->pin & (GNTPIN_devw_mask|GNTPIN_hstw_mask)) ) - clear_flags |= GTF_writing; } - if ( !act->pin ) - clear_flags |= GTF_reading; - - if ( clear_flags ) - gnttab_clear_flags(rd, clear_flags, status); + reduce_status_for_pin(rd, act, status, readonly); active_entry_release(act); grant_read_unlock(rgt); @@ -2481,27 +2475,6 @@ release_grant_for_copy( } } -/* The status for a grant indicates that we're taking more access than - the pin requires. Fix up the status to match the pin. Called - under the domain's grant table lock. */ -/* Only safe on transitive grants. Even then, note that we don't - attempt to drop any pin on the referent grant. */ -static void fixup_status_for_copy_pin(struct domain *rd, - const struct active_grant_entry *act, - uint16_t *status) -{ - unsigned int clear_flags = 0; - - if ( !(act->pin & (GNTPIN_hstw_mask | GNTPIN_devw_mask)) ) - clear_flags |= GTF_writing; - - if ( !act->pin ) - clear_flags |= GTF_reading; - - if ( clear_flags ) - gnttab_clear_flags(rd, clear_flags, status); -} - /* * Grab a machine frame number from a grant entry and update the flags * and pin count as appropriate. If rc == GNTST_okay, note that this *does* @@ -2529,7 +2502,6 @@ acquire_grant_for_copy( bool is_sub_page; s16 rc = GNTST_okay; unsigned int pin_incr = readonly ? GNTPIN_hstr_inc : GNTPIN_hstw_inc; - unsigned int clear_flags = 0; *page = NULL; @@ -2616,8 +2588,8 @@ acquire_grant_for_copy( if ( rc != GNTST_okay ) { - fixup_status_for_copy_pin(rd, act, status); rcu_unlock_domain(td); + reduce_status_for_pin(rd, act, status, readonly); active_entry_release(act); grant_read_unlock(rgt); return rc; @@ -2639,8 +2611,8 @@ acquire_grant_for_copy( !act->is_sub_page)) ) { release_grant_for_copy(td, trans_gref, readonly); - fixup_status_for_copy_pin(rd, act, status); rcu_unlock_domain(td); + reduce_status_for_pin(rd, act, status, readonly); active_entry_release(act); grant_read_unlock(rgt); put_page(*page); @@ -2754,15 +2726,7 @@ acquire_grant_for_copy( return rc; unlock_out_clear: - if ( !(readonly) && - !(act->pin & (GNTPIN_hstw_mask | GNTPIN_devw_mask)) ) - clear_flags |= GTF_writing; - - if ( !act->pin ) - clear_flags |= GTF_reading; - - if ( clear_flags ) - gnttab_clear_flags(rd, clear_flags, status); + reduce_status_for_pin(rd, act, status, readonly); unlock_out: active_entry_release(act); @@ -3732,8 +3696,6 @@ gnttab_release_mappings( for ( handle = 0; handle < gt->maptrack_limit; handle++ ) { - unsigned int clear_flags = 0; - map = &maptrack_entry(gt, handle); if ( !(map->flags & (GNTMAP_device_map|GNTMAP_host_map)) ) continue; @@ -3806,16 +3768,9 @@ gnttab_release_mappings( put_page(pg); } } - - if ( (act->pin & (GNTPIN_devw_mask|GNTPIN_hstw_mask)) == 0 ) - clear_flags |= GTF_writing; } - if ( act->pin == 0 ) - clear_flags |= GTF_reading; - - if ( clear_flags ) - gnttab_clear_flags(rd, clear_flags, status); + reduce_status_for_pin(rd, act, status, map->flags & GNTMAP_readonly); active_entry_release(act); grant_read_unlock(rgt); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 13:55:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 13:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69693.124890 (Exim 4.92) (envelope-from ) id 1l1Uzq-0001S2-Dq; Mon, 18 Jan 2021 13:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69693.124890; Mon, 18 Jan 2021 13: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 1l1Uzq-0001Ru-AX; Mon, 18 Jan 2021 13:55:06 +0000 Received: by outflank-mailman (input) for mailman id 69693; Mon, 18 Jan 2021 13:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Uzo-0001Ro-95 for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 13:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Uzo-0002V9-3Q for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 13:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1Uzo-0004h3-1b for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 13: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=LYvnuSOJNVK/l4myAdCVeaps567LJdjxmn8Row5kbvY=; b=NljaZhxz2CLIW5tNFQ8V70lj5y +gaA2nV8p2xrAYtrm8VhBwJe5Zg9NjxDHkuayd3d4Yqx9HhpSbqewLWCe9gumLzziIkIbvqY3YJS3 xyOzlKaY0gcp3e1odirUvMxB8IezBe+x4ev5K5JovkIHBM3PtQeOTaDVDtL8DBekkk1s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenhypfs: fix reading of gzipped string Message-Id: Date: Mon, 18 Jan 2021 13:55:04 +0000 commit 971275352691869b227f11b92d21303c567ddfb3 Author: Juergen Gross AuthorDate: Mon Jan 18 13:06:28 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 18 13:52:40 2021 +0000 tools/libxenhypfs: fix reading of gzipped string Reading a gzipped string value from hypfs doesn't add a 0 byte at the end. Fix that. Fixes: 86234eafb95295 ("libs: add libxenhypfs") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper --- tools/libs/hypfs/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/libs/hypfs/core.c b/tools/libs/hypfs/core.c index f94c5ea1e2..52b30db8d7 100644 --- a/tools/libs/hypfs/core.c +++ b/tools/libs/hypfs/core.c @@ -146,12 +146,13 @@ static void *xenhypfs_inflate(void *in_data, size_t *sz) break; out_sz = z.next_out - workbuf; - content = realloc(content, *sz + out_sz); + content = realloc(content, *sz + out_sz + 1); if (!content) { ret = Z_MEM_ERROR; break; } memcpy(content + *sz, workbuf, out_sz); + *(char *)(content + *sz + out_sz) = 0; } inflateEnd(&z); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 16:33:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 16:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69889.125260 (Exim 4.92) (envelope-from ) id 1l1XSl-0003IP-Q6; Mon, 18 Jan 2021 16:33:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69889.125260; Mon, 18 Jan 2021 16:33:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1XSl-0003IH-Mw; Mon, 18 Jan 2021 16:33:07 +0000 Received: by outflank-mailman (input) for mailman id 69889; Mon, 18 Jan 2021 16:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1XSj-0003IC-MY for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 16:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1XSj-0005rA-Jk for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 16:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1XSj-0007bK-IW for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 16: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=rNE3Fl+6+TRw/f69Pr6kyv1ZbfW6uVdOsVjnoUBGBXo=; b=R22IvrjrxrZlgCh6JB3JAe4eP8 QZCkwF7dzG3hHFvdSMXoeCxlTKzZvAlOYgkLdBPK5lZBKR7QxzSkxPkA2xIh2SDWb9+kUVrvw10Pc 4nl66w3igkBp2+V/UvWB2D21f1tnGWAy750gwq0YcjahGpbsuEZWUOv6SnVStMErQOy8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/domain: Reposition config copying in domain_create() Message-Id: Date: Mon, 18 Jan 2021 16:33:05 +0000 commit 1839011c7eccd1b119d71a36b07ed914bfa9c5da Author: Andrew Cooper AuthorDate: Mon Jan 18 14:50:57 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Jan 18 16:23:03 2021 +0000 xen/domain: Reposition config copying in domain_create() This is cleanup for two pending series which will copy more data than just flags from config. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/common/domain.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index d151be3f36..164c9d14e9 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -421,14 +421,15 @@ struct domain *domain_create(domid_t domid, if ( (d = alloc_domain_struct()) == NULL ) return ERR_PTR(-ENOMEM); - d->options = config ? config->flags : 0; - /* Sort out our idea of is_system_domain(). */ d->domain_id = domid; /* Debug sanity. */ ASSERT(is_system_domain(d) ? config == NULL : config != NULL); + if ( config ) + d->options = config->flags; + /* Sort out our idea of is_control_domain(). */ d->is_privileged = is_priv; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 17:55:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 17:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69940.125395 (Exim 4.92) (envelope-from ) id 1l1Yk5-0003Uv-SG; Mon, 18 Jan 2021 17:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69940.125395; Mon, 18 Jan 2021 17: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 1l1Yk5-0003Un-PR; Mon, 18 Jan 2021 17:55:05 +0000 Received: by outflank-mailman (input) for mailman id 69940; Mon, 18 Jan 2021 17:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Yk4-0003Ue-Gn for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 17:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Yk4-0007CI-Dc for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 17:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1Yk4-0001Av-Ca for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 17: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=kxdM29RoceZAU1nnrR5iFZ25uJI6qsUgqsaEgr964qc=; b=BGikby4wxC+aZ9vFgf0L4PdoPU RnrQELIe9gYvpWDKzdLnjRwukMl/fh0dAD6KsYiQdVDJSSS1MlegnQm/FKZiG27ciJIomGDMT44zz err0B/zJgrJsaFzxjU+tCSst6hFgP2vu/Js6He47R7ZMXl96OfyIGSBESOlW2OKEzMSg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mem_sharing: fix uninitialized 'preempted' variable Message-Id: Date: Mon, 18 Jan 2021 17:55:04 +0000 commit cb34a2fa162184b150d48a3b6f385bacbec22ce7 Author: Tamas K Lengyel AuthorDate: Mon Jan 18 10:23:06 2021 -0700 Commit: Andrew Cooper CommitDate: Mon Jan 18 17:50:11 2021 +0000 x86/mem_sharing: fix uninitialized 'preempted' variable UBSAN catches an uninitialized use of the 'preempted' variable in fork_hap_allocation when there is no preemption. Fixes: 41548c5472a ("mem_sharing: VM forking") Signed-off-by: Tamas K Lengyel Acked-by: Andrew Cooper --- xen/arch/x86/mm/mem_sharing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index c8a6d11b90..adaeab4612 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1644,7 +1644,7 @@ static int copy_vcpu_settings(struct domain *cd, const struct domain *d) static int fork_hap_allocation(struct domain *cd, struct domain *d) { int rc; - bool preempted; + bool preempted = false; unsigned long mb = hap_get_allocation(d); if ( mb == hap_get_allocation(cd) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 18:00:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 18:00:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.69944.125404 (Exim 4.92) (envelope-from ) id 1l1Yow-0004Og-A2; Mon, 18 Jan 2021 18:00:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 69944.125404; Mon, 18 Jan 2021 18: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 1l1Yow-0004O7-6M; Mon, 18 Jan 2021 18:00:06 +0000 Received: by outflank-mailman (input) for mailman id 69944; Mon, 18 Jan 2021 18:00:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1You-0004BH-Sl for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 18:00:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1You-0007Nf-R2 for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 18:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1You-0001lK-Q4 for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 18: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=ZDVMssFPPjPrqYRnjr7p4GVWpMp9hGm2AGor2anGhjc=; b=S2xofhSXoSRi2Pz8FxTOWoB+wO /04nWli14oU1v/FTYPvXcrqpNhbLj9NoIa2GHg1KOHkI42lnV18FhBLbGWKGT2GlGGXmNz5eGrsDt 6kGkrurmtte2uMk2huwegLd16vXQdx918MI6o9gP8mOVSyynTprOSwVtL4xzTVE6X5GI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] ocaml/libs/eventchn: drop unneeded evtchn.h Message-Id: Date: Mon, 18 Jan 2021 18:00:04 +0000 commit cf2a56606033c244321f5d1b6b97d055b2506897 Author: Manuel Bouyer AuthorDate: Tue Jan 12 19:12:39 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 18 17:55:27 2021 +0000 ocaml/libs/eventchn: drop unneeded evtchn.h On NetBSD xen/sys/evtchn.h is not available any more. Just remove it as it's not needed. Signed-off-by: Manuel Bouyer Acked-by: Christian Lindig --- tools/ocaml/libs/eventchn/xeneventchn_stubs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/ocaml/libs/eventchn/xeneventchn_stubs.c b/tools/ocaml/libs/eventchn/xeneventchn_stubs.c index ba40078d09..f889a7a2e4 100644 --- a/tools/ocaml/libs/eventchn/xeneventchn_stubs.c +++ b/tools/ocaml/libs/eventchn/xeneventchn_stubs.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #define CAML_NAME_SPACE -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 19:11:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 19:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70008.125575 (Exim 4.92) (envelope-from ) id 1l1Zvd-000449-Ir; Mon, 18 Jan 2021 19:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70008.125575; Mon, 18 Jan 2021 19: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 1l1Zvd-000441-Fv; Mon, 18 Jan 2021 19:11:05 +0000 Received: by outflank-mailman (input) for mailman id 70008; Mon, 18 Jan 2021 19:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Zvc-00043w-Q6 for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Zvc-0000An-LE for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1Zvc-0006sV-JT for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xKLQDT08i5SeE5ApW+l/05XrfOcRBiHFjUE216V1gyg=; b=RlxIUqjCFthNkh20eQt8h0Bq7+ 7ttfZjqR4TDzUXndyGq2Z0H7U8QanFxeA6OMSBlv0u7enexLPSTnQBMGuhDjxYDtgl1IpcUBbXpUe 0+Ky9p70opxKVx9epfwnF11TJOcOiJjkN5uzN0iw5Aq7Kz4uOgUgoOWINSE7B01cM9ag=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/evtchn: fix build on NetBSD Message-Id: Date: Mon, 18 Jan 2021 19:11:04 +0000 commit 3a0b215c6f69c3a73d3ea9591823cb28c4a84dea Author: From: Manuel Bouyer AuthorDate: Mon Jan 18 18:38:41 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Jan 18 18:58:20 2021 +0000 libs/evtchn: fix build on NetBSD Use xenio3.h for ioctl definitions read_exact/write_exact seems to not be available here, which cause a gcc error. Use plain read/write, the xenevtchn interface won't do partial read/write on NetBSD anyway so it should be safe. This is in line with the rest of the OS specific helpers. Fixes: b7f76a699dc ('tools: Refactor /dev/xen/evtchn wrappers into libxenevtchn') Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- tools/libs/evtchn/netbsd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libs/evtchn/netbsd.c b/tools/libs/evtchn/netbsd.c index 60a9235978..1cebc21ffc 100644 --- a/tools/libs/evtchn/netbsd.c +++ b/tools/libs/evtchn/netbsd.c @@ -25,10 +25,10 @@ #include -#include - #include "private.h" +#include + #define EVTCHN_DEV_NAME "/dev/xenevt" int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) @@ -138,7 +138,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) int fd = xce->fd; evtchn_port_t port; - if ( read_exact(fd, (char *)&port, sizeof(port)) == -1 ) + if ( read(fd, (char *)&port, sizeof(port)) == -1 ) return -1; return port; @@ -148,7 +148,7 @@ int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port) { int fd = xce->fd; - return write_exact(fd, (char *)&port, sizeof(port)); + return write(fd, (char *)&port, sizeof(port)); } /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 19:11:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 19:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70011.125593 (Exim 4.92) (envelope-from ) id 1l1Zvn-000483-UQ; Mon, 18 Jan 2021 19:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70011.125593; Mon, 18 Jan 2021 19:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Zvn-00047v-RA; Mon, 18 Jan 2021 19:11:15 +0000 Received: by outflank-mailman (input) for mailman id 70011; Mon, 18 Jan 2021 19:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Zvm-00047X-PE for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Zvm-0000Ay-OR for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1Zvm-0006tr-NO for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19: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=Kqnt1Q7MVfnsXrV3cJcroZ0lKRMCjYZXlYko83nOWto=; b=bV12UPA9mKIVFti2Ky+uT2Ptyn VaBgFfYpu1NNOtQhd98hHycOH9uvkI8zA8E7GHk0uloV/XMAjngJDyF+BQqoobOzT2VQ20T8VuAzw 4rMN1YCTwc57ZBYvcpGl/MtSojlOpcl7V8oXNcJCbIe8R2GYD94SfgYNLvMrg0/OcL2Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenbackendd: Remove xenbackendd Message-Id: Date: Mon, 18 Jan 2021 19:11:14 +0000 commit 01ce02c21c097a453553bf9d4044a2dbfd8938f7 Author: Manuel Bouyer AuthorDate: Tue Jan 12 19:12:26 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 18 18:58:20 2021 +0000 tools/xenbackendd: Remove xenbackendd NetBSD doens't need xenbackendd with xl toolstack so don't build it. Remove now unused xenbackendd directory/files, and remaining references in the hotplug scripts. Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné [Also clean up stale comments in the Linux xencommons script] Signed-off-by: Andrew Cooper --- .gitignore | 2 - tools/Makefile | 1 - tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 6 - tools/hotplug/NetBSD/block | 1 - tools/hotplug/NetBSD/rc.d/xencommons.in | 2 - tools/hotplug/NetBSD/vif-bridge | 1 - tools/hotplug/NetBSD/vif-ip | 1 - tools/xenbackendd/Makefile | 45 --- tools/xenbackendd/xenbackendd.c | 326 --------------------- 9 files changed, 385 deletions(-) diff --git a/.gitignore b/.gitignore index 35957cc21f..9e0488e0cd 100644 --- a/.gitignore +++ b/.gitignore @@ -279,8 +279,6 @@ tools/tests/vpci/vpci.[hc] tools/tests/vpci/test_vpci tools/xcutils/lsevtchn tools/xcutils/readnotes -tools/xenbackendd/_paths.h -tools/xenbackendd/xenbackendd tools/xenmon/xentrace_setmask tools/xenmon/xenbaked tools/xenpaging/xenpaging diff --git a/tools/Makefile b/tools/Makefile index ed71474421..757a560be0 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -18,7 +18,6 @@ SUBDIRS-$(CONFIG_X86) += firmware SUBDIRS-y += console SUBDIRS-y += xenmon SUBDIRS-y += xentop -SUBDIRS-$(CONFIG_NetBSD) += xenbackendd SUBDIRS-y += libfsimage SUBDIRS-$(CONFIG_Linux) += vchan diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in index 0fc6557d4a..b059a2910d 100644 --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in @@ -87,12 +87,6 @@ XENSTORED_ARGS= # Only evaluated if XENSTORETYPE is "domain". XENSTORE_DOMAIN_ARGS= -## Type: string -## Default: Not defined, xenbackendd debug mode off -# -# Running xenbackendd in debug mode -#XENBACKENDD_DEBUG=[yes|on|1] - # qemu path #QEMU_XEN=@qemu_xen_path@ diff --git a/tools/hotplug/NetBSD/block b/tools/hotplug/NetBSD/block index 32c20b6c89..2a0516f436 100644 --- a/tools/hotplug/NetBSD/block +++ b/tools/hotplug/NetBSD/block @@ -1,7 +1,6 @@ #!/bin/sh -e # $NetBSD: block-nbsd,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $ -# Called by xenbackendd # Usage: block xsdir_backend_path state DIR=$(dirname "$0") diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in b/tools/hotplug/NetBSD/rc.d/xencommons.in index 886a2e2840..3981787eac 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons.in +++ b/tools/hotplug/NetBSD/rc.d/xencommons.in @@ -22,8 +22,6 @@ required_files="/kern/xen/privcmd" XENSTORED_PIDFILE="@XEN_RUN_DIR@/xenstored.pid" XENCONSOLED_PIDFILE="@XEN_RUN_DIR@/xenconsoled.pid" -XENBACKENDD_PIDFILE="@XEN_RUN_DIR@/xenbackendd.pid" -#XENBACKENDD_DEBUG=1 #XENCONSOLED_TRACE="@XEN_LOG_DIR@/xenconsole-trace.log" #XENSTORED_TRACE="@XEN_LOG_DIR@/xenstore-trace.log" diff --git a/tools/hotplug/NetBSD/vif-bridge b/tools/hotplug/NetBSD/vif-bridge index b58e922601..b1b25cbbde 100644 --- a/tools/hotplug/NetBSD/vif-bridge +++ b/tools/hotplug/NetBSD/vif-bridge @@ -1,7 +1,6 @@ #!/bin/sh -e # $NetBSD: vif-bridge-nbsd,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $ -# Called by xenbackendd # Usage: vif-bridge xsdir_backend_path state DIR=$(dirname "$0") diff --git a/tools/hotplug/NetBSD/vif-ip b/tools/hotplug/NetBSD/vif-ip index 83cbfe20e2..3e7bd2c022 100644 --- a/tools/hotplug/NetBSD/vif-ip +++ b/tools/hotplug/NetBSD/vif-ip @@ -1,7 +1,6 @@ #!/bin/sh -e # $NetBSD: vif-ip-nbsd,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $ -# Called by xenbackendd # Usage: vif-ip xsdir_backend_path state DIR=$(dirname "$0") diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile deleted file mode 100644 index ba53bbf7e6..0000000000 --- a/tools/xenbackendd/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2009 Advanced Micro Devices, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; under version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -XEN_ROOT=$(CURDIR)/../.. -include $(XEN_ROOT)/tools/Rules.mk - -CFLAGS += -Werror -CFLAGS += $(CFLAGS_libxenstore) -CPPFLAGS += -DXEN_SCRIPT_DIR="\"$(XEN_SCRIPT_DIR)\"" -LDLIBS += $(LDLIBS_libxenstore) - -.PHONY: all -all: build - -.PHONY: build -build: xenbackendd - -.PHONY: install -install: build - $(INSTALL_DIR) $(DESTDIR)$(sbindir) - $(INSTALL_PROG) xenbackendd $(DESTDIR)$(sbindir) - -.PHONY: clean -clean: - $(RM) *.a *.so *.o $(DEPS_RM) xenbackendd _paths.h - -.PHONY: distclean -distclean: clean - -xenbackendd.o: _paths.h -xenbackendd: xenbackendd.o - $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS) - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - --include $(DEPS_INCLUDE) diff --git a/tools/xenbackendd/xenbackendd.c b/tools/xenbackendd/xenbackendd.c deleted file mode 100644 index 21884af772..0000000000 --- a/tools/xenbackendd/xenbackendd.c +++ /dev/null @@ -1,326 +0,0 @@ -/* $NetBSD: xenbackendd.c,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $ */ -/* - * Copyright (C) 2006 Manuel Bouyer - * Copyright (C) 2009 Christoph Egger - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; under version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "_paths.h" - -#define DEVTYPE_UNKNOWN 0 -#define DEVTYPE_VIF 1 -#define DEVTYPE_VBD 2 -#define DISABLE_EXEC "libxl/disable_udev" - -#define DOMAIN_PATH "/local/domain/0" - -#ifndef XEN_SCRIPT_DIR -#error XEN_SCRIPT_DIR not defined -#endif - -#ifndef VBD_SCRIPT -#define VBD_SCRIPT XEN_SCRIPT_DIR"/block" -#endif -#ifndef LOG_FILE -#define LOG_FILE XEN_LOG_DIR "xenbackendd.log" -#endif -#ifndef PID_FILE -#define PID_FILE XEN_RUN_DIR "xenbackendd.pid" -#endif - - -struct xs_handle *xs; - -int fflag = 0; -int dflag = 0; - -const char *vbd_script = NULL; -const char *log_file = NULL; -const char *pidfile = NULL; - -static void -dolog(int pri, const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, "\n"); - fflush(stderr); - va_start(ap, fmt); - vsyslog(pri, fmt, ap); - va_end(ap); -} - -static void -dodebug(const char *fmt, ...) -{ - va_list ap; - - if (dflag == 0) - return; - va_start(ap, fmt); - vfprintf(stdout, fmt, ap); - va_end(ap); - printf("\n"); - fflush(stdout); -} - -static void -doexec(const char *cmd, const char *arg1, const char *arg2) -{ - dodebug("exec %s %s %s", cmd, arg1, arg2); - switch(vfork()) { - case -1: - dolog(LOG_ERR, "can't vfork: %s", strerror(errno)); - break; - case 0: - execl(cmd, cmd, arg1, arg2, NULL); - dolog(LOG_ERR, "can't exec %s: %s", cmd, strerror(errno)); - exit(EXIT_FAILURE); - /* NOTREACHED */ - break; - default: - wait(NULL); - break; - } -} - -static void -usage(void) -{ - fprintf(stderr, - "usage: %s [-d] [-f] [-l log_file] [-p pif_file] [-s vbd_script]\n", - getprogname()); - exit(EXIT_FAILURE); -} - -static int -xen_setup(void) -{ - xs = xs_open(0); - if (xs == NULL) { - dolog(LOG_ERR, - "Failed to contact xenstore (%s). Is it running?", - strerror(errno)); - goto out; - } - - if (!xs_watch(xs, DOMAIN_PATH, "backend")) { - dolog(LOG_ERR, "xenstore watch on backend fails."); - goto out; - } - return 0; - - out: - if (xs) { - xs_close(xs); - xs = NULL; - } - return -1; -} - -int -main(int argc, char * const argv[]) -{ - char **vec; - unsigned int num; - char *s; - int state; - char *sstate, *sdisable; - char *p; - char buf[80]; - int type; - int ch; - int debug_fd; - FILE *pidfile_f; - - while ((ch = getopt(argc, argv, "dfl:p:s:")) != -1) { - switch (ch) { - case 'd': - dflag = 1; - break; - case 'f': - fflag = 1; - break; - case 'l': - log_file = optarg; - break; - case 'p': - pidfile = optarg; - case 's': - vbd_script = optarg; - break; - default: - usage(); - } - } - - if (vbd_script == NULL) - vbd_script = VBD_SCRIPT; - if (pidfile == NULL) - pidfile = PID_FILE; - if (log_file == NULL) - log_file = LOG_FILE; - - openlog("xenbackendd", LOG_PID | LOG_NDELAY, LOG_DAEMON); - - if (fflag == 0) { - /* open log file */ - debug_fd = open(log_file, O_RDWR | O_CREAT | O_TRUNC, 0644); - if (debug_fd == -1) { - dolog(LOG_ERR, "can't open %s: %s", - log_file, strerror(errno)); - exit(EXIT_FAILURE); - } - } - - if (fflag == 0) { - /* daemonize */ - pidfile_f = fopen(pidfile, "w"); - if (pidfile_f == NULL) { - dolog(LOG_ERR, "can't open %s: %s", - pidfile, strerror(errno)); - exit(EXIT_FAILURE); - } - if (daemon(0, 0) < 0) { - dolog(LOG_ERR, "can't daemonize: %s", - strerror(errno)); - exit(EXIT_FAILURE); - } - fprintf(pidfile_f, "%d\n", (int)getpid()); - fclose(pidfile_f); - - /* redirect stderr to log file */ - if (dup2(debug_fd, STDERR_FILENO) < 0) { - dolog(LOG_ERR, "can't redirect stderr to %s: %s\n", - log_file, strerror(errno)); - exit(EXIT_FAILURE); - } - - /* also redirect stdout if we're in debug mode */ - if (dflag) { - if (dup2(debug_fd, STDOUT_FILENO) < 0) { - dolog(LOG_ERR, - "can't redirect stdout to %s: %s\n", - log_file, strerror(errno)); - exit(EXIT_FAILURE); - } - } - - close(debug_fd); - debug_fd = -1; - } - - if (xen_setup() < 0) - exit(EXIT_FAILURE); - - for (;;) { - vec = xs_read_watch(xs, &num); - dodebug("read from xen watch: %s", *vec); - if (!vec) { - dolog(LOG_ERR, "xs_read_watch: NULL\n"); - continue; - } - - sdisable = xs_read(xs, XBT_NULL, DISABLE_EXEC, 0); - if (sdisable) - goto next1; - - if (strlen(vec[XS_WATCH_PATH]) < sizeof("state")) - goto next1; - - /* find last component of path, check if it's "state" */ - p = &vec[XS_WATCH_PATH][ - strlen(vec[XS_WATCH_PATH]) - sizeof("state")]; - if (p[0] != '/') - goto next1; - p[0] = '\0'; - p++; - if (strcmp(p, "state") != 0) - goto next1; - - snprintf(buf, sizeof(buf), "%s/state", vec[XS_WATCH_PATH]); - sstate = xs_read(xs, XBT_NULL, buf, 0); - if (sstate == NULL) { - dolog(LOG_ERR, - "Failed to read %s (%s)", buf, strerror(errno)); - goto next1; - } - - state = atoi(sstate); - snprintf(buf, sizeof(buf), "%s/hotplug-status", - vec[XS_WATCH_PATH]); - s = xs_read(xs, XBT_NULL, buf, 0); - if (s != NULL && state != 6 /* XenbusStateClosed */) - goto next2; - - type = DEVTYPE_UNKNOWN; - if (strncmp(vec[XS_WATCH_PATH], - DOMAIN_PATH "/backend/vif", - strlen(DOMAIN_PATH "/backend/vif")) == 0) - type = DEVTYPE_VIF; - - if (strncmp(vec[XS_WATCH_PATH], - DOMAIN_PATH "/backend/vbd", - strlen(DOMAIN_PATH "/backend/vbd")) == 0) - type = DEVTYPE_VBD; - - switch(type) { - case DEVTYPE_VIF: - free(s); - snprintf(buf, sizeof(buf), "%s/script", - vec[XS_WATCH_PATH]); - s = xs_read(xs, XBT_NULL, buf, 0); - if (s == NULL) { - dolog(LOG_ERR, - "Failed to read %s (%s)", buf, - strerror(errno)); - goto next2; - } - doexec(s, vec[XS_WATCH_PATH], sstate); - break; - - case DEVTYPE_VBD: - doexec(vbd_script, vec[XS_WATCH_PATH], sstate); - break; - - default: - break; - } - -next2: - free(s); - free(sstate); - -next1: - free(sdisable); - free(vec); - } - - return 0; -} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 19:11:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 19:11:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70012.125598 (Exim 4.92) (envelope-from ) id 1l1Zvy-0004BY-1i; Mon, 18 Jan 2021 19:11:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70012.125598; Mon, 18 Jan 2021 19: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 1l1Zvx-0004BU-Ui; Mon, 18 Jan 2021 19:11:25 +0000 Received: by outflank-mailman (input) for mailman id 70012; Mon, 18 Jan 2021 19:11:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Zvw-0004BA-SN for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Zvw-0000BC-RZ for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1Zvw-0006vC-Qd for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6JvWCD7wKdmhLnVedJhMp5yILJNcn81I0P+NS4ht1/o=; b=JcGW1qiZnAepbOHQu16+BQbZ/x pibqyJQoMb4SMq5kZUaiyqHS8rKgKkf02dAF5a3osub5Jtc8VuGRDADcWH3MnVrmPlOmF/qJ0ZpDJ ucGgHK6pdkVSVd+mUOJ/qbZqce6DJI1lAVzhkaJOI4eXfTSwGJJRvSX57Ik7oK8gzRZg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenpaging: include errno.h Message-Id: Date: Mon, 18 Jan 2021 19:11:24 +0000 commit 8e4f3b6cd68495937a496b94ff228907dbd1958b Author: Manuel Bouyer AuthorDate: Tue Jan 12 19:12:40 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 18 18:58:20 2021 +0000 tools/xenpaging: include errno.h writable definition of errno on NetBSD. Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- tools/xenpaging/xenpaging.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c index 33098046c2..6e5490315d 100644 --- a/tools/xenpaging/xenpaging.c +++ b/tools/xenpaging/xenpaging.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 19:11:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 19:11:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70015.125602 (Exim 4.92) (envelope-from ) id 1l1Zw8-0004Dl-3d; Mon, 18 Jan 2021 19:11:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70015.125602; Mon, 18 Jan 2021 19: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 1l1Zw8-0004De-0a; Mon, 18 Jan 2021 19:11:36 +0000 Received: by outflank-mailman (input) for mailman id 70015; Mon, 18 Jan 2021 19:11:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Zw7-0004DT-00 for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1Zw6-0000BJ-V9 for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1Zw6-0006wS-Tn for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+VArHus9yQrwtgv5pOw+nTYCfL4eGck9/TYwgIsPKc4=; b=dvWWcw0oz0v6IBWL16og4EznG2 rVMXuPIv9uhiSQGdlesDM76Xrtq70N2pTIA4/gM/aafppTjZMm0nXqW4wCd+C7wa3OjuV8mtelWdg AFq59vPkgrMF4ohoxvKiFNDuX2apbMPwcPwfYVZYUMtKQHhRRUI1PziiSUEN5kIWaktI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstat: Remove usused NetBSD code Message-Id: Date: Mon, 18 Jan 2021 19:11:34 +0000 commit 4d0fbc2de5201f98508dec55466a4dbc1fb908c4 Author: Manuel Bouyer AuthorDate: Tue Jan 12 19:12:42 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 18 18:58:20 2021 +0000 tools/xenstat: Remove usused NetBSD code remove PROCNETDEV_HEADER[] and read_attributes_vbd(), gcc complains that they are unused Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- tools/libs/stat/xenstat_netbsd.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tools/libs/stat/xenstat_netbsd.c b/tools/libs/stat/xenstat_netbsd.c index 6e9d6aee10..64eda9e1ae 100644 --- a/tools/libs/stat/xenstat_netbsd.c +++ b/tools/libs/stat/xenstat_netbsd.c @@ -55,11 +55,6 @@ get_priv_data(xenstat_handle *handle) } /* Expected format of /proc/net/dev */ -static const char PROCNETDEV_HEADER[] = - "Inter-| Receive |" - " Transmit\n" - " face |bytes packets errs drop fifo frame compressed multicast|" - "bytes packets errs drop fifo colls carrier compressed\n"; /* Collect information about networks */ int xenstat_collect_networks(xenstat_node * node) @@ -76,12 +71,6 @@ void xenstat_uninit_networks(xenstat_handle * handle) fclose(priv->procnetdev); } -static int read_attributes_vbd(const char *vbd_directory, const char *what, char *ret, int cap) -{ - /* XXX implement */ - return 0; -} - /* Collect information about VBDs */ int xenstat_collect_vbds(xenstat_node * node) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jan 18 19:11:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Jan 2021 19:11:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70016.125606 (Exim 4.92) (envelope-from ) id 1l1ZwI-0004FD-5N; Mon, 18 Jan 2021 19:11:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70016.125606; Mon, 18 Jan 2021 19: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 1l1ZwI-0004F5-2I; Mon, 18 Jan 2021 19:11:46 +0000 Received: by outflank-mailman (input) for mailman id 70016; Mon, 18 Jan 2021 19:11:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1ZwH-0004Ev-3Y for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1ZwH-0000BS-2m for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19:11:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1ZwH-0006xI-18 for xen-changelog@lists.xenproject.org; Mon, 18 Jan 2021 19: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=kFOyTGZz0WgC1pgeS2teB9A/100xCkLex5Pj4MkV0+E=; b=hLH8J0XK3h/KJZhHgNxmxkh/EX 3D+dfSQFbHF1xvBoiYw96kebZMDjppTvNH2avpdj5eXd7rleBoTdN+uTIbFLc2Dp7SN2tZXnL9vQm t59d5TBY44oiOJ1d8wSgGtai2vIUUD9c8EB4OS7b9o0bsK+7nyRvb7JxT56EnnGDpPqA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/gdbsx: Use right path for privcmd on NetBSD Message-Id: Date: Mon, 18 Jan 2021 19:11:45 +0000 commit 5e53349960d951f428add94603d57148535de864 Author: Manuel Bouyer AuthorDate: Tue Jan 12 19:12:28 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 18 19:07:37 2021 +0000 tools/gdbsx: Use right path for privcmd on NetBSD On NetBSD the privcmd interface node is /kern/xen/privcmd Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- tools/debugger/gdbsx/xg/xg_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/debugger/gdbsx/xg/xg_main.c b/tools/debugger/gdbsx/xg/xg_main.c index a4e8653168..4576c762af 100644 --- a/tools/debugger/gdbsx/xg/xg_main.c +++ b/tools/debugger/gdbsx/xg/xg_main.c @@ -126,11 +126,11 @@ xg_init() int flags, saved_errno; XGTRC("E\n"); - if ((_dom0_fd=open("/dev/xen/privcmd", O_RDWR)) == -1) { - if ((_dom0_fd=open("/proc/xen/privcmd", O_RDWR)) == -1) { - perror("Failed to open /dev/xen/privcmd or /proc/xen/privcmd\n"); - return -1; - } + if ((_dom0_fd=open("/dev/xen/privcmd", O_RDWR)) == -1 && + (_dom0_fd=open("/proc/xen/privcmd", O_RDWR)) == -1 && + (_dom0_fd=open("/kern/xen/privcmd", O_RDWR)) == -1) { + perror("Failed to open privcmd\n"); + return -1; } /* Although we return the file handle as the 'xc handle' the API * does not specify / guarentee that this integer is in fact -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 06:33:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 06:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70152.125838 (Exim 4.92) (envelope-from ) id 1l1kZb-0000ho-DT; Tue, 19 Jan 2021 06:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70152.125838; Tue, 19 Jan 2021 06: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 1l1kZb-0000hg-AU; Tue, 19 Jan 2021 06:33:03 +0000 Received: by outflank-mailman (input) for mailman id 70152; Tue, 19 Jan 2021 06:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1kZa-0000hb-4W for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1kZa-0002D4-3c for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1kZa-00039I-1K for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qgZrfI8w0lUg3Kk8l04cTqh8jLSp/fsdjvGWnh2UIz4=; b=JBzisuVJd6zDsfZxxs3rPF4Cec b3ULajDYtaxeXmpCTbX8uVvEy05Wyfb/tCe6Iv5GaVneSuTMWlJbVa59CPVADQhYE3P3iZt4HHGxG z/RP3wVmoQb29D62RfapGWD5X0JDAgHLWad7KmPIsubA2N1gFLpkfy2LQ5RXticf8rPU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] introduce unaligned.h Message-Id: Date: Tue, 19 Jan 2021 06:33:02 +0000 commit 7c9f81687ad611515474b1c17afc2f79f19faef5 Author: Jan Beulich AuthorDate: Mon Jan 18 12:09:13 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 18 12:09:13 2021 +0100 introduce unaligned.h Rather than open-coding commonly used constructs in yet more places when pulling in zstd decompression support (and its xxhash prereq), pull out the custom bits into a commonly used header (for the hypervisor build; the tool stack and stubdom builds of libxenguest will still remain in need of similarly taking care of). For now this is limited to x86, where custom logic isn't needed (considering this is going to be used in init code only, even using alternatives patching to use MOVBE doesn't seem worthwhile). For Arm64 with CONFIG_ACPI=y (due to efi-dom0.c's re-use of xz/crc32.c) drop the not really necessary inclusion of xz's private.h. No change in generated code. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/common/lz4/defs.h | 9 +++-- xen/common/lzo.c | 7 ++-- xen/common/unlzo.c | 19 +++------- xen/common/xz/crc32.c | 2 -- xen/common/xz/private.h | 23 ++++-------- xen/include/asm-x86/unaligned.h | 6 ++++ xen/include/xen/unaligned.h | 79 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 104 insertions(+), 41 deletions(-) diff --git a/xen/common/lz4/defs.h b/xen/common/lz4/defs.h index d886a4e122..4fbea2ac3d 100644 --- a/xen/common/lz4/defs.h +++ b/xen/common/lz4/defs.h @@ -10,18 +10,21 @@ #ifdef __XEN__ #include -#endif +#include +#else -static inline u16 INIT get_unaligned_le16(const void *p) +static inline u16 get_unaligned_le16(const void *p) { return le16_to_cpup(p); } -static inline u32 INIT get_unaligned_le32(const void *p) +static inline u32 get_unaligned_le32(const void *p) { return le32_to_cpup(p); } +#endif + /* * Detects 64 bits mode */ diff --git a/xen/common/lzo.c b/xen/common/lzo.c index f4c0ad8530..e4841794f4 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -97,13 +97,12 @@ #ifdef __XEN__ #include #include +#include +#else +#define get_unaligned_le16(_p) (*(u16 *)(_p)) #endif #include -#define get_unaligned(_p) (*(_p)) -#define put_unaligned(_val,_p) (*(_p)=_val) -#define get_unaligned_le16(_p) (*(u16 *)(_p)) -#define get_unaligned_le32(_p) (*(u32 *)(_p)) #include "decompress.h" diff --git a/xen/common/unlzo.c b/xen/common/unlzo.c index 5ae6cf911e..11f64fcf3b 100644 --- a/xen/common/unlzo.c +++ b/xen/common/unlzo.c @@ -34,30 +34,19 @@ #ifdef __XEN__ #include -#endif +#include +#else -#if 1 /* ndef CONFIG_??? */ -static inline u16 INIT get_unaligned_be16(void *p) +static inline u16 get_unaligned_be16(const void *p) { return be16_to_cpup(p); } -static inline u32 INIT get_unaligned_be32(void *p) +static inline u32 get_unaligned_be32(const void *p) { return be32_to_cpup(p); } -#else -#include - -static inline u16 INIT get_unaligned_be16(void *p) -{ - return be16_to_cpu(__get_unaligned(p, 2)); -} -static inline u32 INIT get_unaligned_be32(void *p) -{ - return be32_to_cpu(__get_unaligned(p, 4)); -} #endif static const unsigned char lzop_magic[] = { diff --git a/xen/common/xz/crc32.c b/xen/common/xz/crc32.c index af08ae2cf6..0708b61638 100644 --- a/xen/common/xz/crc32.c +++ b/xen/common/xz/crc32.c @@ -15,8 +15,6 @@ * but they are bigger and use more memory for the lookup table. */ -#include "private.h" - XZ_EXTERN uint32_t INITDATA xz_crc32_table[256]; XZ_EXTERN void INIT xz_crc32_init(void) diff --git a/xen/common/xz/private.h b/xen/common/xz/private.h index 7ea2489229..511343fcc2 100644 --- a/xen/common/xz/private.h +++ b/xen/common/xz/private.h @@ -13,34 +13,23 @@ #ifdef __XEN__ #include #include -#endif - -#define get_le32(p) le32_to_cpup((const uint32_t *)(p)) +#include +#else -#if 1 /* ndef CONFIG_??? */ -static inline u32 INIT get_unaligned_le32(void *p) +static inline u32 get_unaligned_le32(const void *p) { return le32_to_cpup(p); } -static inline void INIT put_unaligned_le32(u32 val, void *p) +static inline void put_unaligned_le32(u32 val, void *p) { *(__force __le32*)p = cpu_to_le32(val); } -#else -#include - -static inline u32 INIT get_unaligned_le32(void *p) -{ - return le32_to_cpu(__get_unaligned(p, 4)); -} -static inline void INIT put_unaligned_le32(u32 val, void *p) -{ - __put_unaligned(cpu_to_le32(val), p, 4); -} #endif +#define get_le32(p) le32_to_cpup((const uint32_t *)(p)) + #define false 0 #define true 1 diff --git a/xen/include/asm-x86/unaligned.h b/xen/include/asm-x86/unaligned.h new file mode 100644 index 0000000000..6070801d4a --- /dev/null +++ b/xen/include/asm-x86/unaligned.h @@ -0,0 +1,6 @@ +#ifndef __ASM_UNALIGNED_H__ +#define __ASM_UNALIGNED_H__ + +#include + +#endif /* __ASM_UNALIGNED_H__ */ diff --git a/xen/include/xen/unaligned.h b/xen/include/xen/unaligned.h new file mode 100644 index 0000000000..eef7ec73b6 --- /dev/null +++ b/xen/include/xen/unaligned.h @@ -0,0 +1,79 @@ +/* + * This header can be used by architectures where unaligned accesses work + * without faulting, and at least reasonably efficiently. Other architectures + * will need to have a custom asm/unaligned.h. + */ +#ifndef __ASM_UNALIGNED_H__ +#error "xen/unaligned.h should not be included directly - include asm/unaligned.h instead" +#endif + +#ifndef __XEN_UNALIGNED_H__ +#define __XEN_UNALIGNED_H__ + +#include +#include + +#define get_unaligned(p) (*(p)) +#define put_unaligned(val, p) (*(p) = (val)) + +static inline uint16_t get_unaligned_be16(const void *p) +{ + return be16_to_cpup(p); +} + +static inline void put_unaligned_be16(uint16_t val, void *p) +{ + *(__force __be16*)p = cpu_to_be16(val); +} + +static inline uint32_t get_unaligned_be32(const void *p) +{ + return be32_to_cpup(p); +} + +static inline void put_unaligned_be32(uint32_t val, void *p) +{ + *(__force __be32*)p = cpu_to_be32(val); +} + +static inline uint64_t get_unaligned_be64(const void *p) +{ + return be64_to_cpup(p); +} + +static inline void put_unaligned_be64(uint64_t val, void *p) +{ + *(__force __be64*)p = cpu_to_be64(val); +} + +static inline uint16_t get_unaligned_le16(const void *p) +{ + return le16_to_cpup(p); +} + +static inline void put_unaligned_le16(uint16_t val, void *p) +{ + *(__force __le16*)p = cpu_to_le16(val); +} + +static inline uint32_t get_unaligned_le32(const void *p) +{ + return le32_to_cpup(p); +} + +static inline void put_unaligned_le32(uint32_t val, void *p) +{ + *(__force __le32*)p = cpu_to_le32(val); +} + +static inline uint64_t get_unaligned_le64(const void *p) +{ + return le64_to_cpup(p); +} + +static inline void put_unaligned_le64(uint64_t val, void *p) +{ + *(__force __le64*)p = cpu_to_le64(val); +} + +#endif /* __XEN_UNALIGNED_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 06:33:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 06:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70153.125843 (Exim 4.92) (envelope-from ) id 1l1kZm-0000im-GA; Tue, 19 Jan 2021 06:33:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70153.125843; Tue, 19 Jan 2021 06:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1kZm-0000ie-C6; Tue, 19 Jan 2021 06:33:14 +0000 Received: by outflank-mailman (input) for mailman id 70153; Tue, 19 Jan 2021 06:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1kZk-0000iT-8j for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1kZk-0002D8-7W for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1kZk-0003A0-65 for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KpCjVVzO6+TozY1/PiFLIAbpF0TXLYhDcm444fxb2Lw=; b=HJ/eX5ZY+PXKZTC7qSPy7EQF0X CQwwoj7d9d0o39EtY3jhWIZWGmVIJIghpGrvtW+uLyKl72h9ZJCc8gaYiDNTzk4brIcJASbChQpc6 yl7B5aMD3NnNDJA3SwIG5QtXL7R9pgHGKWa+X4Psb4XndIiRfAaBDT4EyNa3nb/K2MQk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] lib: introduce xxhash Message-Id: Date: Tue, 19 Jan 2021 06:33:12 +0000 commit 35d2960ae65f28106fdc5c2130f5f08fadca0e4c Author: Jan Beulich AuthorDate: Mon Jan 18 12:10:34 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 18 12:10:34 2021 +0100 lib: introduce xxhash Taken from Linux at commit d89775fc929c ("lib/: replace HTTP links with HTTPS ones"), but split into separate 32-bit and 64-bit sources, since the immediate consumer (zstd) will need only the latter. Note that the building of this code is restricted to x86 for now because of the need to sort asm/unaligned.h for Arm. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/include/xen/xxhash.h | 259 +++++++++++++++++++++++++++++++++++++++++ xen/lib/Makefile | 2 + xen/lib/xxhash32.c | 259 +++++++++++++++++++++++++++++++++++++++++ xen/lib/xxhash64.c | 294 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 814 insertions(+) diff --git a/xen/include/xen/xxhash.h b/xen/include/xen/xxhash.h new file mode 100644 index 0000000000..6f2237cbcf --- /dev/null +++ b/xen/include/xen/xxhash.h @@ -0,0 +1,259 @@ +/* + * xxHash - Extremely Fast Hash algorithm + * Copyright (C) 2012-2016, Yann Collet. + * + * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. This program is dual-licensed; you may select + * either version 2 of the GNU General Public License ("GPL") or BSD license + * ("BSD"). + * + * You can contact the author at: + * - xxHash homepage: https://cyan4973.github.io/xxHash/ + * - xxHash source repository: https://github.com/Cyan4973/xxHash + */ + +/* + * Notice extracted from xxHash homepage: + * + * xxHash is an extremely fast Hash algorithm, running at RAM speed limits. + * It also successfully passes all tests from the SMHasher suite. + * + * Comparison (single thread, Windows Seven 32 bits, using SMHasher on a Core 2 + * Duo @3GHz) + * + * Name Speed Q.Score Author + * xxHash 5.4 GB/s 10 + * CrapWow 3.2 GB/s 2 Andrew + * MumurHash 3a 2.7 GB/s 10 Austin Appleby + * SpookyHash 2.0 GB/s 10 Bob Jenkins + * SBox 1.4 GB/s 9 Bret Mulvey + * Lookup3 1.2 GB/s 9 Bob Jenkins + * SuperFastHash 1.2 GB/s 1 Paul Hsieh + * CityHash64 1.05 GB/s 10 Pike & Alakuijala + * FNV 0.55 GB/s 5 Fowler, Noll, Vo + * CRC32 0.43 GB/s 9 + * MD5-32 0.33 GB/s 10 Ronald L. Rivest + * SHA1-32 0.28 GB/s 10 + * + * Q.Score is a measure of quality of the hash function. + * It depends on successfully passing SMHasher test set. + * 10 is a perfect score. + * + * A 64-bits version, named xxh64 offers much better speed, + * but for 64-bits applications only. + * Name Speed on 64 bits Speed on 32 bits + * xxh64 13.8 GB/s 1.9 GB/s + * xxh32 6.8 GB/s 6.0 GB/s + */ + +#ifndef __XENXXHASH_H__ +#define __XENXXHASH_H__ + +#include + +/*-**************************** + * Simple Hash Functions + *****************************/ + +/** + * xxh32() - calculate the 32-bit hash of the input with a given seed. + * + * @input: The data to hash. + * @length: The length of the data to hash. + * @seed: The seed can be used to alter the result predictably. + * + * Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark) : 5.4 GB/s + * + * Return: The 32-bit hash of the data. + */ +uint32_t xxh32(const void *input, size_t length, uint32_t seed); + +/** + * xxh64() - calculate the 64-bit hash of the input with a given seed. + * + * @input: The data to hash. + * @length: The length of the data to hash. + * @seed: The seed can be used to alter the result predictably. + * + * This function runs 2x faster on 64-bit systems, but slower on 32-bit systems. + * + * Return: The 64-bit hash of the data. + */ +uint64_t xxh64(const void *input, size_t length, uint64_t seed); + +/** + * xxhash() - calculate wordsize hash of the input with a given seed + * @input: The data to hash. + * @length: The length of the data to hash. + * @seed: The seed can be used to alter the result predictably. + * + * If the hash does not need to be comparable between machines with + * different word sizes, this function will call whichever of xxh32() + * or xxh64() is faster. + * + * Return: wordsize hash of the data. + */ + +static inline unsigned long xxhash(const void *input, size_t length, + uint64_t seed) +{ +#if BITS_PER_LONG == 64 + return xxh64(input, length, seed); +#else + return xxh32(input, length, seed); +#endif +} + +/*-**************************** + * Streaming Hash Functions + *****************************/ + +/* + * These definitions are only meant to allow allocation of XXH state + * statically, on stack, or in a struct for example. + * Do not use members directly. + */ + +/** + * struct xxh32_state - private xxh32 state, do not use members directly + */ +struct xxh32_state { + uint32_t total_len_32; + uint32_t large_len; + uint32_t v1; + uint32_t v2; + uint32_t v3; + uint32_t v4; + uint32_t mem32[4]; + uint32_t memsize; +}; + +/** + * struct xxh32_state - private xxh64 state, do not use members directly + */ +struct xxh64_state { + uint64_t total_len; + uint64_t v1; + uint64_t v2; + uint64_t v3; + uint64_t v4; + uint64_t mem64[4]; + uint32_t memsize; +}; + +/** + * xxh32_reset() - reset the xxh32 state to start a new hashing operation + * + * @state: The xxh32 state to reset. + * @seed: Initialize the hash state with this seed. + * + * Call this function on any xxh32_state to prepare for a new hashing operation. + */ +void xxh32_reset(struct xxh32_state *state, uint32_t seed); + +/** + * xxh32_update() - hash the data given and update the xxh32 state + * + * @state: The xxh32 state to update. + * @input: The data to hash. + * @length: The length of the data to hash. + * + * After calling xxh32_reset() call xxh32_update() as many times as necessary. + * + * Return: Zero on success, otherwise an error code. + */ +int xxh32_update(struct xxh32_state *state, const void *input, size_t length); + +/** + * xxh32_digest() - produce the current xxh32 hash + * + * @state: Produce the current xxh32 hash of this state. + * + * A hash value can be produced at any time. It is still possible to continue + * inserting input into the hash state after a call to xxh32_digest(), and + * generate new hashes later on, by calling xxh32_digest() again. + * + * Return: The xxh32 hash stored in the state. + */ +uint32_t xxh32_digest(const struct xxh32_state *state); + +/** + * xxh64_reset() - reset the xxh64 state to start a new hashing operation + * + * @state: The xxh64 state to reset. + * @seed: Initialize the hash state with this seed. + */ +void xxh64_reset(struct xxh64_state *state, uint64_t seed); + +/** + * xxh64_update() - hash the data given and update the xxh64 state + * @state: The xxh64 state to update. + * @input: The data to hash. + * @length: The length of the data to hash. + * + * After calling xxh64_reset() call xxh64_update() as many times as necessary. + * + * Return: Zero on success, otherwise an error code. + */ +int xxh64_update(struct xxh64_state *state, const void *input, size_t length); + +/** + * xxh64_digest() - produce the current xxh64 hash + * + * @state: Produce the current xxh64 hash of this state. + * + * A hash value can be produced at any time. It is still possible to continue + * inserting input into the hash state after a call to xxh64_digest(), and + * generate new hashes later on, by calling xxh64_digest() again. + * + * Return: The xxh64 hash stored in the state. + */ +uint64_t xxh64_digest(const struct xxh64_state *state); + +/*-************************** + * Utils + ***************************/ + +/** + * xxh32_copy_state() - copy the source state into the destination state + * + * @src: The source xxh32 state. + * @dst: The destination xxh32 state. + */ +void xxh32_copy_state(struct xxh32_state *dst, const struct xxh32_state *src); + +/** + * xxh64_copy_state() - copy the source state into the destination state + * + * @src: The source xxh64 state. + * @dst: The destination xxh64 state. + */ +void xxh64_copy_state(struct xxh64_state *dst, const struct xxh64_state *src); + +#endif /* __XENXXHASH_H__ */ diff --git a/xen/lib/Makefile b/xen/lib/Makefile index 42cf7a1164..1c2227cbfc 100644 --- a/xen/lib/Makefile +++ b/xen/lib/Makefile @@ -7,3 +7,5 @@ lib-y += list-sort.o lib-y += parse-size.o lib-y += rbtree.o lib-y += sort.o +lib-$(CONFIG_X86) += xxhash32.o +lib-$(CONFIG_X86) += xxhash64.o diff --git a/xen/lib/xxhash32.c b/xen/lib/xxhash32.c new file mode 100644 index 0000000000..e8d403e5ce --- /dev/null +++ b/xen/lib/xxhash32.c @@ -0,0 +1,259 @@ +/* + * xxHash - Extremely Fast Hash algorithm + * Copyright (C) 2012-2016, Yann Collet. + * + * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. This program is dual-licensed; you may select + * either version 2 of the GNU General Public License ("GPL") or BSD license + * ("BSD"). + * + * You can contact the author at: + * - xxHash homepage: https://cyan4973.github.io/xxHash/ + * - xxHash source repository: https://github.com/Cyan4973/xxHash + */ + +#include +#include +#include +#include +#include + +/*-************************************* + * Macros + **************************************/ +#define xxh_rotl32(x, r) ((x << r) | (x >> (32 - r))) + +#ifdef __LITTLE_ENDIAN +# define XXH_CPU_LITTLE_ENDIAN 1 +#else +# define XXH_CPU_LITTLE_ENDIAN 0 +#endif + +/*-************************************* + * Constants + **************************************/ +static const uint32_t PRIME32_1 = 2654435761U; +static const uint32_t PRIME32_2 = 2246822519U; +static const uint32_t PRIME32_3 = 3266489917U; +static const uint32_t PRIME32_4 = 668265263U; +static const uint32_t PRIME32_5 = 374761393U; + +/*-************************** + * Utils + ***************************/ +void xxh32_copy_state(struct xxh32_state *dst, const struct xxh32_state *src) +{ + memcpy(dst, src, sizeof(*dst)); +} + +/*-*************************** + * Simple Hash Functions + ****************************/ +static uint32_t xxh32_round(uint32_t seed, const uint32_t input) +{ + seed += input * PRIME32_2; + seed = xxh_rotl32(seed, 13); + seed *= PRIME32_1; + return seed; +} + +uint32_t xxh32(const void *input, const size_t len, const uint32_t seed) +{ + const uint8_t *p = (const uint8_t *)input; + const uint8_t *b_end = p + len; + uint32_t h32; + + if (len >= 16) { + const uint8_t *const limit = b_end - 16; + uint32_t v1 = seed + PRIME32_1 + PRIME32_2; + uint32_t v2 = seed + PRIME32_2; + uint32_t v3 = seed + 0; + uint32_t v4 = seed - PRIME32_1; + + do { + v1 = xxh32_round(v1, get_unaligned_le32(p)); + p += 4; + v2 = xxh32_round(v2, get_unaligned_le32(p)); + p += 4; + v3 = xxh32_round(v3, get_unaligned_le32(p)); + p += 4; + v4 = xxh32_round(v4, get_unaligned_le32(p)); + p += 4; + } while (p <= limit); + + h32 = xxh_rotl32(v1, 1) + xxh_rotl32(v2, 7) + + xxh_rotl32(v3, 12) + xxh_rotl32(v4, 18); + } else { + h32 = seed + PRIME32_5; + } + + h32 += (uint32_t)len; + + while (p + 4 <= b_end) { + h32 += get_unaligned_le32(p) * PRIME32_3; + h32 = xxh_rotl32(h32, 17) * PRIME32_4; + p += 4; + } + + while (p < b_end) { + h32 += (*p) * PRIME32_5; + h32 = xxh_rotl32(h32, 11) * PRIME32_1; + p++; + } + + h32 ^= h32 >> 15; + h32 *= PRIME32_2; + h32 ^= h32 >> 13; + h32 *= PRIME32_3; + h32 ^= h32 >> 16; + + return h32; +} + +/*-************************************************** + * Advanced Hash Functions + ***************************************************/ +void xxh32_reset(struct xxh32_state *statePtr, const uint32_t seed) +{ + /* use a local state for memcpy() to avoid strict-aliasing warnings */ + struct xxh32_state state; + + memset(&state, 0, sizeof(state)); + state.v1 = seed + PRIME32_1 + PRIME32_2; + state.v2 = seed + PRIME32_2; + state.v3 = seed + 0; + state.v4 = seed - PRIME32_1; + memcpy(statePtr, &state, sizeof(state)); +} + +int xxh32_update(struct xxh32_state *state, const void *input, const size_t len) +{ + const uint8_t *p = (const uint8_t *)input; + const uint8_t *const b_end = p + len; + + if (input == NULL) + return -EINVAL; + + state->total_len_32 += (uint32_t)len; + state->large_len |= (len >= 16) | (state->total_len_32 >= 16); + + if (state->memsize + len < 16) { /* fill in tmp buffer */ + memcpy((uint8_t *)(state->mem32) + state->memsize, input, len); + state->memsize += (uint32_t)len; + return 0; + } + + if (state->memsize) { /* some data left from previous update */ + const uint32_t *p32 = state->mem32; + + memcpy((uint8_t *)(state->mem32) + state->memsize, input, + 16 - state->memsize); + + state->v1 = xxh32_round(state->v1, get_unaligned_le32(p32)); + p32++; + state->v2 = xxh32_round(state->v2, get_unaligned_le32(p32)); + p32++; + state->v3 = xxh32_round(state->v3, get_unaligned_le32(p32)); + p32++; + state->v4 = xxh32_round(state->v4, get_unaligned_le32(p32)); + p32++; + + p += 16-state->memsize; + state->memsize = 0; + } + + if (p <= b_end - 16) { + const uint8_t *const limit = b_end - 16; + uint32_t v1 = state->v1; + uint32_t v2 = state->v2; + uint32_t v3 = state->v3; + uint32_t v4 = state->v4; + + do { + v1 = xxh32_round(v1, get_unaligned_le32(p)); + p += 4; + v2 = xxh32_round(v2, get_unaligned_le32(p)); + p += 4; + v3 = xxh32_round(v3, get_unaligned_le32(p)); + p += 4; + v4 = xxh32_round(v4, get_unaligned_le32(p)); + p += 4; + } while (p <= limit); + + state->v1 = v1; + state->v2 = v2; + state->v3 = v3; + state->v4 = v4; + } + + if (p < b_end) { + memcpy(state->mem32, p, (size_t)(b_end-p)); + state->memsize = (uint32_t)(b_end-p); + } + + return 0; +} + +uint32_t xxh32_digest(const struct xxh32_state *state) +{ + const uint8_t *p = (const uint8_t *)state->mem32; + const uint8_t *const b_end = (const uint8_t *)(state->mem32) + + state->memsize; + uint32_t h32; + + if (state->large_len) { + h32 = xxh_rotl32(state->v1, 1) + xxh_rotl32(state->v2, 7) + + xxh_rotl32(state->v3, 12) + xxh_rotl32(state->v4, 18); + } else { + h32 = state->v3 /* == seed */ + PRIME32_5; + } + + h32 += state->total_len_32; + + while (p + 4 <= b_end) { + h32 += get_unaligned_le32(p) * PRIME32_3; + h32 = xxh_rotl32(h32, 17) * PRIME32_4; + p += 4; + } + + while (p < b_end) { + h32 += (*p) * PRIME32_5; + h32 = xxh_rotl32(h32, 11) * PRIME32_1; + p++; + } + + h32 ^= h32 >> 15; + h32 *= PRIME32_2; + h32 ^= h32 >> 13; + h32 *= PRIME32_3; + h32 ^= h32 >> 16; + + return h32; +} + diff --git a/xen/lib/xxhash64.c b/xen/lib/xxhash64.c new file mode 100644 index 0000000000..ba6bcf152d --- /dev/null +++ b/xen/lib/xxhash64.c @@ -0,0 +1,294 @@ +/* + * xxHash - Extremely Fast Hash algorithm + * Copyright (C) 2012-2016, Yann Collet. + * + * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. This program is dual-licensed; you may select + * either version 2 of the GNU General Public License ("GPL") or BSD license + * ("BSD"). + * + * You can contact the author at: + * - xxHash homepage: https://cyan4973.github.io/xxHash/ + * - xxHash source repository: https://github.com/Cyan4973/xxHash + */ + +#include +#include +#include +#include +#include + +/*-************************************* + * Macros + **************************************/ +#define xxh_rotl64(x, r) ((x << r) | (x >> (64 - r))) + +#ifdef __LITTLE_ENDIAN +# define XXH_CPU_LITTLE_ENDIAN 1 +#else +# define XXH_CPU_LITTLE_ENDIAN 0 +#endif + +/*-************************************* + * Constants + **************************************/ +static const uint64_t PRIME64_1 = 11400714785074694791ULL; +static const uint64_t PRIME64_2 = 14029467366897019727ULL; +static const uint64_t PRIME64_3 = 1609587929392839161ULL; +static const uint64_t PRIME64_4 = 9650029242287828579ULL; +static const uint64_t PRIME64_5 = 2870177450012600261ULL; + +/*-************************** + * Utils + ***************************/ +void xxh64_copy_state(struct xxh64_state *dst, const struct xxh64_state *src) +{ + memcpy(dst, src, sizeof(*dst)); +} + +/*-*************************** + * Simple Hash Functions + ****************************/ +static uint64_t xxh64_round(uint64_t acc, const uint64_t input) +{ + acc += input * PRIME64_2; + acc = xxh_rotl64(acc, 31); + acc *= PRIME64_1; + return acc; +} + +static uint64_t xxh64_merge_round(uint64_t acc, uint64_t val) +{ + val = xxh64_round(0, val); + acc ^= val; + acc = acc * PRIME64_1 + PRIME64_4; + return acc; +} + +uint64_t xxh64(const void *input, const size_t len, const uint64_t seed) +{ + const uint8_t *p = (const uint8_t *)input; + const uint8_t *const b_end = p + len; + uint64_t h64; + + if (len >= 32) { + const uint8_t *const limit = b_end - 32; + uint64_t v1 = seed + PRIME64_1 + PRIME64_2; + uint64_t v2 = seed + PRIME64_2; + uint64_t v3 = seed + 0; + uint64_t v4 = seed - PRIME64_1; + + do { + v1 = xxh64_round(v1, get_unaligned_le64(p)); + p += 8; + v2 = xxh64_round(v2, get_unaligned_le64(p)); + p += 8; + v3 = xxh64_round(v3, get_unaligned_le64(p)); + p += 8; + v4 = xxh64_round(v4, get_unaligned_le64(p)); + p += 8; + } while (p <= limit); + + h64 = xxh_rotl64(v1, 1) + xxh_rotl64(v2, 7) + + xxh_rotl64(v3, 12) + xxh_rotl64(v4, 18); + h64 = xxh64_merge_round(h64, v1); + h64 = xxh64_merge_round(h64, v2); + h64 = xxh64_merge_round(h64, v3); + h64 = xxh64_merge_round(h64, v4); + + } else { + h64 = seed + PRIME64_5; + } + + h64 += (uint64_t)len; + + while (p + 8 <= b_end) { + const uint64_t k1 = xxh64_round(0, get_unaligned_le64(p)); + + h64 ^= k1; + h64 = xxh_rotl64(h64, 27) * PRIME64_1 + PRIME64_4; + p += 8; + } + + if (p + 4 <= b_end) { + h64 ^= (uint64_t)(get_unaligned_le32(p)) * PRIME64_1; + h64 = xxh_rotl64(h64, 23) * PRIME64_2 + PRIME64_3; + p += 4; + } + + while (p < b_end) { + h64 ^= (*p) * PRIME64_5; + h64 = xxh_rotl64(h64, 11) * PRIME64_1; + p++; + } + + h64 ^= h64 >> 33; + h64 *= PRIME64_2; + h64 ^= h64 >> 29; + h64 *= PRIME64_3; + h64 ^= h64 >> 32; + + return h64; +} + +/*-************************************************** + * Advanced Hash Functions + ***************************************************/ +void xxh64_reset(struct xxh64_state *statePtr, const uint64_t seed) +{ + /* use a local state for memcpy() to avoid strict-aliasing warnings */ + struct xxh64_state state; + + memset(&state, 0, sizeof(state)); + state.v1 = seed + PRIME64_1 + PRIME64_2; + state.v2 = seed + PRIME64_2; + state.v3 = seed + 0; + state.v4 = seed - PRIME64_1; + memcpy(statePtr, &state, sizeof(state)); +} + +int xxh64_update(struct xxh64_state *state, const void *input, const size_t len) +{ + const uint8_t *p = (const uint8_t *)input; + const uint8_t *const b_end = p + len; + + if (input == NULL) + return -EINVAL; + + state->total_len += len; + + if (state->memsize + len < 32) { /* fill in tmp buffer */ + memcpy(((uint8_t *)state->mem64) + state->memsize, input, len); + state->memsize += (uint32_t)len; + return 0; + } + + if (state->memsize) { /* tmp buffer is full */ + uint64_t *p64 = state->mem64; + + memcpy(((uint8_t *)p64) + state->memsize, input, + 32 - state->memsize); + + state->v1 = xxh64_round(state->v1, get_unaligned_le64(p64)); + p64++; + state->v2 = xxh64_round(state->v2, get_unaligned_le64(p64)); + p64++; + state->v3 = xxh64_round(state->v3, get_unaligned_le64(p64)); + p64++; + state->v4 = xxh64_round(state->v4, get_unaligned_le64(p64)); + + p += 32 - state->memsize; + state->memsize = 0; + } + + if (p + 32 <= b_end) { + const uint8_t *const limit = b_end - 32; + uint64_t v1 = state->v1; + uint64_t v2 = state->v2; + uint64_t v3 = state->v3; + uint64_t v4 = state->v4; + + do { + v1 = xxh64_round(v1, get_unaligned_le64(p)); + p += 8; + v2 = xxh64_round(v2, get_unaligned_le64(p)); + p += 8; + v3 = xxh64_round(v3, get_unaligned_le64(p)); + p += 8; + v4 = xxh64_round(v4, get_unaligned_le64(p)); + p += 8; + } while (p <= limit); + + state->v1 = v1; + state->v2 = v2; + state->v3 = v3; + state->v4 = v4; + } + + if (p < b_end) { + memcpy(state->mem64, p, (size_t)(b_end-p)); + state->memsize = (uint32_t)(b_end - p); + } + + return 0; +} + +uint64_t xxh64_digest(const struct xxh64_state *state) +{ + const uint8_t *p = (const uint8_t *)state->mem64; + const uint8_t *const b_end = (const uint8_t *)state->mem64 + + state->memsize; + uint64_t h64; + + if (state->total_len >= 32) { + const uint64_t v1 = state->v1; + const uint64_t v2 = state->v2; + const uint64_t v3 = state->v3; + const uint64_t v4 = state->v4; + + h64 = xxh_rotl64(v1, 1) + xxh_rotl64(v2, 7) + + xxh_rotl64(v3, 12) + xxh_rotl64(v4, 18); + h64 = xxh64_merge_round(h64, v1); + h64 = xxh64_merge_round(h64, v2); + h64 = xxh64_merge_round(h64, v3); + h64 = xxh64_merge_round(h64, v4); + } else { + h64 = state->v3 + PRIME64_5; + } + + h64 += (uint64_t)state->total_len; + + while (p + 8 <= b_end) { + const uint64_t k1 = xxh64_round(0, get_unaligned_le64(p)); + + h64 ^= k1; + h64 = xxh_rotl64(h64, 27) * PRIME64_1 + PRIME64_4; + p += 8; + } + + if (p + 4 <= b_end) { + h64 ^= (uint64_t)(get_unaligned_le32(p)) * PRIME64_1; + h64 = xxh_rotl64(h64, 23) * PRIME64_2 + PRIME64_3; + p += 4; + } + + while (p < b_end) { + h64 ^= (*p) * PRIME64_5; + h64 = xxh_rotl64(h64, 11) * PRIME64_1; + p++; + } + + h64 ^= h64 >> 33; + h64 *= PRIME64_2; + h64 ^= h64 >> 29; + h64 *= PRIME64_3; + h64 ^= h64 >> 32; + + return h64; +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 06:33:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 06:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70154.125846 (Exim 4.92) (envelope-from ) id 1l1kZv-0000kF-JY; Tue, 19 Jan 2021 06:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70154.125846; Tue, 19 Jan 2021 06: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 1l1kZv-0000k8-Fr; Tue, 19 Jan 2021 06:33:23 +0000 Received: by outflank-mailman (input) for mailman id 70154; Tue, 19 Jan 2021 06:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1kZu-0000k1-CD for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1kZu-0002DG-BJ for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1kZu-0003AZ-A3 for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NHLaqvOhksM4VObwzHVXFHVG1lP8pnHttMtKJpZBaqc=; b=v5sx5z+2+MzQv6XV0DjT/lAK6U 3jIAdYcZcwl4qLgp0/OluWeyqTqiYv2n4h9OPghtIrH+NWG3xtiB2RS9Vj5VRu0gM01LYqbVxo4FK nKk+PfMtBWxGuvlIeDzaPrnMWzPU6lLKasZNT0OXXTV2T3grz6JYtVsuV1y7QfPgvOdo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/Dom0: support zstd compressed kernels Message-Id: Date: Tue, 19 Jan 2021 06:33:22 +0000 commit d6627cf1b63ce57a6a7e2c1800dbc50eed742c32 Author: Jan Beulich AuthorDate: Mon Jan 18 12:12:23 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 18 12:12:23 2021 +0100 x86/Dom0: support zstd compressed kernels Taken from Linux at commit 1c4dd334df3a ("lib: decompress_unzstd: Limit output size") for unzstd.c (renamed from decompress_unzstd.c) and 36f9ff9e03de ("lib: Fix fall-through warnings for Clang") for zstd/, with bits from linux/zstd.h merged into suitable other headers. To limit the editing necessary, introduce ptrdiff_t. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/common/Makefile | 2 +- xen/common/decompress.c | 3 + xen/common/unzstd.c | 308 +++++ xen/common/zstd/bitstream.h | 380 ++++++ xen/common/zstd/decompress.c | 2496 ++++++++++++++++++++++++++++++++++++++ xen/common/zstd/entropy_common.c | 243 ++++ xen/common/zstd/error_private.h | 110 ++ xen/common/zstd/fse.h | 575 +++++++++ xen/common/zstd/fse_decompress.c | 324 +++++ xen/common/zstd/huf.h | 212 ++++ xen/common/zstd/huf_decompress.c | 960 +++++++++++++++ xen/common/zstd/mem.h | 151 +++ xen/common/zstd/zstd_common.c | 74 ++ xen/common/zstd/zstd_internal.h | 372 ++++++ xen/include/asm-arm/types.h | 6 + xen/include/asm-x86/types.h | 6 + xen/include/xen/decompress.h | 2 +- 17 files changed, 6222 insertions(+), 2 deletions(-) diff --git a/xen/common/Makefile b/xen/common/Makefile index 7a4e652b57..d751315a87 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -55,7 +55,7 @@ obj-bin-y += warning.init.o obj-$(CONFIG_XENOPROF) += xenoprof.o obj-y += xmalloc_tlsf.o -obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma lzo unlzo unlz4 earlycpio,$(n).init.o) +obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma lzo unlzo unlz4 unzstd earlycpio,$(n).init.o) obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o kernel.o memory.o multicall.o xlat.o) diff --git a/xen/common/decompress.c b/xen/common/decompress.c index 9d6e0c4ab0..79e60f4802 100644 --- a/xen/common/decompress.c +++ b/xen/common/decompress.c @@ -31,5 +31,8 @@ int __init decompress(void *inbuf, unsigned int len, void *outbuf) if ( len >= 2 && !memcmp(inbuf, "\x02\x21", 2) ) return unlz4(inbuf, len, NULL, NULL, outbuf, NULL, error); + if ( len >= 4 && !memcmp(inbuf, "\x28\xb5\x2f\xfd", 4) ) + return unzstd(inbuf, len, NULL, NULL, outbuf, NULL, error); + return 1; } diff --git a/xen/common/unzstd.c b/xen/common/unzstd.c new file mode 100644 index 0000000000..a107616427 --- /dev/null +++ b/xen/common/unzstd.c @@ -0,0 +1,308 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * Important notes about in-place decompression + * + * At least on x86, the kernel is decompressed in place: the compressed data + * is placed to the end of the output buffer, and the decompressor overwrites + * most of the compressed data. There must be enough safety margin to + * guarantee that the write position is always behind the read position. + * + * The safety margin for ZSTD with a 128 KB block size is calculated below. + * Note that the margin with ZSTD is bigger than with GZIP or XZ! + * + * The worst case for in-place decompression is that the beginning of + * the file is compressed extremely well, and the rest of the file is + * uncompressible. Thus, we must look for worst-case expansion when the + * compressor is encoding uncompressible data. + * + * The structure of the .zst file in case of a compresed kernel is as follows. + * Maximum sizes (as bytes) of the fields are in parenthesis. + * + * Frame Header: (18) + * Blocks: (N) + * Checksum: (4) + * + * The frame header and checksum overhead is at most 22 bytes. + * + * ZSTD stores the data in blocks. Each block has a header whose size is + * a 3 bytes. After the block header, there is up to 128 KB of payload. + * The maximum uncompressed size of the payload is 128 KB. The minimum + * uncompressed size of the payload is never less than the payload size + * (excluding the block header). + * + * The assumption, that the uncompressed size of the payload is never + * smaller than the payload itself, is valid only when talking about + * the payload as a whole. It is possible that the payload has parts where + * the decompressor consumes more input than it produces output. Calculating + * the worst case for this would be tricky. Instead of trying to do that, + * let's simply make sure that the decompressor never overwrites any bytes + * of the payload which it is currently reading. + * + * Now we have enough information to calculate the safety margin. We need + * - 22 bytes for the .zst file format headers; + * - 3 bytes per every 128 KiB of uncompressed size (one block header per + * block); and + * - 128 KiB (biggest possible zstd block size) to make sure that the + * decompressor never overwrites anything from the block it is currently + * reading. + * + * We get the following formula: + * + * safety_margin = 22 + uncompressed_size * 3 / 131072 + 131072 + * <= 22 + (uncompressed_size >> 15) + 131072 + */ + +#include "decompress.h" + +#include "zstd/entropy_common.c" +#include "zstd/fse_decompress.c" +#include "zstd/huf_decompress.c" +#include "zstd/zstd_common.c" +#include "zstd/decompress.c" + +/* 128MB is the maximum window size supported by zstd. */ +#define ZSTD_WINDOWSIZE_MAX (1 << ZSTD_WINDOWLOG_MAX) +/* + * Size of the input and output buffers in multi-call mode. + * Pick a larger size because it isn't used during kernel decompression, + * since that is single pass, and we have to allocate a large buffer for + * zstd's window anyway. The larger size speeds up initramfs decompression. + */ +#define ZSTD_IOBUF_SIZE (1 << 17) + +static int INIT handle_zstd_error(size_t ret, void (*error)(const char *x)) +{ + const int err = ZSTD_getErrorCode(ret); + + if (!ZSTD_isError(ret)) + return 0; + + switch (err) { + case ZSTD_error_memory_allocation: + error("ZSTD decompressor ran out of memory"); + break; + case ZSTD_error_prefix_unknown: + error("Input is not in the ZSTD format (wrong magic bytes)"); + break; + case ZSTD_error_dstSize_tooSmall: + case ZSTD_error_corruption_detected: + case ZSTD_error_checksum_wrong: + error("ZSTD-compressed data is corrupt"); + break; + default: + error("ZSTD-compressed data is probably corrupt"); + break; + } + return -1; +} + +/* + * Handle the case where we have the entire input and output in one segment. + * We can allocate less memory (no circular buffer for the sliding window), + * and avoid some memcpy() calls. + */ +static int INIT decompress_single(const u8 *in_buf, long in_len, u8 *out_buf, + long out_len, unsigned int *in_pos, + void (*error)(const char *x)) +{ + const size_t wksp_size = ZSTD_DCtxWorkspaceBound(); + void *wksp = large_malloc(wksp_size); + ZSTD_DCtx *dctx = ZSTD_initDCtx(wksp, wksp_size); + int err; + size_t ret; + + if (dctx == NULL) { + error("Out of memory while allocating ZSTD_DCtx"); + err = -1; + goto out; + } + /* + * Find out how large the frame actually is, there may be junk at + * the end of the frame that ZSTD_decompressDCtx() can't handle. + */ + ret = ZSTD_findFrameCompressedSize(in_buf, in_len); + err = handle_zstd_error(ret, error); + if (err) + goto out; + in_len = (long)ret; + + ret = ZSTD_decompressDCtx(dctx, out_buf, out_len, in_buf, in_len); + err = handle_zstd_error(ret, error); + if (err) + goto out; + + if (in_pos != NULL) + *in_pos = in_len; + + err = 0; +out: + if (wksp != NULL) + large_free(wksp); + return err; +} + +STATIC int INIT unzstd(unsigned char *in_buf, unsigned int in_len, + int (*fill)(void*, unsigned int), + int (*flush)(void*, unsigned int), + unsigned char *out_buf, + unsigned int *in_pos, + void (*error)(const char *x)) +{ + ZSTD_inBuffer in; + ZSTD_outBuffer out; + ZSTD_frameParams params; + void *in_allocated = NULL; + void *out_allocated = NULL; + void *wksp = NULL; + size_t wksp_size; + ZSTD_DStream *dstream; + int err; + size_t ret; + /* + * ZSTD decompression code won't be happy if the buffer size is so big + * that its end address overflows. When the size is not provided, make + * it as big as possible without having the end address overflow. + */ + unsigned long out_len = ULONG_MAX - (unsigned long)out_buf; + + if (fill == NULL && flush == NULL) + /* + * We can decompress faster and with less memory when we have a + * single chunk. + */ + return decompress_single(in_buf, in_len, out_buf, out_len, + in_pos, error); + + /* + * If in_buf is not provided, we must be using fill(), so allocate + * a large enough buffer. If it is provided, it must be at least + * ZSTD_IOBUF_SIZE large. + */ + if (in_buf == NULL) { + in_allocated = large_malloc(ZSTD_IOBUF_SIZE); + if (in_allocated == NULL) { + error("Out of memory while allocating input buffer"); + err = -1; + goto out; + } + in_buf = in_allocated; + in_len = 0; + } + /* Read the first chunk, since we need to decode the frame header. */ + if (fill != NULL) + in_len = fill(in_buf, ZSTD_IOBUF_SIZE); + if ((int)in_len < 0) { + error("ZSTD-compressed data is truncated"); + err = -1; + goto out; + } + /* Set the first non-empty input buffer. */ + in.src = in_buf; + in.pos = 0; + in.size = in_len; + /* Allocate the output buffer if we are using flush(). */ + if (flush != NULL) { + out_allocated = large_malloc(ZSTD_IOBUF_SIZE); + if (out_allocated == NULL) { + error("Out of memory while allocating output buffer"); + err = -1; + goto out; + } + out_buf = out_allocated; + out_len = ZSTD_IOBUF_SIZE; + } + /* Set the output buffer. */ + out.dst = out_buf; + out.pos = 0; + out.size = out_len; + + /* + * We need to know the window size to allocate the ZSTD_DStream. + * Since we are streaming, we need to allocate a buffer for the sliding + * window. The window size varies from 1 KB to ZSTD_WINDOWSIZE_MAX + * (8 MB), so it is important to use the actual value so as not to + * waste memory when it is smaller. + */ + ret = ZSTD_getFrameParams(¶ms, in.src, in.size); + err = handle_zstd_error(ret, error); + if (err) + goto out; + if (ret != 0) { + error("ZSTD-compressed data has an incomplete frame header"); + err = -1; + goto out; + } + if (params.windowSize > ZSTD_WINDOWSIZE_MAX) { + error("ZSTD-compressed data has too large a window size"); + err = -1; + goto out; + } + + /* + * Allocate the ZSTD_DStream now that we know how much memory is + * required. + */ + wksp_size = ZSTD_DStreamWorkspaceBound(params.windowSize); + wksp = large_malloc(wksp_size); + dstream = ZSTD_initDStream(params.windowSize, wksp, wksp_size); + if (dstream == NULL) { + error("Out of memory while allocating ZSTD_DStream"); + err = -1; + goto out; + } + + /* + * Decompression loop: + * Read more data if necessary (error if no more data can be read). + * Call the decompression function, which returns 0 when finished. + * Flush any data produced if using flush(). + */ + if (in_pos != NULL) + *in_pos = 0; + do { + /* + * If we need to reload data, either we have fill() and can + * try to get more data, or we don't and the input is truncated. + */ + if (in.pos == in.size) { + if (in_pos != NULL) + *in_pos += in.pos; + in_len = fill ? fill(in_buf, ZSTD_IOBUF_SIZE) : -1; + if ((int)in_len < 0) { + error("ZSTD-compressed data is truncated"); + err = -1; + goto out; + } + in.pos = 0; + in.size = in_len; + } + /* Returns zero when the frame is complete. */ + ret = ZSTD_decompressStream(dstream, &out, &in); + err = handle_zstd_error(ret, error); + if (err) + goto out; + /* Flush all of the data produced if using flush(). */ + if (flush != NULL && out.pos > 0) { + if (out.pos != flush(out.dst, out.pos)) { + error("Failed to flush()"); + err = -1; + goto out; + } + out.pos = 0; + } + } while (ret != 0); + + if (in_pos != NULL) + *in_pos += in.pos; + + err = 0; +out: + if (in_allocated != NULL) + large_free(in_allocated); + if (out_allocated != NULL) + large_free(out_allocated); + if (wksp != NULL) + large_free(wksp); + return err; +} diff --git a/xen/common/zstd/bitstream.h b/xen/common/zstd/bitstream.h new file mode 100644 index 0000000000..2b06d4551f --- /dev/null +++ b/xen/common/zstd/bitstream.h @@ -0,0 +1,380 @@ +/* + * bitstream + * Part of FSE library + * header file (to include) + * Copyright (C) 2013-2016, Yann Collet. + * + * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. This program is dual-licensed; you may select + * either version 2 of the GNU General Public License ("GPL") or BSD license + * ("BSD"). + * + * You can contact the author at : + * - Source repository : https://github.com/Cyan4973/FiniteStateEntropy + */ +#ifndef BITSTREAM_H_MODULE +#define BITSTREAM_H_MODULE + +/* +* This API consists of small unitary functions, which must be inlined for best performance. +* Since link-time-optimization is not available for all compilers, +* these functions are defined into a .h to be included. +*/ + +/*-**************************************** +* Dependencies +******************************************/ +#include "error_private.h" /* error codes and messages */ +#include "mem.h" /* unaligned access routines */ + +/*========================================= +* Target specific +=========================================*/ +#define STREAM_ACCUMULATOR_MIN_32 25 +#define STREAM_ACCUMULATOR_MIN_64 57 +#define STREAM_ACCUMULATOR_MIN ((U32)(ZSTD_32bits() ? STREAM_ACCUMULATOR_MIN_32 : STREAM_ACCUMULATOR_MIN_64)) + +/*-****************************************** +* bitStream encoding API (write forward) +********************************************/ +/* bitStream can mix input from multiple sources. +* A critical property of these streams is that they encode and decode in **reverse** direction. +* So the first bit sequence you add will be the last to be read, like a LIFO stack. +*/ +typedef struct { + size_t bitContainer; + int bitPos; + char *startPtr; + char *ptr; + char *endPtr; +} BIT_CStream_t; + +ZSTD_STATIC size_t BIT_initCStream(BIT_CStream_t *bitC, void *dstBuffer, size_t dstCapacity); +ZSTD_STATIC void BIT_addBits(BIT_CStream_t *bitC, size_t value, unsigned nbBits); +ZSTD_STATIC void BIT_flushBits(BIT_CStream_t *bitC); +ZSTD_STATIC size_t BIT_closeCStream(BIT_CStream_t *bitC); + +/* Start with initCStream, providing the size of buffer to write into. +* bitStream will never write outside of this buffer. +* `dstCapacity` must be >= sizeof(bitD->bitContainer), otherwise @return will be an error code. +* +* bits are first added to a local register. +* Local register is size_t, hence 64-bits on 64-bits systems, or 32-bits on 32-bits systems. +* Writing data into memory is an explicit operation, performed by the flushBits function. +* Hence keep track how many bits are potentially stored into local register to avoid register overflow. +* After a flushBits, a maximum of 7 bits might still be stored into local register. +* +* Avoid storing elements of more than 24 bits if you want compatibility with 32-bits bitstream readers. +* +* Last operation is to close the bitStream. +* The function returns the final size of CStream in bytes. +* If data couldn't fit into `dstBuffer`, it will return a 0 ( == not storable) +*/ + +/*-******************************************** +* bitStream decoding API (read backward) +**********************************************/ +typedef struct { + size_t bitContainer; + unsigned bitsConsumed; + const char *ptr; + const char *start; +} BIT_DStream_t; + +typedef enum { + BIT_DStream_unfinished = 0, + BIT_DStream_endOfBuffer = 1, + BIT_DStream_completed = 2, + BIT_DStream_overflow = 3 +} BIT_DStream_status; /* result of BIT_reloadDStream() */ +/* 1,2,4,8 would be better for bitmap combinations, but slows down performance a bit ... :( */ + +ZSTD_STATIC size_t BIT_initDStream(BIT_DStream_t *bitD, const void *srcBuffer, size_t srcSize); +ZSTD_STATIC size_t BIT_readBits(BIT_DStream_t *bitD, unsigned nbBits); +ZSTD_STATIC BIT_DStream_status BIT_reloadDStream(BIT_DStream_t *bitD); +ZSTD_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t *bitD); + +/* Start by invoking BIT_initDStream(). +* A chunk of the bitStream is then stored into a local register. +* Local register size is 64-bits on 64-bits systems, 32-bits on 32-bits systems (size_t). +* You can then retrieve bitFields stored into the local register, **in reverse order**. +* Local register is explicitly reloaded from memory by the BIT_reloadDStream() method. +* A reload guarantee a minimum of ((8*sizeof(bitD->bitContainer))-7) bits when its result is BIT_DStream_unfinished. +* Otherwise, it can be less than that, so proceed accordingly. +* Checking if DStream has reached its end can be performed with BIT_endOfDStream(). +*/ + +/*-**************************************** +* unsafe API +******************************************/ +ZSTD_STATIC void BIT_addBitsFast(BIT_CStream_t *bitC, size_t value, unsigned nbBits); +/* faster, but works only if value is "clean", meaning all high bits above nbBits are 0 */ + +ZSTD_STATIC void BIT_flushBitsFast(BIT_CStream_t *bitC); +/* unsafe version; does not check buffer overflow */ + +ZSTD_STATIC size_t BIT_readBitsFast(BIT_DStream_t *bitD, unsigned nbBits); +/* faster, but works only if nbBits >= 1 */ + +/*-************************************************************** +* Internal functions +****************************************************************/ +ZSTD_STATIC unsigned BIT_highbit32(register U32 val) { return 31 - __builtin_clz(val); } + +/*===== Local Constants =====*/ +static const unsigned BIT_mask[] = {0, 1, 3, 7, 0xF, 0x1F, 0x3F, 0x7F, 0xFF, + 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF, 0x1FFFF, + 0x3FFFF, 0x7FFFF, 0xFFFFF, 0x1FFFFF, 0x3FFFFF, 0x7FFFFF, 0xFFFFFF, 0x1FFFFFF, 0x3FFFFFF}; /* up to 26 bits */ + +/*-************************************************************** +* bitStream encoding +****************************************************************/ +/*! BIT_initCStream() : + * `dstCapacity` must be > sizeof(void*) + * @return : 0 if success, + otherwise an error code (can be tested using ERR_isError() ) */ +ZSTD_STATIC size_t BIT_initCStream(BIT_CStream_t *bitC, void *startPtr, size_t dstCapacity) +{ + bitC->bitContainer = 0; + bitC->bitPos = 0; + bitC->startPtr = (char *)startPtr; + bitC->ptr = bitC->startPtr; + bitC->endPtr = bitC->startPtr + dstCapacity - sizeof(bitC->ptr); + if (dstCapacity <= sizeof(bitC->ptr)) + return ERROR(dstSize_tooSmall); + return 0; +} + +/*! BIT_addBits() : + can add up to 26 bits into `bitC`. + Does not check for register overflow ! */ +ZSTD_STATIC void BIT_addBits(BIT_CStream_t *bitC, size_t value, unsigned nbBits) +{ + bitC->bitContainer |= (value & BIT_mask[nbBits]) << bitC->bitPos; + bitC->bitPos += nbBits; +} + +/*! BIT_addBitsFast() : + * works only if `value` is _clean_, meaning all high bits above nbBits are 0 */ +ZSTD_STATIC void BIT_addBitsFast(BIT_CStream_t *bitC, size_t value, unsigned nbBits) +{ + bitC->bitContainer |= value << bitC->bitPos; + bitC->bitPos += nbBits; +} + +/*! BIT_flushBitsFast() : + * unsafe version; does not check buffer overflow */ +ZSTD_STATIC void BIT_flushBitsFast(BIT_CStream_t *bitC) +{ + size_t const nbBytes = bitC->bitPos >> 3; + ZSTD_writeLEST(bitC->ptr, bitC->bitContainer); + bitC->ptr += nbBytes; + bitC->bitPos &= 7; + bitC->bitContainer >>= nbBytes * 8; /* if bitPos >= sizeof(bitContainer)*8 --> undefined behavior */ +} + +/*! BIT_flushBits() : + * safe version; check for buffer overflow, and prevents it. + * note : does not signal buffer overflow. This will be revealed later on using BIT_closeCStream() */ +ZSTD_STATIC void BIT_flushBits(BIT_CStream_t *bitC) +{ + size_t const nbBytes = bitC->bitPos >> 3; + ZSTD_writeLEST(bitC->ptr, bitC->bitContainer); + bitC->ptr += nbBytes; + if (bitC->ptr > bitC->endPtr) + bitC->ptr = bitC->endPtr; + bitC->bitPos &= 7; + bitC->bitContainer >>= nbBytes * 8; /* if bitPos >= sizeof(bitContainer)*8 --> undefined behavior */ +} + +/*! BIT_closeCStream() : + * @return : size of CStream, in bytes, + or 0 if it could not fit into dstBuffer */ +ZSTD_STATIC size_t BIT_closeCStream(BIT_CStream_t *bitC) +{ + BIT_addBitsFast(bitC, 1, 1); /* endMark */ + BIT_flushBits(bitC); + + if (bitC->ptr >= bitC->endPtr) + return 0; /* doesn't fit within authorized budget : cancel */ + + return (bitC->ptr - bitC->startPtr) + (bitC->bitPos > 0); +} + +/*-******************************************************** +* bitStream decoding +**********************************************************/ +/*! BIT_initDStream() : +* Initialize a BIT_DStream_t. +* `bitD` : a pointer to an already allocated BIT_DStream_t structure. +* `srcSize` must be the *exact* size of the bitStream, in bytes. +* @return : size of stream (== srcSize) or an errorCode if a problem is detected +*/ +ZSTD_STATIC size_t BIT_initDStream(BIT_DStream_t *bitD, const void *srcBuffer, size_t srcSize) +{ + if (srcSize < 1) { + memset(bitD, 0, sizeof(*bitD)); + return ERROR(srcSize_wrong); + } + + if (srcSize >= sizeof(bitD->bitContainer)) { /* normal case */ + bitD->start = (const char *)srcBuffer; + bitD->ptr = (const char *)srcBuffer + srcSize - sizeof(bitD->bitContainer); + bitD->bitContainer = ZSTD_readLEST(bitD->ptr); + { + BYTE const lastByte = ((const BYTE *)srcBuffer)[srcSize - 1]; + bitD->bitsConsumed = lastByte ? 8 - BIT_highbit32(lastByte) : 0; /* ensures bitsConsumed is always set */ + if (lastByte == 0) + return ERROR(GENERIC); /* endMark not present */ + } + } else { + bitD->start = (const char *)srcBuffer; + bitD->ptr = bitD->start; + bitD->bitContainer = *(const BYTE *)(bitD->start); + switch (srcSize) { + case 7: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[6]) << (sizeof(bitD->bitContainer) * 8 - 16); + /* fallthrough */ + case 6: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[5]) << (sizeof(bitD->bitContainer) * 8 - 24); + /* fallthrough */ + case 5: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[4]) << (sizeof(bitD->bitContainer) * 8 - 32); + /* fallthrough */ + case 4: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[3]) << 24; + /* fallthrough */ + case 3: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[2]) << 16; + /* fallthrough */ + case 2: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[1]) << 8; + /* fallthrough */ + default:; + } + { + BYTE const lastByte = ((const BYTE *)srcBuffer)[srcSize - 1]; + bitD->bitsConsumed = lastByte ? 8 - BIT_highbit32(lastByte) : 0; + if (lastByte == 0) + return ERROR(GENERIC); /* endMark not present */ + } + bitD->bitsConsumed += (U32)(sizeof(bitD->bitContainer) - srcSize) * 8; + } + + return srcSize; +} + +ZSTD_STATIC size_t BIT_getUpperBits(size_t bitContainer, U32 const start) { return bitContainer >> start; } + +ZSTD_STATIC size_t BIT_getMiddleBits(size_t bitContainer, U32 const start, U32 const nbBits) { return (bitContainer >> start) & BIT_mask[nbBits]; } + +ZSTD_STATIC size_t BIT_getLowerBits(size_t bitContainer, U32 const nbBits) { return bitContainer & BIT_mask[nbBits]; } + +/*! BIT_lookBits() : + * Provides next n bits from local register. + * local register is not modified. + * On 32-bits, maxNbBits==24. + * On 64-bits, maxNbBits==56. + * @return : value extracted + */ +ZSTD_STATIC size_t BIT_lookBits(const BIT_DStream_t *bitD, U32 nbBits) +{ + U32 const bitMask = sizeof(bitD->bitContainer) * 8 - 1; + return ((bitD->bitContainer << (bitD->bitsConsumed & bitMask)) >> 1) >> ((bitMask - nbBits) & bitMask); +} + +/*! BIT_lookBitsFast() : +* unsafe version; only works only if nbBits >= 1 */ +ZSTD_STATIC size_t BIT_lookBitsFast(const BIT_DStream_t *bitD, U32 nbBits) +{ + U32 const bitMask = sizeof(bitD->bitContainer) * 8 - 1; + return (bitD->bitContainer << (bitD->bitsConsumed & bitMask)) >> (((bitMask + 1) - nbBits) & bitMask); +} + +ZSTD_STATIC void BIT_skipBits(BIT_DStream_t *bitD, U32 nbBits) { bitD->bitsConsumed += nbBits; } + +/*! BIT_readBits() : + * Read (consume) next n bits from local register and update. + * Pay attention to not read more than nbBits contained into local register. + * @return : extracted value. + */ +ZSTD_STATIC size_t BIT_readBits(BIT_DStream_t *bitD, U32 nbBits) +{ + size_t const value = BIT_lookBits(bitD, nbBits); + BIT_skipBits(bitD, nbBits); + return value; +} + +/*! BIT_readBitsFast() : +* unsafe version; only works only if nbBits >= 1 */ +ZSTD_STATIC size_t BIT_readBitsFast(BIT_DStream_t *bitD, U32 nbBits) +{ + size_t const value = BIT_lookBitsFast(bitD, nbBits); + BIT_skipBits(bitD, nbBits); + return value; +} + +/*! BIT_reloadDStream() : +* Refill `bitD` from buffer previously set in BIT_initDStream() . +* This function is safe, it guarantees it will not read beyond src buffer. +* @return : status of `BIT_DStream_t` internal register. + if status == BIT_DStream_unfinished, internal register is filled with >= (sizeof(bitD->bitContainer)*8 - 7) bits */ +ZSTD_STATIC BIT_DStream_status BIT_reloadDStream(BIT_DStream_t *bitD) +{ + if (bitD->bitsConsumed > (sizeof(bitD->bitContainer) * 8)) /* should not happen => corruption detected */ + return BIT_DStream_overflow; + + if (bitD->ptr >= bitD->start + sizeof(bitD->bitContainer)) { + bitD->ptr -= bitD->bitsConsumed >> 3; + bitD->bitsConsumed &= 7; + bitD->bitContainer = ZSTD_readLEST(bitD->ptr); + return BIT_DStream_unfinished; + } + if (bitD->ptr == bitD->start) { + if (bitD->bitsConsumed < sizeof(bitD->bitContainer) * 8) + return BIT_DStream_endOfBuffer; + return BIT_DStream_completed; + } + { + U32 nbBytes = bitD->bitsConsumed >> 3; + BIT_DStream_status result = BIT_DStream_unfinished; + if (bitD->ptr - nbBytes < bitD->start) { + nbBytes = (U32)(bitD->ptr - bitD->start); /* ptr > start */ + result = BIT_DStream_endOfBuffer; + } + bitD->ptr -= nbBytes; + bitD->bitsConsumed -= nbBytes * 8; + bitD->bitContainer = ZSTD_readLEST(bitD->ptr); /* reminder : srcSize > sizeof(bitD) */ + return result; + } +} + +/*! BIT_endOfDStream() : +* @return Tells if DStream has exactly reached its end (all bits consumed). +*/ +ZSTD_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t *DStream) +{ + return ((DStream->ptr == DStream->start) && (DStream->bitsConsumed == sizeof(DStream->bitContainer) * 8)); +} + +#endif /* BITSTREAM_H_MODULE */ diff --git a/xen/common/zstd/decompress.c b/xen/common/zstd/decompress.c new file mode 100644 index 0000000000..3d3ef136e5 --- /dev/null +++ b/xen/common/zstd/decompress.c @@ -0,0 +1,2496 @@ +/** + * Copyright (c) 2016-present, Yann Collet, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of https://github.com/facebook/zstd. + * An additional grant of patent rights can be found in the PATENTS file in the + * same directory. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. This program is dual-licensed; you may select + * either version 2 of the GNU General Public License ("GPL") or BSD license + * ("BSD"). + */ + +/* *************************************************************** +* Tuning parameters +*****************************************************************/ +/*! +* MAXWINDOWSIZE_DEFAULT : +* maximum window size accepted by DStream, by default. +* Frames requiring more memory will be rejected. +*/ +#ifndef ZSTD_MAXWINDOWSIZE_DEFAULT +#define ZSTD_MAXWINDOWSIZE_DEFAULT ((1 << ZSTD_WINDOWLOG_MAX) + 1) /* defined within zstd.h */ +#endif + +/*-******************************************************* +* Dependencies +*********************************************************/ +#include "fse.h" +#include "huf.h" +#include "mem.h" /* low level memory routines */ +#include "zstd_internal.h" +#include /* memcpy, memmove, memset */ + +#define ZSTD_PREFETCH(ptr) __builtin_prefetch(ptr, 0, 0) + +/*-************************************* +* Macros +***************************************/ +#define ZSTD_isError ERR_isError /* for inlining */ +#define FSE_isError ERR_isError +#define HUF_isError ERR_isError + +/*_******************************************************* +* Memory operations +**********************************************************/ +static void INIT ZSTD_copy4(void *dst, const void *src) { memcpy(dst, src, 4); } + +/*-************************************************************* +* Context management +***************************************************************/ +typedef enum { + ZSTDds_getFrameHeaderSize, + ZSTDds_decodeFrameHeader, + ZSTDds_decodeBlockHeader, + ZSTDds_decompressBlock, + ZSTDds_decompressLastBlock, + ZSTDds_checkChecksum, + ZSTDds_decodeSkippableHeader, + ZSTDds_skipFrame +} ZSTD_dStage; + +typedef struct { + FSE_DTable LLTable[FSE_DTABLE_SIZE_U32(LLFSELog)]; + FSE_DTable OFTable[FSE_DTABLE_SIZE_U32(OffFSELog)]; + FSE_DTable MLTable[FSE_DTABLE_SIZE_U32(MLFSELog)]; + HUF_DTable hufTable[HUF_DTABLE_SIZE(HufLog)]; /* can accommodate HUF_decompress4X */ + U64 workspace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32 / 2]; + U32 rep[ZSTD_REP_NUM]; +} ZSTD_entropyTables_t; + +struct ZSTD_DCtx_s { + const FSE_DTable *LLTptr; + const FSE_DTable *MLTptr; + const FSE_DTable *OFTptr; + const HUF_DTable *HUFptr; + ZSTD_entropyTables_t entropy; + const void *previousDstEnd; /* detect continuity */ + const void *base; /* start of curr segment */ + const void *vBase; /* virtual start of previous segment if it was just before curr one */ + const void *dictEnd; /* end of previous segment */ + size_t expected; + ZSTD_frameParams fParams; + blockType_e bType; /* used in ZSTD_decompressContinue(), to transfer blockType between header decoding and block decoding stages */ + ZSTD_dStage stage; + U32 litEntropy; + U32 fseEntropy; + struct xxh64_state xxhState; + size_t headerSize; + U32 dictID; + const BYTE *litPtr; + ZSTD_customMem customMem; + size_t litSize; + size_t rleSize; + BYTE litBuffer[ZSTD_BLOCKSIZE_ABSOLUTEMAX + WILDCOPY_OVERLENGTH]; + BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX]; +}; /* typedef'd to ZSTD_DCtx within "zstd.h" */ + +size_t INIT ZSTD_DCtxWorkspaceBound(void) { return ZSTD_ALIGN(sizeof(ZSTD_stack)) + ZSTD_ALIGN(sizeof(ZSTD_DCtx)); } + +size_t INIT ZSTD_decompressBegin(ZSTD_DCtx *dctx) +{ + dctx->expected = ZSTD_frameHeaderSize_prefix; + dctx->stage = ZSTDds_getFrameHeaderSize; + dctx->previousDstEnd = NULL; + dctx->base = NULL; + dctx->vBase = NULL; + dctx->dictEnd = NULL; + dctx->entropy.hufTable[0] = (HUF_DTable)((HufLog)*0x1000001); /* cover both little and big endian */ + dctx->litEntropy = dctx->fseEntropy = 0; + dctx->dictID = 0; + ZSTD_STATIC_ASSERT(sizeof(dctx->entropy.rep) == sizeof(repStartValue)); + memcpy(dctx->entropy.rep, repStartValue, sizeof(repStartValue)); /* initial repcodes */ + dctx->LLTptr = dctx->entropy.LLTable; + dctx->MLTptr = dctx->entropy.MLTable; + dctx->OFTptr = dctx->entropy.OFTable; + dctx->HUFptr = dctx->entropy.hufTable; + return 0; +} + +ZSTD_DCtx *INIT ZSTD_createDCtx_advanced(ZSTD_customMem customMem) +{ + ZSTD_DCtx *dctx; + + if (!customMem.customAlloc || !customMem.customFree) + return NULL; + + dctx = (ZSTD_DCtx *)ZSTD_malloc(sizeof(ZSTD_DCtx), customMem); + if (!dctx) + return NULL; + memcpy(&dctx->customMem, &customMem, sizeof(customMem)); + ZSTD_decompressBegin(dctx); + return dctx; +} + +ZSTD_DCtx *INIT ZSTD_initDCtx(void *workspace, size_t workspaceSize) +{ + ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize); + return ZSTD_createDCtx_advanced(stackMem); +} + +size_t INIT ZSTD_freeDCtx(ZSTD_DCtx *dctx) +{ + if (dctx == NULL) + return 0; /* support free on NULL */ + ZSTD_free(dctx, dctx->customMem); + return 0; /* reserved as a potential error code in the future */ +} + +void INIT ZSTD_copyDCtx(ZSTD_DCtx *dstDCtx, const ZSTD_DCtx *srcDCtx) +{ + size_t const workSpaceSize = (ZSTD_BLOCKSIZE_ABSOLUTEMAX + WILDCOPY_OVERLENGTH) + ZSTD_frameHeaderSize_max; + memcpy(dstDCtx, srcDCtx, sizeof(ZSTD_DCtx) - workSpaceSize); /* no need to copy workspace */ +} + +STATIC size_t ZSTD_findFrameCompressedSize(const void *src, size_t srcSize); +STATIC size_t ZSTD_decompressBegin_usingDict(ZSTD_DCtx *dctx, const void *dict, + size_t dictSize); + +static void ZSTD_refDDict(ZSTD_DCtx *dstDCtx, const ZSTD_DDict *ddict); + +/*-************************************************************* +* Decompression section +***************************************************************/ + +/*! ZSTD_isFrame() : + * Tells if the content of `buffer` starts with a valid Frame Identifier. + * Note : Frame Identifier is 4 bytes. If `size < 4`, @return will always be 0. + * Note 2 : Legacy Frame Identifiers are considered valid only if Legacy Support is enabled. + * Note 3 : Skippable Frame Identifiers are considered valid. */ +unsigned INIT ZSTD_isFrame(const void *buffer, size_t size) +{ + if (size < 4) + return 0; + { + U32 const magic = ZSTD_readLE32(buffer); + if (magic == ZSTD_MAGICNUMBER) + return 1; + if ((magic & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) + return 1; + } + return 0; +} + +/** ZSTD_frameHeaderSize() : +* srcSize must be >= ZSTD_frameHeaderSize_prefix. +* @return : size of the Frame Header */ +static size_t INIT ZSTD_frameHeaderSize(const void *src, size_t srcSize) +{ + if (srcSize < ZSTD_frameHeaderSize_prefix) + return ERROR(srcSize_wrong); + { + BYTE const fhd = ((const BYTE *)src)[4]; + U32 const dictID = fhd & 3; + U32 const singleSegment = (fhd >> 5) & 1; + U32 const fcsId = fhd >> 6; + return ZSTD_frameHeaderSize_prefix + !singleSegment + ZSTD_did_fieldSize[dictID] + ZSTD_fcs_fieldSize[fcsId] + (singleSegment && !fcsId); + } +} + +/** ZSTD_getFrameParams() : +* decode Frame Header, or require larger `srcSize`. +* @return : 0, `fparamsPtr` is correctly filled, +* >0, `srcSize` is too small, result is expected `srcSize`, +* or an error code, which can be tested using ZSTD_isError() */ +size_t INIT ZSTD_getFrameParams(ZSTD_frameParams *fparamsPtr, const void *src, size_t srcSize) +{ + const BYTE *ip = (const BYTE *)src; + + if (srcSize < ZSTD_frameHeaderSize_prefix) + return ZSTD_frameHeaderSize_prefix; + if (ZSTD_readLE32(src) != ZSTD_MAGICNUMBER) { + if ((ZSTD_readLE32(src) & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) { + if (srcSize < ZSTD_skippableHeaderSize) + return ZSTD_skippableHeaderSize; /* magic number + skippable frame length */ + memset(fparamsPtr, 0, sizeof(*fparamsPtr)); + fparamsPtr->frameContentSize = ZSTD_readLE32((const char *)src + 4); + fparamsPtr->windowSize = 0; /* windowSize==0 means a frame is skippable */ + return 0; + } + return ERROR(prefix_unknown); + } + + /* ensure there is enough `srcSize` to fully read/decode frame header */ + { + size_t const fhsize = ZSTD_frameHeaderSize(src, srcSize); + if (srcSize < fhsize) + return fhsize; + } + + { + BYTE const fhdByte = ip[4]; + size_t pos = 5; + U32 const dictIDSizeCode = fhdByte & 3; + U32 const checksumFlag = (fhdByte >> 2) & 1; + U32 const singleSegment = (fhdByte >> 5) & 1; + U32 const fcsID = fhdByte >> 6; + U32 const windowSizeMax = 1U << ZSTD_WINDOWLOG_MAX; + U32 windowSize = 0; + U32 dictID = 0; + U64 frameContentSize = 0; + if ((fhdByte & 0x08) != 0) + return ERROR(frameParameter_unsupported); /* reserved bits, which must be zero */ + if (!singleSegment) { + BYTE const wlByte = ip[pos++]; + U32 const windowLog = (wlByte >> 3) + ZSTD_WINDOWLOG_ABSOLUTEMIN; + if (windowLog > ZSTD_WINDOWLOG_MAX) + return ERROR(frameParameter_windowTooLarge); /* avoids issue with 1 << windowLog */ + windowSize = (1U << windowLog); + windowSize += (windowSize >> 3) * (wlByte & 7); + } + + switch (dictIDSizeCode) { + default: /* impossible */ + case 0: break; + case 1: + dictID = ip[pos]; + pos++; + break; + case 2: + dictID = ZSTD_readLE16(ip + pos); + pos += 2; + break; + case 3: + dictID = ZSTD_readLE32(ip + pos); + pos += 4; + break; + } + switch (fcsID) { + default: /* impossible */ + case 0: + if (singleSegment) + frameContentSize = ip[pos]; + break; + case 1: frameContentSize = ZSTD_readLE16(ip + pos) + 256; break; + case 2: frameContentSize = ZSTD_readLE32(ip + pos); break; + case 3: frameContentSize = ZSTD_readLE64(ip + pos); break; + } + if (!windowSize) + windowSize = (U32)frameContentSize; + if (windowSize > windowSizeMax) + return ERROR(frameParameter_windowTooLarge); + fparamsPtr->frameContentSize = frameContentSize; + fparamsPtr->windowSize = windowSize; + fparamsPtr->dictID = dictID; + fparamsPtr->checksumFlag = checksumFlag; + } + return 0; +} + +/** ZSTD_getFrameContentSize() : +* compatible with legacy mode +* @return : decompressed size of the single frame pointed to be `src` if known, otherwise +* - ZSTD_CONTENTSIZE_UNKNOWN if the size cannot be determined +* - ZSTD_CONTENTSIZE_ERROR if an error occurred (e.g. invalid magic number, srcSize too small) */ +unsigned long long INIT ZSTD_getFrameContentSize(const void *src, size_t srcSize) +{ + { + ZSTD_frameParams fParams; + if (ZSTD_getFrameParams(&fParams, src, srcSize) != 0) + return ZSTD_CONTENTSIZE_ERROR; + if (fParams.windowSize == 0) { + /* Either skippable or empty frame, size == 0 either way */ + return 0; + } else if (fParams.frameContentSize != 0) { + return fParams.frameContentSize; + } else { + return ZSTD_CONTENTSIZE_UNKNOWN; + } + } +} + +/** ZSTD_findDecompressedSize() : + * compatible with legacy mode + * `srcSize` must be the exact length of some number of ZSTD compressed and/or + * skippable frames + * @return : decompressed size of the frames contained */ +unsigned long long INIT ZSTD_findDecompressedSize(const void *src, size_t srcSize) +{ + { + unsigned long long totalDstSize = 0; + while (srcSize >= ZSTD_frameHeaderSize_prefix) { + const U32 magicNumber = ZSTD_readLE32(src); + + if ((magicNumber & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) { + size_t skippableSize; + if (srcSize < ZSTD_skippableHeaderSize) + return ERROR(srcSize_wrong); + skippableSize = ZSTD_readLE32((const BYTE *)src + 4) + ZSTD_skippableHeaderSize; + if (srcSize < skippableSize) { + return ZSTD_CONTENTSIZE_ERROR; + } + + src = (const BYTE *)src + skippableSize; + srcSize -= skippableSize; + continue; + } + + { + unsigned long long const ret = ZSTD_getFrameContentSize(src, srcSize); + if (ret >= ZSTD_CONTENTSIZE_ERROR) + return ret; + + /* check for overflow */ + if (totalDstSize + ret < totalDstSize) + return ZSTD_CONTENTSIZE_ERROR; + totalDstSize += ret; + } + { + size_t const frameSrcSize = ZSTD_findFrameCompressedSize(src, srcSize); + if (ZSTD_isError(frameSrcSize)) { + return ZSTD_CONTENTSIZE_ERROR; + } + + src = (const BYTE *)src + frameSrcSize; + srcSize -= frameSrcSize; + } + } + + if (srcSize) { + return ZSTD_CONTENTSIZE_ERROR; + } + + return totalDstSize; + } +} + +/** ZSTD_decodeFrameHeader() : +* `headerSize` must be the size provided by ZSTD_frameHeaderSize(). +* @return : 0 if success, or an error code, which can be tested using ZSTD_isError() */ +static size_t INIT ZSTD_decodeFrameHeader(ZSTD_DCtx *dctx, const void *src, size_t headerSize) +{ + size_t const result = ZSTD_getFrameParams(&(dctx->fParams), src, headerSize); + if (ZSTD_isError(result)) + return result; /* invalid header */ + if (result > 0) + return ERROR(srcSize_wrong); /* headerSize too small */ + if (dctx->fParams.dictID && (dctx->dictID != dctx->fParams.dictID)) + return ERROR(dictionary_wrong); + if (dctx->fParams.checksumFlag) + xxh64_reset(&dctx->xxhState, 0); + return 0; +} + +typedef struct { + blockType_e blockType; + U32 lastBlock; + U32 origSize; +} blockProperties_t; + +/*! ZSTD_getcBlockSize() : +* Provides the size of compressed block from block header `src` */ +size_t INIT ZSTD_getcBlockSize(const void *src, size_t srcSize, blockProperties_t *bpPtr) +{ + if (srcSize < ZSTD_blockHeaderSize) + return ERROR(srcSize_wrong); + { + U32 const cBlockHeader = ZSTD_readLE24(src); + U32 const cSize = cBlockHeader >> 3; + bpPtr->lastBlock = cBlockHeader & 1; + bpPtr->blockType = (blockType_e)((cBlockHeader >> 1) & 3); + bpPtr->origSize = cSize; /* only useful for RLE */ + if (bpPtr->blockType == bt_rle) + return 1; + if (bpPtr->blockType == bt_reserved) + return ERROR(corruption_detected); + return cSize; + } +} + +static size_t INIT ZSTD_copyRawBlock(void *dst, size_t dstCapacity, const void *src, size_t srcSize) +{ + if (srcSize > dstCapacity) + return ERROR(dstSize_tooSmall); + memcpy(dst, src, srcSize); + return srcSize; +} + +static size_t INIT ZSTD_setRleBlock(void *dst, size_t dstCapacity, const void *src, size_t srcSize, size_t regenSize) +{ + if (srcSize != 1) + return ERROR(srcSize_wrong); + if (regenSize > dstCapacity) + return ERROR(dstSize_tooSmall); + memset(dst, *(const BYTE *)src, regenSize); + return regenSize; +} + +/*! ZSTD_decodeLiteralsBlock() : + @return : nb of bytes read from src (< srcSize ) */ +size_t INIT ZSTD_decodeLiteralsBlock(ZSTD_DCtx *dctx, const void *src, size_t srcSize) /* note : srcSize < BLOCKSIZE */ +{ + if (srcSize < MIN_CBLOCK_SIZE) + return ERROR(corruption_detected); + + { + const BYTE *const istart = (const BYTE *)src; + symbolEncodingType_e const litEncType = (symbolEncodingType_e)(istart[0] & 3); + + switch (litEncType) { + case set_repeat: + if (dctx->litEntropy == 0) + return ERROR(dictionary_corrupted); + /* fallthrough */ + case set_compressed: + if (srcSize < 5) + return ERROR(corruption_detected); /* srcSize >= MIN_CBLOCK_SIZE == 3; here we need up to 5 for case 3 */ + { + size_t lhSize, litSize, litCSize; + U32 singleStream = 0; + U32 const lhlCode = (istart[0] >> 2) & 3; + U32 const lhc = ZSTD_readLE32(istart); + switch (lhlCode) { + case 0: + case 1: + default: /* note : default is impossible, since lhlCode into [0..3] */ + /* 2 - 2 - 10 - 10 */ + singleStream = !lhlCode; + lhSize = 3; + litSize = (lhc >> 4) & 0x3FF; + litCSize = (lhc >> 14) & 0x3FF; + break; + case 2: + /* 2 - 2 - 14 - 14 */ + lhSize = 4; + litSize = (lhc >> 4) & 0x3FFF; + litCSize = lhc >> 18; + break; + case 3: + /* 2 - 2 - 18 - 18 */ + lhSize = 5; + litSize = (lhc >> 4) & 0x3FFFF; + litCSize = (lhc >> 22) + (istart[4] << 10); + break; + } + if (litSize > ZSTD_BLOCKSIZE_ABSOLUTEMAX) + return ERROR(corruption_detected); + if (litCSize + lhSize > srcSize) + return ERROR(corruption_detected); + + if (HUF_isError( + (litEncType == set_repeat) + ? (singleStream ? HUF_decompress1X_usingDTable(dctx->litBuffer, litSize, istart + lhSize, litCSize, dctx->HUFptr) + : HUF_decompress4X_usingDTable(dctx->litBuffer, litSize, istart + lhSize, litCSize, dctx->HUFptr)) + : (singleStream + ? HUF_decompress1X2_DCtx_wksp(dctx->entropy.hufTable, dctx->litBuffer, litSize, istart + lhSize, litCSize, + dctx->entropy.workspace, sizeof(dctx->entropy.workspace)) + : HUF_decompress4X_hufOnly_wksp(dctx->entropy.hufTable, dctx->litBuffer, litSize, istart + lhSize, litCSize, + dctx->entropy.workspace, sizeof(dctx->entropy.workspace))))) + return ERROR(corruption_detected); + + dctx->litPtr = dctx->litBuffer; + dctx->litSize = litSize; + dctx->litEntropy = 1; + if (litEncType == set_compressed) + dctx->HUFptr = dctx->entropy.hufTable; + memset(dctx->litBuffer + dctx->litSize, 0, WILDCOPY_OVERLENGTH); + return litCSize + lhSize; + } + + case set_basic: { + size_t litSize, lhSize; + U32 const lhlCode = ((istart[0]) >> 2) & 3; + switch (lhlCode) { + case 0: + case 2: + default: /* note : default is impossible, since lhlCode into [0..3] */ + lhSize = 1; + litSize = istart[0] >> 3; + break; + case 1: + lhSize = 2; + litSize = ZSTD_readLE16(istart) >> 4; + break; + case 3: + lhSize = 3; + litSize = ZSTD_readLE24(istart) >> 4; + break; + } + + if (lhSize + litSize + WILDCOPY_OVERLENGTH > srcSize) { /* risk reading beyond src buffer with wildcopy */ + if (litSize + lhSize > srcSize) + return ERROR(corruption_detected); + memcpy(dctx->litBuffer, istart + lhSize, litSize); + dctx->litPtr = dctx->litBuffer; + dctx->litSize = litSize; + memset(dctx->litBuffer + dctx->litSize, 0, WILDCOPY_OVERLENGTH); + return lhSize + litSize; + } + /* direct reference into compressed stream */ + dctx->litPtr = istart + lhSize; + dctx->litSize = litSize; + return lhSize + litSize; + } + + case set_rle: { + U32 const lhlCode = ((istart[0]) >> 2) & 3; + size_t litSize, lhSize; + switch (lhlCode) { + case 0: + case 2: + default: /* note : default is impossible, since lhlCode into [0..3] */ + lhSize = 1; + litSize = istart[0] >> 3; + break; + case 1: + lhSize = 2; + litSize = ZSTD_readLE16(istart) >> 4; + break; + case 3: + lhSize = 3; + litSize = ZSTD_readLE24(istart) >> 4; + if (srcSize < 4) + return ERROR(corruption_detected); /* srcSize >= MIN_CBLOCK_SIZE == 3; here we need lhSize+1 = 4 */ + break; + } + if (litSize > ZSTD_BLOCKSIZE_ABSOLUTEMAX) + return ERROR(corruption_detected); + memset(dctx->litBuffer, istart[lhSize], litSize + WILDCOPY_OVERLENGTH); + dctx->litPtr = dctx->litBuffer; + dctx->litSize = litSize; + return lhSize + 1; + } + default: + return ERROR(corruption_detected); /* impossible */ + } + } +} + +typedef union { + FSE_decode_t realData; + U32 alignedBy4; +} FSE_decode_t4; + +static const FSE_decode_t4 LL_defaultDTable[(1 << LL_DEFAULTNORMLOG) + 1] = { + {{LL_DEFAULTNORMLOG, 1, 1}}, /* header : tableLog, fastMode, fastMode */ + {{0, 0, 4}}, /* 0 : base, symbol, bits */ + {{16, 0, 4}}, + {{32, 1, 5}}, + {{0, 3, 5}}, + {{0, 4, 5}}, + {{0, 6, 5}}, + {{0, 7, 5}}, + {{0, 9, 5}}, + {{0, 10, 5}}, + {{0, 12, 5}}, + {{0, 14, 6}}, + {{0, 16, 5}}, + {{0, 18, 5}}, + {{0, 19, 5}}, + {{0, 21, 5}}, + {{0, 22, 5}}, + {{0, 24, 5}}, + {{32, 25, 5}}, + {{0, 26, 5}}, + {{0, 27, 6}}, + {{0, 29, 6}}, + {{0, 31, 6}}, + {{32, 0, 4}}, + {{0, 1, 4}}, + {{0, 2, 5}}, + {{32, 4, 5}}, + {{0, 5, 5}}, + {{32, 7, 5}}, + {{0, 8, 5}}, + {{32, 10, 5}}, + {{0, 11, 5}}, + {{0, 13, 6}}, + {{32, 16, 5}}, + {{0, 17, 5}}, + {{32, 19, 5}}, + {{0, 20, 5}}, + {{32, 22, 5}}, + {{0, 23, 5}}, + {{0, 25, 4}}, + {{16, 25, 4}}, + {{32, 26, 5}}, + {{0, 28, 6}}, + {{0, 30, 6}}, + {{48, 0, 4}}, + {{16, 1, 4}}, + {{32, 2, 5}}, + {{32, 3, 5}}, + {{32, 5, 5}}, + {{32, 6, 5}}, + {{32, 8, 5}}, + {{32, 9, 5}}, + {{32, 11, 5}}, + {{32, 12, 5}}, + {{0, 15, 6}}, + {{32, 17, 5}}, + {{32, 18, 5}}, + {{32, 20, 5}}, + {{32, 21, 5}}, + {{32, 23, 5}}, + {{32, 24, 5}}, + {{0, 35, 6}}, + {{0, 34, 6}}, + {{0, 33, 6}}, + {{0, 32, 6}}, +}; /* LL_defaultDTable */ + +static const FSE_decode_t4 ML_defaultDTable[(1 << ML_DEFAULTNORMLOG) + 1] = { + {{ML_DEFAULTNORMLOG, 1, 1}}, /* header : tableLog, fastMode, fastMode */ + {{0, 0, 6}}, /* 0 : base, symbol, bits */ + {{0, 1, 4}}, + {{32, 2, 5}}, + {{0, 3, 5}}, + {{0, 5, 5}}, + {{0, 6, 5}}, + {{0, 8, 5}}, + {{0, 10, 6}}, + {{0, 13, 6}}, + {{0, 16, 6}}, + {{0, 19, 6}}, + {{0, 22, 6}}, + {{0, 25, 6}}, + {{0, 28, 6}}, + {{0, 31, 6}}, + {{0, 33, 6}}, + {{0, 35, 6}}, + {{0, 37, 6}}, + {{0, 39, 6}}, + {{0, 41, 6}}, + {{0, 43, 6}}, + {{0, 45, 6}}, + {{16, 1, 4}}, + {{0, 2, 4}}, + {{32, 3, 5}}, + {{0, 4, 5}}, + {{32, 6, 5}}, + {{0, 7, 5}}, + {{0, 9, 6}}, + {{0, 12, 6}}, + {{0, 15, 6}}, + {{0, 18, 6}}, + {{0, 21, 6}}, + {{0, 24, 6}}, + {{0, 27, 6}}, + {{0, 30, 6}}, + {{0, 32, 6}}, + {{0, 34, 6}}, + {{0, 36, 6}}, + {{0, 38, 6}}, + {{0, 40, 6}}, + {{0, 42, 6}}, + {{0, 44, 6}}, + {{32, 1, 4}}, + {{48, 1, 4}}, + {{16, 2, 4}}, + {{32, 4, 5}}, + {{32, 5, 5}}, + {{32, 7, 5}}, + {{32, 8, 5}}, + {{0, 11, 6}}, + {{0, 14, 6}}, + {{0, 17, 6}}, + {{0, 20, 6}}, + {{0, 23, 6}}, + {{0, 26, 6}}, + {{0, 29, 6}}, + {{0, 52, 6}}, + {{0, 51, 6}}, + {{0, 50, 6}}, + {{0, 49, 6}}, + {{0, 48, 6}}, + {{0, 47, 6}}, + {{0, 46, 6}}, +}; /* ML_defaultDTable */ + +static const FSE_decode_t4 OF_defaultDTable[(1 << OF_DEFAULTNORMLOG) + 1] = { + {{OF_DEFAULTNORMLOG, 1, 1}}, /* header : tableLog, fastMode, fastMode */ + {{0, 0, 5}}, /* 0 : base, symbol, bits */ + {{0, 6, 4}}, + {{0, 9, 5}}, + {{0, 15, 5}}, + {{0, 21, 5}}, + {{0, 3, 5}}, + {{0, 7, 4}}, + {{0, 12, 5}}, + {{0, 18, 5}}, + {{0, 23, 5}}, + {{0, 5, 5}}, + {{0, 8, 4}}, + {{0, 14, 5}}, + {{0, 20, 5}}, + {{0, 2, 5}}, + {{16, 7, 4}}, + {{0, 11, 5}}, + {{0, 17, 5}}, + {{0, 22, 5}}, + {{0, 4, 5}}, + {{16, 8, 4}}, + {{0, 13, 5}}, + {{0, 19, 5}}, + {{0, 1, 5}}, + {{16, 6, 4}}, + {{0, 10, 5}}, + {{0, 16, 5}}, + {{0, 28, 5}}, + {{0, 27, 5}}, + {{0, 26, 5}}, + {{0, 25, 5}}, + {{0, 24, 5}}, +}; /* OF_defaultDTable */ + +/*! ZSTD_buildSeqTable() : + @return : nb bytes read from src, + or an error code if it fails, testable with ZSTD_isError() +*/ +static size_t INIT ZSTD_buildSeqTable(FSE_DTable *DTableSpace, const FSE_DTable **DTablePtr, + symbolEncodingType_e type, U32 max, U32 maxLog, const void *src, + size_t srcSize, const FSE_decode_t4 *defaultTable, + U32 flagRepeatTable, void *workspace, size_t workspaceSize) +{ + const void *const tmpPtr = defaultTable; /* bypass strict aliasing */ + switch (type) { + case set_rle: + if (!srcSize) + return ERROR(srcSize_wrong); + if ((*(const BYTE *)src) > max) + return ERROR(corruption_detected); + FSE_buildDTable_rle(DTableSpace, *(const BYTE *)src); + *DTablePtr = DTableSpace; + return 1; + case set_basic: *DTablePtr = (const FSE_DTable *)tmpPtr; return 0; + case set_repeat: + if (!flagRepeatTable) + return ERROR(corruption_detected); + return 0; + default: /* impossible */ + case set_compressed: { + U32 tableLog; + S16 *norm = (S16 *)workspace; + size_t const spaceUsed32 = ALIGN(sizeof(S16) * (MaxSeq + 1), sizeof(U32)) >> 2; + + if ((spaceUsed32 << 2) > workspaceSize) + return ERROR(GENERIC); + workspace = (U32 *)workspace + spaceUsed32; + workspaceSize -= (spaceUsed32 << 2); + { + size_t const headerSize = FSE_readNCount(norm, &max, &tableLog, src, srcSize); + if (FSE_isError(headerSize)) + return ERROR(corruption_detected); + if (tableLog > maxLog) + return ERROR(corruption_detected); + FSE_buildDTable_wksp(DTableSpace, norm, max, tableLog, workspace, workspaceSize); + *DTablePtr = DTableSpace; + return headerSize; + } + } + } +} + +size_t INIT ZSTD_decodeSeqHeaders(ZSTD_DCtx *dctx, int *nbSeqPtr, const void *src, size_t srcSize) +{ + const BYTE *const istart = (const BYTE *const)src; + const BYTE *const iend = istart + srcSize; + const BYTE *ip = istart; + + /* check */ + if (srcSize < MIN_SEQUENCES_SIZE) + return ERROR(srcSize_wrong); + + /* SeqHead */ + { + int nbSeq = *ip++; + if (!nbSeq) { + *nbSeqPtr = 0; + return 1; + } + if (nbSeq > 0x7F) { + if (nbSeq == 0xFF) { + if (ip + 2 > iend) + return ERROR(srcSize_wrong); + nbSeq = ZSTD_readLE16(ip) + LONGNBSEQ, ip += 2; + } else { + if (ip >= iend) + return ERROR(srcSize_wrong); + nbSeq = ((nbSeq - 0x80) << 8) + *ip++; + } + } + *nbSeqPtr = nbSeq; + } + + /* FSE table descriptors */ + if (ip + 4 > iend) + return ERROR(srcSize_wrong); /* minimum possible size */ + { + symbolEncodingType_e const LLtype = (symbolEncodingType_e)(*ip >> 6); + symbolEncodingType_e const OFtype = (symbolEncodingType_e)((*ip >> 4) & 3); + symbolEncodingType_e const MLtype = (symbolEncodingType_e)((*ip >> 2) & 3); + ip++; + + /* Build DTables */ + { + size_t const llhSize = ZSTD_buildSeqTable(dctx->entropy.LLTable, &dctx->LLTptr, LLtype, MaxLL, LLFSELog, ip, iend - ip, + LL_defaultDTable, dctx->fseEntropy, dctx->entropy.workspace, sizeof(dctx->entropy.workspace)); + if (ZSTD_isError(llhSize)) + return ERROR(corruption_detected); + ip += llhSize; + } + { + size_t const ofhSize = ZSTD_buildSeqTable(dctx->entropy.OFTable, &dctx->OFTptr, OFtype, MaxOff, OffFSELog, ip, iend - ip, + OF_defaultDTable, dctx->fseEntropy, dctx->entropy.workspace, sizeof(dctx->entropy.workspace)); + if (ZSTD_isError(ofhSize)) + return ERROR(corruption_detected); + ip += ofhSize; + } + { + size_t const mlhSize = ZSTD_buildSeqTable(dctx->entropy.MLTable, &dctx->MLTptr, MLtype, MaxML, MLFSELog, ip, iend - ip, + ML_defaultDTable, dctx->fseEntropy, dctx->entropy.workspace, sizeof(dctx->entropy.workspace)); + if (ZSTD_isError(mlhSize)) + return ERROR(corruption_detected); + ip += mlhSize; + } + } + + return ip - istart; +} + +typedef struct { + size_t litLength; + size_t matchLength; + size_t offset; + const BYTE *match; +} seq_t; + +typedef struct { + BIT_DStream_t DStream; + FSE_DState_t stateLL; + FSE_DState_t stateOffb; + FSE_DState_t stateML; + size_t prevOffset[ZSTD_REP_NUM]; + const BYTE *base; + size_t pos; + uPtrDiff gotoDict; +} seqState_t; + +FORCE_NOINLINE +size_t ZSTD_execSequenceLast7(BYTE *op, BYTE *const oend, seq_t sequence, const BYTE **litPtr, const BYTE *const litLimit, const BYTE *const base, + const BYTE *const vBase, const BYTE *const dictEnd) +{ + BYTE *const oLitEnd = op + sequence.litLength; + size_t const sequenceLength = sequence.litLength + sequence.matchLength; + BYTE *const oMatchEnd = op + sequenceLength; /* risk : address space overflow (32-bits) */ + BYTE *const oend_w = oend - WILDCOPY_OVERLENGTH; + const BYTE *const iLitEnd = *litPtr + sequence.litLength; + const BYTE *match = oLitEnd - sequence.offset; + + /* check */ + if (oMatchEnd > oend) + return ERROR(dstSize_tooSmall); /* last match must start at a minimum distance of WILDCOPY_OVERLENGTH from oend */ + if (iLitEnd > litLimit) + return ERROR(corruption_detected); /* over-read beyond lit buffer */ + if (oLitEnd <= oend_w) + return ERROR(GENERIC); /* Precondition */ + + /* copy literals */ + if (op < oend_w) { + ZSTD_wildcopy(op, *litPtr, oend_w - op); + *litPtr += oend_w - op; + op = oend_w; + } + while (op < oLitEnd) + *op++ = *(*litPtr)++; + + /* copy Match */ + if (sequence.offset > (size_t)(oLitEnd - base)) { + /* offset beyond prefix */ + if (sequence.offset > (size_t)(oLitEnd - vBase)) + return ERROR(corruption_detected); + match = dictEnd - (base - match); + if (match + sequence.matchLength <= dictEnd) { + memmove(oLitEnd, match, sequence.matchLength); + return sequenceLength; + } + /* span extDict & currPrefixSegment */ + { + size_t const length1 = dictEnd - match; + memmove(oLitEnd, match, length1); + op = oLitEnd + length1; + sequence.matchLength -= length1; + match = base; + } + } + while (op < oMatchEnd) + *op++ = *match++; + return sequenceLength; +} + +static seq_t INIT ZSTD_decodeSequence(seqState_t *seqState) +{ + seq_t seq; + + U32 const llCode = FSE_peekSymbol(&seqState->stateLL); + U32 const mlCode = FSE_peekSymbol(&seqState->stateML); + U32 const ofCode = FSE_peekSymbol(&seqState->stateOffb); /* <= maxOff, by table construction */ + + U32 const llBits = LL_bits[llCode]; + U32 const mlBits = ML_bits[mlCode]; + U32 const ofBits = ofCode; + U32 const totalBits = llBits + mlBits + ofBits; + + static const U32 LL_base[MaxLL + 1] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, + 20, 22, 24, 28, 32, 40, 48, 64, 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000, 0x10000}; + + static const U32 ML_base[MaxML + 1] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 39, 41, + 43, 47, 51, 59, 67, 83, 99, 0x83, 0x103, 0x203, 0x403, 0x803, 0x1003, 0x2003, 0x4003, 0x8003, 0x10003}; + + static const U32 OF_base[MaxOff + 1] = {0, 1, 1, 5, 0xD, 0x1D, 0x3D, 0x7D, 0xFD, 0x1FD, + 0x3FD, 0x7FD, 0xFFD, 0x1FFD, 0x3FFD, 0x7FFD, 0xFFFD, 0x1FFFD, 0x3FFFD, 0x7FFFD, + 0xFFFFD, 0x1FFFFD, 0x3FFFFD, 0x7FFFFD, 0xFFFFFD, 0x1FFFFFD, 0x3FFFFFD, 0x7FFFFFD, 0xFFFFFFD}; + + /* sequence */ + { + size_t offset; + if (!ofCode) + offset = 0; + else { + offset = OF_base[ofCode] + BIT_readBitsFast(&seqState->DStream, ofBits); /* <= (ZSTD_WINDOWLOG_MAX-1) bits */ + if (ZSTD_32bits()) + BIT_reloadDStream(&seqState->DStream); + } + + if (ofCode <= 1) { + offset += (llCode == 0); + if (offset) { + size_t temp = (offset == 3) ? seqState->prevOffset[0] - 1 : seqState->prevOffset[offset]; + temp += !temp; /* 0 is not valid; input is corrupted; force offset to 1 */ + if (offset != 1) + seqState->prevOffset[2] = seqState->prevOffset[1]; + seqState->prevOffset[1] = seqState->prevOffset[0]; + seqState->prevOffset[0] = offset = temp; + } else { + offset = seqState->prevOffset[0]; + } + } else { + seqState->prevOffset[2] = seqState->prevOffset[1]; + seqState->prevOffset[1] = seqState->prevOffset[0]; + seqState->prevOffset[0] = offset; + } + seq.offset = offset; + } + + seq.matchLength = ML_base[mlCode] + ((mlCode > 31) ? BIT_readBitsFast(&seqState->DStream, mlBits) : 0); /* <= 16 bits */ + if (ZSTD_32bits() && (mlBits + llBits > 24)) + BIT_reloadDStream(&seqState->DStream); + + seq.litLength = LL_base[llCode] + ((llCode > 15) ? BIT_readBitsFast(&seqState->DStream, llBits) : 0); /* <= 16 bits */ + if (ZSTD_32bits() || (totalBits > 64 - 7 - (LLFSELog + MLFSELog + OffFSELog))) + BIT_reloadDStream(&seqState->DStream); + + /* ANS state update */ + FSE_updateState(&seqState->stateLL, &seqState->DStream); /* <= 9 bits */ + FSE_updateState(&seqState->stateML, &seqState->DStream); /* <= 9 bits */ + if (ZSTD_32bits()) + BIT_reloadDStream(&seqState->DStream); /* <= 18 bits */ + FSE_updateState(&seqState->stateOffb, &seqState->DStream); /* <= 8 bits */ + + seq.match = NULL; + + return seq; +} + +FORCE_INLINE +size_t ZSTD_execSequence(BYTE *op, BYTE *const oend, seq_t sequence, const BYTE **litPtr, const BYTE *const litLimit, const BYTE *const base, + const BYTE *const vBase, const BYTE *const dictEnd) +{ + BYTE *const oLitEnd = op + sequence.litLength; + size_t const sequenceLength = sequence.litLength + sequence.matchLength; + BYTE *const oMatchEnd = op + sequenceLength; /* risk : address space overflow (32-bits) */ + BYTE *const oend_w = oend - WILDCOPY_OVERLENGTH; + const BYTE *const iLitEnd = *litPtr + sequence.litLength; + const BYTE *match = oLitEnd - sequence.offset; + + /* check */ + if (oMatchEnd > oend) + return ERROR(dstSize_tooSmall); /* last match must start at a minimum distance of WILDCOPY_OVERLENGTH from oend */ + if (iLitEnd > litLimit) + return ERROR(corruption_detected); /* over-read beyond lit buffer */ + if (oLitEnd > oend_w) + return ZSTD_execSequenceLast7(op, oend, sequence, litPtr, litLimit, base, vBase, dictEnd); + + /* copy Literals */ + ZSTD_copy8(op, *litPtr); + if (sequence.litLength > 8) + ZSTD_wildcopy(op + 8, (*litPtr) + 8, + sequence.litLength - 8); /* note : since oLitEnd <= oend-WILDCOPY_OVERLENGTH, no risk of overwrite beyond oend */ + op = oLitEnd; + *litPtr = iLitEnd; /* update for next sequence */ + + /* copy Match */ + if (sequence.offset > (size_t)(oLitEnd - base)) { + /* offset beyond prefix */ + if (sequence.offset > (size_t)(oLitEnd - vBase)) + return ERROR(corruption_detected); + match = dictEnd + (match - base); + if (match + sequence.matchLength <= dictEnd) { + memmove(oLitEnd, match, sequence.matchLength); + return sequenceLength; + } + /* span extDict & currPrefixSegment */ + { + size_t const length1 = dictEnd - match; + memmove(oLitEnd, match, length1); + op = oLitEnd + length1; + sequence.matchLength -= length1; + match = base; + if (op > oend_w || sequence.matchLength < MINMATCH) { + U32 i; + for (i = 0; i < sequence.matchLength; ++i) + op[i] = match[i]; + return sequenceLength; + } + } + } + /* Requirement: op <= oend_w && sequence.matchLength >= MINMATCH */ + + /* match within prefix */ + if (sequence.offset < 8) { + /* close range match, overlap */ + static const U32 dec32table[] = {0, 1, 2, 1, 4, 4, 4, 4}; /* added */ + static const int dec64table[] = {8, 8, 8, 7, 8, 9, 10, 11}; /* subtracted */ + int const sub2 = dec64table[sequence.offset]; + op[0] = match[0]; + op[1] = match[1]; + op[2] = match[2]; + op[3] = match[3]; + match += dec32table[sequence.offset]; + ZSTD_copy4(op + 4, match); + match -= sub2; + } else { + ZSTD_copy8(op, match); + } + op += 8; + match += 8; + + if (oMatchEnd > oend - (16 - MINMATCH)) { + if (op < oend_w) { + ZSTD_wildcopy(op, match, oend_w - op); + match += oend_w - op; + op = oend_w; + } + while (op < oMatchEnd) + *op++ = *match++; + } else { + ZSTD_wildcopy(op, match, (ptrdiff_t)sequence.matchLength - 8); /* works even if matchLength < 8 */ + } + return sequenceLength; +} + +static size_t INIT ZSTD_decompressSequences(ZSTD_DCtx *dctx, void *dst, size_t maxDstSize, const void *seqStart, size_t seqSize) +{ + const BYTE *ip = (const BYTE *)seqStart; + const BYTE *const iend = ip + seqSize; + BYTE *const ostart = (BYTE * const)dst; + BYTE *const oend = ostart + maxDstSize; + BYTE *op = ostart; + const BYTE *litPtr = dctx->litPtr; + const BYTE *const litEnd = litPtr + dctx->litSize; + const BYTE *const base = (const BYTE *)(dctx->base); + const BYTE *const vBase = (const BYTE *)(dctx->vBase); + const BYTE *const dictEnd = (const BYTE *)(dctx->dictEnd); + int nbSeq; + + /* Build Decoding Tables */ + { + size_t const seqHSize = ZSTD_decodeSeqHeaders(dctx, &nbSeq, ip, seqSize); + if (ZSTD_isError(seqHSize)) + return seqHSize; + ip += seqHSize; + } + + /* Regen sequences */ + if (nbSeq) { + seqState_t seqState; + dctx->fseEntropy = 1; + { + U32 i; + for (i = 0; i < ZSTD_REP_NUM; i++) + seqState.prevOffset[i] = dctx->entropy.rep[i]; + } + CHECK_E(BIT_initDStream(&seqState.DStream, ip, iend - ip), corruption_detected); + FSE_initDState(&seqState.stateLL, &seqState.DStream, dctx->LLTptr); + FSE_initDState(&seqState.stateOffb, &seqState.DStream, dctx->OFTptr); + FSE_initDState(&seqState.stateML, &seqState.DStream, dctx->MLTptr); + + for (; (BIT_reloadDStream(&(seqState.DStream)) <= BIT_DStream_completed) && nbSeq;) { + nbSeq--; + { + seq_t const sequence = ZSTD_decodeSequence(&seqState); + size_t const oneSeqSize = ZSTD_execSequence(op, oend, sequence, &litPtr, litEnd, base, vBase, dictEnd); + if (ZSTD_isError(oneSeqSize)) + return oneSeqSize; + op += oneSeqSize; + } + } + + /* check if reached exact end */ + if (nbSeq) + return ERROR(corruption_detected); + /* save reps for next block */ + { + U32 i; + for (i = 0; i < ZSTD_REP_NUM; i++) + dctx->entropy.rep[i] = (U32)(seqState.prevOffset[i]); + } + } + + /* last literal segment */ + { + size_t const lastLLSize = litEnd - litPtr; + if (lastLLSize > (size_t)(oend - op)) + return ERROR(dstSize_tooSmall); + memcpy(op, litPtr, lastLLSize); + op += lastLLSize; + } + + return op - ostart; +} + +FORCE_INLINE seq_t ZSTD_decodeSequenceLong_generic(seqState_t *seqState, int const longOffsets) +{ + seq_t seq; + + U32 const llCode = FSE_peekSymbol(&seqState->stateLL); + U32 const mlCode = FSE_peekSymbol(&seqState->stateML); + U32 const ofCode = FSE_peekSymbol(&seqState->stateOffb); /* <= maxOff, by table construction */ + + U32 const llBits = LL_bits[llCode]; + U32 const mlBits = ML_bits[mlCode]; + U32 const ofBits = ofCode; + U32 const totalBits = llBits + mlBits + ofBits; + + static const U32 LL_base[MaxLL + 1] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, + 20, 22, 24, 28, 32, 40, 48, 64, 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000, 0x10000}; + + static const U32 ML_base[MaxML + 1] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 39, 41, + 43, 47, 51, 59, 67, 83, 99, 0x83, 0x103, 0x203, 0x403, 0x803, 0x1003, 0x2003, 0x4003, 0x8003, 0x10003}; + + static const U32 OF_base[MaxOff + 1] = {0, 1, 1, 5, 0xD, 0x1D, 0x3D, 0x7D, 0xFD, 0x1FD, + 0x3FD, 0x7FD, 0xFFD, 0x1FFD, 0x3FFD, 0x7FFD, 0xFFFD, 0x1FFFD, 0x3FFFD, 0x7FFFD, + 0xFFFFD, 0x1FFFFD, 0x3FFFFD, 0x7FFFFD, 0xFFFFFD, 0x1FFFFFD, 0x3FFFFFD, 0x7FFFFFD, 0xFFFFFFD}; + + /* sequence */ + { + size_t offset; + if (!ofCode) + offset = 0; + else { + if (longOffsets) { + int const extraBits = ofBits - MIN(ofBits, STREAM_ACCUMULATOR_MIN); + offset = OF_base[ofCode] + (BIT_readBitsFast(&seqState->DStream, ofBits - extraBits) << extraBits); + if (ZSTD_32bits() || extraBits) + BIT_reloadDStream(&seqState->DStream); + if (extraBits) + offset += BIT_readBitsFast(&seqState->DStream, extraBits); + } else { + offset = OF_base[ofCode] + BIT_readBitsFast(&seqState->DStream, ofBits); /* <= (ZSTD_WINDOWLOG_MAX-1) bits */ + if (ZSTD_32bits()) + BIT_reloadDStream(&seqState->DStream); + } + } + + if (ofCode <= 1) { + offset += (llCode == 0); + if (offset) { + size_t temp = (offset == 3) ? seqState->prevOffset[0] - 1 : seqState->prevOffset[offset]; + temp += !temp; /* 0 is not valid; input is corrupted; force offset to 1 */ + if (offset != 1) + seqState->prevOffset[2] = seqState->prevOffset[1]; + seqState->prevOffset[1] = seqState->prevOffset[0]; + seqState->prevOffset[0] = offset = temp; + } else { + offset = seqState->prevOffset[0]; + } + } else { + seqState->prevOffset[2] = seqState->prevOffset[1]; + seqState->prevOffset[1] = seqState->prevOffset[0]; + seqState->prevOffset[0] = offset; + } + seq.offset = offset; + } + + seq.matchLength = ML_base[mlCode] + ((mlCode > 31) ? BIT_readBitsFast(&seqState->DStream, mlBits) : 0); /* <= 16 bits */ + if (ZSTD_32bits() && (mlBits + llBits > 24)) + BIT_reloadDStream(&seqState->DStream); + + seq.litLength = LL_base[llCode] + ((llCode > 15) ? BIT_readBitsFast(&seqState->DStream, llBits) : 0); /* <= 16 bits */ + if (ZSTD_32bits() || (totalBits > 64 - 7 - (LLFSELog + MLFSELog + OffFSELog))) + BIT_reloadDStream(&seqState->DStream); + + { + size_t const pos = seqState->pos + seq.litLength; + seq.match = seqState->base + pos - seq.offset; /* single memory segment */ + if (seq.offset > pos) + seq.match += seqState->gotoDict; /* separate memory segment */ + seqState->pos = pos + seq.matchLength; + } + + /* ANS state update */ + FSE_updateState(&seqState->stateLL, &seqState->DStream); /* <= 9 bits */ + FSE_updateState(&seqState->stateML, &seqState->DStream); /* <= 9 bits */ + if (ZSTD_32bits()) + BIT_reloadDStream(&seqState->DStream); /* <= 18 bits */ + FSE_updateState(&seqState->stateOffb, &seqState->DStream); /* <= 8 bits */ + + return seq; +} + +static seq_t INIT ZSTD_decodeSequenceLong(seqState_t *seqState, unsigned const windowSize) +{ + if (ZSTD_highbit32(windowSize) > STREAM_ACCUMULATOR_MIN) { + return ZSTD_decodeSequenceLong_generic(seqState, 1); + } else { + return ZSTD_decodeSequenceLong_generic(seqState, 0); + } +} + +FORCE_INLINE +size_t INIT ZSTD_execSequenceLong(BYTE *op, BYTE *const oend, seq_t sequence, const BYTE **litPtr, + const BYTE *const litLimit, const BYTE *const base, + const BYTE *const vBase, const BYTE *const dictEnd) +{ + BYTE *const oLitEnd = op + sequence.litLength; + size_t const sequenceLength = sequence.litLength + sequence.matchLength; + BYTE *const oMatchEnd = op + sequenceLength; /* risk : address space overflow (32-bits) */ + BYTE *const oend_w = oend - WILDCOPY_OVERLENGTH; + const BYTE *const iLitEnd = *litPtr + sequence.litLength; + const BYTE *match = sequence.match; + + /* check */ + if (oMatchEnd > oend) + return ERROR(dstSize_tooSmall); /* last match must start at a minimum distance of WILDCOPY_OVERLENGTH from oend */ + if (iLitEnd > litLimit) + return ERROR(corruption_detected); /* over-read beyond lit buffer */ + if (oLitEnd > oend_w) + return ZSTD_execSequenceLast7(op, oend, sequence, litPtr, litLimit, base, vBase, dictEnd); + + /* copy Literals */ + ZSTD_copy8(op, *litPtr); + if (sequence.litLength > 8) + ZSTD_wildcopy(op + 8, (*litPtr) + 8, + sequence.litLength - 8); /* note : since oLitEnd <= oend-WILDCOPY_OVERLENGTH, no risk of overwrite beyond oend */ + op = oLitEnd; + *litPtr = iLitEnd; /* update for next sequence */ + + /* copy Match */ + if (sequence.offset > (size_t)(oLitEnd - base)) { + /* offset beyond prefix */ + if (sequence.offset > (size_t)(oLitEnd - vBase)) + return ERROR(corruption_detected); + if (match + sequence.matchLength <= dictEnd) { + memmove(oLitEnd, match, sequence.matchLength); + return sequenceLength; + } + /* span extDict & currPrefixSegment */ + { + size_t const length1 = dictEnd - match; + memmove(oLitEnd, match, length1); + op = oLitEnd + length1; + sequence.matchLength -= length1; + match = base; + if (op > oend_w || sequence.matchLength < MINMATCH) { + U32 i; + for (i = 0; i < sequence.matchLength; ++i) + op[i] = match[i]; + return sequenceLength; + } + } + } + /* Requirement: op <= oend_w && sequence.matchLength >= MINMATCH */ + + /* match within prefix */ + if (sequence.offset < 8) { + /* close range match, overlap */ + static const U32 dec32table[] = {0, 1, 2, 1, 4, 4, 4, 4}; /* added */ + static const int dec64table[] = {8, 8, 8, 7, 8, 9, 10, 11}; /* subtracted */ + int const sub2 = dec64table[sequence.offset]; + op[0] = match[0]; + op[1] = match[1]; + op[2] = match[2]; + op[3] = match[3]; + match += dec32table[sequence.offset]; + ZSTD_copy4(op + 4, match); + match -= sub2; + } else { + ZSTD_copy8(op, match); + } + op += 8; + match += 8; + + if (oMatchEnd > oend - (16 - MINMATCH)) { + if (op < oend_w) { + ZSTD_wildcopy(op, match, oend_w - op); + match += oend_w - op; + op = oend_w; + } + while (op < oMatchEnd) + *op++ = *match++; + } else { + ZSTD_wildcopy(op, match, (ptrdiff_t)sequence.matchLength - 8); /* works even if matchLength < 8 */ + } + return sequenceLength; +} + +static size_t INIT ZSTD_decompressSequencesLong(ZSTD_DCtx *dctx, void *dst, size_t maxDstSize, const void *seqStart, size_t seqSize) +{ + const BYTE *ip = (const BYTE *)seqStart; + const BYTE *const iend = ip + seqSize; + BYTE *const ostart = (BYTE * const)dst; + BYTE *const oend = ostart + maxDstSize; + BYTE *op = ostart; + const BYTE *litPtr = dctx->litPtr; + const BYTE *const litEnd = litPtr + dctx->litSize; + const BYTE *const base = (const BYTE *)(dctx->base); + const BYTE *const vBase = (const BYTE *)(dctx->vBase); + const BYTE *const dictEnd = (const BYTE *)(dctx->dictEnd); + unsigned const windowSize = dctx->fParams.windowSize; + int nbSeq; + + /* Build Decoding Tables */ + { + size_t const seqHSize = ZSTD_decodeSeqHeaders(dctx, &nbSeq, ip, seqSize); + if (ZSTD_isError(seqHSize)) + return seqHSize; + ip += seqHSize; + } + + /* Regen sequences */ + if (nbSeq) { +#define STORED_SEQS 4 +#define STOSEQ_MASK (STORED_SEQS - 1) +#define ADVANCED_SEQS 4 + seq_t *sequences = (seq_t *)dctx->entropy.workspace; + int const seqAdvance = MIN(nbSeq, ADVANCED_SEQS); + seqState_t seqState; + int seqNb; + ZSTD_STATIC_ASSERT(sizeof(dctx->entropy.workspace) >= sizeof(seq_t) * STORED_SEQS); + dctx->fseEntropy = 1; + { + U32 i; + for (i = 0; i < ZSTD_REP_NUM; i++) + seqState.prevOffset[i] = dctx->entropy.rep[i]; + } + seqState.base = base; + seqState.pos = (size_t)(op - base); + seqState.gotoDict = (uPtrDiff)dictEnd - (uPtrDiff)base; /* cast to avoid undefined behaviour */ + CHECK_E(BIT_initDStream(&seqState.DStream, ip, iend - ip), corruption_detected); + FSE_initDState(&seqState.stateLL, &seqState.DStream, dctx->LLTptr); + FSE_initDState(&seqState.stateOffb, &seqState.DStream, dctx->OFTptr); + FSE_initDState(&seqState.stateML, &seqState.DStream, dctx->MLTptr); + + /* prepare in advance */ + for (seqNb = 0; (BIT_reloadDStream(&seqState.DStream) <= BIT_DStream_completed) && seqNb < seqAdvance; seqNb++) { + sequences[seqNb] = ZSTD_decodeSequenceLong(&seqState, windowSize); + } + if (seqNb < seqAdvance) + return ERROR(corruption_detected); + + /* decode and decompress */ + for (; (BIT_reloadDStream(&(seqState.DStream)) <= BIT_DStream_completed) && seqNb < nbSeq; seqNb++) { + seq_t const sequence = ZSTD_decodeSequenceLong(&seqState, windowSize); + size_t const oneSeqSize = + ZSTD_execSequenceLong(op, oend, sequences[(seqNb - ADVANCED_SEQS) & STOSEQ_MASK], &litPtr, litEnd, base, vBase, dictEnd); + if (ZSTD_isError(oneSeqSize)) + return oneSeqSize; + ZSTD_PREFETCH(sequence.match); + sequences[seqNb & STOSEQ_MASK] = sequence; + op += oneSeqSize; + } + if (seqNb < nbSeq) + return ERROR(corruption_detected); + + /* finish queue */ + seqNb -= seqAdvance; + for (; seqNb < nbSeq; seqNb++) { + size_t const oneSeqSize = ZSTD_execSequenceLong(op, oend, sequences[seqNb & STOSEQ_MASK], &litPtr, litEnd, base, vBase, dictEnd); + if (ZSTD_isError(oneSeqSize)) + return oneSeqSize; + op += oneSeqSize; + } + + /* save reps for next block */ + { + U32 i; + for (i = 0; i < ZSTD_REP_NUM; i++) + dctx->entropy.rep[i] = (U32)(seqState.prevOffset[i]); + } + } + + /* last literal segment */ + { + size_t const lastLLSize = litEnd - litPtr; + if (lastLLSize > (size_t)(oend - op)) + return ERROR(dstSize_tooSmall); + memcpy(op, litPtr, lastLLSize); + op += lastLLSize; + } + + return op - ostart; +} + +static size_t INIT ZSTD_decompressBlock_internal(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize) +{ /* blockType == blockCompressed */ + const BYTE *ip = (const BYTE *)src; + + if (srcSize >= ZSTD_BLOCKSIZE_ABSOLUTEMAX) + return ERROR(srcSize_wrong); + + /* Decode literals section */ + { + size_t const litCSize = ZSTD_decodeLiteralsBlock(dctx, src, srcSize); + if (ZSTD_isError(litCSize)) + return litCSize; + ip += litCSize; + srcSize -= litCSize; + } + if (sizeof(size_t) > 4) /* do not enable prefetching on 32-bits x86, as it's performance detrimental */ + /* likely because of register pressure */ + /* if that's the correct cause, then 32-bits ARM should be affected differently */ + /* it would be good to test this on ARM real hardware, to see if prefetch version improves speed */ + if (dctx->fParams.windowSize > (1 << 23)) + return ZSTD_decompressSequencesLong(dctx, dst, dstCapacity, ip, srcSize); + return ZSTD_decompressSequences(dctx, dst, dstCapacity, ip, srcSize); +} + +static void INIT ZSTD_checkContinuity(ZSTD_DCtx *dctx, const void *dst) +{ + if (dst != dctx->previousDstEnd) { /* not contiguous */ + dctx->dictEnd = dctx->previousDstEnd; + dctx->vBase = (const char *)dst - ((const char *)(dctx->previousDstEnd) - (const char *)(dctx->base)); + dctx->base = dst; + dctx->previousDstEnd = dst; + } +} + +size_t INIT ZSTD_decompressBlock(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize) +{ + size_t dSize; + ZSTD_checkContinuity(dctx, dst); + dSize = ZSTD_decompressBlock_internal(dctx, dst, dstCapacity, src, srcSize); + dctx->previousDstEnd = (char *)dst + dSize; + return dSize; +} + +/** ZSTD_insertBlock() : + insert `src` block into `dctx` history. Useful to track uncompressed blocks. */ +size_t INIT ZSTD_insertBlock(ZSTD_DCtx *dctx, const void *blockStart, size_t blockSize) +{ + ZSTD_checkContinuity(dctx, blockStart); + dctx->previousDstEnd = (const char *)blockStart + blockSize; + return blockSize; +} + +size_t INIT ZSTD_generateNxBytes(void *dst, size_t dstCapacity, BYTE byte, size_t length) +{ + if (length > dstCapacity) + return ERROR(dstSize_tooSmall); + memset(dst, byte, length); + return length; +} + +/** ZSTD_findFrameCompressedSize() : + * compatible with legacy mode + * `src` must point to the start of a ZSTD frame, ZSTD legacy frame, or skippable frame + * `srcSize` must be at least as large as the frame contained + * @return : the compressed size of the frame starting at `src` */ +size_t INIT ZSTD_findFrameCompressedSize(const void *src, size_t srcSize) +{ + if (srcSize >= ZSTD_skippableHeaderSize && (ZSTD_readLE32(src) & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) { + return ZSTD_skippableHeaderSize + ZSTD_readLE32((const BYTE *)src + 4); + } else { + const BYTE *ip = (const BYTE *)src; + const BYTE *const ipstart = ip; + size_t remainingSize = srcSize; + ZSTD_frameParams fParams; + + size_t const headerSize = ZSTD_frameHeaderSize(ip, remainingSize); + if (ZSTD_isError(headerSize)) + return headerSize; + + /* Frame Header */ + { + size_t const ret = ZSTD_getFrameParams(&fParams, ip, remainingSize); + if (ZSTD_isError(ret)) + return ret; + if (ret > 0) + return ERROR(srcSize_wrong); + } + + ip += headerSize; + remainingSize -= headerSize; + + /* Loop on each block */ + while (1) { + blockProperties_t blockProperties; + size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSize, &blockProperties); + if (ZSTD_isError(cBlockSize)) + return cBlockSize; + + if (ZSTD_blockHeaderSize + cBlockSize > remainingSize) + return ERROR(srcSize_wrong); + + ip += ZSTD_blockHeaderSize + cBlockSize; + remainingSize -= ZSTD_blockHeaderSize + cBlockSize; + + if (blockProperties.lastBlock) + break; + } + + if (fParams.checksumFlag) { /* Frame content checksum */ + if (remainingSize < 4) + return ERROR(srcSize_wrong); + ip += 4; + remainingSize -= 4; + } + + return ip - ipstart; + } +} + +/*! ZSTD_decompressFrame() : +* @dctx must be properly initialized */ +static size_t INIT ZSTD_decompressFrame(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void **srcPtr, size_t *srcSizePtr) +{ + const BYTE *ip = (const BYTE *)(*srcPtr); + BYTE *const ostart = (BYTE * const)dst; + BYTE *const oend = ostart + dstCapacity; + BYTE *op = ostart; + size_t remainingSize = *srcSizePtr; + + /* check */ + if (remainingSize < ZSTD_frameHeaderSize_min + ZSTD_blockHeaderSize) + return ERROR(srcSize_wrong); + + /* Frame Header */ + { + size_t const frameHeaderSize = ZSTD_frameHeaderSize(ip, ZSTD_frameHeaderSize_prefix); + if (ZSTD_isError(frameHeaderSize)) + return frameHeaderSize; + if (remainingSize < frameHeaderSize + ZSTD_blockHeaderSize) + return ERROR(srcSize_wrong); + CHECK_F(ZSTD_decodeFrameHeader(dctx, ip, frameHeaderSize)); + ip += frameHeaderSize; + remainingSize -= frameHeaderSize; + } + + /* Loop on each block */ + while (1) { + size_t decodedSize; + blockProperties_t blockProperties; + size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSize, &blockProperties); + if (ZSTD_isError(cBlockSize)) + return cBlockSize; + + ip += ZSTD_blockHeaderSize; + remainingSize -= ZSTD_blockHeaderSize; + if (cBlockSize > remainingSize) + return ERROR(srcSize_wrong); + + switch (blockProperties.blockType) { + case bt_compressed: decodedSize = ZSTD_decompressBlock_internal(dctx, op, oend - op, ip, cBlockSize); break; + case bt_raw: decodedSize = ZSTD_copyRawBlock(op, oend - op, ip, cBlockSize); break; + case bt_rle: decodedSize = ZSTD_generateNxBytes(op, oend - op, *ip, blockProperties.origSize); break; + case bt_reserved: + default: return ERROR(corruption_detected); + } + + if (ZSTD_isError(decodedSize)) + return decodedSize; + if (dctx->fParams.checksumFlag) + xxh64_update(&dctx->xxhState, op, decodedSize); + op += decodedSize; + ip += cBlockSize; + remainingSize -= cBlockSize; + if (blockProperties.lastBlock) + break; + } + + if (dctx->fParams.checksumFlag) { /* Frame content checksum verification */ + U32 const checkCalc = (U32)xxh64_digest(&dctx->xxhState); + U32 checkRead; + if (remainingSize < 4) + return ERROR(checksum_wrong); + checkRead = ZSTD_readLE32(ip); + if (checkRead != checkCalc) + return ERROR(checksum_wrong); + ip += 4; + remainingSize -= 4; + } + + /* Allow caller to get size read */ + *srcPtr = ip; + *srcSizePtr = remainingSize; + return op - ostart; +} + +static const void *ZSTD_DDictDictContent(const ZSTD_DDict *ddict); +static size_t ZSTD_DDictDictSize(const ZSTD_DDict *ddict); + +static size_t INIT ZSTD_decompressMultiFrame(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize, const void *dict, size_t dictSize, + const ZSTD_DDict *ddict) +{ + void *const dststart = dst; + + if (ddict) { + if (dict) { + /* programmer error, these two cases should be mutually exclusive */ + return ERROR(GENERIC); + } + + dict = ZSTD_DDictDictContent(ddict); + dictSize = ZSTD_DDictDictSize(ddict); + } + + while (srcSize >= ZSTD_frameHeaderSize_prefix) { + U32 magicNumber; + + magicNumber = ZSTD_readLE32(src); + if (magicNumber != ZSTD_MAGICNUMBER) { + if ((magicNumber & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) { + size_t skippableSize; + if (srcSize < ZSTD_skippableHeaderSize) + return ERROR(srcSize_wrong); + skippableSize = ZSTD_readLE32((const BYTE *)src + 4) + ZSTD_skippableHeaderSize; + if (srcSize < skippableSize) { + return ERROR(srcSize_wrong); + } + + src = (const BYTE *)src + skippableSize; + srcSize -= skippableSize; + continue; + } else { + return ERROR(prefix_unknown); + } + } + + if (ddict) { + /* we were called from ZSTD_decompress_usingDDict */ + ZSTD_refDDict(dctx, ddict); + } else { + /* this will initialize correctly with no dict if dict == NULL, so + * use this in all cases but ddict */ + CHECK_F(ZSTD_decompressBegin_usingDict(dctx, dict, dictSize)); + } + ZSTD_checkContinuity(dctx, dst); + + { + const size_t res = ZSTD_decompressFrame(dctx, dst, dstCapacity, &src, &srcSize); + if (ZSTD_isError(res)) + return res; + /* don't need to bounds check this, ZSTD_decompressFrame will have + * already */ + dst = (BYTE *)dst + res; + dstCapacity -= res; + } + } + + if (srcSize) + return ERROR(srcSize_wrong); /* input not entirely consumed */ + + return (BYTE *)dst - (BYTE *)dststart; +} + +size_t INIT ZSTD_decompress_usingDict(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize, const void *dict, size_t dictSize) +{ + return ZSTD_decompressMultiFrame(dctx, dst, dstCapacity, src, srcSize, dict, dictSize, NULL); +} + +size_t INIT ZSTD_decompressDCtx(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize) +{ + return ZSTD_decompress_usingDict(dctx, dst, dstCapacity, src, srcSize, NULL, 0); +} + +/*-************************************** +* Advanced Streaming Decompression API +* Bufferless and synchronous +****************************************/ +size_t INIT ZSTD_nextSrcSizeToDecompress(ZSTD_DCtx *dctx) { return dctx->expected; } + +ZSTD_nextInputType_e INIT ZSTD_nextInputType(ZSTD_DCtx *dctx) +{ + switch (dctx->stage) { + default: /* should not happen */ + case ZSTDds_getFrameHeaderSize: + case ZSTDds_decodeFrameHeader: return ZSTDnit_frameHeader; + case ZSTDds_decodeBlockHeader: return ZSTDnit_blockHeader; + case ZSTDds_decompressBlock: return ZSTDnit_block; + case ZSTDds_decompressLastBlock: return ZSTDnit_lastBlock; + case ZSTDds_checkChecksum: return ZSTDnit_checksum; + case ZSTDds_decodeSkippableHeader: + case ZSTDds_skipFrame: return ZSTDnit_skippableFrame; + } +} + +int INIT ZSTD_isSkipFrame(ZSTD_DCtx *dctx) { return dctx->stage == ZSTDds_skipFrame; } /* for zbuff */ + +/** ZSTD_decompressContinue() : +* @return : nb of bytes generated into `dst` (necessarily <= `dstCapacity) +* or an error code, which can be tested using ZSTD_isError() */ +size_t INIT ZSTD_decompressContinue(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize) +{ + /* Sanity check */ + if (srcSize != dctx->expected) + return ERROR(srcSize_wrong); + if (dstCapacity) + ZSTD_checkContinuity(dctx, dst); + + switch (dctx->stage) { + case ZSTDds_getFrameHeaderSize: + if (srcSize != ZSTD_frameHeaderSize_prefix) + return ERROR(srcSize_wrong); /* impossible */ + if ((ZSTD_readLE32(src) & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) { /* skippable frame */ + memcpy(dctx->headerBuffer, src, ZSTD_frameHeaderSize_prefix); + dctx->expected = ZSTD_skippableHeaderSize - ZSTD_frameHeaderSize_prefix; /* magic number + skippable frame length */ + dctx->stage = ZSTDds_decodeSkippableHeader; + return 0; + } + dctx->headerSize = ZSTD_frameHeaderSize(src, ZSTD_frameHeaderSize_prefix); + if (ZSTD_isError(dctx->headerSize)) + return dctx->headerSize; + memcpy(dctx->headerBuffer, src, ZSTD_frameHeaderSize_prefix); + if (dctx->headerSize > ZSTD_frameHeaderSize_prefix) { + dctx->expected = dctx->headerSize - ZSTD_frameHeaderSize_prefix; + dctx->stage = ZSTDds_decodeFrameHeader; + return 0; + } + dctx->expected = 0; /* not necessary to copy more */ + /* fallthrough */ + + case ZSTDds_decodeFrameHeader: + memcpy(dctx->headerBuffer + ZSTD_frameHeaderSize_prefix, src, dctx->expected); + CHECK_F(ZSTD_decodeFrameHeader(dctx, dctx->headerBuffer, dctx->headerSize)); + dctx->expected = ZSTD_blockHeaderSize; + dctx->stage = ZSTDds_decodeBlockHeader; + return 0; + + case ZSTDds_decodeBlockHeader: { + blockProperties_t bp; + size_t const cBlockSize = ZSTD_getcBlockSize(src, ZSTD_blockHeaderSize, &bp); + if (ZSTD_isError(cBlockSize)) + return cBlockSize; + dctx->expected = cBlockSize; + dctx->bType = bp.blockType; + dctx->rleSize = bp.origSize; + if (cBlockSize) { + dctx->stage = bp.lastBlock ? ZSTDds_decompressLastBlock : ZSTDds_decompressBlock; + return 0; + } + /* empty block */ + if (bp.lastBlock) { + if (dctx->fParams.checksumFlag) { + dctx->expected = 4; + dctx->stage = ZSTDds_checkChecksum; + } else { + dctx->expected = 0; /* end of frame */ + dctx->stage = ZSTDds_getFrameHeaderSize; + } + } else { + dctx->expected = 3; /* go directly to next header */ + dctx->stage = ZSTDds_decodeBlockHeader; + } + return 0; + } + case ZSTDds_decompressLastBlock: + case ZSTDds_decompressBlock: { + size_t rSize; + switch (dctx->bType) { + case bt_compressed: rSize = ZSTD_decompressBlock_internal(dctx, dst, dstCapacity, src, srcSize); break; + case bt_raw: rSize = ZSTD_copyRawBlock(dst, dstCapacity, src, srcSize); break; + case bt_rle: rSize = ZSTD_setRleBlock(dst, dstCapacity, src, srcSize, dctx->rleSize); break; + case bt_reserved: /* should never happen */ + default: return ERROR(corruption_detected); + } + if (ZSTD_isError(rSize)) + return rSize; + if (dctx->fParams.checksumFlag) + xxh64_update(&dctx->xxhState, dst, rSize); + + if (dctx->stage == ZSTDds_decompressLastBlock) { /* end of frame */ + if (dctx->fParams.checksumFlag) { /* another round for frame checksum */ + dctx->expected = 4; + dctx->stage = ZSTDds_checkChecksum; + } else { + dctx->expected = 0; /* ends here */ + dctx->stage = ZSTDds_getFrameHeaderSize; + } + } else { + dctx->stage = ZSTDds_decodeBlockHeader; + dctx->expected = ZSTD_blockHeaderSize; + dctx->previousDstEnd = (char *)dst + rSize; + } + return rSize; + } + case ZSTDds_checkChecksum: { + U32 const h32 = (U32)xxh64_digest(&dctx->xxhState); + U32 const check32 = ZSTD_readLE32(src); /* srcSize == 4, guaranteed by dctx->expected */ + if (check32 != h32) + return ERROR(checksum_wrong); + dctx->expected = 0; + dctx->stage = ZSTDds_getFrameHeaderSize; + return 0; + } + case ZSTDds_decodeSkippableHeader: { + memcpy(dctx->headerBuffer + ZSTD_frameHeaderSize_prefix, src, dctx->expected); + dctx->expected = ZSTD_readLE32(dctx->headerBuffer + 4); + dctx->stage = ZSTDds_skipFrame; + return 0; + } + case ZSTDds_skipFrame: { + dctx->expected = 0; + dctx->stage = ZSTDds_getFrameHeaderSize; + return 0; + } + default: + return ERROR(GENERIC); /* impossible */ + } +} + +static size_t INIT ZSTD_refDictContent(ZSTD_DCtx *dctx, const void *dict, size_t dictSize) +{ + dctx->dictEnd = dctx->previousDstEnd; + dctx->vBase = (const char *)dict - ((const char *)(dctx->previousDstEnd) - (const char *)(dctx->base)); + dctx->base = dict; + dctx->previousDstEnd = (const char *)dict + dictSize; + return 0; +} + +/* ZSTD_loadEntropy() : + * dict : must point at beginning of a valid zstd dictionary + * @return : size of entropy tables read */ +static size_t INIT ZSTD_loadEntropy(ZSTD_entropyTables_t *entropy, const void *const dict, size_t const dictSize) +{ + const BYTE *dictPtr = (const BYTE *)dict; + const BYTE *const dictEnd = dictPtr + dictSize; + + if (dictSize <= 8) + return ERROR(dictionary_corrupted); + dictPtr += 8; /* skip header = magic + dictID */ + + { + size_t const hSize = HUF_readDTableX4_wksp(entropy->hufTable, dictPtr, dictEnd - dictPtr, entropy->workspace, sizeof(entropy->workspace)); + if (HUF_isError(hSize)) + return ERROR(dictionary_corrupted); + dictPtr += hSize; + } + + { + short offcodeNCount[MaxOff + 1]; + U32 offcodeMaxValue = MaxOff, offcodeLog; + size_t const offcodeHeaderSize = FSE_readNCount(offcodeNCount, &offcodeMaxValue, &offcodeLog, dictPtr, dictEnd - dictPtr); + if (FSE_isError(offcodeHeaderSize)) + return ERROR(dictionary_corrupted); + if (offcodeLog > OffFSELog) + return ERROR(dictionary_corrupted); + CHECK_E(FSE_buildDTable_wksp(entropy->OFTable, offcodeNCount, offcodeMaxValue, offcodeLog, entropy->workspace, sizeof(entropy->workspace)), dictionary_corrupted); + dictPtr += offcodeHeaderSize; + } + + { + short matchlengthNCount[MaxML + 1]; + unsigned matchlengthMaxValue = MaxML, matchlengthLog; + size_t const matchlengthHeaderSize = FSE_readNCount(matchlengthNCount, &matchlengthMaxValue, &matchlengthLog, dictPtr, dictEnd - dictPtr); + if (FSE_isError(matchlengthHeaderSize)) + return ERROR(dictionary_corrupted); + if (matchlengthLog > MLFSELog) + return ERROR(dictionary_corrupted); + CHECK_E(FSE_buildDTable_wksp(entropy->MLTable, matchlengthNCount, matchlengthMaxValue, matchlengthLog, entropy->workspace, sizeof(entropy->workspace)), dictionary_corrupted); + dictPtr += matchlengthHeaderSize; + } + + { + short litlengthNCount[MaxLL + 1]; + unsigned litlengthMaxValue = MaxLL, litlengthLog; + size_t const litlengthHeaderSize = FSE_readNCount(litlengthNCount, &litlengthMaxValue, &litlengthLog, dictPtr, dictEnd - dictPtr); + if (FSE_isError(litlengthHeaderSize)) + return ERROR(dictionary_corrupted); + if (litlengthLog > LLFSELog) + return ERROR(dictionary_corrupted); + CHECK_E(FSE_buildDTable_wksp(entropy->LLTable, litlengthNCount, litlengthMaxValue, litlengthLog, entropy->workspace, sizeof(entropy->workspace)), dictionary_corrupted); + dictPtr += litlengthHeaderSize; + } + + if (dictPtr + 12 > dictEnd) + return ERROR(dictionary_corrupted); + { + int i; + size_t const dictContentSize = (size_t)(dictEnd - (dictPtr + 12)); + for (i = 0; i < 3; i++) { + U32 const rep = ZSTD_readLE32(dictPtr); + dictPtr += 4; + if (rep == 0 || rep >= dictContentSize) + return ERROR(dictionary_corrupted); + entropy->rep[i] = rep; + } + } + + return dictPtr - (const BYTE *)dict; +} + +static size_t INIT ZSTD_decompress_insertDictionary(ZSTD_DCtx *dctx, const void *dict, size_t dictSize) +{ + if (dictSize < 8) + return ZSTD_refDictContent(dctx, dict, dictSize); + { + U32 const magic = ZSTD_readLE32(dict); + if (magic != ZSTD_DICT_MAGIC) { + return ZSTD_refDictContent(dctx, dict, dictSize); /* pure content mode */ + } + } + dctx->dictID = ZSTD_readLE32((const char *)dict + 4); + + /* load entropy tables */ + { + size_t const eSize = ZSTD_loadEntropy(&dctx->entropy, dict, dictSize); + if (ZSTD_isError(eSize)) + return ERROR(dictionary_corrupted); + dict = (const char *)dict + eSize; + dictSize -= eSize; + } + dctx->litEntropy = dctx->fseEntropy = 1; + + /* reference dictionary content */ + return ZSTD_refDictContent(dctx, dict, dictSize); +} + +size_t INIT ZSTD_decompressBegin_usingDict(ZSTD_DCtx *dctx, const void *dict, size_t dictSize) +{ + CHECK_F(ZSTD_decompressBegin(dctx)); + if (dict && dictSize) + CHECK_E(ZSTD_decompress_insertDictionary(dctx, dict, dictSize), dictionary_corrupted); + return 0; +} + +/* ====== ZSTD_DDict ====== */ + +struct ZSTD_DDict_s { + void *dictBuffer; + const void *dictContent; + size_t dictSize; + ZSTD_entropyTables_t entropy; + U32 dictID; + U32 entropyPresent; + ZSTD_customMem cMem; +}; /* typedef'd to ZSTD_DDict within "zstd.h" */ + +size_t INIT ZSTD_DDictWorkspaceBound(void) { return ZSTD_ALIGN(sizeof(ZSTD_stack)) + ZSTD_ALIGN(sizeof(ZSTD_DDict)); } + +static const void *INIT ZSTD_DDictDictContent(const ZSTD_DDict *ddict) { return ddict->dictContent; } + +static size_t INIT ZSTD_DDictDictSize(const ZSTD_DDict *ddict) { return ddict->dictSize; } + +static void INIT ZSTD_refDDict(ZSTD_DCtx *dstDCtx, const ZSTD_DDict *ddict) +{ + ZSTD_decompressBegin(dstDCtx); /* init */ + if (ddict) { /* support refDDict on NULL */ + dstDCtx->dictID = ddict->dictID; + dstDCtx->base = ddict->dictContent; + dstDCtx->vBase = ddict->dictContent; + dstDCtx->dictEnd = (const BYTE *)ddict->dictContent + ddict->dictSize; + dstDCtx->previousDstEnd = dstDCtx->dictEnd; + if (ddict->entropyPresent) { + dstDCtx->litEntropy = 1; + dstDCtx->fseEntropy = 1; + dstDCtx->LLTptr = ddict->entropy.LLTable; + dstDCtx->MLTptr = ddict->entropy.MLTable; + dstDCtx->OFTptr = ddict->entropy.OFTable; + dstDCtx->HUFptr = ddict->entropy.hufTable; + dstDCtx->entropy.rep[0] = ddict->entropy.rep[0]; + dstDCtx->entropy.rep[1] = ddict->entropy.rep[1]; + dstDCtx->entropy.rep[2] = ddict->entropy.rep[2]; + } else { + dstDCtx->litEntropy = 0; + dstDCtx->fseEntropy = 0; + } + } +} + +static size_t INIT ZSTD_loadEntropy_inDDict(ZSTD_DDict *ddict) +{ + ddict->dictID = 0; + ddict->entropyPresent = 0; + if (ddict->dictSize < 8) + return 0; + { + U32 const magic = ZSTD_readLE32(ddict->dictContent); + if (magic != ZSTD_DICT_MAGIC) + return 0; /* pure content mode */ + } + ddict->dictID = ZSTD_readLE32((const char *)ddict->dictContent + 4); + + /* load entropy tables */ + CHECK_E(ZSTD_loadEntropy(&ddict->entropy, ddict->dictContent, ddict->dictSize), dictionary_corrupted); + ddict->entropyPresent = 1; + return 0; +} + +static ZSTD_DDict *INIT ZSTD_createDDict_advanced(const void *dict, size_t dictSize, unsigned byReference, ZSTD_customMem customMem) +{ + if (!customMem.customAlloc || !customMem.customFree) + return NULL; + + { + ZSTD_DDict *const ddict = (ZSTD_DDict *)ZSTD_malloc(sizeof(ZSTD_DDict), customMem); + if (!ddict) + return NULL; + ddict->cMem = customMem; + + if ((byReference) || (!dict) || (!dictSize)) { + ddict->dictBuffer = NULL; + ddict->dictContent = dict; + } else { + void *const internalBuffer = ZSTD_malloc(dictSize, customMem); + if (!internalBuffer) { + ZSTD_freeDDict(ddict); + return NULL; + } + memcpy(internalBuffer, dict, dictSize); + ddict->dictBuffer = internalBuffer; + ddict->dictContent = internalBuffer; + } + ddict->dictSize = dictSize; + ddict->entropy.hufTable[0] = (HUF_DTable)((HufLog)*0x1000001); /* cover both little and big endian */ + /* parse dictionary content */ + { + size_t const errorCode = ZSTD_loadEntropy_inDDict(ddict); + if (ZSTD_isError(errorCode)) { + ZSTD_freeDDict(ddict); + return NULL; + } + } + + return ddict; + } +} + +/*! ZSTD_initDDict() : +* Create a digested dictionary, to start decompression without startup delay. +* `dict` content is copied inside DDict. +* Consequently, `dict` can be released after `ZSTD_DDict` creation */ +ZSTD_DDict *INIT ZSTD_initDDict(const void *dict, size_t dictSize, void *workspace, size_t workspaceSize) +{ + ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize); + return ZSTD_createDDict_advanced(dict, dictSize, 1, stackMem); +} + +size_t INIT ZSTD_freeDDict(ZSTD_DDict *ddict) +{ + if (ddict == NULL) + return 0; /* support free on NULL */ + { + ZSTD_customMem const cMem = ddict->cMem; + ZSTD_free(ddict->dictBuffer, cMem); + ZSTD_free(ddict, cMem); + return 0; + } +} + +/*! ZSTD_getDictID_fromDict() : + * Provides the dictID stored within dictionary. + * if @return == 0, the dictionary is not conformant with Zstandard specification. + * It can still be loaded, but as a content-only dictionary. */ +unsigned INIT ZSTD_getDictID_fromDict(const void *dict, size_t dictSize) +{ + if (dictSize < 8) + return 0; + if (ZSTD_readLE32(dict) != ZSTD_DICT_MAGIC) + return 0; + return ZSTD_readLE32((const char *)dict + 4); +} + +/*! ZSTD_getDictID_fromDDict() : + * Provides the dictID of the dictionary loaded into `ddict`. + * If @return == 0, the dictionary is not conformant to Zstandard specification, or empty. + * Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */ +unsigned INIT ZSTD_getDictID_fromDDict(const ZSTD_DDict *ddict) +{ + if (ddict == NULL) + return 0; + return ZSTD_getDictID_fromDict(ddict->dictContent, ddict->dictSize); +} + +/*! ZSTD_getDictID_fromFrame() : + * Provides the dictID required to decompressed the frame stored within `src`. + * If @return == 0, the dictID could not be decoded. + * This could for one of the following reasons : + * - The frame does not require a dictionary to be decoded (most common case). + * - The frame was built with dictID intentionally removed. Whatever dictionary is necessary is a hidden information. + * Note : this use case also happens when using a non-conformant dictionary. + * - `srcSize` is too small, and as a result, the frame header could not be decoded (only possible if `srcSize < ZSTD_FRAMEHEADERSIZE_MAX`). + * - This is not a Zstandard frame. + * When identifying the exact failure cause, it's possible to used ZSTD_getFrameParams(), which will provide a more precise error code. */ +unsigned INIT ZSTD_getDictID_fromFrame(const void *src, size_t srcSize) +{ + ZSTD_frameParams zfp = {0, 0, 0, 0}; + size_t const hError = ZSTD_getFrameParams(&zfp, src, srcSize); + if (ZSTD_isError(hError)) + return 0; + return zfp.dictID; +} + +/*! ZSTD_decompress_usingDDict() : +* Decompression using a pre-digested Dictionary +* Use dictionary without significant overhead. */ +size_t INIT ZSTD_decompress_usingDDict(ZSTD_DCtx *dctx, void *dst, size_t dstCapacity, const void *src, size_t srcSize, const ZSTD_DDict *ddict) +{ + /* pass content and size in case legacy frames are encountered */ + return ZSTD_decompressMultiFrame(dctx, dst, dstCapacity, src, srcSize, NULL, 0, ddict); +} + +/*===================================== +* Streaming decompression +*====================================*/ + +typedef enum { zdss_init, zdss_loadHeader, zdss_read, zdss_load, zdss_flush } ZSTD_dStreamStage; + +/* *** Resource management *** */ +struct ZSTD_DStream_s { + ZSTD_DCtx *dctx; + ZSTD_DDict *ddictLocal; + const ZSTD_DDict *ddict; + ZSTD_frameParams fParams; + ZSTD_dStreamStage stage; + char *inBuff; + size_t inBuffSize; + size_t inPos; + size_t maxWindowSize; + char *outBuff; + size_t outBuffSize; + size_t outStart; + size_t outEnd; + size_t blockSize; + BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX]; /* tmp buffer to store frame header */ + size_t lhSize; + ZSTD_customMem customMem; + void *legacyContext; + U32 previousLegacyVersion; + U32 legacyVersion; + U32 hostageByte; +}; /* typedef'd to ZSTD_DStream within "zstd.h" */ + +size_t INIT ZSTD_DStreamWorkspaceBound(size_t maxWindowSize) +{ + size_t const blockSize = MIN(maxWindowSize, ZSTD_BLOCKSIZE_ABSOLUTEMAX); + size_t const inBuffSize = blockSize; + size_t const outBuffSize = maxWindowSize + blockSize + WILDCOPY_OVERLENGTH * 2; + return ZSTD_DCtxWorkspaceBound() + ZSTD_ALIGN(sizeof(ZSTD_DStream)) + ZSTD_ALIGN(inBuffSize) + ZSTD_ALIGN(outBuffSize); +} + +static ZSTD_DStream *INIT ZSTD_createDStream_advanced(ZSTD_customMem customMem) +{ + ZSTD_DStream *zds; + + if (!customMem.customAlloc || !customMem.customFree) + return NULL; + + zds = (ZSTD_DStream *)ZSTD_malloc(sizeof(ZSTD_DStream), customMem); + if (zds == NULL) + return NULL; + memset(zds, 0, sizeof(ZSTD_DStream)); + memcpy(&zds->customMem, &customMem, sizeof(ZSTD_customMem)); + zds->dctx = ZSTD_createDCtx_advanced(customMem); + if (zds->dctx == NULL) { + ZSTD_freeDStream(zds); + return NULL; + } + zds->stage = zdss_init; + zds->maxWindowSize = ZSTD_MAXWINDOWSIZE_DEFAULT; + return zds; +} + +ZSTD_DStream *INIT ZSTD_initDStream(size_t maxWindowSize, void *workspace, size_t workspaceSize) +{ + ZSTD_customMem const stackMem = ZSTD_initStack(workspace, workspaceSize); + ZSTD_DStream *zds = ZSTD_createDStream_advanced(stackMem); + if (!zds) { + return NULL; + } + From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 06:33:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 06:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70155.125850 (Exim 4.92) (envelope-from ) id 1l1ka5-0000lg-NF; Tue, 19 Jan 2021 06:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70155.125850; Tue, 19 Jan 2021 06: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 1l1ka5-0000lY-KE; Tue, 19 Jan 2021 06:33:33 +0000 Received: by outflank-mailman (input) for mailman id 70155; Tue, 19 Jan 2021 06:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1ka4-0000lT-Gg for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1ka4-0002DN-Fp for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1ka4-0003BA-DZ for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YYJpouoeXkEA1Opn2g09QcSS0iHNRq0EWztIDRY3m00=; b=K+AN8e9zQVJg8omgb7y6RXZhA5 TG7JMxBywcVRw9SabbnwZ9poMKOPybU0aE7KOsc2z31hgodZaL6wHPpzdJM15fxA9FAyJqAVXOADt Qp0lLdfl6o8T/oaSWifqdYCt0V/58h1vIYYYfH86kHMVqLkT9emFlTitn4bIlBVqbjUA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] gnttab: adjust pin count overflow checks Message-Id: Date: Tue, 19 Jan 2021 06:33:32 +0000 commit 8cec5d065c243e54cae97aaa14b0de447883c278 Author: Jan Beulich AuthorDate: Mon Jan 18 12:13:42 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 18 12:13:42 2021 +0100 gnttab: adjust pin count overflow checks It's at least odd to check counters which aren't going to be incremented, resulting in failure just because prior operations may have reached the refcount limit. And it's also not helpful to use open-coded literal numbers in these checks. Calculate the increment values first and derive from them the mask to use in the checks. Also move the pin count checks ahead of the calculation of the status (and for copy also sha2) pointers: They're not needed in the failure cases, and this way the compiler may also have an easier time keeping the variables at least transiently in registers for the subsequent uses. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/common/grant_table.c | 85 ++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 35 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index a5d3ed8bda..3c75116933 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -322,23 +322,38 @@ shared_entry_header(struct grant_table *t, grant_ref_t ref) /* Active grant entry - used for shadowing GTF_permit_access grants. */ struct active_grant_entry { - uint32_t pin; /* Reference count information: */ +/* + * 4x byte-wide reference counts, for {host,device}{read,write} mappings, + * implemented as a single 32-bit (presumably to optimise checking for any + * reference). + */ + uint32_t pin; + /* Width of the individual counter fields. */ +#define GNTPIN_cntr_width 8 +#define GNTPIN_cntr_mask ((1U << GNTPIN_cntr_width) - 1) /* Count of writable host-CPU mappings. */ #define GNTPIN_hstw_shift 0 #define GNTPIN_hstw_inc (1U << GNTPIN_hstw_shift) -#define GNTPIN_hstw_mask (0xFFU << GNTPIN_hstw_shift) +#define GNTPIN_hstw_mask (GNTPIN_cntr_mask << GNTPIN_hstw_shift) /* Count of read-only host-CPU mappings. */ -#define GNTPIN_hstr_shift 8 +#define GNTPIN_hstr_shift (GNTPIN_hstw_shift + GNTPIN_cntr_width) #define GNTPIN_hstr_inc (1U << GNTPIN_hstr_shift) -#define GNTPIN_hstr_mask (0xFFU << GNTPIN_hstr_shift) +#define GNTPIN_hstr_mask (GNTPIN_cntr_mask << GNTPIN_hstr_shift) /* Count of writable device-bus mappings. */ -#define GNTPIN_devw_shift 16 +#define GNTPIN_devw_shift (GNTPIN_hstr_shift + GNTPIN_cntr_width) #define GNTPIN_devw_inc (1U << GNTPIN_devw_shift) -#define GNTPIN_devw_mask (0xFFU << GNTPIN_devw_shift) +#define GNTPIN_devw_mask (GNTPIN_cntr_mask << GNTPIN_devw_shift) /* Count of read-only device-bus mappings. */ -#define GNTPIN_devr_shift 24 +#define GNTPIN_devr_shift (GNTPIN_devw_shift + GNTPIN_cntr_width) #define GNTPIN_devr_inc (1U << GNTPIN_devr_shift) -#define GNTPIN_devr_mask (0xFFU << GNTPIN_devr_shift) +#define GNTPIN_devr_mask (GNTPIN_cntr_mask << GNTPIN_devr_shift) + +/* Convert a combination of GNTPIN_*_inc to an overflow checking mask. */ +#define GNTPIN_incr2oflow_mask(x) ({ \ + ASSERT(!((x) & ~(GNTPIN_hstw_inc | GNTPIN_hstr_inc | \ + GNTPIN_devw_inc | GNTPIN_devr_inc))); \ + (x) << (GNTPIN_cntr_width - 1); \ +}) domid_t domid; /* Domain being granted access. */ unsigned int start:15; /* For sub-page grants, the start offset @@ -988,7 +1003,8 @@ map_grant_ref( mfn_t mfn; struct page_info *pg = NULL; int rc = GNTST_okay; - unsigned int cache_flags, clear_flags = 0, refcnt = 0, typecnt = 0; + unsigned int cache_flags, clear_flags = 0, refcnt = 0, typecnt = 0, + pin_incr = 0; bool host_map_created = false; struct active_grant_entry *act = NULL; struct grant_mapping *mt; @@ -998,7 +1014,14 @@ map_grant_ref( ld = current->domain; - if ( unlikely((op->flags & (GNTMAP_device_map|GNTMAP_host_map)) == 0) ) + if ( op->flags & GNTMAP_device_map ) + pin_incr += (op->flags & GNTMAP_readonly) ? GNTPIN_devr_inc + : GNTPIN_devw_inc; + if ( op->flags & GNTMAP_host_map ) + pin_incr += (op->flags & GNTMAP_readonly) ? GNTPIN_hstr_inc + : GNTPIN_hstw_inc; + + if ( unlikely(!pin_incr) ) { gdprintk(XENLOG_INFO, "Bad flags in grant map op: %x\n", op->flags); op->status = GNTST_bad_gntref; @@ -1052,19 +1075,19 @@ map_grant_ref( shah = shared_entry_header(rgt, ref); act = active_entry_acquire(rgt, ref); - /* Make sure we do not access memory speculatively */ - status = evaluate_nospec(rgt->gt_version == 1) ? &shah->flags - : &status_entry(rgt, ref); - /* If already pinned, check the active domid and avoid refcnt overflow. */ if ( act->pin && ((act->domid != ld->domain_id) || - (act->pin & 0x80808080U) != 0 || + (act->pin & GNTPIN_incr2oflow_mask(pin_incr)) || (act->is_sub_page)) ) PIN_FAIL(act_release_out, GNTST_general_error, "Bad domain (%d != %d), or risk of counter overflow %08x, or subpage %d\n", act->domid, ld->domain_id, act->pin, act->is_sub_page); + /* Make sure we do not access memory speculatively */ + status = evaluate_nospec(rgt->gt_version == 1) ? &shah->flags + : &status_entry(rgt, ref); + if ( !act->pin || (!(op->flags & GNTMAP_readonly) && !(act->pin & (GNTPIN_hstw_mask|GNTPIN_devw_mask))) ) @@ -1095,12 +1118,7 @@ map_grant_ref( } } - if ( op->flags & GNTMAP_device_map ) - act->pin += (op->flags & GNTMAP_readonly) ? - GNTPIN_devr_inc : GNTPIN_devw_inc; - if ( op->flags & GNTMAP_host_map ) - act->pin += (op->flags & GNTMAP_readonly) ? - GNTPIN_hstr_inc : GNTPIN_hstw_inc; + act->pin += pin_incr; mfn = act->mfn; @@ -1275,13 +1293,7 @@ map_grant_ref( grant_read_lock(rgt); act = active_entry_acquire(rgt, op->ref); - - if ( op->flags & GNTMAP_device_map ) - act->pin -= (op->flags & GNTMAP_readonly) ? - GNTPIN_devr_inc : GNTPIN_devw_inc; - if ( op->flags & GNTMAP_host_map ) - act->pin -= (op->flags & GNTMAP_readonly) ? - GNTPIN_hstr_inc : GNTPIN_hstw_inc; + act->pin -= pin_incr; unlock_out_clear: if ( !(op->flags & GNTMAP_readonly) && @@ -2516,6 +2528,7 @@ acquire_grant_for_copy( uint16_t trans_length; bool is_sub_page; s16 rc = GNTST_okay; + unsigned int pin_incr = readonly ? GNTPIN_hstr_inc : GNTPIN_hstw_inc; unsigned int clear_flags = 0; *page = NULL; @@ -2530,6 +2543,14 @@ acquire_grant_for_copy( shah = shared_entry_header(rgt, gref); act = active_entry_acquire(rgt, gref); + /* If already pinned, check the active domid and avoid refcnt overflow. */ + if ( act->pin && + ((act->domid != ldom) || + (act->pin & GNTPIN_incr2oflow_mask(pin_incr))) ) + PIN_FAIL(unlock_out, GNTST_general_error, + "Bad domain (%d != %d), or risk of counter overflow %08x\n", + act->domid, ldom, act->pin); + if ( evaluate_nospec(rgt->gt_version == 1) ) { sha2 = NULL; @@ -2541,12 +2562,6 @@ acquire_grant_for_copy( status = &status_entry(rgt, gref); } - /* If already pinned, check the active domid and avoid refcnt overflow. */ - if ( act->pin && ((act->domid != ldom) || (act->pin & 0x80808080U) != 0) ) - PIN_FAIL(unlock_out, GNTST_general_error, - "Bad domain (%d != %d), or risk of counter overflow %08x\n", - act->domid, ldom, act->pin); - old_pin = act->pin; if ( sha2 && (shah->flags & GTF_type_mask) == GTF_transitive ) { @@ -2728,7 +2743,7 @@ acquire_grant_for_copy( } } - act->pin += readonly ? GNTPIN_hstr_inc : GNTPIN_hstw_inc; + act->pin += pin_incr; *page_off = act->start; *length = act->length; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 06:33:43 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 06:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70156.125854 (Exim 4.92) (envelope-from ) id 1l1kaF-0000n2-P4; Tue, 19 Jan 2021 06:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70156.125854; Tue, 19 Jan 2021 06: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 1l1kaF-0000mt-Lm; Tue, 19 Jan 2021 06:33:43 +0000 Received: by outflank-mailman (input) for mailman id 70156; Tue, 19 Jan 2021 06:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1kaE-0000mm-LO for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1kaE-0002Da-KC for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1kaE-0003Be-I3 for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Sgidfu6h8ZOTOawLfaVUgMkq94lM+6M7O9Rb08eFyQ4=; b=a1TLkF9Rqgfxi4vRyXm5siHjxI 6n4GgdSkfDH7bpPfFwEoO6Aqy36eyH/DFokZNvpOI/Z4yVGNPFoGDerfcjRR+o5Qhr395R3c04ihe i34mLzsA0/fgYgwVaHwvaVHj6y021NvJZX+2H2iG/iOOw5eRNSgjrXLSfIqKbYtA0JnI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] gnttab: consolidate pin-to-status syncing Message-Id: Date: Tue, 19 Jan 2021 06:33:42 +0000 commit b066d57183548ae199acdf6a0022e012e324a7b2 Author: Jan Beulich AuthorDate: Mon Jan 18 12:14:19 2021 +0100 Commit: Jan Beulich CommitDate: Mon Jan 18 12:14:19 2021 +0100 gnttab: consolidate pin-to-status syncing Forever since the fix for XSA-230 the 2nd of the comments ahead of fixup_status_for_copy_pin() has been stale - there's nothing specific to transitive grants there anymore. Move the function up, drop the "copy" part from its name again, add a "readonly" parameter, and use it also on other paths having decremented one (or not having got to increment any) of the pin counts. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/common/grant_table.c | 99 +++++++++++++----------------------------------- 1 file changed, 27 insertions(+), 72 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 3c75116933..b24bce0f9f 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -920,6 +920,25 @@ static int _set_status(const grant_entry_header_t *shah, return _set_status_v2(shah, status, rd, act, readonly, mapflag, ldomid); } +/* + * The status for a grant may indicate that we're taking more access than + * the pin requires. Reduce the status to match the pin. Called with the + * domain's grant table lock held at least in read mode and with the active + * entry lock held (iow act->pin can't change behind our backs). + */ +static void reduce_status_for_pin(struct domain *rd, + const struct active_grant_entry *act, + uint16_t *status, bool readonly) +{ + unsigned int clear_flags = act->pin ? 0 : GTF_reading; + + if ( !readonly && !(act->pin & (GNTPIN_hstw_mask | GNTPIN_devw_mask)) ) + clear_flags |= GTF_writing; + + if ( clear_flags ) + gnttab_clear_flags(rd, clear_flags, status); +} + static struct active_grant_entry *grant_map_exists(const struct domain *ld, struct grant_table *rgt, mfn_t mfn, @@ -1003,8 +1022,7 @@ map_grant_ref( mfn_t mfn; struct page_info *pg = NULL; int rc = GNTST_okay; - unsigned int cache_flags, clear_flags = 0, refcnt = 0, typecnt = 0, - pin_incr = 0; + unsigned int cache_flags, refcnt = 0, typecnt = 0, pin_incr = 0; bool host_map_created = false; struct active_grant_entry *act = NULL; struct grant_mapping *mt; @@ -1296,15 +1314,7 @@ map_grant_ref( act->pin -= pin_incr; unlock_out_clear: - if ( !(op->flags & GNTMAP_readonly) && - !(act->pin & (GNTPIN_hstw_mask|GNTPIN_devw_mask)) ) - clear_flags |= GTF_writing; - - if ( !act->pin ) - clear_flags |= GTF_reading; - - if ( clear_flags ) - gnttab_clear_flags(rd, clear_flags, status); + reduce_status_for_pin(rd, act, status, op->flags & GNTMAP_readonly); act_release_out: active_entry_release(act); @@ -1519,7 +1529,6 @@ unmap_common_complete(struct gnttab_unmap_common *op) grant_entry_header_t *sha; struct page_info *pg; uint16_t *status; - unsigned int clear_flags = 0; if ( evaluate_nospec(!op->done) ) { @@ -1578,15 +1587,7 @@ unmap_common_complete(struct gnttab_unmap_common *op) act->pin -= GNTPIN_hstw_inc; } - if ( ((act->pin & (GNTPIN_devw_mask|GNTPIN_hstw_mask)) == 0) && - !(op->done & GNTMAP_readonly) ) - clear_flags |= GTF_writing; - - if ( act->pin == 0 ) - clear_flags |= GTF_reading; - - if ( clear_flags ) - gnttab_clear_flags(rd, clear_flags, status); + reduce_status_for_pin(rd, act, status, op->done & GNTMAP_readonly); active_entry_release(act); grant_read_unlock(rgt); @@ -2426,7 +2427,6 @@ release_grant_for_copy( uint16_t *status; grant_ref_t trans_gref; struct domain *td; - unsigned int clear_flags = 0; grant_read_lock(rgt); @@ -2456,15 +2456,9 @@ release_grant_for_copy( gnttab_mark_dirty(rd, mfn); act->pin -= GNTPIN_hstw_inc; - if ( !(act->pin & (GNTPIN_devw_mask|GNTPIN_hstw_mask)) ) - clear_flags |= GTF_writing; } - if ( !act->pin ) - clear_flags |= GTF_reading; - - if ( clear_flags ) - gnttab_clear_flags(rd, clear_flags, status); + reduce_status_for_pin(rd, act, status, readonly); active_entry_release(act); grant_read_unlock(rgt); @@ -2481,27 +2475,6 @@ release_grant_for_copy( } } -/* The status for a grant indicates that we're taking more access than - the pin requires. Fix up the status to match the pin. Called - under the domain's grant table lock. */ -/* Only safe on transitive grants. Even then, note that we don't - attempt to drop any pin on the referent grant. */ -static void fixup_status_for_copy_pin(struct domain *rd, - const struct active_grant_entry *act, - uint16_t *status) -{ - unsigned int clear_flags = 0; - - if ( !(act->pin & (GNTPIN_hstw_mask | GNTPIN_devw_mask)) ) - clear_flags |= GTF_writing; - - if ( !act->pin ) - clear_flags |= GTF_reading; - - if ( clear_flags ) - gnttab_clear_flags(rd, clear_flags, status); -} - /* * Grab a machine frame number from a grant entry and update the flags * and pin count as appropriate. If rc == GNTST_okay, note that this *does* @@ -2529,7 +2502,6 @@ acquire_grant_for_copy( bool is_sub_page; s16 rc = GNTST_okay; unsigned int pin_incr = readonly ? GNTPIN_hstr_inc : GNTPIN_hstw_inc; - unsigned int clear_flags = 0; *page = NULL; @@ -2616,8 +2588,8 @@ acquire_grant_for_copy( if ( rc != GNTST_okay ) { - fixup_status_for_copy_pin(rd, act, status); rcu_unlock_domain(td); + reduce_status_for_pin(rd, act, status, readonly); active_entry_release(act); grant_read_unlock(rgt); return rc; @@ -2639,8 +2611,8 @@ acquire_grant_for_copy( !act->is_sub_page)) ) { release_grant_for_copy(td, trans_gref, readonly); - fixup_status_for_copy_pin(rd, act, status); rcu_unlock_domain(td); + reduce_status_for_pin(rd, act, status, readonly); active_entry_release(act); grant_read_unlock(rgt); put_page(*page); @@ -2754,15 +2726,7 @@ acquire_grant_for_copy( return rc; unlock_out_clear: - if ( !(readonly) && - !(act->pin & (GNTPIN_hstw_mask | GNTPIN_devw_mask)) ) - clear_flags |= GTF_writing; - - if ( !act->pin ) - clear_flags |= GTF_reading; - - if ( clear_flags ) - gnttab_clear_flags(rd, clear_flags, status); + reduce_status_for_pin(rd, act, status, readonly); unlock_out: active_entry_release(act); @@ -3732,8 +3696,6 @@ gnttab_release_mappings( for ( handle = 0; handle < gt->maptrack_limit; handle++ ) { - unsigned int clear_flags = 0; - map = &maptrack_entry(gt, handle); if ( !(map->flags & (GNTMAP_device_map|GNTMAP_host_map)) ) continue; @@ -3806,16 +3768,9 @@ gnttab_release_mappings( put_page(pg); } } - - if ( (act->pin & (GNTPIN_devw_mask|GNTPIN_hstw_mask)) == 0 ) - clear_flags |= GTF_writing; } - if ( act->pin == 0 ) - clear_flags |= GTF_reading; - - if ( clear_flags ) - gnttab_clear_flags(rd, clear_flags, status); + reduce_status_for_pin(rd, act, status, map->flags & GNTMAP_readonly); active_entry_release(act); grant_read_unlock(rgt); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 06:33:53 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 06:33:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70157.125858 (Exim 4.92) (envelope-from ) id 1l1kaP-0000oF-QR; Tue, 19 Jan 2021 06:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70157.125858; Tue, 19 Jan 2021 06:33:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1kaP-0000o7-NU; Tue, 19 Jan 2021 06:33:53 +0000 Received: by outflank-mailman (input) for mailman id 70157; Tue, 19 Jan 2021 06:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1kaO-0000nz-OK for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1kaO-0002Dl-Nc for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1kaO-0003CA-MI for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 06: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=pSHrROBXEdEiMGKR/F+60kxUZbE+zZZTVVlXnvRTnsE=; b=AtFLZpylp/y0tCUGOdmF7WCwUc cnNJFeWKxWpqjZPqwhleZsNEM8uY9oMdz3OqWJQnzdHH0uulhIXycuiswIA/A6TYX8CqzHhx6C8vU LczAznzB3AwYthA+/CsGzv0t4/fqE3vRa5IbWo6FZfUc6LuSrwxL9KqHlWje0Vv0odrA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxenhypfs: fix reading of gzipped string Message-Id: Date: Tue, 19 Jan 2021 06:33:52 +0000 commit 971275352691869b227f11b92d21303c567ddfb3 Author: Juergen Gross AuthorDate: Mon Jan 18 13:06:28 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 18 13:52:40 2021 +0000 tools/libxenhypfs: fix reading of gzipped string Reading a gzipped string value from hypfs doesn't add a 0 byte at the end. Fix that. Fixes: 86234eafb95295 ("libs: add libxenhypfs") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper --- tools/libs/hypfs/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/libs/hypfs/core.c b/tools/libs/hypfs/core.c index f94c5ea1e2..52b30db8d7 100644 --- a/tools/libs/hypfs/core.c +++ b/tools/libs/hypfs/core.c @@ -146,12 +146,13 @@ static void *xenhypfs_inflate(void *in_data, size_t *sz) break; out_sz = z.next_out - workbuf; - content = realloc(content, *sz + out_sz); + content = realloc(content, *sz + out_sz + 1); if (!content) { ret = Z_MEM_ERROR; break; } memcpy(content + *sz, workbuf, out_sz); + *(char *)(content + *sz + out_sz) = 0; } inflateEnd(&z); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 15:11:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 15:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70472.126480 (Exim 4.92) (envelope-from ) id 1l1sew-0003ut-HX; Tue, 19 Jan 2021 15:11:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70472.126480; Tue, 19 Jan 2021 15: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 1l1sew-0003uk-EM; Tue, 19 Jan 2021 15:11:06 +0000 Received: by outflank-mailman (input) for mailman id 70472; Tue, 19 Jan 2021 15:11:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1sev-0003uf-3v for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 15:11:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1sev-00030b-0K for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 15:11:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1seu-0005O4-Vb for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 15: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=Q5tFAxaqpXWLwsmEBVYyj6VoKA4OuyG4mV33jkiPFUw=; b=4ze7ywi4EYKErhHnYE63D6CqoU JXyj27VqLp6RA/oo8vpFOfRrgEUnojyuAk3fSNNpu6JJ81Xi0wd39b9TE6o0RyOgOBnzgfLtQ+ZTW E3cLCkOkT5iMnjMvPHP/dXza1ijqyvl9yvqqQ0FuUK4upnimkP3a4sAMeQsOFM2PC+sU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] kconfig: ensure strndup() declaration is visible Message-Id: Date: Tue, 19 Jan 2021 15:11:04 +0000 commit 0f4fd0de7532c08bdd77a46f101e5ca1220cd163 Author: Jan Beulich AuthorDate: Tue Jan 19 16:03:41 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 19 16:03:41 2021 +0100 kconfig: ensure strndup() declaration is visible Its guard was updated such that it is visible by default when POSIX 2008 was adopted by glibc. It's not visible by default on older glibc. Fixes: f80fe2b34f08 ("xen: Update Kconfig to Linux v5.4") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Doug Goldstein --- xen/tools/kconfig/parser.y | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/tools/kconfig/parser.y b/xen/tools/kconfig/parser.y index 60936c7686..822fc89fc8 100644 --- a/xen/tools/kconfig/parser.y +++ b/xen/tools/kconfig/parser.y @@ -4,6 +4,7 @@ */ %{ +#define _GNU_SOURCE #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 15:11:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 15:11:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70473.126483 (Exim 4.92) (envelope-from ) id 1l1sf6-0003vc-Is; Tue, 19 Jan 2021 15:11:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70473.126483; Tue, 19 Jan 2021 15: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 1l1sf6-0003vV-Fv; Tue, 19 Jan 2021 15:11:16 +0000 Received: by outflank-mailman (input) for mailman id 70473; Tue, 19 Jan 2021 15:11:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1sf5-0003vL-5e for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 15:11:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1sf5-00030x-3o for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 15:11:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1sf5-0005On-2Z for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 15:11:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=A6tnAYIhuoCNslVS+mrruaSzaSeF2YOA+kStPvqtEtQ=; b=chn7gZROPGqBCF8JG9SbcCo88J MlO6vc3Tgwhss0iWJ+GBJJdAdbMW/jxo7Q0gi9ufmtz5oQBux1gaJSe/s9Y/O9ZiVqBqikEcOpwBx Gp2HkaqUBGwujaz2C+4NJXkp5CxnhEfgeZ2U4KScrhtWt1TcjfnQXOySxk5qO6uWcKj0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/CPUID: unconditionally set XEN_HVM_CPUID_IOMMU_MAPPINGS Message-Id: Date: Tue, 19 Jan 2021 15:11:15 +0000 commit b7f462872ab1e7de8d3e02f9e71dee11d0fd3560 Author: Roger Pau Monné AuthorDate: Tue Jan 19 16:04:06 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 19 16:04:06 2021 +0100 x86/CPUID: unconditionally set XEN_HVM_CPUID_IOMMU_MAPPINGS This is a revert of f5cfa0985673 plus a rework of the comment that accompanies the setting of the flag so we don't forget why it needs to be unconditionally set: it's indicating whether the version of Xen has the original issue fixed and IOMMU entries are created for grant/foreign maps. If the flag is only exposed when the IOMMU is enabled the guest could resort to use bounce buffers when running backends as it would assume the underlying Xen version still has the bug present and thus grant/foreign maps cannot be used with devices. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/arch/x86/traps.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 4bd2cb6a1a..a6f1d45e77 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1049,11 +1049,17 @@ void cpuid_hypervisor_leaves(const struct vcpu *v, uint32_t leaf, res->a |= XEN_HVM_CPUID_X2APIC_VIRT; /* - * Indicate that memory mapped from other domains (either grants or - * foreign pages) has valid IOMMU entries. + * 1) Xen 4.10 and older was broken WRT grant maps requesting a DMA + * mapping, and forgot to honour the guest's request. + * 2) 4.11 (and presumably backports) fixed the bug, so the map + * hypercall actually did what the guest asked. + * 3) To work around the bug, guests must bounce buffer all DMA that + * would otherwise use a grant map, because it doesn't know whether the + * DMA is originating from an emulated or a real device. + * 4) This flag tells guests it is safe not to bounce-buffer all DMA to + * work around the bug. */ - if ( is_iommu_enabled(d) ) - res->a |= XEN_HVM_CPUID_IOMMU_MAPPINGS; + res->a |= XEN_HVM_CPUID_IOMMU_MAPPINGS; /* Indicate presence of vcpu id and set it in ebx */ res->a |= XEN_HVM_CPUID_VCPU_ID_PRESENT; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 15:33:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 15:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.70538.126615 (Exim 4.92) (envelope-from ) id 1l1t0F-00074S-CM; Tue, 19 Jan 2021 15:33:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 70538.126615; Tue, 19 Jan 2021 15:33:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1t0F-00074K-8i; Tue, 19 Jan 2021 15:33:07 +0000 Received: by outflank-mailman (input) for mailman id 70538; Tue, 19 Jan 2021 15:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1t0D-00074F-S5 for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 15:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1t0D-0003Pe-PV for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 15:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1t0D-0006v1-Na for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 15: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=3pPL0A/7KpX+gCbCwIVYS67m6aaXI6Rz/Qz2z7raP4E=; b=Ul/Z1lUPUYr+xXbE23XhxMNkg9 auiez4Vbv8D4HNfBsWlN2LmMIuPWOL2E/VytK+j0+HrQ4rWIUHeoAWEr+10svomak8jLjcRwbCzNR kUQY28CtrEg8tLdeXxdYjUm0yAa/KN5msWJThx6LndYT+0xwrVQwH1fZhSJ/Bbechvlw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/domain: Introduce vcpu_teardown() Message-Id: Date: Tue, 19 Jan 2021 15:33:05 +0000 commit a59e56b65c410792f2e75ac36251e9a911c43109 Author: Andrew Cooper AuthorDate: Mon Sep 28 14:17:02 2020 +0100 Commit: Andrew Cooper CommitDate: Tue Jan 19 15:27:50 2021 +0000 xen/domain: Introduce vcpu_teardown() Similarly to c/s 98d4d6d8a6 "xen/domain: Introduce domain_teardown()", introduce a common mechanism for restartable per-vcpu teardown logic. Extend the PROGRESS() mechanism to support saving and restoring the vcpu loop variable across hypercalls. This will eventually supersede domain_reliquish_resources(), and reduce the quantity of redundant logic performed. No functional change (yet). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/domain.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- xen/include/xen/sched.h | 1 + 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 164c9d14e9..2b461655c3 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -130,6 +130,22 @@ static void vcpu_info_reset(struct vcpu *v) v->vcpu_info_mfn = INVALID_MFN; } +/* + * Release resources held by a vcpu. There may or may not be live references + * to the vcpu, and it may or may not be fully constructed. + * + * If d->is_dying is DOMDYING_dead, this must not return non-zero. + */ +static int vcpu_teardown(struct vcpu *v) +{ + return 0; +} + +/* + * Destoy a vcpu once all references to it have been dropped. Used either + * from domain_destroy()'s RCU path, or from the vcpu_create() error path + * before the vcpu is placed on the domain's vcpu list. + */ static void vcpu_destroy(struct vcpu *v) { free_vcpu_struct(v); @@ -206,6 +222,11 @@ struct vcpu *vcpu_create(struct domain *d, unsigned int vcpu_id) sched_destroy_vcpu(v); fail_wq: destroy_waitqueue_vcpu(v); + + /* Must not hit a continuation in this context. */ + if ( vcpu_teardown(v) ) + ASSERT_UNREACHABLE(); + vcpu_destroy(v); return NULL; @@ -284,6 +305,9 @@ custom_param("extra_guest_irqs", parse_extra_guest_irqs); */ static int domain_teardown(struct domain *d) { + struct vcpu *v; + int rc; + BUG_ON(!d->is_dying); /* @@ -298,7 +322,9 @@ static int domain_teardown(struct domain *d) * will logically restart work from this point. * * PROGRESS() markers must not be in the middle of loops. The loop - * variable isn't preserved across a continuation. + * variable isn't preserved across a continuation. PROGRESS_VCPU() + * markers may be used in the middle of for_each_vcpu() loops, which + * preserve v but no other loop variables. * * To avoid redundant work, there should be a marker before each * function which may return -ERESTART. @@ -308,14 +334,32 @@ static int domain_teardown(struct domain *d) /* Fallthrough */ \ case PROG_ ## x +#define PROGRESS_VCPU(x) \ + d->teardown.val = PROG_vcpu_ ## x; \ + d->teardown.vcpu = v; \ + /* Fallthrough */ \ + case PROG_vcpu_ ## x: \ + v = d->teardown.vcpu + enum { - PROG_done = 1, + PROG_vcpu_teardown = 1, + PROG_done, }; case 0: + for_each_vcpu ( d, v ) + { + PROGRESS_VCPU(teardown); + + rc = vcpu_teardown(v); + if ( rc ) + return rc; + } + PROGRESS(done): break; +#undef PROGRESS_VCPU #undef PROGRESS default: diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 3e46384a3c..da19f4e9f6 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -532,6 +532,7 @@ struct domain */ struct { unsigned int val; + struct vcpu *vcpu; } teardown; }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 18:11:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 18:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71011.127089 (Exim 4.92) (envelope-from ) id 1l1vT7-0003IY-Ji; Tue, 19 Jan 2021 18:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71011.127089; Tue, 19 Jan 2021 18: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 1l1vT7-0003IQ-Gg; Tue, 19 Jan 2021 18:11:05 +0000 Received: by outflank-mailman (input) for mailman id 71011; Tue, 19 Jan 2021 18:11:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1vT6-0003IL-UX for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 18:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1vT6-0006kX-T1 for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 18:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1vT6-0007hu-RF for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 18:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZT9+HL7VrvcaFM7CDgC2UIHSmMEJQceEX6PocDht6AU=; b=ogBtgAgSxrMnkd6+qGEwEb+esu QXWgPyM0bdNk4yO0xryw0h/RgJEr2x9DdV4+ZJWYdS+oUEt66mI5B+KX9ToLCD1TmOePwTXijhSzI do6cOLRjjX91gSp7FxH3wdL9QsslcbvIKEV28yfGBKfabTTNGqapXsmymU8MdQwkCZ6E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/gnttab: Log when grant_table_init() fails Message-Id: Date: Tue, 19 Jan 2021 18:11:04 +0000 commit 3487f4cf8bf5cef47a4c3918c13a502afc9891f6 Author: Andrew Cooper AuthorDate: Tue Jan 19 11:08:17 2021 +0000 Commit: Andrew Cooper CommitDate: Tue Jan 19 18:05:20 2021 +0000 xen/gnttab: Log when grant_table_init() fails ... so debug builds can see what went wrong, rather than getting an unqualified -EINVAL out of domain creation. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/common/grant_table.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index b24bce0f9f..f6f5acd300 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1920,7 +1920,11 @@ int grant_table_init(struct domain *d, int max_grant_frames, if ( max_grant_frames < INITIAL_NR_GRANT_FRAMES || max_grant_frames > opt_max_grant_frames || max_maptrack_frames > opt_max_maptrack_frames ) + { + dprintk(XENLOG_INFO, "Bad grant table sizes: grant %u, maptrack %u\n", + max_grant_frames, max_maptrack_frames); return -EINVAL; + } if ( (gt = xzalloc(struct grant_table)) == NULL ) return -ENOMEM; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 22:44:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 22:44:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71098.127169 (Exim 4.92) (envelope-from ) id 1l1zjH-0004T7-98; Tue, 19 Jan 2021 22:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71098.127169; Tue, 19 Jan 2021 22: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 1l1zjH-0004Ss-5I; Tue, 19 Jan 2021 22:44:03 +0000 Received: by outflank-mailman (input) for mailman id 71098; Tue, 19 Jan 2021 22:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zjG-0004S2-8k for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zjG-0003Fb-5F for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1zjG-0002ST-2H for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ISN2+ZEObUDJrgPXbtpF2vKgP2olDonCUsv512VLdW4=; b=EJhev0r0P5E++LoRC211pIwlJp 4m7FB83l7SE8wu7Y7WD7/QH4V5lIHG5MjCIKTYYjdGs3kfCDVjSyMcDVMeLZDCPrWjjbZlCSvzfNa FYVvBJFWtnklxKzWf5d5FsSYZSKHvo8o83D3PscbTgF9nwi/2TkULzf7nYBqmls6/n1c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/domain: Reposition config copying in domain_create() Message-Id: Date: Tue, 19 Jan 2021 22:44:02 +0000 commit 1839011c7eccd1b119d71a36b07ed914bfa9c5da Author: Andrew Cooper AuthorDate: Mon Jan 18 14:50:57 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Jan 18 16:23:03 2021 +0000 xen/domain: Reposition config copying in domain_create() This is cleanup for two pending series which will copy more data than just flags from config. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/common/domain.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index d151be3f36..164c9d14e9 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -421,14 +421,15 @@ struct domain *domain_create(domid_t domid, if ( (d = alloc_domain_struct()) == NULL ) return ERR_PTR(-ENOMEM); - d->options = config ? config->flags : 0; - /* Sort out our idea of is_system_domain(). */ d->domain_id = domid; /* Debug sanity. */ ASSERT(is_system_domain(d) ? config == NULL : config != NULL); + if ( config ) + d->options = config->flags; + /* Sort out our idea of is_control_domain(). */ d->is_privileged = is_priv; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 22:44:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 22:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71099.127171 (Exim 4.92) (envelope-from ) id 1l1zjR-0004Ug-9l; Tue, 19 Jan 2021 22:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71099.127171; Tue, 19 Jan 2021 22:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zjR-0004UZ-6t; Tue, 19 Jan 2021 22:44:13 +0000 Received: by outflank-mailman (input) for mailman id 71099; Tue, 19 Jan 2021 22:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zjQ-0004UU-9Q for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zjQ-0003Fu-8Z for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1zjQ-0002TI-7K for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kYC/MJh/uYGCCZ5fUh+3QVWcca9vTYJG9ZXdcGUmFzM=; b=UJIaXKGtQvlJCrZkMEn8DE42CA YNVBNHXP9QO5lY8y4dCFtogRcZtG9qm9dA9VGGHuB/wtTXpU8jUwRWal6Y4U2/3c9/UhWpTkTkUK/ Uj5cFqPHWXJcma7Kf+GZJsqT7ZyBKdJSXe1kMC3pFOAnY17y4q6+SFTJyXcaMNutuhGU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mem_sharing: fix uninitialized 'preempted' variable Message-Id: Date: Tue, 19 Jan 2021 22:44:12 +0000 commit cb34a2fa162184b150d48a3b6f385bacbec22ce7 Author: Tamas K Lengyel AuthorDate: Mon Jan 18 10:23:06 2021 -0700 Commit: Andrew Cooper CommitDate: Mon Jan 18 17:50:11 2021 +0000 x86/mem_sharing: fix uninitialized 'preempted' variable UBSAN catches an uninitialized use of the 'preempted' variable in fork_hap_allocation when there is no preemption. Fixes: 41548c5472a ("mem_sharing: VM forking") Signed-off-by: Tamas K Lengyel Acked-by: Andrew Cooper --- xen/arch/x86/mm/mem_sharing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index c8a6d11b90..adaeab4612 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1644,7 +1644,7 @@ static int copy_vcpu_settings(struct domain *cd, const struct domain *d) static int fork_hap_allocation(struct domain *cd, struct domain *d) { int rc; - bool preempted; + bool preempted = false; unsigned long mb = hap_get_allocation(d); if ( mb == hap_get_allocation(cd) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 22:44:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 22:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71100.127176 (Exim 4.92) (envelope-from ) id 1l1zjb-0004Vw-BZ; Tue, 19 Jan 2021 22:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71100.127176; Tue, 19 Jan 2021 22:44: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 1l1zjb-0004Vo-8X; Tue, 19 Jan 2021 22:44:23 +0000 Received: by outflank-mailman (input) for mailman id 71100; Tue, 19 Jan 2021 22:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zja-0004Vf-Eo for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zja-0003G2-Dx for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1zja-0002VC-Ab for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=u+LqXH/OXqF7ptesM91j0ZA0jeGxcTIdT0YUbvSsumk=; b=BUI1wxvapg0t9xv3aFRzvJNKOV xwX8i1y4IqNrVkSIe6IXaMcu1o6tgkE2bAcxc0k7RZsZo4f/+ArOUGYMncSavPZZ2D5oNKkfzqBAv swUQI5OWKjmS0/SkIL2Wlb4q2SNql2Ej7pQZV4k0xpjWgdBGjJMLf9kcUCVxTRNyZgbo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ocaml/libs/eventchn: drop unneeded evtchn.h Message-Id: Date: Tue, 19 Jan 2021 22:44:22 +0000 commit cf2a56606033c244321f5d1b6b97d055b2506897 Author: Manuel Bouyer AuthorDate: Tue Jan 12 19:12:39 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 18 17:55:27 2021 +0000 ocaml/libs/eventchn: drop unneeded evtchn.h On NetBSD xen/sys/evtchn.h is not available any more. Just remove it as it's not needed. Signed-off-by: Manuel Bouyer Acked-by: Christian Lindig --- tools/ocaml/libs/eventchn/xeneventchn_stubs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/ocaml/libs/eventchn/xeneventchn_stubs.c b/tools/ocaml/libs/eventchn/xeneventchn_stubs.c index ba40078d09..f889a7a2e4 100644 --- a/tools/ocaml/libs/eventchn/xeneventchn_stubs.c +++ b/tools/ocaml/libs/eventchn/xeneventchn_stubs.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #define CAML_NAME_SPACE -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 22:44:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 22:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71101.127180 (Exim 4.92) (envelope-from ) id 1l1zjl-0004XY-D2; Tue, 19 Jan 2021 22:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71101.127180; Tue, 19 Jan 2021 22:44:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zjl-0004XQ-A1; Tue, 19 Jan 2021 22:44:33 +0000 Received: by outflank-mailman (input) for mailman id 71101; Tue, 19 Jan 2021 22:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zjk-0004XK-Ik for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zjk-0003GC-Hw for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1zjk-0002W2-G1 for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9C18SET6QzhdGWWXpZwLYIVEAD1HLUi0Nf0LeotFvTs=; b=0GCu8uEQWbBH+oBFqb1pf9gRES Z6gp/lFrumQnM3MB2CC2wxoKum1Pqv7+g5yiCHVph0Mkjk1GnAih+7ZV3PgolzJc8C4Gfjl8Uf0Fd fAON6fWlhLIoI4rrcavij0BPu8Idtl4R8vQNXZBWE3F9tgu+CvEfo6WvTNgr9hK8Jg6A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/evtchn: fix build on NetBSD Message-Id: Date: Tue, 19 Jan 2021 22:44:32 +0000 commit 3a0b215c6f69c3a73d3ea9591823cb28c4a84dea Author: From: Manuel Bouyer AuthorDate: Mon Jan 18 18:38:41 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Jan 18 18:58:20 2021 +0000 libs/evtchn: fix build on NetBSD Use xenio3.h for ioctl definitions read_exact/write_exact seems to not be available here, which cause a gcc error. Use plain read/write, the xenevtchn interface won't do partial read/write on NetBSD anyway so it should be safe. This is in line with the rest of the OS specific helpers. Fixes: b7f76a699dc ('tools: Refactor /dev/xen/evtchn wrappers into libxenevtchn') Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- tools/libs/evtchn/netbsd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libs/evtchn/netbsd.c b/tools/libs/evtchn/netbsd.c index 60a9235978..1cebc21ffc 100644 --- a/tools/libs/evtchn/netbsd.c +++ b/tools/libs/evtchn/netbsd.c @@ -25,10 +25,10 @@ #include -#include - #include "private.h" +#include + #define EVTCHN_DEV_NAME "/dev/xenevt" int osdep_evtchn_open(xenevtchn_handle *xce, unsigned int flags) @@ -138,7 +138,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) int fd = xce->fd; evtchn_port_t port; - if ( read_exact(fd, (char *)&port, sizeof(port)) == -1 ) + if ( read(fd, (char *)&port, sizeof(port)) == -1 ) return -1; return port; @@ -148,7 +148,7 @@ int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port) { int fd = xce->fd; - return write_exact(fd, (char *)&port, sizeof(port)); + return write(fd, (char *)&port, sizeof(port)); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 22:44:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 22:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71104.127194 (Exim 4.92) (envelope-from ) id 1l1zjw-0004aA-0I; Tue, 19 Jan 2021 22:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71104.127194; Tue, 19 Jan 2021 22:44:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zjv-0004Zo-Nv; Tue, 19 Jan 2021 22:44:43 +0000 Received: by outflank-mailman (input) for mailman id 71104; Tue, 19 Jan 2021 22:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zju-0004Z6-M4 for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zju-0003GQ-LB for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1zju-0002Wd-KE for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pImdTqWSS7wzFHzXch48lrBxqgKeK/jeGn+T79wTdXI=; b=1BsrBexAdm6Dl6QZq4cwyn5vLK /74+tiuHetW/yOh7yJNz9pvpS8t4I6yPGPuFvzzPvRNyzPZKP0Ly0kyjaH4OM6ZAKG4rS8/kI7b4b cHuHOxxKHMP6DLJjetN97HMrX4YbxT2bVru6UKa4Z9YDZmX540QG5JcJl0IviO+GEZIo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenbackendd: Remove xenbackendd Message-Id: Date: Tue, 19 Jan 2021 22:44:42 +0000 commit 01ce02c21c097a453553bf9d4044a2dbfd8938f7 Author: Manuel Bouyer AuthorDate: Tue Jan 12 19:12:26 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 18 18:58:20 2021 +0000 tools/xenbackendd: Remove xenbackendd NetBSD doens't need xenbackendd with xl toolstack so don't build it. Remove now unused xenbackendd directory/files, and remaining references in the hotplug scripts. Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné [Also clean up stale comments in the Linux xencommons script] Signed-off-by: Andrew Cooper --- .gitignore | 2 - tools/Makefile | 1 - tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 6 - tools/hotplug/NetBSD/block | 1 - tools/hotplug/NetBSD/rc.d/xencommons.in | 2 - tools/hotplug/NetBSD/vif-bridge | 1 - tools/hotplug/NetBSD/vif-ip | 1 - tools/xenbackendd/Makefile | 45 --- tools/xenbackendd/xenbackendd.c | 326 --------------------- 9 files changed, 385 deletions(-) diff --git a/.gitignore b/.gitignore index 35957cc21f..9e0488e0cd 100644 --- a/.gitignore +++ b/.gitignore @@ -279,8 +279,6 @@ tools/tests/vpci/vpci.[hc] tools/tests/vpci/test_vpci tools/xcutils/lsevtchn tools/xcutils/readnotes -tools/xenbackendd/_paths.h -tools/xenbackendd/xenbackendd tools/xenmon/xentrace_setmask tools/xenmon/xenbaked tools/xenpaging/xenpaging diff --git a/tools/Makefile b/tools/Makefile index ed71474421..757a560be0 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -18,7 +18,6 @@ SUBDIRS-$(CONFIG_X86) += firmware SUBDIRS-y += console SUBDIRS-y += xenmon SUBDIRS-y += xentop -SUBDIRS-$(CONFIG_NetBSD) += xenbackendd SUBDIRS-y += libfsimage SUBDIRS-$(CONFIG_Linux) += vchan diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in index 0fc6557d4a..b059a2910d 100644 --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in @@ -87,12 +87,6 @@ XENSTORED_ARGS= # Only evaluated if XENSTORETYPE is "domain". XENSTORE_DOMAIN_ARGS= -## Type: string -## Default: Not defined, xenbackendd debug mode off -# -# Running xenbackendd in debug mode -#XENBACKENDD_DEBUG=[yes|on|1] - # qemu path #QEMU_XEN=@qemu_xen_path@ diff --git a/tools/hotplug/NetBSD/block b/tools/hotplug/NetBSD/block index 32c20b6c89..2a0516f436 100644 --- a/tools/hotplug/NetBSD/block +++ b/tools/hotplug/NetBSD/block @@ -1,7 +1,6 @@ #!/bin/sh -e # $NetBSD: block-nbsd,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $ -# Called by xenbackendd # Usage: block xsdir_backend_path state DIR=$(dirname "$0") diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in b/tools/hotplug/NetBSD/rc.d/xencommons.in index 886a2e2840..3981787eac 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons.in +++ b/tools/hotplug/NetBSD/rc.d/xencommons.in @@ -22,8 +22,6 @@ required_files="/kern/xen/privcmd" XENSTORED_PIDFILE="@XEN_RUN_DIR@/xenstored.pid" XENCONSOLED_PIDFILE="@XEN_RUN_DIR@/xenconsoled.pid" -XENBACKENDD_PIDFILE="@XEN_RUN_DIR@/xenbackendd.pid" -#XENBACKENDD_DEBUG=1 #XENCONSOLED_TRACE="@XEN_LOG_DIR@/xenconsole-trace.log" #XENSTORED_TRACE="@XEN_LOG_DIR@/xenstore-trace.log" diff --git a/tools/hotplug/NetBSD/vif-bridge b/tools/hotplug/NetBSD/vif-bridge index b58e922601..b1b25cbbde 100644 --- a/tools/hotplug/NetBSD/vif-bridge +++ b/tools/hotplug/NetBSD/vif-bridge @@ -1,7 +1,6 @@ #!/bin/sh -e # $NetBSD: vif-bridge-nbsd,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $ -# Called by xenbackendd # Usage: vif-bridge xsdir_backend_path state DIR=$(dirname "$0") diff --git a/tools/hotplug/NetBSD/vif-ip b/tools/hotplug/NetBSD/vif-ip index 83cbfe20e2..3e7bd2c022 100644 --- a/tools/hotplug/NetBSD/vif-ip +++ b/tools/hotplug/NetBSD/vif-ip @@ -1,7 +1,6 @@ #!/bin/sh -e # $NetBSD: vif-ip-nbsd,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $ -# Called by xenbackendd # Usage: vif-ip xsdir_backend_path state DIR=$(dirname "$0") diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile deleted file mode 100644 index ba53bbf7e6..0000000000 --- a/tools/xenbackendd/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2009 Advanced Micro Devices, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; under version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -XEN_ROOT=$(CURDIR)/../.. -include $(XEN_ROOT)/tools/Rules.mk - -CFLAGS += -Werror -CFLAGS += $(CFLAGS_libxenstore) -CPPFLAGS += -DXEN_SCRIPT_DIR="\"$(XEN_SCRIPT_DIR)\"" -LDLIBS += $(LDLIBS_libxenstore) - -.PHONY: all -all: build - -.PHONY: build -build: xenbackendd - -.PHONY: install -install: build - $(INSTALL_DIR) $(DESTDIR)$(sbindir) - $(INSTALL_PROG) xenbackendd $(DESTDIR)$(sbindir) - -.PHONY: clean -clean: - $(RM) *.a *.so *.o $(DEPS_RM) xenbackendd _paths.h - -.PHONY: distclean -distclean: clean - -xenbackendd.o: _paths.h -xenbackendd: xenbackendd.o - $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS) - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - --include $(DEPS_INCLUDE) diff --git a/tools/xenbackendd/xenbackendd.c b/tools/xenbackendd/xenbackendd.c deleted file mode 100644 index 21884af772..0000000000 --- a/tools/xenbackendd/xenbackendd.c +++ /dev/null @@ -1,326 +0,0 @@ -/* $NetBSD: xenbackendd.c,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $ */ -/* - * Copyright (C) 2006 Manuel Bouyer - * Copyright (C) 2009 Christoph Egger - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; under version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "_paths.h" - -#define DEVTYPE_UNKNOWN 0 -#define DEVTYPE_VIF 1 -#define DEVTYPE_VBD 2 -#define DISABLE_EXEC "libxl/disable_udev" - -#define DOMAIN_PATH "/local/domain/0" - -#ifndef XEN_SCRIPT_DIR -#error XEN_SCRIPT_DIR not defined -#endif - -#ifndef VBD_SCRIPT -#define VBD_SCRIPT XEN_SCRIPT_DIR"/block" -#endif -#ifndef LOG_FILE -#define LOG_FILE XEN_LOG_DIR "xenbackendd.log" -#endif -#ifndef PID_FILE -#define PID_FILE XEN_RUN_DIR "xenbackendd.pid" -#endif - - -struct xs_handle *xs; - -int fflag = 0; -int dflag = 0; - -const char *vbd_script = NULL; -const char *log_file = NULL; -const char *pidfile = NULL; - -static void -dolog(int pri, const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, "\n"); - fflush(stderr); - va_start(ap, fmt); - vsyslog(pri, fmt, ap); - va_end(ap); -} - -static void -dodebug(const char *fmt, ...) -{ - va_list ap; - - if (dflag == 0) - return; - va_start(ap, fmt); - vfprintf(stdout, fmt, ap); - va_end(ap); - printf("\n"); - fflush(stdout); -} - -static void -doexec(const char *cmd, const char *arg1, const char *arg2) -{ - dodebug("exec %s %s %s", cmd, arg1, arg2); - switch(vfork()) { - case -1: - dolog(LOG_ERR, "can't vfork: %s", strerror(errno)); - break; - case 0: - execl(cmd, cmd, arg1, arg2, NULL); - dolog(LOG_ERR, "can't exec %s: %s", cmd, strerror(errno)); - exit(EXIT_FAILURE); - /* NOTREACHED */ - break; - default: - wait(NULL); - break; - } -} - -static void -usage(void) -{ - fprintf(stderr, - "usage: %s [-d] [-f] [-l log_file] [-p pif_file] [-s vbd_script]\n", - getprogname()); - exit(EXIT_FAILURE); -} - -static int -xen_setup(void) -{ - xs = xs_open(0); - if (xs == NULL) { - dolog(LOG_ERR, - "Failed to contact xenstore (%s). Is it running?", - strerror(errno)); - goto out; - } - - if (!xs_watch(xs, DOMAIN_PATH, "backend")) { - dolog(LOG_ERR, "xenstore watch on backend fails."); - goto out; - } - return 0; - - out: - if (xs) { - xs_close(xs); - xs = NULL; - } - return -1; -} - -int -main(int argc, char * const argv[]) -{ - char **vec; - unsigned int num; - char *s; - int state; - char *sstate, *sdisable; - char *p; - char buf[80]; - int type; - int ch; - int debug_fd; - FILE *pidfile_f; - - while ((ch = getopt(argc, argv, "dfl:p:s:")) != -1) { - switch (ch) { - case 'd': - dflag = 1; - break; - case 'f': - fflag = 1; - break; - case 'l': - log_file = optarg; - break; - case 'p': - pidfile = optarg; - case 's': - vbd_script = optarg; - break; - default: - usage(); - } - } - - if (vbd_script == NULL) - vbd_script = VBD_SCRIPT; - if (pidfile == NULL) - pidfile = PID_FILE; - if (log_file == NULL) - log_file = LOG_FILE; - - openlog("xenbackendd", LOG_PID | LOG_NDELAY, LOG_DAEMON); - - if (fflag == 0) { - /* open log file */ - debug_fd = open(log_file, O_RDWR | O_CREAT | O_TRUNC, 0644); - if (debug_fd == -1) { - dolog(LOG_ERR, "can't open %s: %s", - log_file, strerror(errno)); - exit(EXIT_FAILURE); - } - } - - if (fflag == 0) { - /* daemonize */ - pidfile_f = fopen(pidfile, "w"); - if (pidfile_f == NULL) { - dolog(LOG_ERR, "can't open %s: %s", - pidfile, strerror(errno)); - exit(EXIT_FAILURE); - } - if (daemon(0, 0) < 0) { - dolog(LOG_ERR, "can't daemonize: %s", - strerror(errno)); - exit(EXIT_FAILURE); - } - fprintf(pidfile_f, "%d\n", (int)getpid()); - fclose(pidfile_f); - - /* redirect stderr to log file */ - if (dup2(debug_fd, STDERR_FILENO) < 0) { - dolog(LOG_ERR, "can't redirect stderr to %s: %s\n", - log_file, strerror(errno)); - exit(EXIT_FAILURE); - } - - /* also redirect stdout if we're in debug mode */ - if (dflag) { - if (dup2(debug_fd, STDOUT_FILENO) < 0) { - dolog(LOG_ERR, - "can't redirect stdout to %s: %s\n", - log_file, strerror(errno)); - exit(EXIT_FAILURE); - } - } - - close(debug_fd); - debug_fd = -1; - } - - if (xen_setup() < 0) - exit(EXIT_FAILURE); - - for (;;) { - vec = xs_read_watch(xs, &num); - dodebug("read from xen watch: %s", *vec); - if (!vec) { - dolog(LOG_ERR, "xs_read_watch: NULL\n"); - continue; - } - - sdisable = xs_read(xs, XBT_NULL, DISABLE_EXEC, 0); - if (sdisable) - goto next1; - - if (strlen(vec[XS_WATCH_PATH]) < sizeof("state")) - goto next1; - - /* find last component of path, check if it's "state" */ - p = &vec[XS_WATCH_PATH][ - strlen(vec[XS_WATCH_PATH]) - sizeof("state")]; - if (p[0] != '/') - goto next1; - p[0] = '\0'; - p++; - if (strcmp(p, "state") != 0) - goto next1; - - snprintf(buf, sizeof(buf), "%s/state", vec[XS_WATCH_PATH]); - sstate = xs_read(xs, XBT_NULL, buf, 0); - if (sstate == NULL) { - dolog(LOG_ERR, - "Failed to read %s (%s)", buf, strerror(errno)); - goto next1; - } - - state = atoi(sstate); - snprintf(buf, sizeof(buf), "%s/hotplug-status", - vec[XS_WATCH_PATH]); - s = xs_read(xs, XBT_NULL, buf, 0); - if (s != NULL && state != 6 /* XenbusStateClosed */) - goto next2; - - type = DEVTYPE_UNKNOWN; - if (strncmp(vec[XS_WATCH_PATH], - DOMAIN_PATH "/backend/vif", - strlen(DOMAIN_PATH "/backend/vif")) == 0) - type = DEVTYPE_VIF; - - if (strncmp(vec[XS_WATCH_PATH], - DOMAIN_PATH "/backend/vbd", - strlen(DOMAIN_PATH "/backend/vbd")) == 0) - type = DEVTYPE_VBD; - - switch(type) { - case DEVTYPE_VIF: - free(s); - snprintf(buf, sizeof(buf), "%s/script", - vec[XS_WATCH_PATH]); - s = xs_read(xs, XBT_NULL, buf, 0); - if (s == NULL) { - dolog(LOG_ERR, - "Failed to read %s (%s)", buf, - strerror(errno)); - goto next2; - } - doexec(s, vec[XS_WATCH_PATH], sstate); - break; - - case DEVTYPE_VBD: - doexec(vbd_script, vec[XS_WATCH_PATH], sstate); - break; - - default: - break; - } - -next2: - free(s); - free(sstate); - -next1: - free(sdisable); - free(vec); - } - - return 0; -} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 22:44:53 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 22:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71106.127203 (Exim 4.92) (envelope-from ) id 1l1zk5-0004d9-Sx; Tue, 19 Jan 2021 22:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71106.127203; Tue, 19 Jan 2021 22:44:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zk5-0004d1-Pv; Tue, 19 Jan 2021 22:44:53 +0000 Received: by outflank-mailman (input) for mailman id 71106; Tue, 19 Jan 2021 22:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zk4-0004cm-Oi for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zk4-0003GY-Nv for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1zk4-0002XK-NG for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iU1zMraP8QIJsNUbJ9xgU7bkt+VC+p1lawvn3rALnTw=; b=10wScB8qfyexlYpeKnai+gV+m/ lSXEGIXZFvHCSRk2LrQFu0faCbvK067jkRc/0jV6ek/cJIH1JFNrThy777C66dhAgiaTZtkCEmNu7 X3GkmwsgO4spkwBQDJOBqPETOog7HxVa8rDwpCz1jFojLQ0B8hBIEqjQ8idptWDUYNLc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenpaging: include errno.h Message-Id: Date: Tue, 19 Jan 2021 22:44:52 +0000 commit 8e4f3b6cd68495937a496b94ff228907dbd1958b Author: Manuel Bouyer AuthorDate: Tue Jan 12 19:12:40 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 18 18:58:20 2021 +0000 tools/xenpaging: include errno.h writable definition of errno on NetBSD. Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- tools/xenpaging/xenpaging.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c index 33098046c2..6e5490315d 100644 --- a/tools/xenpaging/xenpaging.c +++ b/tools/xenpaging/xenpaging.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 22:45:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 22:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71107.127207 (Exim 4.92) (envelope-from ) id 1l1zkG-0004g1-V5; Tue, 19 Jan 2021 22:45:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71107.127207; Tue, 19 Jan 2021 22:45:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zkG-0004ft-RZ; Tue, 19 Jan 2021 22:45:04 +0000 Received: by outflank-mailman (input) for mailman id 71107; Tue, 19 Jan 2021 22:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zkE-0004fZ-SS for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zkE-0003H6-Rj for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1zkE-0002YF-Q3 for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:45:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0OlkDsGWlGgvh2iSt62aXqlFi/AkuAAsYZbAzrVusXE=; b=TSqsyw03AjZYga86J9Vj4mApbr jWxBxMwvEv2iQNnHehDraQyKTfiO/zkSWsb2CBbWYDc8xz9MAPC9bb+h+KFshgfhK1HmebtJ7fn4H JI8srdbGV9c5jzZ9+nJhJLgJ4HpO9WcJ5ZBvNV6H7Djxxi9MaNBBOvcl8Tz9w5sfFIXU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstat: Remove usused NetBSD code Message-Id: Date: Tue, 19 Jan 2021 22:45:02 +0000 commit 4d0fbc2de5201f98508dec55466a4dbc1fb908c4 Author: Manuel Bouyer AuthorDate: Tue Jan 12 19:12:42 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 18 18:58:20 2021 +0000 tools/xenstat: Remove usused NetBSD code remove PROCNETDEV_HEADER[] and read_attributes_vbd(), gcc complains that they are unused Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- tools/libs/stat/xenstat_netbsd.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tools/libs/stat/xenstat_netbsd.c b/tools/libs/stat/xenstat_netbsd.c index 6e9d6aee10..64eda9e1ae 100644 --- a/tools/libs/stat/xenstat_netbsd.c +++ b/tools/libs/stat/xenstat_netbsd.c @@ -55,11 +55,6 @@ get_priv_data(xenstat_handle *handle) } /* Expected format of /proc/net/dev */ -static const char PROCNETDEV_HEADER[] = - "Inter-| Receive |" - " Transmit\n" - " face |bytes packets errs drop fifo frame compressed multicast|" - "bytes packets errs drop fifo colls carrier compressed\n"; /* Collect information about networks */ int xenstat_collect_networks(xenstat_node * node) @@ -76,12 +71,6 @@ void xenstat_uninit_networks(xenstat_handle * handle) fclose(priv->procnetdev); } -static int read_attributes_vbd(const char *vbd_directory, const char *what, char *ret, int cap) -{ - /* XXX implement */ - return 0; -} - /* Collect information about VBDs */ int xenstat_collect_vbds(xenstat_node * node) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jan 19 22:45:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Jan 2021 22:45:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71109.127210 (Exim 4.92) (envelope-from ) id 1l1zkQ-0004iI-W4; Tue, 19 Jan 2021 22:45:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71109.127210; Tue, 19 Jan 2021 22:45:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zkQ-0004iA-T4; Tue, 19 Jan 2021 22:45:14 +0000 Received: by outflank-mailman (input) for mailman id 71109; Tue, 19 Jan 2021 22:45:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zkO-0004hw-VV for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l1zkO-0003Ha-Uh for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l1zkO-0002Ym-Tu for xen-changelog@lists.xenproject.org; Tue, 19 Jan 2021 22:45: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=TIELEfoMVPpHPO0jn9JoC628v4vpl3L7oEdTcrsqXgM=; b=vZNkR001kRkWH7qofvp+TBox06 ANZaSdKMd9rNcPtYG/Urew5yV0uxVSDhtwIHyjmTAxEMnHdKTOQ2R88B/hVEUtD7Pymv8FGOA8RsV frAAvIoE4cQcTxhLXmGZ990yurnsLGRXoSkyPLgPqNm7fe189HaUpv5UN/sMd9FpIIi8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/gdbsx: Use right path for privcmd on NetBSD Message-Id: Date: Tue, 19 Jan 2021 22:45:12 +0000 commit 5e53349960d951f428add94603d57148535de864 Author: Manuel Bouyer AuthorDate: Tue Jan 12 19:12:28 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Jan 18 19:07:37 2021 +0000 tools/gdbsx: Use right path for privcmd on NetBSD On NetBSD the privcmd interface node is /kern/xen/privcmd Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- tools/debugger/gdbsx/xg/xg_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/debugger/gdbsx/xg/xg_main.c b/tools/debugger/gdbsx/xg/xg_main.c index a4e8653168..4576c762af 100644 --- a/tools/debugger/gdbsx/xg/xg_main.c +++ b/tools/debugger/gdbsx/xg/xg_main.c @@ -126,11 +126,11 @@ xg_init() int flags, saved_errno; XGTRC("E\n"); - if ((_dom0_fd=open("/dev/xen/privcmd", O_RDWR)) == -1) { - if ((_dom0_fd=open("/proc/xen/privcmd", O_RDWR)) == -1) { - perror("Failed to open /dev/xen/privcmd or /proc/xen/privcmd\n"); - return -1; - } + if ((_dom0_fd=open("/dev/xen/privcmd", O_RDWR)) == -1 && + (_dom0_fd=open("/proc/xen/privcmd", O_RDWR)) == -1 && + (_dom0_fd=open("/kern/xen/privcmd", O_RDWR)) == -1) { + perror("Failed to open privcmd\n"); + return -1; } /* Although we return the file handle as the 'xc handle' the API * does not specify / guarentee that this integer is in fact -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jan 20 12:55:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Jan 2021 12:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71363.127695 (Exim 4.92) (envelope-from ) id 1l2D0q-0003L4-HN; Wed, 20 Jan 2021 12:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71363.127695; Wed, 20 Jan 2021 12:55: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 1l2D0q-0003Kw-EG; Wed, 20 Jan 2021 12:55:04 +0000 Received: by outflank-mailman (input) for mailman id 71363; Wed, 20 Jan 2021 12:55:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2D0p-0003Kr-0B for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 12:55:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2D0o-0000Z8-R7 for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 12:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2D0o-0001f9-PB for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 12: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=nN/PaYf7b7D0SfjpdRGTJPpwn/3v9X2ObBgKJjVPK5E=; b=eZpjdsr2cGwlvYDwtTJSQ9Fmsz G7LRXsUISbIQusbmvKVMkyRm++ydlBgUUxoleMTOz4m1CMIqhL4wwlgUYAtkZsZN2OtM/3C3JVpvM hoMlI3M/v4jlwPkKr1HlDmByW38VXmMld1UhGsXaExAJDG73UaV5nJovvlBv6GOH7umI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] kconfig: ensure strndup() declaration is visible Message-Id: Date: Wed, 20 Jan 2021 12:55:02 +0000 commit 0f4fd0de7532c08bdd77a46f101e5ca1220cd163 Author: Jan Beulich AuthorDate: Tue Jan 19 16:03:41 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 19 16:03:41 2021 +0100 kconfig: ensure strndup() declaration is visible Its guard was updated such that it is visible by default when POSIX 2008 was adopted by glibc. It's not visible by default on older glibc. Fixes: f80fe2b34f08 ("xen: Update Kconfig to Linux v5.4") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Doug Goldstein --- xen/tools/kconfig/parser.y | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/tools/kconfig/parser.y b/xen/tools/kconfig/parser.y index 60936c7686..822fc89fc8 100644 --- a/xen/tools/kconfig/parser.y +++ b/xen/tools/kconfig/parser.y @@ -4,6 +4,7 @@ */ %{ +#define _GNU_SOURCE #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jan 20 12:55:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Jan 2021 12:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71364.127701 (Exim 4.92) (envelope-from ) id 1l2D10-0003Ln-JV; Wed, 20 Jan 2021 12:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71364.127701; Wed, 20 Jan 2021 12:55: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 1l2D10-0003Ld-Fi; Wed, 20 Jan 2021 12:55:14 +0000 Received: by outflank-mailman (input) for mailman id 71364; Wed, 20 Jan 2021 12:55:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2D0y-0003LW-Ve for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 12:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2D0y-0000ZK-Ul for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 12:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2D0y-0001g5-TK for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 12: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=H4alk47uLm1TIRbtla4igcX1jxxZdA6I6GAzqPWKiV0=; b=GQjsqcgZLSHKMG17a7UOIWhnhB MLYTPnpqpa1fwS72W0E0XaRtfXfcYoOOFBjYefQWSZEyBW8lLmB5Zq7GjLQ/g/oKbQbB+F+EUIXJp qPspMqyj6vQmI9IYHFT7NdBv5Hy5PtdKC63uZmVhAoaIz/UtdJlzX3QJ86PyfF+kzBd0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/CPUID: unconditionally set XEN_HVM_CPUID_IOMMU_MAPPINGS Message-Id: Date: Wed, 20 Jan 2021 12:55:12 +0000 commit b7f462872ab1e7de8d3e02f9e71dee11d0fd3560 Author: Roger Pau Monné AuthorDate: Tue Jan 19 16:04:06 2021 +0100 Commit: Jan Beulich CommitDate: Tue Jan 19 16:04:06 2021 +0100 x86/CPUID: unconditionally set XEN_HVM_CPUID_IOMMU_MAPPINGS This is a revert of f5cfa0985673 plus a rework of the comment that accompanies the setting of the flag so we don't forget why it needs to be unconditionally set: it's indicating whether the version of Xen has the original issue fixed and IOMMU entries are created for grant/foreign maps. If the flag is only exposed when the IOMMU is enabled the guest could resort to use bounce buffers when running backends as it would assume the underlying Xen version still has the bug present and thus grant/foreign maps cannot be used with devices. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/arch/x86/traps.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 4bd2cb6a1a..a6f1d45e77 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1049,11 +1049,17 @@ void cpuid_hypervisor_leaves(const struct vcpu *v, uint32_t leaf, res->a |= XEN_HVM_CPUID_X2APIC_VIRT; /* - * Indicate that memory mapped from other domains (either grants or - * foreign pages) has valid IOMMU entries. + * 1) Xen 4.10 and older was broken WRT grant maps requesting a DMA + * mapping, and forgot to honour the guest's request. + * 2) 4.11 (and presumably backports) fixed the bug, so the map + * hypercall actually did what the guest asked. + * 3) To work around the bug, guests must bounce buffer all DMA that + * would otherwise use a grant map, because it doesn't know whether the + * DMA is originating from an emulated or a real device. + * 4) This flag tells guests it is safe not to bounce-buffer all DMA to + * work around the bug. */ - if ( is_iommu_enabled(d) ) - res->a |= XEN_HVM_CPUID_IOMMU_MAPPINGS; + res->a |= XEN_HVM_CPUID_IOMMU_MAPPINGS; /* Indicate presence of vcpu id and set it in ebx */ res->a |= XEN_HVM_CPUID_VCPU_ID_PRESENT; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jan 20 12:55:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Jan 2021 12:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71365.127702 (Exim 4.92) (envelope-from ) id 1l2D1A-0003NU-KQ; Wed, 20 Jan 2021 12:55:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71365.127702; Wed, 20 Jan 2021 12:55: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 1l2D1A-0003NM-HO; Wed, 20 Jan 2021 12:55:24 +0000 Received: by outflank-mailman (input) for mailman id 71365; Wed, 20 Jan 2021 12:55:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2D19-0003NB-2R for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 12:55:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2D19-0000Zq-1d for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 12:55:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2D19-0001go-0l for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 12:55: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=pU/bLHVDk52McX7NXX2SKzzObBwU2NsQvr5LhetLtb0=; b=pD7BUs2m7D1JI3abeO49cRsRCj aqsIz7LnkQDTs2fdXjzazpE/6Z0uddFsMRbD+H2c2G5/VHHx1dBe8eohA4sV75vkwjIZUMCHVnGdl ZLlJ8sI7f3+KrEIDZRfJjYPxa0qu+8rzJsDxGZpG6VjZMKKR0iWw92skrsoUYXJ85dBQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/domain: Introduce vcpu_teardown() Message-Id: Date: Wed, 20 Jan 2021 12:55:23 +0000 commit a59e56b65c410792f2e75ac36251e9a911c43109 Author: Andrew Cooper AuthorDate: Mon Sep 28 14:17:02 2020 +0100 Commit: Andrew Cooper CommitDate: Tue Jan 19 15:27:50 2021 +0000 xen/domain: Introduce vcpu_teardown() Similarly to c/s 98d4d6d8a6 "xen/domain: Introduce domain_teardown()", introduce a common mechanism for restartable per-vcpu teardown logic. Extend the PROGRESS() mechanism to support saving and restoring the vcpu loop variable across hypercalls. This will eventually supersede domain_reliquish_resources(), and reduce the quantity of redundant logic performed. No functional change (yet). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/domain.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- xen/include/xen/sched.h | 1 + 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 164c9d14e9..2b461655c3 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -130,6 +130,22 @@ static void vcpu_info_reset(struct vcpu *v) v->vcpu_info_mfn = INVALID_MFN; } +/* + * Release resources held by a vcpu. There may or may not be live references + * to the vcpu, and it may or may not be fully constructed. + * + * If d->is_dying is DOMDYING_dead, this must not return non-zero. + */ +static int vcpu_teardown(struct vcpu *v) +{ + return 0; +} + +/* + * Destoy a vcpu once all references to it have been dropped. Used either + * from domain_destroy()'s RCU path, or from the vcpu_create() error path + * before the vcpu is placed on the domain's vcpu list. + */ static void vcpu_destroy(struct vcpu *v) { free_vcpu_struct(v); @@ -206,6 +222,11 @@ struct vcpu *vcpu_create(struct domain *d, unsigned int vcpu_id) sched_destroy_vcpu(v); fail_wq: destroy_waitqueue_vcpu(v); + + /* Must not hit a continuation in this context. */ + if ( vcpu_teardown(v) ) + ASSERT_UNREACHABLE(); + vcpu_destroy(v); return NULL; @@ -284,6 +305,9 @@ custom_param("extra_guest_irqs", parse_extra_guest_irqs); */ static int domain_teardown(struct domain *d) { + struct vcpu *v; + int rc; + BUG_ON(!d->is_dying); /* @@ -298,7 +322,9 @@ static int domain_teardown(struct domain *d) * will logically restart work from this point. * * PROGRESS() markers must not be in the middle of loops. The loop - * variable isn't preserved across a continuation. + * variable isn't preserved across a continuation. PROGRESS_VCPU() + * markers may be used in the middle of for_each_vcpu() loops, which + * preserve v but no other loop variables. * * To avoid redundant work, there should be a marker before each * function which may return -ERESTART. @@ -308,14 +334,32 @@ static int domain_teardown(struct domain *d) /* Fallthrough */ \ case PROG_ ## x +#define PROGRESS_VCPU(x) \ + d->teardown.val = PROG_vcpu_ ## x; \ + d->teardown.vcpu = v; \ + /* Fallthrough */ \ + case PROG_vcpu_ ## x: \ + v = d->teardown.vcpu + enum { - PROG_done = 1, + PROG_vcpu_teardown = 1, + PROG_done, }; case 0: + for_each_vcpu ( d, v ) + { + PROGRESS_VCPU(teardown); + + rc = vcpu_teardown(v); + if ( rc ) + return rc; + } + PROGRESS(done): break; +#undef PROGRESS_VCPU #undef PROGRESS default: diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 3e46384a3c..da19f4e9f6 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -532,6 +532,7 @@ struct domain */ struct { unsigned int val; + struct vcpu *vcpu; } teardown; }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jan 20 12:55:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Jan 2021 12:55:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71366.127707 (Exim 4.92) (envelope-from ) id 1l2D1K-0003Oi-Lz; Wed, 20 Jan 2021 12:55:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71366.127707; Wed, 20 Jan 2021 12:55: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 1l2D1K-0003Oa-Iz; Wed, 20 Jan 2021 12:55:34 +0000 Received: by outflank-mailman (input) for mailman id 71366; Wed, 20 Jan 2021 12:55:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2D1J-0003OS-5h for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 12:55:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2D1J-0000a5-4y for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 12:55:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2D1J-0001hW-3o for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 12:55: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=7+HPxopkUjBjGZDrykbkWM2dMzzrQBsz9/hvMfHBINQ=; b=Nhn/cIFwklY0xaMDNXHa7fxeTh LBmwkNx3VrOZ3JzU1q+GPRCDly+pnkD97tVyUjMiqJ08bwQwsijHxSR0L3pWdNoPEYpEg5ZiBycWg bp/I4l6mhsUm4yafpZ47Rc8KfMyOV/ocMMA+XX6CS5ZqboOjP+yMmuP73BVI3QIgEESk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/gnttab: Log when grant_table_init() fails Message-Id: Date: Wed, 20 Jan 2021 12:55:33 +0000 commit 3487f4cf8bf5cef47a4c3918c13a502afc9891f6 Author: Andrew Cooper AuthorDate: Tue Jan 19 11:08:17 2021 +0000 Commit: Andrew Cooper CommitDate: Tue Jan 19 18:05:20 2021 +0000 xen/gnttab: Log when grant_table_init() fails ... so debug builds can see what went wrong, rather than getting an unqualified -EINVAL out of domain creation. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/common/grant_table.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index b24bce0f9f..f6f5acd300 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1920,7 +1920,11 @@ int grant_table_init(struct domain *d, int max_grant_frames, if ( max_grant_frames < INITIAL_NR_GRANT_FRAMES || max_grant_frames > opt_max_grant_frames || max_maptrack_frames > opt_max_maptrack_frames ) + { + dprintk(XENLOG_INFO, "Bad grant table sizes: grant %u, maptrack %u\n", + max_grant_frames, max_maptrack_frames); return -EINVAL; + } if ( (gt = xzalloc(struct grant_table)) == NULL ) return -ENOMEM; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jan 20 17:33:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Jan 2021 17:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71678.128545 (Exim 4.92) (envelope-from ) id 1l2HLu-0004OW-BA; Wed, 20 Jan 2021 17:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71678.128545; Wed, 20 Jan 2021 17:33:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2HLu-0004OO-87; Wed, 20 Jan 2021 17:33:06 +0000 Received: by outflank-mailman (input) for mailman id 71678; Wed, 20 Jan 2021 17:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2HLs-0004OI-Ak for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 17:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2HLs-00061Y-7r for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 17:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2HLs-0007Bu-5u for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 17:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hFKvCB52DugVLC+QsNtMDO1su5HCN+dq+h9MfcUsGew=; b=QMrFyb+qHuwcEAcdqelaLQOuMx /KIqzbGR78hMTCBBcjhzZBa1gPEIrYitpp/9HwKreLx6+ePVa8fNDOUisTvC47aQhEj/yY79ig9Fn RR7UyzDm4/+2kWGdNxM+IZ67awjkq8zQzZbYTFgSBrJ2W0TISiEzbI7IyNm4VgaF2/SQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add defensive barrier in get_cycles for Arm64 Message-Id: Date: Wed, 20 Jan 2021 17:33:04 +0000 commit 7936671da9fbf645d6bb207608f7b81c27f992de Author: Wei Chen AuthorDate: Fri Jan 8 14:21:26 2021 +0800 Commit: Julien Grall CommitDate: Wed Jan 20 17:26:18 2021 +0000 xen/arm: Add defensive barrier in get_cycles for Arm64 Per the discussion [1] on the mailing list, we'd better to have a barrier after reading CNTPCT in get_cycles. If there is not any barrier there. When get_cycles being used in some seqlock critical context in the future, the seqlock can be speculated potentially. We import Linux commit 75a19a0202db21638a1c2b424afb867e1f9a2376: arm64: arch_timer: Ensure counter register reads occur with seqlock held When executing clock_gettime(), either in the vDSO or via a system call, we need to ensure that the read of the counter register occurs within the seqlock reader critical section. This ensures that updates to the clocksource parameters (e.g. the multiplier) are consistent with the counter value and therefore avoids the situation where time appears to go backwards across multiple reads. Extend the vDSO logic so that the seqlock critical section covers the read of the counter register as well as accesses to the data page. Since reads of the counter system registers are not ordered by memory barrier instructions, introduce dependency ordering from the counter read to a subsequent memory access so that the seqlock memory barriers apply to the counter access in both the vDSO and the system call paths. Cc: Cc: Marc Zyngier Tested-by: Vincenzo Frascino Link: https://lore.kernel.org/linux-arm-kernel/alpine.DEB.2.21.1902081950260.1662@nanos.tec.linutronix.de/ Reported-by: Thomas Gleixner Signed-off-by: Will Deacon While we are not aware of such use in Xen, it would be best to add the barrier to avoid any suprise. In order to reduce the impact of new barrier, we perfer to use enforce order instead of ISB [2]. Currently, enforce order is not applied to arm32 as this is not done in Linux at the date of this patch. If this is done in Linux it will need to be also done in Xen. To avoid adding read_cntpct_enforce_ordering everywhere, we introduced a new helper read_cntpct_stable to replace original get_cycles, and turn get_cycles to a wrapper which we can add read_cntpct_enforce_ordering easily. [1] https://lists.xenproject.org/archives/html/xen-devel/2020-12/msg00181.html [2] https://lkml.org/lkml/2020/3/13/645 Signed-off-by: Wei Chen Reviewed-by: Julien Grall --- xen/include/asm-arm/time.h | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index 5c4529ebb5..6b8fd839dd 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -11,9 +11,26 @@ typedef uint64_t cycles_t; -static inline cycles_t get_cycles(void) +/* + * Ensure that reads of the counter are treated the same as memory reads + * for the purposes of ordering by subsequent memory barriers. + */ +#if defined(CONFIG_ARM_64) +#define read_cntpct_enforce_ordering(val) do { \ + uint64_t tmp, _val = (val); \ + \ + asm volatile( \ + "eor %0, %1, %1\n" \ + "add %0, sp, %0\n" \ + "ldr xzr, [%0]" \ + : "=r" (tmp) : "r" (_val)); \ +} while (0) +#else +#define read_cntpct_enforce_ordering(val) do {} while (0) +#endif + +static inline cycles_t read_cntpct_stable(void) { - isb(); /* * ARM_WORKAROUND_858921: Cortex-A73 (all versions) counter read * can return a wrong value when the counter crosses a 32bit boundary. @@ -36,6 +53,28 @@ static inline cycles_t get_cycles(void) } } +static inline cycles_t get_cycles(void) +{ + cycles_t cnt; + + isb(); + cnt = read_cntpct_stable(); + + /* + * If there is not any barrier here. When get_cycles being used in + * some seqlock critical context in the future, the seqlock can be + * speculated potentially. + * + * To prevent seqlock from being speculated silently, we add a barrier + * here defensively. Normally, we just need an ISB here is enough, but + * considering the minimum performance cost. We prefer to use enforce + * order here. + */ + read_cntpct_enforce_ordering(cnt); + + return cnt; +} + /* List of timer's IRQ */ enum timer_ppi { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jan 20 17:55:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Jan 2021 17:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71692.128585 (Exim 4.92) (envelope-from ) id 1l2HhC-0006eI-Kz; Wed, 20 Jan 2021 17:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71692.128585; Wed, 20 Jan 2021 17: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 1l2HhC-0006eA-Hz; Wed, 20 Jan 2021 17:55:06 +0000 Received: by outflank-mailman (input) for mailman id 71692; Wed, 20 Jan 2021 17:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2HhB-0006e5-63 for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 17:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2HhB-0006Mq-1v for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 17:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2HhA-0000NE-Uo for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 17: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=4MbwoPG0PL5HIhSkOwb+3JD1pgcCmCGMfEfSKNFbyMM=; b=OnZose8TPlW6rVOzHYZqX4LMSq KGBJOFFp1vPau0FIubuS0gIYpyyuhJoaV2fI1546B3PgLvJLwC9Mld7QSGEeY6KXOuS3ltT2NfBXR vv9C5r0GmHqRgczMxo909pm6KBmV25m3j8aHh4Dzb14YN4YVAgQ3l1yEZXoUiTq4G62U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Hide Pointer Authentication (PAC) Message-Id: Date: Wed, 20 Jan 2021 17:55:04 +0000 commit 3d64806ba5cd2ac4a01844e63c023c8c2e0aca9f Author: Vladimir Murzin AuthorDate: Wed Jan 20 11:27:12 2021 +0000 Commit: Julien Grall CommitDate: Wed Jan 20 17:42:27 2021 +0000 xen/arm: Hide Pointer Authentication (PAC) The ARMv8.3 Pointer Authentication extension is not supported by Xen at the moment, so do not expose that via ID register. Signed-off-by: Vladimir Murzin Reviewed-by: Bertrand Marquis [julien: s/__res0/__res2/ to avoid name duplication] Reviewed-by: Julien Grall --- xen/arch/arm/cpufeature.c | 6 ++++++ xen/include/asm-arm/cpufeature.h | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 99fe4db280..1d88783809 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -187,6 +187,12 @@ static int __init create_guest_cpuinfo(void) /* Hide MTE support as Xen does not support it */ guest_cpuinfo.pfr64.mte = 0; + + /* Hide PAC support as Xen does not support it */ + guest_cpuinfo.isa64.apa = 0; + guest_cpuinfo.isa64.api = 0; + guest_cpuinfo.isa64.gpa = 0; + guest_cpuinfo.isa64.gpi = 0; #endif /* Hide AMU support */ diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 13a2739a69..70cb67301f 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -212,8 +212,44 @@ struct cpuinfo_arm { }; } mm64; - struct { + union { uint64_t bits[2]; + struct { + /* ISAR0 */ + unsigned long __res0:4; + unsigned long aes:4; + unsigned long sha1:4; + unsigned long sha2:4; + unsigned long crc32:4; + unsigned long atomic:4; + unsigned long __res1:4; + unsigned long rdm:4; + unsigned long sha3:4; + unsigned long sm3:4; + unsigned long sm4:4; + unsigned long dp:4; + unsigned long fhm:4; + unsigned long ts:4; + unsigned long tlb:4; + unsigned long rndr:4; + + /* ISAR1 */ + unsigned long dpb:4; + unsigned long apa:4; + unsigned long api:4; + unsigned long jscvt:4; + unsigned long fcma:4; + unsigned long lrcpc:4; + unsigned long gpa:4; + unsigned long gpi:4; + unsigned long frintts:4; + unsigned long sb:4; + unsigned long specres:4; + unsigned long bf16:4; + unsigned long dgh:4; + unsigned long i8mm:4; + unsigned long __res2:8; + }; } isa64; struct { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jan 20 17:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Jan 2021 17:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71693.128589 (Exim 4.92) (envelope-from ) id 1l2HhM-0006fH-MW; Wed, 20 Jan 2021 17:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71693.128589; Wed, 20 Jan 2021 17: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 1l2HhM-0006f9-JU; Wed, 20 Jan 2021 17:55:16 +0000 Received: by outflank-mailman (input) for mailman id 71693; Wed, 20 Jan 2021 17:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2HhL-0006f3-6l for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 17:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2HhL-0006Mz-5w for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 17:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2HhL-0000OS-48 for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 17: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=2Lok8MNNVI/lptsEtTEM7kEvU2w/Muk7BBH7hbipTxs=; b=Xlmc9x4tVnFpIQ0tCkzEtXGyr3 8/DaPkys6EE8bq7WfXjBDtFQhyuwdoqfu20chQps0zPRPuCHkNM9zQSB+LmOYi6ojDChSLgHtl8p5 V7F4Pq45/b8HC8KhMCdzP7rFIa6U8oHwbYIzw0mropnOsuug68+KDHezw2U+/hOovj1Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Relax GIC version check Message-Id: Date: Wed, 20 Jan 2021 17:55:15 +0000 commit 74cbc59b9455b75cf7202ee8edf4190dad05d0b9 Author: Vladimir Murzin AuthorDate: Wed Jan 20 11:26:44 2021 +0000 Commit: Julien Grall CommitDate: Wed Jan 20 17:43:33 2021 +0000 xen/arm: Relax GIC version check Supported values are 0b0000 GIC CPU interface system registers not implemented. 0b0001 System register interface to versions 3.0 and 4.0 of the GIC CPU interface is supported. 0b0011 System register interface to version 4.1 of the GIC CPU interface is supported. 4.1 is still backward compatible with 4.0/3.0, moreover ARM ARM guarantees that future versions of the GIC CPU interface retain backwards compatible. Signed-off-by: Vladimir Murzin Reviewed-by: Bertrand Marquis Acked-by: Julien Grall Release-Acked-by: Ian Jackson --- xen/include/asm-arm/cpufeature.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 70cb67301f..9ea3970c70 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -17,7 +17,7 @@ #define cpu_has_el3_64 (boot_cpu_feature64(el3) >= 1) #define cpu_has_fp (boot_cpu_feature64(fp) < 8) #define cpu_has_simd (boot_cpu_feature64(simd) < 8) -#define cpu_has_gicv3 (boot_cpu_feature64(gic) == 1) +#define cpu_has_gicv3 (boot_cpu_feature64(gic) >= 1) #endif #define cpu_feature32(c, feat) ((c)->pfr32.feat) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jan 20 17:55:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Jan 2021 17:55:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71694.128593 (Exim 4.92) (envelope-from ) id 1l2HhW-0006hD-PO; Wed, 20 Jan 2021 17:55:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71694.128593; Wed, 20 Jan 2021 17: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 1l2HhW-0006h4-MI; Wed, 20 Jan 2021 17:55:26 +0000 Received: by outflank-mailman (input) for mailman id 71694; Wed, 20 Jan 2021 17:55:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2HhV-0006gv-AV for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 17:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2HhV-0006NQ-9g for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 17:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2HhV-0000PL-87 for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 17: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=J/jHpi4mJq9NrOn4+pvAu1OsHJIQFYJA9WCW1ZsbFUs=; b=4dxOd/nT870cQVzGynlyjxosQU TcGR1e7a2+UkQV+Hn2LJuK6X8aNWmuNabWNBlVBAYrgcrzSxf90z36jhoiT9NCbsOouc2bd0Ki5yL e88LPho810zJUwt3WP8I3nfl+8JII1y3PF1+3YtWRtFxZ+874ONICmf3/zbAOxP419y0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data() Message-Id: Date: Wed, 20 Jan 2021 17:55:25 +0000 commit 2bb32b809250923658dadff6a9eb66c0b8cbe403 Author: Julien Grall AuthorDate: Sat Nov 28 11:36:42 2020 +0000 Commit: Julien Grall CommitDate: Wed Jan 20 17:49:23 2021 +0000 xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data() init_one_desc_irq() can return an error if it is unable to allocate memory. While this is unlikely to happen during boot (called from init_{,local_}irq_data()), it is better to harden the code by propagting the return value. Spotted by coverity. CID: 106529 Signed-off-by: Julien Grall Reviewed-by: Roger Paul Monné Reviewed-by: Volodymyr Babchuk Reviewed-by: Bertrand Marquis Acked-by: Stefano Stabellini --- xen/arch/arm/irq.c | 12 ++++++++++-- xen/arch/x86/irq.c | 7 ++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 3877657a52..b71b099e6f 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -88,7 +88,11 @@ static int __init init_irq_data(void) for ( irq = NR_LOCAL_IRQS; irq < NR_IRQS; irq++ ) { struct irq_desc *desc = irq_to_desc(irq); - init_one_irq_desc(desc); + int rc = init_one_irq_desc(desc); + + if ( rc ) + return rc; + desc->irq = irq; desc->action = NULL; } @@ -105,7 +109,11 @@ static int init_local_irq_data(void) for ( irq = 0; irq < NR_LOCAL_IRQS; irq++ ) { struct irq_desc *desc = irq_to_desc(irq); - init_one_irq_desc(desc); + int rc = init_one_irq_desc(desc); + + if ( rc ) + return rc; + desc->irq = irq; desc->action = NULL; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 13b1af57f3..21881a1345 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -432,9 +432,14 @@ int __init init_irq_data(void) for ( irq = 0; irq < nr_irqs_gsi; irq++ ) { + int rc; + desc = irq_to_desc(irq); desc->irq = irq; - init_one_irq_desc(desc); + + rc = init_one_irq_desc(desc); + if ( rc ) + return rc; } for ( ; irq < nr_irqs; irq++ ) irq_to_desc(irq)->irq = irq; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jan 20 18:00:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Jan 2021 18:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.71698.128609 (Exim 4.92) (envelope-from ) id 1l2Hm3-0007hq-EB; Wed, 20 Jan 2021 18:00:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 71698.128609; Wed, 20 Jan 2021 18:00:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2Hm3-0007hZ-Av; Wed, 20 Jan 2021 18:00:07 +0000 Received: by outflank-mailman (input) for mailman id 71698; Wed, 20 Jan 2021 18:00:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2Hm1-0007dk-ES for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 18:00:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2Hm1-0006YJ-Di for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 18:00:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2Hm1-00014q-CP for xen-changelog@lists.xenproject.org; Wed, 20 Jan 2021 18:00:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fexLL/lXF2L8NmdbF5fE0TbfrY7muSVsDqa0ojT3jcc=; b=ehumwhz91yexGaJNSaPavJLdSq o5Mkp0mubsDTs1LPoJ2tfxIxFc08UCbP5UGg9LHpgDKZYteJqEtv9+H8NO1Xu3lCy8wlaoCXURnY/ 8oS2jCb/fBHADgkNIk4IUMTlHhU45PDIdoDTgdZw0H94LwrInmdFu058a5gxnJursQzw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Don't ignore the affinity level 3 in the MPIDR Message-Id: Date: Wed, 20 Jan 2021 18:00:05 +0000 commit e8adbf680b56a3f4b9600c7bcc04fec1877a6213 Author: Wei Chen AuthorDate: Fri Jan 8 14:29:53 2021 +0800 Commit: Julien Grall CommitDate: Wed Jan 20 17:55:27 2021 +0000 xen/arm: Don't ignore the affinity level 3 in the MPIDR Currently, Xen is considering that all the affinity bits are defined below 32-bit. However, Arm64 define a 3rd level affinity in bits 32-39. The function gicv3_send_sgi_list in the GICv3 driver will compute the cluster using the following code: uint64_t cluster_id = cpu_logical_map(cpu) & ~MPIDR_AFF0_MASK; Because MPIDR_AFF0_MASK is defined as a 32-bit value, we will miss out the 3rd level affinity. As a consequence, the IPI would not be sent to the correct vCPU. This particular error can be solved by switching MPIDR_AFF0_MASK to use unsigned long. However, take the opportunity to switch all the MPIDR_* define to use unsigned long to avoid anymore issue. Signed-off-by: Wei Chen [julien: Reword the commit message] Reviewed-by: Julien Grall --- xen/include/asm-arm/processor.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 87c8136022..5c1768cdec 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -75,11 +75,11 @@ /* MPIDR Multiprocessor Affinity Register */ #define _MPIDR_UP (30) -#define MPIDR_UP (_AC(1,U) << _MPIDR_UP) +#define MPIDR_UP (_AC(1,UL) << _MPIDR_UP) #define _MPIDR_SMP (31) -#define MPIDR_SMP (_AC(1,U) << _MPIDR_SMP) +#define MPIDR_SMP (_AC(1,UL) << _MPIDR_SMP) #define MPIDR_AFF0_SHIFT (0) -#define MPIDR_AFF0_MASK (_AC(0xff,U) << MPIDR_AFF0_SHIFT) +#define MPIDR_AFF0_MASK (_AC(0xff,UL) << MPIDR_AFF0_SHIFT) #ifdef CONFIG_ARM_64 #define MPIDR_HWID_MASK _AC(0xff00ffffff,UL) #else -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:22:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72182.129729 (Exim 4.92) (envelope-from ) id 1l2bmg-00064G-FT; Thu, 21 Jan 2021 15:22:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72182.129729; Thu, 21 Jan 2021 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 1l2bmg-000648-CN; Thu, 21 Jan 2021 15:22:06 +0000 Received: by outflank-mailman (input) for mailman id 72182; Thu, 21 Jan 2021 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 1l2bme-000643-ME for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 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 1l2bme-0002fT-J7 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bme-0004Ja-HI for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 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=jIgm/x9/WDqZIm/4XpGtyA8VObWd/fqB18xWrnfRO38=; b=KxO+C4jSgVOxCXz7ahtsY/2Qqn P+nLOfkmXmLLOEv6xcF9mMLlsvaqxO78z6rfBuYAdNKAtOFZi25GGeBcNSMSJ8toYVJT8Wo/ZbCdU 8oy7x8w2D6iRP+XQFCPo5Xjwb2B/3sbhV+Oc6J5jKSdJB4xcy4h0+gx8rp+d8n3gjB40=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/dpci: do not remove pirqs from domain tree on unbind Message-Id: Date: Thu, 21 Jan 2021 15:22:04 +0000 commit 58427889f5a420cc5226f88524b3228f90b72a58 Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:11:41 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:11:41 2021 +0100 x86/dpci: do not remove pirqs from domain tree on unbind A fix for a previous issue removed the pirqs from the domain tree when they are unbound in order to prevent shared pirqs from triggering a BUG_ON in __pirq_guest_unbind if they are unbound multiple times. That caused free_domain_pirqs to no longer unmap the pirqs because they are gone from the domain pirq tree, thus leaving stale unbound pirqs after domain destruction if the domain had mapped dpci pirqs after shutdown. Take a different approach to fix the original issue, instead of removing the pirq from d->pirq_tree clear the flags of the dpci pirq struct to signal that the pirq is now unbound. This prevents calling pirq_guest_unbind multiple times for the same pirq without having to remove it from the domain pirq tree. This is XSA-360. Fixes: 5b58dad089 ('x86/pass-through: avoid double IRQ unbind during domain cleanup') Reported-by: Samuel Verschelde Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/x86/hvm.c | 27 ++++++++------------------- xen/include/asm-x86/hvm/irq.h | 2 -- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 21881a1345..032fe82167 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1349,7 +1349,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d) } if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq ) - BUG_ON(!d->is_dying); + BUG(); } /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */ diff --git a/xen/drivers/passthrough/x86/hvm.c b/xen/drivers/passthrough/x86/hvm.c index edc8059518..a6e2863c14 100644 --- a/xen/drivers/passthrough/x86/hvm.c +++ b/xen/drivers/passthrough/x86/hvm.c @@ -1036,6 +1036,10 @@ static int pci_clean_dpci_irq(struct domain *d, { struct dev_intx_gsi_link *digl, *tmp; + if ( !pirq_dpci->flags ) + /* Already processed. */ + return 0; + pirq_guest_unbind(d, dpci_pirq(pirq_dpci)); if ( pt_irq_need_timer(pirq_dpci->flags) ) @@ -1046,15 +1050,10 @@ static int pci_clean_dpci_irq(struct domain *d, list_del(&digl->list); xfree(digl); } + /* Note the pirq is now unbound. */ + pirq_dpci->flags = 0; - radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); - - if ( !pt_pirq_softirq_active(pirq_dpci) ) - return 0; - - domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; - - return -ERESTART; + return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; } int arch_pci_clean_pirqs(struct domain *d) @@ -1071,18 +1070,8 @@ int arch_pci_clean_pirqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = 0; - - if ( hvm_irq_dpci->pending_pirq_dpci ) - { - if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) - ret = -ERESTART; - else - hvm_irq_dpci->pending_pirq_dpci = NULL; - } + int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); - if ( !ret ) - ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); if ( ret ) { spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index 532880d497..7f76f6c437 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -160,8 +160,6 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; - /* Clean up: Entry with a softirq invocation pending / in progress. */ - struct hvm_pirq_dpci *pending_pirq_dpci; }; /* Machine IRQ to guest device/intx mapping. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:22:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:22:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72183.129734 (Exim 4.92) (envelope-from ) id 1l2bmq-000652-HS; Thu, 21 Jan 2021 15:22:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72183.129734; Thu, 21 Jan 2021 15:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bmq-00064t-Dw; Thu, 21 Jan 2021 15:22:16 +0000 Received: by outflank-mailman (input) for mailman id 72183; Thu, 21 Jan 2021 15:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bmo-00064l-NZ for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bmo-0002fW-Mm for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bmo-0004KF-LR for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xiO+16/J+LHjuB5jycZp4/c3T3NzLykf5Hj2DeuCCdA=; b=50D4BfA6ZNgGLM2MXlO56No1e8 2Z63/xPo//MR3FAfulwWIxNyOiWoVxdZIe4nzqSVhjzuofe1n2Txpi3XHF4V5dMqnX6b4xQ4TM9fR CHzfFq75FcM1LEBEVDUrcoB0AbHxUa88nqD1k1ZiCVRKr+eC6C/gZci+EJ3w8QMp3z98=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs/man: modify xl(1) in preparation for naming of assignable devices Message-Id: Date: Thu, 21 Jan 2021 15:22:14 +0000 commit c0b8aba56c8664d3de1416096d26eb2a32b3ce43 Author: Paul Durrant AuthorDate: Tue Jan 5 17:46:36 2021 +0000 Commit: Wei Liu CommitDate: Thu Jan 21 15:20:40 2021 +0000 docs/man: modify xl(1) in preparation for naming of assignable devices A subsequent patch will introduce code to allow a name to be specified to 'xl pci-assignable-add' such that the assignable device may be referred to by than name in subsequent operations. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- docs/man/xl.1.pod.in | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in index af31d2b572..f4779d8fd6 100644 --- a/docs/man/xl.1.pod.in +++ b/docs/man/xl.1.pod.in @@ -1595,19 +1595,23 @@ List virtual network interfaces for a domain. =over 4 -=item B +=item B [I<-n>] List all the B of assignable PCI devices. See -L for more information. +L for more information. If the -n option is +specified then any name supplied when the device was made assignable +will also be displayed. These are devices in the system which are configured to be available for passthrough and are bound to a suitable PCI backend driver in domain 0 rather than a real driver. -=item B I +=item B [I<-n NAME>] I Make the device at B assignable to guests. See -L for more information. +L for more information. If the -n option is +supplied then the assignable device entry will the named with the +given B. This will bind the device to the pciback driver and assign it to the "quarantine domain". If it is already bound to a driver, it will @@ -1622,10 +1626,11 @@ not to do this on a device critical to domain 0's operation, such as storage controllers, network interfaces, or GPUs that are currently being used. -=item B [I<-r>] I +=item B [I<-r>] I|I -Make the device at B not assignable to guests. See -L for more information. +Make a device non-assignable to guests. The device may be identified +either by its B or the B supplied when the device was made +assignable. See L for more information. This will at least unbind the device from pciback, and re-assign it from the "quarantine domain" back to domain 0. If the -r -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:22:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:22:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72184.129736 (Exim 4.92) (envelope-from ) id 1l2bn0-00066Q-Ib; Thu, 21 Jan 2021 15:22:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72184.129736; Thu, 21 Jan 2021 15:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bn0-00066I-FY; Thu, 21 Jan 2021 15:22:26 +0000 Received: by outflank-mailman (input) for mailman id 72184; Thu, 21 Jan 2021 15:22:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bmy-000661-Qu for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bmy-0002fh-Q2 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bmy-0004Kr-PD for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EnOf6SkrrG5COwD6UDIl+1ac965/nxHkLCGyLvIzI/M=; b=SVMe2C79XlgxMWHKK4OU/s3CGT N0oz0dth8ydhPqXFKUWvgCMEUmcWnVC7geBO5t6p8RcrPY84M6fzbYrHIMA1DzwuPTJRpjWoSC142 zaTa6s/fvLvyx5Z+5iRhxRLxXb0d6ckjy8yRR98e9enfq4MVR3vezG10cxAl8pQv7elc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxlu: introduce xlu_pci_parse_spec_string() Message-Id: Date: Thu, 21 Jan 2021 15:22:24 +0000 commit bdc0799fe26ab066f47fb026148aa93e95b262f6 Author: Paul Durrant AuthorDate: Tue Jan 5 17:46:37 2021 +0000 Commit: Wei Liu CommitDate: Thu Jan 21 15:20:40 2021 +0000 libxlu: introduce xlu_pci_parse_spec_string() This patch largely re-writes the code to parse a PCI_SPEC_STRING and enters it via the newly introduced function. The new parser also deals with 'bdf' and 'vslot' as non-positional paramaters, as per the documentation in xl-pci-configuration(5). The existing xlu_pci_parse_bdf() function remains, but now strictly parses BDF values. Some existing callers of xlu_pci_parse_bdf() are modified to call xlu_pci_parse_spec_string() as per the documentation in xl(1). NOTE: Usage text in xl_cmdtable.c and error messages are also modified appropriately. As a side-effect this patch also fixes a bug where using '*' to specify all functions would lead to an assertion failure at the end of xlu_pci_parse_bdf(). Fixes: d25cc3ec93eb ("libxl: workaround gcc 10.2 maybe-uninitialized warning") Signed-off-by: Paul Durrant Acked-by: Wei Liu --- tools/include/libxlutil.h | 8 +- tools/libs/util/libxlu_pci.c | 348 +++++++++++++++++++++++-------------------- tools/xl/xl_cmdtable.c | 4 +- tools/xl/xl_parse.c | 4 +- tools/xl/xl_pci.c | 33 ++-- 5 files changed, 213 insertions(+), 184 deletions(-) diff --git a/tools/include/libxlutil.h b/tools/include/libxlutil.h index 92e35c5462..4dd3c5e92b 100644 --- a/tools/include/libxlutil.h +++ b/tools/include/libxlutil.h @@ -108,10 +108,16 @@ int xlu_disk_parse(XLU_Config *cfg, int nspecs, const char *const *specs, * resulting disk struct is used with libxl. */ +/* + * PCI BDF + */ +int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pci, const char *str); + /* * PCI specification parsing */ -int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pcidev, const char *str); +int xlu_pci_parse_spec_string(XLU_Config *cfg, libxl_device_pci *pci, + const char *str); /* * RDM parsing diff --git a/tools/libs/util/libxlu_pci.c b/tools/libs/util/libxlu_pci.c index 1d38fffce3..05472a0bd1 100644 --- a/tools/libs/util/libxlu_pci.c +++ b/tools/libs/util/libxlu_pci.c @@ -1,5 +1,7 @@ #define _GNU_SOURCE +#include + #include "libxlu_internal.h" #include "libxlu_disk_l.h" #include "libxlu_disk_i.h" @@ -9,185 +11,209 @@ #define XLU__PCI_ERR(_c, _x, _a...) \ if((_c) && (_c)->report) fprintf((_c)->report, _x, ##_a) -static int hex_convert(const char *str, unsigned int *val, unsigned int mask) +static int parse_bdf(libxl_device_pci *pci, const char *str, const char **endp) { - unsigned long ret; - char *end; - - ret = strtoul(str, &end, 16); - if ( end == str || *end != '\0' ) - return -1; - if ( ret & ~mask ) - return -1; - *val = (unsigned int)ret & mask; - return 0; -} + const char *ptr = str; + unsigned int colons = 0; + unsigned int domain, bus, dev, func; + int n; + + /* Count occurrences of ':' to detrmine presence/absence of the 'domain' */ + while (isxdigit(*ptr) || *ptr == ':') { + if (*ptr == ':') + colons++; + ptr++; + } + + ptr = str; + switch (colons) { + case 1: + domain = 0; + if (sscanf(ptr, "%x:%x.%n", &bus, &dev, &n) != 2) + return ERROR_INVAL; + break; + case 2: + if (sscanf(ptr, "%x:%x:%x.%n", &domain, &bus, &dev, &n) != 3) + return ERROR_INVAL; + break; + default: + return ERROR_INVAL; + } + + if (domain > 0xffff || bus > 0xff || dev > 0x1f) + return ERROR_INVAL; + + ptr += n; + if (*ptr == '*') { + pci->vfunc_mask = LIBXL_PCI_FUNC_ALL; + func = 0; + ptr++; + } else { + if (sscanf(ptr, "%x%n", &func, &n) != 1) + return ERROR_INVAL; + if (func > 7) + return ERROR_INVAL; + pci->vfunc_mask = 1; + ptr += n; + } -static int pci_struct_fill(libxl_device_pci *pci, unsigned int domain, - unsigned int bus, unsigned int dev, - unsigned int func, unsigned int vdevfn) -{ pci->domain = domain; pci->bus = bus; pci->dev = dev; pci->func = func; - pci->vdevfn = vdevfn; + + if (endp) + *endp = ptr; + return 0; } -#define STATE_DOMAIN 0 -#define STATE_BUS 1 -#define STATE_DEV 2 -#define STATE_FUNC 3 -#define STATE_VSLOT 4 -#define STATE_OPTIONS_K 6 -#define STATE_OPTIONS_V 7 -#define STATE_TERMINAL 8 -#define STATE_TYPE 9 -#define STATE_RDM_STRATEGY 10 -#define STATE_RESERVE_POLICY 11 -#define INVALID 0xffffffff -int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pci, const char *str) +static int parse_vslot(uint32_t *vdevfnp, const char *str, const char **endp) { - unsigned state = STATE_DOMAIN; - unsigned dom = INVALID, bus = INVALID, dev = INVALID, func = INVALID, vslot = 0; - char *buf2, *tok, *ptr, *end, *optkey = NULL; + const char *ptr = str; + unsigned int val; + int n; + + if (sscanf(ptr, "%x%n", &val, &n) != 1) + return ERROR_INVAL; + + if (val > 0x1f) + return ERROR_INVAL; + + ptr += n; + + *vdevfnp = val << 3; + + if (endp) + *endp = ptr; + + return 0; +} + +static int parse_key_val(char **keyp, char**valp, const char *str, + const char **endp) +{ + const char *ptr = str; + char *key, *val; + + while (*ptr != '=' && *ptr != '\0') + ptr++; + + if (*ptr == '\0') + return ERROR_INVAL; - if ( NULL == (buf2 = ptr = strdup(str)) ) + key = strndup(str, ptr - str); + if (!key) return ERROR_NOMEM; - for(tok = ptr, end = ptr + strlen(ptr) + 1; ptr < end; ptr++) { - switch(state) { - case STATE_DOMAIN: - if ( *ptr == ':' ) { - state = STATE_BUS; - *ptr = '\0'; - if ( hex_convert(tok, &dom, 0xffff) ) - goto parse_error; - tok = ptr + 1; - } - break; - case STATE_BUS: - if ( *ptr == ':' ) { - state = STATE_DEV; - *ptr = '\0'; - if ( hex_convert(tok, &bus, 0xff) ) - goto parse_error; - tok = ptr + 1; - }else if ( *ptr == '.' ) { - state = STATE_FUNC; - *ptr = '\0'; - if ( dom & ~0xff ) - goto parse_error; - bus = dom; - dom = 0; - if ( hex_convert(tok, &dev, 0xff) ) - goto parse_error; - tok = ptr + 1; - } - break; - case STATE_DEV: - if ( *ptr == '.' ) { - state = STATE_FUNC; - *ptr = '\0'; - if ( hex_convert(tok, &dev, 0xff) ) - goto parse_error; - tok = ptr + 1; - } - break; - case STATE_FUNC: - if ( *ptr == '\0' || *ptr == '@' || *ptr == ',' ) { - switch( *ptr ) { - case '\0': - state = STATE_TERMINAL; - break; - case '@': - state = STATE_VSLOT; - break; - case ',': - state = STATE_OPTIONS_K; - break; - } - *ptr = '\0'; - if ( !strcmp(tok, "*") ) { - pci->vfunc_mask = LIBXL_PCI_FUNC_ALL; - }else{ - if ( hex_convert(tok, &func, 0x7) ) - goto parse_error; - pci->vfunc_mask = (1 << 0); - } - tok = ptr + 1; - } - break; - case STATE_VSLOT: - if ( *ptr == '\0' || *ptr == ',' ) { - state = ( *ptr == ',' ) ? STATE_OPTIONS_K : STATE_TERMINAL; - *ptr = '\0'; - if ( hex_convert(tok, &vslot, 0xff) ) - goto parse_error; - tok = ptr + 1; - } - break; - case STATE_OPTIONS_K: - if ( *ptr == '=' ) { - state = STATE_OPTIONS_V; - *ptr = '\0'; - optkey = tok; - tok = ptr + 1; - } - break; - case STATE_OPTIONS_V: - if ( *ptr == ',' || *ptr == '\0' ) { - state = (*ptr == ',') ? STATE_OPTIONS_K : STATE_TERMINAL; - *ptr = '\0'; - if ( !strcmp(optkey, "msitranslate") ) { - pci->msitranslate = atoi(tok); - }else if ( !strcmp(optkey, "power_mgmt") ) { - pci->power_mgmt = atoi(tok); - }else if ( !strcmp(optkey, "permissive") ) { - pci->permissive = atoi(tok); - }else if ( !strcmp(optkey, "seize") ) { - pci->seize = atoi(tok); - } else if (!strcmp(optkey, "rdm_policy")) { - if (!strcmp(tok, "strict")) { - pci->rdm_policy = LIBXL_RDM_RESERVE_POLICY_STRICT; - } else if (!strcmp(tok, "relaxed")) { - pci->rdm_policy = LIBXL_RDM_RESERVE_POLICY_RELAXED; - } else { - XLU__PCI_ERR(cfg, "%s is not an valid PCI RDM property" - " policy: 'strict' or 'relaxed'.", - tok); - goto parse_error; - } - } else { - XLU__PCI_ERR(cfg, "Unknown PCI BDF option: %s", optkey); - } - tok = ptr + 1; - } - default: - break; + str = ++ptr; /* skip '=' */ + while (*ptr != ',' && *ptr != '\0') + ptr++; + + val = strndup(str, ptr - str); + if (!val) { + free(key); + return ERROR_NOMEM; + } + + if (*ptr == ',') + ptr++; + + *keyp = key; + *valp = val; + *endp = ptr; + + return 0; +} + +static int parse_rdm_policy(XLU_Config *cfg, libxl_rdm_reserve_policy *policy, + const char *str) +{ + int ret = libxl_rdm_reserve_policy_from_string(str, policy); + + if (ret) + XLU__PCI_ERR(cfg, "Unknown RDM policy: %s", str); + + return ret; +} + +int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pci, const char *str) +{ + return parse_bdf(pci, str, NULL); +} + +int xlu_pci_parse_spec_string(XLU_Config *cfg, libxl_device_pci *pci, + const char *str) +{ + const char *ptr = str; + bool bdf_present = false; + int ret; + + /* Attempt to parse 'bdf' as positional parameter */ + ret = parse_bdf(pci, ptr, &ptr); + if (!ret) { + bdf_present = true; + + /* Check whether 'vslot' if present */ + if (*ptr == '@') { + ret = parse_vslot(&pci->vdevfn, ++ptr, &ptr); + if (ret) + return ret; } + if (*ptr == ',') + ptr++; + else if (*ptr != '\0') + return ERROR_INVAL; } - if ( tok != ptr || state != STATE_TERMINAL ) - goto parse_error; + /* Parse the rest as 'key=val' pairs */ + while (*ptr != '\0') { + char *key, *val; - assert(dom != INVALID && bus != INVALID && dev != INVALID && func != INVALID); + ret = parse_key_val(&key, &val, ptr, &ptr); + if (ret) + return ret; - /* Just a pretty way to fill in the values */ - pci_struct_fill(pci, dom, bus, dev, func, vslot << 3); + if (!strcmp(key, "bdf")) { + ret = parse_bdf(pci, val, NULL); + if (!ret) bdf_present = true; + } else if (!strcmp(key, "vslot")) { + ret = parse_vslot(&pci->vdevfn, val, NULL); + } else if (!strcmp(key, "permissive")) { + pci->permissive = atoi(val); + } else if (!strcmp(key, "msitranslate")) { + pci->msitranslate = atoi(val); + } else if (!strcmp(key, "seize")) { + pci->seize= atoi(val); + } else if (!strcmp(key, "power_mgmt")) { + pci->power_mgmt = atoi(val); + } else if (!strcmp(key, "rdm_policy")) { + ret = parse_rdm_policy(cfg, &pci->rdm_policy, val); + } else { + XLU__PCI_ERR(cfg, "Unknown PCI_SPEC_STRING option: %s", key); + ret = ERROR_INVAL; + } - free(buf2); + free(key); + free(val); - return 0; + if (ret) + return ret; + } -parse_error: - free(buf2); - return ERROR_INVAL; + if (!bdf_present) + return ERROR_INVAL; + + return 0; } int xlu_rdm_parse(XLU_Config *cfg, libxl_rdm_reserve *rdm, const char *str) { +#define STATE_TYPE 0 +#define STATE_RDM_STRATEGY 1 +#define STATE_RESERVE_POLICY 2 +#define STATE_TERMINAL 3 + unsigned state = STATE_TYPE; char *buf2, *tok, *ptr, *end; @@ -227,15 +253,8 @@ int xlu_rdm_parse(XLU_Config *cfg, libxl_rdm_reserve *rdm, const char *str) if (*ptr == ',' || *ptr == '\0') { state = *ptr == ',' ? STATE_TYPE : STATE_TERMINAL; *ptr = '\0'; - if (!strcmp(tok, "strict")) { - rdm->policy = LIBXL_RDM_RESERVE_POLICY_STRICT; - } else if (!strcmp(tok, "relaxed")) { - rdm->policy = LIBXL_RDM_RESERVE_POLICY_RELAXED; - } else { - XLU__PCI_ERR(cfg, "Unknown RDM property policy value: %s", - tok); + if (!parse_rdm_policy(cfg, &rdm->policy, tok)) goto parse_error; - } tok = ptr + 1; } default: @@ -253,6 +272,11 @@ int xlu_rdm_parse(XLU_Config *cfg, libxl_rdm_reserve *rdm, const char *str) parse_error: free(buf2); return ERROR_INVAL; + +#undef STATE_TYPE +#undef STATE_RDM_STRATEGY +#undef STATE_RESERVE_POLICY +#undef STATE_TERMINAL } /* diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 6ab5e47da3..30e17a2848 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -90,12 +90,12 @@ struct cmd_spec cmd_table[] = { { "pci-attach", &main_pciattach, 0, 1, "Insert a new pass-through pci device", - " [Virtual Slot]", + " ", }, { "pci-detach", &main_pcidetach, 0, 1, "Remove a domain's pass-through pci device", - " ", + " ", }, { "pci-list", &main_pcilist, 0, 0, diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 4ebf39620a..867e4d068a 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1487,10 +1487,10 @@ void parse_config_data(const char *config_source, * the global policy by default. */ pci->rdm_policy = b_info->u.hvm.rdm.policy; - e = xlu_pci_parse_bdf(config, pci, buf); + e = xlu_pci_parse_spec_string(config, pci, buf); if (e) { fprintf(stderr, - "unable to parse PCI BDF `%s' for passthrough\n", + "unable to parse PCI_SPEC_STRING `%s' for passthrough\n", buf); exit(-e); } diff --git a/tools/xl/xl_pci.c b/tools/xl/xl_pci.c index f71498cbb5..9a66494bb5 100644 --- a/tools/xl/xl_pci.c +++ b/tools/xl/xl_pci.c @@ -54,7 +54,7 @@ int main_pcilist(int argc, char **argv) return 0; } -static int pcidetach(uint32_t domid, const char *bdf, int force) +static int pcidetach(uint32_t domid, const char *spec_string, int force) { libxl_device_pci pci; XLU_Config *config; @@ -65,8 +65,9 @@ static int pcidetach(uint32_t domid, const char *bdf, int force) config = xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_inig"); exit(-1); } - if (xlu_pci_parse_bdf(config, &pci, bdf)) { - fprintf(stderr, "pci-detach: malformed BDF specification \"%s\"\n", bdf); + if (xlu_pci_parse_spec_string(config, &pci, spec_string)) { + fprintf(stderr, "pci-detach: malformed PCI_SPEC_STRING \"%s\"\n", + spec_string); exit(2); } if (force) { @@ -88,7 +89,7 @@ int main_pcidetach(int argc, char **argv) uint32_t domid; int opt; int force = 0; - const char *bdf = NULL; + const char *spec_string = NULL; SWITCH_FOREACH_OPT(opt, "f", NULL, "pci-detach", 2) { case 'f': @@ -97,15 +98,15 @@ int main_pcidetach(int argc, char **argv) } domid = find_domain(argv[optind]); - bdf = argv[optind + 1]; + spec_string = argv[optind + 1]; - if (pcidetach(domid, bdf, force)) + if (pcidetach(domid, spec_string, force)) return EXIT_FAILURE; return EXIT_SUCCESS; } -static int pciattach(uint32_t domid, const char *bdf, const char *vs) +static int pciattach(uint32_t domid, const char *spec_string) { libxl_device_pci pci; XLU_Config *config; @@ -116,8 +117,9 @@ static int pciattach(uint32_t domid, const char *bdf, const char *vs) config = xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_inig"); exit(-1); } - if (xlu_pci_parse_bdf(config, &pci, bdf)) { - fprintf(stderr, "pci-attach: malformed BDF specification \"%s\"\n", bdf); + if (xlu_pci_parse_spec_string(config, &pci, spec_string)) { + fprintf(stderr, "pci-attach: malformed PCI_SPEC_STRING \"%s\"\n", + spec_string); exit(2); } @@ -134,19 +136,16 @@ int main_pciattach(int argc, char **argv) { uint32_t domid; int opt; - const char *bdf = NULL, *vs = NULL; + const char *spec_string = NULL; SWITCH_FOREACH_OPT(opt, "", NULL, "pci-attach", 2) { /* No options */ } domid = find_domain(argv[optind]); - bdf = argv[optind + 1]; - - if (optind + 1 < argc) - vs = argv[optind + 2]; + spec_string = argv[optind + 1]; - if (pciattach(domid, bdf, vs)) + if (pciattach(domid, spec_string)) return EXIT_FAILURE; return EXIT_SUCCESS; @@ -192,7 +191,7 @@ static int pciassignable_add(const char *bdf, int rebind) if (!config) { perror("xlu_cfg_init"); exit(-1); } if (xlu_pci_parse_bdf(config, &pci, bdf)) { - fprintf(stderr, "pci-assignable-add: malformed BDF specification \"%s\"\n", bdf); + fprintf(stderr, "pci-assignable-add: malformed BDF \"%s\"\n", bdf); exit(2); } @@ -234,7 +233,7 @@ static int pciassignable_remove(const char *bdf, int rebind) if (!config) { perror("xlu_cfg_init"); exit(-1); } if (xlu_pci_parse_bdf(config, &pci, bdf)) { - fprintf(stderr, "pci-assignable-remove: malformed BDF specification \"%s\"\n", bdf); + fprintf(stderr, "pci-assignable-remove: malformed BDF \"%s\"\n", bdf); exit(2); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:22:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:22:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72185.129741 (Exim 4.92) (envelope-from ) id 1l2bnA-00067w-Lg; Thu, 21 Jan 2021 15:22:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72185.129741; Thu, 21 Jan 2021 15: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 1l2bnA-00067o-Ig; Thu, 21 Jan 2021 15:22:36 +0000 Received: by outflank-mailman (input) for mailman id 72185; Thu, 21 Jan 2021 15:22:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bn8-00067e-UR for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bn8-0002fr-Tg for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bn8-0004LN-SE for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22: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=Tt+rRgPewNWoccOFbViF8zgSsM/VyYvJzyWm124gTj8=; b=JVxbf47dTHOr6HFrLscukxABEo T2rthOYgA28+R4pMb+H1NoEgnXKF6YPE4YRPRyoY1tahnUrvVpen2HWgfzvt/idzF3oJ6kIj8qhQ3 aUzB32x3z2h19snvjhHaMz/LU1VGE9hjqA8iLB1TuxiGQYAo2cuFD8n4HWzjnacvKgWM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxl: stop setting 'vdevfn' in pci_struct_fill() Message-Id: Date: Thu, 21 Jan 2021 15:22:34 +0000 commit d473d74af381fd7086b5b9ca405a67735a41cc79 Author: Paul Durrant AuthorDate: Tue Jan 5 17:46:38 2021 +0000 Commit: Wei Liu CommitDate: Thu Jan 21 15:20:40 2021 +0000 libxl: stop setting 'vdevfn' in pci_struct_fill() There are only two call-sites. One always sets it to 0 (which is unnecessary as the structure is already initialized to zero) and the other can simply set the 'vdevfn' field directly (after proper structure initialization), avoiding the need for a local variable. A subsequent patch will also make use of pci_struct_fill() in a context where 'vdevfn' may already have been set. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- tools/libs/light/libxl_pci.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 74c2196ae3..6feedadc62 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -39,13 +39,12 @@ static unsigned int pci_encode_bdf(libxl_device_pci *pci) static void pci_struct_fill(libxl_device_pci *pci, unsigned int domain, unsigned int bus, unsigned int dev, - unsigned int func, unsigned int vdevfn) + unsigned int func) { pci->domain = domain; pci->bus = bus; pci->dev = dev; pci->func = func; - pci->vdevfn = vdevfn; } static void libxl_create_pci_backend_device(libxl__gc *gc, @@ -451,7 +450,7 @@ libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *num) new = pcis + *num; libxl_device_pci_init(new); - pci_struct_fill(new, dom, bus, dev, func, 0); + pci_struct_fill(new, dom, bus, dev, func); if (pci_info_xs_read(gc, new, "domid")) /* already assigned */ continue; @@ -2288,17 +2287,19 @@ static int libxl__device_pci_from_xs_be(libxl__gc *gc, libxl_devid nr, void *data) { char *s; - unsigned int domain = 0, bus = 0, dev = 0, func = 0, vdevfn = 0; + unsigned int domain = 0, bus = 0, dev = 0, func = 0; libxl_device_pci *pci = data; + libxl_device_pci_init(pci); + s = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/dev-%d", be_path, nr)); sscanf(s, PCI_BDF, &domain, &bus, &dev, &func); + pci_struct_fill(pci, domain, bus, dev, func); + s = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/vdevfn-%d", be_path, nr)); if (s) - vdevfn = strtol(s, (char **) NULL, 16); - - pci_struct_fill(pci, domain, bus, dev, func, vdevfn); + pci->vdevfn = strtol(s, (char **) NULL, 16); s = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/opts-%d", be_path, nr)); if (s) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:22:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:22:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72186.129745 (Exim 4.92) (envelope-from ) id 1l2bnK-00069d-N7; Thu, 21 Jan 2021 15:22:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72186.129745; Thu, 21 Jan 2021 15: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 1l2bnK-00069V-KD; Thu, 21 Jan 2021 15:22:46 +0000 Received: by outflank-mailman (input) for mailman id 72186; Thu, 21 Jan 2021 15:22:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bnJ-00069L-2e for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bnJ-0002gF-12 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bnI-0004M8-W4 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22: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=YrW4xnc0MBZt81iuYcM3MgiHEnoK4MproXz8RYTphfY=; b=CFAFComVIXmXQLKuQ8lqylvJzc efwdE+U6/s2ayFJ0izNe+d3FHY5KiBLS/RgOsRMQLlSQUlZBdNCDEkR1jbiaJ/lY51+z3DWATOMCL j360p1McN6f7xuvqHiYICk4DJptfph7e8jaFVyxi8AAhpbH0OMQiRbrwnVOEoNTYxLns=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxl: add 'name' field to 'libxl_device_pci' in the IDL... Message-Id: Date: Thu, 21 Jan 2021 15:22:44 +0000 commit 57bff091f47f0784f67cad198649469cbac585d8 Author: Paul Durrant AuthorDate: Tue Jan 5 17:46:39 2021 +0000 Commit: Wei Liu CommitDate: Thu Jan 21 15:20:40 2021 +0000 libxl: add 'name' field to 'libxl_device_pci' in the IDL... ... and modify libxl_pci_bdf_assignable_add/remove/list() to make use of it. libxl_pci_bdf_assignable_add() will store the name of the device in xenstore if the field is specified (i.e. non-NULL) and libxl_pci_bdf_assignable_remove() will remove devices specified only by name, looking up the BDF as necessary. libxl_pci_bdf_assignable_list() will also populate the 'name' field if a name was stored by libxl_pci_bdf_assignable_add(). NOTE: This patch also fixes whitespace in the declaration of 'libxl_device_pci' in the IDL. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- tools/include/libxl.h | 6 ++++ tools/libs/light/libxl_pci.c | 77 ++++++++++++++++++++++++++++++++++++++-- tools/libs/light/libxl_types.idl | 13 +++---- 3 files changed, 87 insertions(+), 9 deletions(-) diff --git a/tools/include/libxl.h b/tools/include/libxl.h index 3433c950f9..3488fbf56f 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -463,6 +463,12 @@ */ #define LIBXL_HAVE_DEVICE_PCI_ASSIGNABLE_LIST_FREE 1 +/* + * LIBXL_HAVE_DEVICE_PCI_NAME indicates that the libxl_device_pci type + * has a name field. + */ +#define LIBXL_HAVE_DEVICE_PCI_NAME 1 + /* * libxl ABI compatibility * diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 6feedadc62..9e3a90dcda 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -438,7 +438,9 @@ libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *num) } while((de = readdir(dir))) { - unsigned dom, bus, dev, func; + unsigned int dom, bus, dev, func; + char *name; + if (sscanf(de->d_name, PCI_BDF, &dom, &bus, &dev, &func) != 4) continue; @@ -455,6 +457,9 @@ libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *num) if (pci_info_xs_read(gc, new, "domid")) /* already assigned */ continue; + name = pci_info_xs_read(gc, new, "name"); + if (name) new->name = strdup(name); + (*num)++; } @@ -742,6 +747,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc, libxl_ctx *ctx = libxl__gc_owner(gc); unsigned dom, bus, dev, func; char *spath, *driver_path = NULL; + const char *name; int rc; struct stat st; @@ -750,6 +756,24 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc, bus = pci->bus; dev = pci->dev; func = pci->func; + name = pci->name; + + /* Sanitise any name that is set */ + if (name) { + unsigned int i, n = strlen(name); + + if (n > 64) { /* Reasonable upper bound on name length */ + LOG(ERROR, "Name too long"); + return ERROR_FAIL; + } + + for (i = 0; i < n; i++) { + if (!isgraph(name[i])) { + LOG(ERROR, "Names may only include printable characters"); + return ERROR_FAIL; + } + } + } /* See if the device exists */ spath = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF, dom, bus, dev, func); @@ -765,7 +789,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc, } if ( rc ) { LOG(WARN, PCI_BDF" already assigned to pciback", dom, bus, dev, func); - goto quarantine; + goto name; } /* Check to see if there's already a driver that we need to unbind from */ @@ -796,7 +820,12 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc, return ERROR_FAIL; } -quarantine: +name: + if (name) + pci_info_xs_write(gc, pci, "name", name); + else + pci_info_xs_remove(gc, pci, "name"); + /* * DOMID_IO is just a sentinel domain, without any actual mappings, * so always pass XEN_DOMCTL_DEV_RDM_RELAXED to avoid assignment being @@ -812,6 +841,40 @@ quarantine: return 0; } +static int name2bdf(libxl__gc *gc, libxl_device_pci *pci) +{ + char **bdfs; + unsigned int i, n; + int rc = ERROR_NOTFOUND; + + bdfs = libxl__xs_directory(gc, XBT_NULL, PCI_INFO_PATH, &n); + if (!n) + goto out; + + for (i = 0; i < n; i++) { + unsigned dom, bus, dev, func; + char *name; + + if (sscanf(bdfs[i], PCI_BDF_XSPATH, &dom, &bus, &dev, &func) != 4) + continue; + + pci_struct_fill(pci, dom, bus, dev, func); + + name = pci_info_xs_read(gc, pci, "name"); + if (name && !strcmp(name, pci->name)) { + rc = 0; + break; + } + } + +out: + if (!rc) + LOG(DETAIL, "'%s' -> " PCI_BDF, pci->name, pci->domain, + pci->bus, pci->dev, pci->func); + + return rc; +} + static int libxl__device_pci_assignable_remove(libxl__gc *gc, libxl_device_pci *pci, int rebind) @@ -820,6 +883,12 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc, int rc; char *driver_path; + /* If the device is named then we need to look up the BDF */ + if (pci->name) { + rc = name2bdf(gc, pci); + if (rc) return rc; + } + /* De-quarantine */ rc = xc_deassign_device(ctx->xch, DOMID_IO, pci_encode_bdf(pci)); if ( rc < 0 ) { @@ -860,6 +929,8 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc, } } + pci_info_xs_remove(gc, pci, "name"); + return 0; } diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 05324736b7..b4a9076b85 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -771,17 +771,18 @@ libxl_device_nic = Struct("device_nic", [ ]) libxl_device_pci = Struct("device_pci", [ - ("func", uint8), - ("dev", uint8), - ("bus", uint8), - ("domain", integer), - ("vdevfn", uint32), + ("func", uint8), + ("dev", uint8), + ("bus", uint8), + ("domain", integer), + ("vdevfn", uint32), ("vfunc_mask", uint32), ("msitranslate", bool), ("power_mgmt", bool), ("permissive", bool), ("seize", bool), - ("rdm_policy", libxl_rdm_reserve_policy), + ("rdm_policy", libxl_rdm_reserve_policy), + ("name", string), ]) libxl_device_rdm = Struct("device_rdm", [ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:22:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:22:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72188.129749 (Exim 4.92) (envelope-from ) id 1l2bnU-0006Aw-P3; Thu, 21 Jan 2021 15:22:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72188.129749; Thu, 21 Jan 2021 15: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 1l2bnU-0006Ao-Lh; Thu, 21 Jan 2021 15:22:56 +0000 Received: by outflank-mailman (input) for mailman id 72188; Thu, 21 Jan 2021 15:22:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bnT-0006Ah-5e for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bnT-0002gQ-4s for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:22:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bnT-0004Ms-38 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15: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=XqSmk2XLr56+DIqBkzRKyXKtHqztngFlTaK+FbcI95k=; b=Wi43GcwcHbR+fP92N1ShHoYWD3 LD2SmfbSZ2LbPddrBJ9ltXh/hfwyQPcrlh9y77PsCCSSuBT4JUGBRBWiuQdykkHT9V98pCNk1cg4+ KhnshYWZFvKgQ3iTelwVi5vJKBYervjCymuXdgRGaqD+OKUILtuN61bPseJrVPqbxaSU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xl: support naming of assignable devices Message-Id: Date: Thu, 21 Jan 2021 15:22:55 +0000 commit 3f9ff4b94f85f1fb1357ae588f8227035c486a4c Author: Paul Durrant AuthorDate: Tue Jan 5 17:46:40 2021 +0000 Commit: Wei Liu CommitDate: Thu Jan 21 15:20:40 2021 +0000 xl: support naming of assignable devices With this patch applied 'xl pci-assignable-add' will take an optional '--name' parameter, 'xl pci-assignable-remove' can be passed either a BDF or a name and 'xl pci-assignable-list' will take a optional '--show-names' flag which determines whether names are displayed in its output. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- tools/xl/xl_cmdtable.c | 12 ++++--- tools/xl/xl_pci.c | 89 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 73 insertions(+), 28 deletions(-) diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 30e17a2848..bd8af12ff3 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -105,21 +105,25 @@ struct cmd_spec cmd_table[] = { { "pci-assignable-add", &main_pciassignable_add, 0, 1, "Make a device assignable for pci-passthru", - "", + "[options] ", + "-n NAME, --name=NAME Name the assignable device.\n" "-h Print this help.\n" }, { "pci-assignable-remove", &main_pciassignable_remove, 0, 1, "Remove a device from being assignable", - "[options] ", + "[options] |NAME", "-h Print this help.\n" "-r Attempt to re-assign the device to the\n" - " original driver" + " original driver." }, { "pci-assignable-list", &main_pciassignable_list, 0, 0, "List all the assignable pci devices", - "", + "[options]", + "-h Print this help.\n" + "-n, --show-names Display assignable device names where\n" + " supplied.\n" }, { "pause", &main_pause, 0, 1, diff --git a/tools/xl/xl_pci.c b/tools/xl/xl_pci.c index 9a66494bb5..b1c3ae2a72 100644 --- a/tools/xl/xl_pci.c +++ b/tools/xl/xl_pci.c @@ -151,7 +151,7 @@ int main_pciattach(int argc, char **argv) return EXIT_SUCCESS; } -static void pciassignable_list(void) +static void pciassignable_list(bool show_names) { libxl_device_pci *pcis; int num, i; @@ -161,8 +161,12 @@ static void pciassignable_list(void) if ( pcis == NULL ) return; for (i = 0; i < num; i++) { - printf("%04x:%02x:%02x.%01x\n", - pcis[i].domain, pcis[i].bus, pcis[i].dev, pcis[i].func); + libxl_device_pci *pci = &pcis[i]; + char *name = show_names ? pci->name : NULL; + + printf("%04x:%02x:%02x.%01x %s\n", + pci->domain, pci->bus, pci->dev, pci->func, + name ?: ""); } libxl_device_pci_assignable_list_free(pcis, num); } @@ -170,20 +174,27 @@ static void pciassignable_list(void) int main_pciassignable_list(int argc, char **argv) { int opt; - - SWITCH_FOREACH_OPT(opt, "", NULL, "pci-assignable-list", 0) { - /* No options */ + static struct option opts[] = { + {"show-names", 0, 0, 'n'}, + COMMON_LONG_OPTS + }; + bool show_names = false; + + SWITCH_FOREACH_OPT(opt, "n", opts, "pci-assignable-list", 0) { + case 'n': + show_names = true; + break; } - pciassignable_list(); + pciassignable_list(show_names); return 0; } -static int pciassignable_add(const char *bdf, int rebind) +static int pciassignable_add(const char *bdf, const char *name, int rebind) { libxl_device_pci pci; XLU_Config *config; - int r = 0; + int r; libxl_device_pci_init(&pci); @@ -195,8 +206,15 @@ static int pciassignable_add(const char *bdf, int rebind) exit(2); } - if (libxl_device_pci_assignable_add(ctx, &pci, rebind)) - r = 1; + if (name) { + pci.name = strdup(name); + if (!pci.name) { + fprintf(stderr, "pci-assignable-add: memory allocation failure\n"); + exit(2); + } + } + + r = libxl_device_pci_assignable_add(ctx, &pci, rebind); libxl_device_pci_dispose(&pci); xlu_cfg_destroy(config); @@ -208,38 +226,61 @@ int main_pciassignable_add(int argc, char **argv) { int opt; const char *bdf = NULL; - - SWITCH_FOREACH_OPT(opt, "", NULL, "pci-assignable-add", 1) { - /* No options */ + static struct option opts[] = { + {"name", 1, 0, 'n'}, + COMMON_LONG_OPTS + }; + const char *name = NULL; + + SWITCH_FOREACH_OPT(opt, "n:", opts, "pci-assignable-add", 1) { + case 'n': + name = optarg; + break; } bdf = argv[optind]; - if (pciassignable_add(bdf, 1)) + if (pciassignable_add(bdf, name, 1)) return EXIT_FAILURE; return EXIT_SUCCESS; } -static int pciassignable_remove(const char *bdf, int rebind) +static int pciassignable_remove(const char *ident, int rebind) { libxl_device_pci pci; XLU_Config *config; - int r = 0; + int r; libxl_device_pci_init(&pci); config = xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_init"); exit(-1); } - if (xlu_pci_parse_bdf(config, &pci, bdf)) { - fprintf(stderr, "pci-assignable-remove: malformed BDF \"%s\"\n", bdf); + /* Try remove-by-name first */ + pci.name = strdup(ident); + if (!pci.name) { + fprintf(stderr, "pci-assignable-add: memory allocation failure\n"); exit(2); } - if (libxl_device_pci_assignable_remove(ctx, &pci, rebind)) - r = 1; + r = libxl_device_pci_assignable_remove(ctx, &pci, rebind); + if (!r || r != ERROR_NOTFOUND) + goto out; + + /* If remove-by-name failed to find the device, try remove-by-BDF */ + free(pci.name); + pci.name = NULL; + if (xlu_pci_parse_bdf(config, &pci, ident)) { + fprintf(stderr, + "pci-assignable-remove: malformed BDF '%s'\n", ident); + exit(2); + } + + r = libxl_device_pci_assignable_remove(ctx, &pci, rebind); + +out: libxl_device_pci_dispose(&pci); xlu_cfg_destroy(config); @@ -249,7 +290,7 @@ static int pciassignable_remove(const char *bdf, int rebind) int main_pciassignable_remove(int argc, char **argv) { int opt; - const char *bdf = NULL; + const char *ident = NULL; int rebind = 0; SWITCH_FOREACH_OPT(opt, "r", NULL, "pci-assignable-remove", 1) { @@ -258,9 +299,9 @@ int main_pciassignable_remove(int argc, char **argv) break; } - bdf = argv[optind]; + ident = argv[optind]; - if (pciassignable_remove(bdf, rebind)) + if (pciassignable_remove(ident, rebind)) return EXIT_FAILURE; return EXIT_SUCCESS; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:23:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:23:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72189.129753 (Exim 4.92) (envelope-from ) id 1l2bne-0006CC-Q7; Thu, 21 Jan 2021 15:23:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72189.129753; Thu, 21 Jan 2021 15: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 1l2bne-0006C4-NC; Thu, 21 Jan 2021 15:23:06 +0000 Received: by outflank-mailman (input) for mailman id 72189; Thu, 21 Jan 2021 15:23:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bnd-0006Bw-8Z for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bnd-0002gq-7l for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bnd-0004Nx-6w for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15: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=OJnsv3mMkOkB+3wBqj5PrTQSWc4Kc5n9AU9uJYlc8nU=; b=qLgp46UMMnWcid/57YfMfXZP0r IE9reWG2ub73U2g2ZIXigDU95o71HXpR7RT2p3q0akvd4W5AEaW3ziDZsGlZfBYlRLT9TbFfVNqbJ GF8MA1Tn3+oS78XbiMpUpT2DQZX59/MrIiPctNzhScCcYO04cV3Xq4mwPkYmBE+s6rvk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs/man: modify xl-pci-configuration(5) to add 'name' field to PCI_SPEC_STRING Message-Id: Date: Thu, 21 Jan 2021 15:23:05 +0000 commit d288f62da14d45b127508236d20385f64924e1f6 Author: Paul Durrant AuthorDate: Tue Jan 5 17:46:41 2021 +0000 Commit: Wei Liu CommitDate: Thu Jan 21 15:20:40 2021 +0000 docs/man: modify xl-pci-configuration(5) to add 'name' field to PCI_SPEC_STRING Since assignable devices can be named, a subsequent patch will support use of a PCI_SPEC_STRING containing a 'name' parameter instead of a 'bdf'. In this case the name will be used to look up the 'bdf' in the list of assignable (or assigned) devices. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- docs/man/xl-pci-configuration.5.pod | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/docs/man/xl-pci-configuration.5.pod b/docs/man/xl-pci-configuration.5.pod index 4dd73bc498..db3360307c 100644 --- a/docs/man/xl-pci-configuration.5.pod +++ b/docs/man/xl-pci-configuration.5.pod @@ -51,7 +51,7 @@ is not specified, or if it is specified with an empty value (whether positionally or explicitly). B: In context of B (see L), parameters other than -B will be ignored. +B or B will be ignored. =head1 Positional Parameters @@ -70,7 +70,11 @@ B<*> to indicate all functions of a multi-function device. =item Default Value -None. This parameter is mandatory as it identifies the device. +None. This parameter is mandatory in its positional form. As a non-positional +parameter it is also mandatory unless a B parameter is present, in +which case B must not be present since the B will be used to find +the B in the list of assignable devices. See L for more information +on naming assignable devices. =back @@ -194,4 +198,21 @@ B: This overrides the global B option. =back +=item B=I + +=over 4 + +=item Description + +This is the name given when the B was made assignable. See L for +more information on naming assignable devices. + +=item Default Value + +None. This parameter must not be present if a B parameter is present. +If a B parameter is not present then B is mandatory as it is +required to look up the B in the list of assignable devices. + +=back + =back -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:23:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:23:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72190.129757 (Exim 4.92) (envelope-from ) id 1l2bno-0006DT-SD; Thu, 21 Jan 2021 15:23:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72190.129757; Thu, 21 Jan 2021 15: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 1l2bno-0006DL-Oj; Thu, 21 Jan 2021 15:23:16 +0000 Received: by outflank-mailman (input) for mailman id 72190; Thu, 21 Jan 2021 15:23:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bnn-0006DB-BN for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bnn-0002gx-Ag for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bnn-0004PK-9v for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15: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=2bEDPdNNpVQjWfTaN0IpCI6dSWsrcRVHUE+1GMqjG6s=; b=VdJxMueucLeBcApWNEWbhZxrLA f5/0Otgq64G1sN5WZHZe4PSH9M1T4Ri+bCNEMrXdan4u+/ae7nSYone74DAhgzUaIfxEkJq1hjXYA 7e4/+kqN1FMyNwWNEqIwdwo7OFix8GN8O/iYua8QgxE7UpsfrBB6lW9andk7FNPxD8nU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxl / libxlu: support 'xl pci-attach/detach' by name Message-Id: Date: Thu, 21 Jan 2021 15:23:15 +0000 commit 9cd5bbf5369d520aacca9a1b141e9a84f62d507d Author: Paul Durrant AuthorDate: Tue Jan 5 17:46:42 2021 +0000 Commit: Wei Liu CommitDate: Thu Jan 21 15:20:40 2021 +0000 libxl / libxlu: support 'xl pci-attach/detach' by name This patch modifies libxlu_pci_parse_spec_string() to parse the new 'name' parameter of PCI_SPEC_STRING detailed in the updated documention in xl-pci-configuration(5) and populate the 'name' field of 'libxl_device_pci'. If the 'name' field is non-NULL then both libxl_device_pci_add() and libxl_device_pci_remove() will use it to look up the device BDF in the list of assignable devices. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- tools/libs/light/libxl_pci.c | 43 ++++++++++++++++++++++++++++++++++++++----- tools/libs/util/libxlu_pci.c | 7 ++++++- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 9e3a90dcda..1a1c263080 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -58,6 +58,8 @@ static void libxl_create_pci_backend_device(libxl__gc *gc, flexarray_append(back, GCSPRINTF(PCI_BDF, pci->domain, pci->bus, pci->dev, pci->func)); if (pci->vdevfn) flexarray_append_pair(back, GCSPRINTF("vdevfn-%d", num), GCSPRINTF("%x", pci->vdevfn)); + if (pci->name) + flexarray_append_pair(back, GCSPRINTF("name-%d", num), GCSPRINTF("%s", pci->name)); flexarray_append(back, GCSPRINTF("opts-%d", num)); flexarray_append(back, GCSPRINTF("msitranslate=%d,power_mgmt=%d,permissive=%d,rdm_policy=%s", @@ -282,6 +284,7 @@ retry_transaction2: xs_rm(ctx->xsh, t, GCSPRINTF("%s/vdev-%d", be_path, i)); xs_rm(ctx->xsh, t, GCSPRINTF("%s/opts-%d", be_path, i)); xs_rm(ctx->xsh, t, GCSPRINTF("%s/vdevfn-%d", be_path, i)); + xs_rm(ctx->xsh, t, GCSPRINTF("%s/name-%d", be_path, i)); libxl__xs_printf(gc, t, num_devs_path, "%d", num - 1); for (j = i + 1; j < num; j++) { tmppath = GCSPRINTF("%s/state-%d", be_path, j); @@ -314,6 +317,12 @@ retry_transaction2: xs_write(ctx->xsh, t, GCSPRINTF("%s/vdevfn-%d", be_path, j - 1), tmp, strlen(tmp)); xs_rm(ctx->xsh, t, tmppath); } + tmppath = GCSPRINTF("%s/name-%d", be_path, j); + tmp = libxl__xs_read(gc, t, tmppath); + if (tmp) { + xs_write(ctx->xsh, t, GCSPRINTF("%s/name-%d", be_path, j - 1), tmp, strlen(tmp)); + xs_rm(ctx->xsh, t, tmppath); + } } if (!xs_transaction_end(ctx->xsh, t, 0)) if (errno == EAGAIN) @@ -1589,6 +1598,12 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid, libxl_device_pci_copy(CTX, &pas->pci, pci); pci = &pas->pci; + /* If the device is named then we need to look up the BDF */ + if (pci->name) { + rc = name2bdf(gc, pci); + if (rc) goto out; + } + pas->starting = starting; pas->callback = device_pci_add_stubdom_done; @@ -1739,11 +1754,19 @@ static void device_pci_add_done(libxl__egc *egc, libxl_device_pci *pci = &pas->pci; if (rc) { - LOGD(ERROR, domid, - "libxl__device_pci_add failed for " - "PCI device %x:%x:%x.%x (rc %d)", - pci->domain, pci->bus, pci->dev, pci->func, - rc); + if (pci->name) { + LOGD(ERROR, domid, + "libxl__device_pci_add failed for " + "PCI device '%s' (rc %d)", + pci->name, + rc); + } else { + LOGD(ERROR, domid, + "libxl__device_pci_add failed for " + "PCI device %x:%x:%x.%x (rc %d)", + pci->domain, pci->bus, pci->dev, pci->func, + rc); + } pci_info_xs_remove(gc, pci, "domid"); } libxl_device_pci_dispose(pci); @@ -2250,6 +2273,12 @@ static void libxl__device_pci_remove_common(libxl__egc *egc, libxl_device_pci_copy(CTX, &prs->pci, pci); pci = &prs->pci; + /* If the device is named then we need to look up the BDF */ + if (pci->name) { + rc = name2bdf(gc, pci); + if (rc) goto out; + } + prs->force = force; libxl__xswait_init(&prs->xswait); libxl__ev_qmp_init(&prs->qmp); @@ -2372,6 +2401,10 @@ static int libxl__device_pci_from_xs_be(libxl__gc *gc, if (s) pci->vdevfn = strtol(s, (char **) NULL, 16); + s = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/name-%d", be_path, nr)); + if (s) + pci->name = strdup(s); + s = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/opts-%d", be_path, nr)); if (s) { char *saveptr; diff --git a/tools/libs/util/libxlu_pci.c b/tools/libs/util/libxlu_pci.c index 05472a0bd1..ad88fee088 100644 --- a/tools/libs/util/libxlu_pci.c +++ b/tools/libs/util/libxlu_pci.c @@ -147,6 +147,7 @@ int xlu_pci_parse_spec_string(XLU_Config *cfg, libxl_device_pci *pci, { const char *ptr = str; bool bdf_present = false; + bool name_present = false; int ret; /* Attempt to parse 'bdf' as positional parameter */ @@ -189,6 +190,10 @@ int xlu_pci_parse_spec_string(XLU_Config *cfg, libxl_device_pci *pci, pci->power_mgmt = atoi(val); } else if (!strcmp(key, "rdm_policy")) { ret = parse_rdm_policy(cfg, &pci->rdm_policy, val); + } else if (!strcmp(key, "name")) { + name_present = true; + pci->name = strdup(val); + if (!pci->name) ret = ERROR_NOMEM; } else { XLU__PCI_ERR(cfg, "Unknown PCI_SPEC_STRING option: %s", key); ret = ERROR_INVAL; @@ -201,7 +206,7 @@ int xlu_pci_parse_spec_string(XLU_Config *cfg, libxl_device_pci *pci, return ret; } - if (!bdf_present) + if (!(bdf_present ^ name_present)) return ERROR_INVAL; return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:23:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:23:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72191.129760 (Exim 4.92) (envelope-from ) id 1l2bnz-0006F3-Vy; Thu, 21 Jan 2021 15:23:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72191.129760; Thu, 21 Jan 2021 15:23: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 1l2bnz-0006Ev-Sz; Thu, 21 Jan 2021 15:23:27 +0000 Received: by outflank-mailman (input) for mailman id 72191; Thu, 21 Jan 2021 15:23:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bny-0006Ei-75 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bny-0002h4-6L for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bny-0004Rc-5Z for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23: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=yC6QZd2AgPHtEixE2slQwsyaa3ARDbE4jqBOYSjL+Ck=; b=JTkjWU7wzn0ifLAD1mu8X3m634 1w+rSnvvr6To4qlTuBAeBPiKYnGyHaqC4eN5MTm89G/l42CgLLjQUVVcFGFXpL/BAHLUCouAuy2ei ouKCUk9qS97E5o+wZwwp3YBM530cJgXZUwArOC0cRD2ka9+44bJV8yET10q0V94XvE4U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] update Xen version to 4.14.2-pre Message-Id: Date: Thu, 21 Jan 2021 15:23:26 +0000 commit 1b09f3dcd4708309a21b4b088cedea86417dcd7b Author: Jan Beulich AuthorDate: Thu Jan 21 16:16:43 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:16:43 2021 +0100 update Xen version to 4.14.2-pre --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index df7cf10be3..5ccbd64ad9 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 14 -export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:23:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:23:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72192.129765 (Exim 4.92) (envelope-from ) id 1l2bo9-0006GG-1R; Thu, 21 Jan 2021 15:23:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72192.129765; Thu, 21 Jan 2021 15:23: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 1l2bo8-0006G7-UY; Thu, 21 Jan 2021 15:23:36 +0000 Received: by outflank-mailman (input) for mailman id 72192; Thu, 21 Jan 2021 15:23:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bo8-0006G1-AR for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bo8-0002hC-9f for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bo8-0004SC-8M for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23: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=Ifq14P0Xl4Mp0F9Yv8Rc5jatFEPgcr11689+V933fBE=; b=j17r6KIIbaFmAqzP3MaIG4xpll mFQoRnv5AbZPxKuSWGKupmi+zd9H2mcLEf2nd1MjFQ53EKFTuZalN0AMY1ofFitbZYGgY5yllM4OU +jDgyA4331TrG4VLQ6kVaZH1HqgrWXjdiiDoBM3rAUIMh6YOfIcZgBzZclpBYBj1Eobo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/hpet: Fix return value of hpet_setup() Message-Id: Date: Thu, 21 Jan 2021 15:23:36 +0000 commit a514c5ef5bda0da4020b22037d921b845a151116 Author: Andrew Cooper AuthorDate: Thu Jan 21 16:17:21 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:17:21 2021 +0100 x86/hpet: Fix return value of hpet_setup() hpet_setup() is idempotent if the rate has already been calculated, and returns the cached value. However, this only works correctly when the return statements are identical. Use a sensibly named local variable, rather than a dead one with a bad name. Fixes: a60bb68219 ("x86/time: reduce rounding errors in calculations") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné master commit: 83736c567d6b64dbce98f251ca72e7870f556421 master date: 2020-12-31 16:19:00 +0000 --- xen/arch/x86/hpet.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 154c67423b..f4951d7a20 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -769,7 +769,7 @@ u64 __init hpet_setup(void) { static u64 __initdata hpet_rate; u32 hpet_id, hpet_period; - unsigned int last; + unsigned int last, rem; if ( hpet_rate ) return hpet_rate; @@ -799,9 +799,11 @@ u64 __init hpet_setup(void) hpet_resume(hpet_boot_cfg); hpet_rate = 1000000000000000ULL; /* 10^15 */ - last = do_div(hpet_rate, hpet_period); + rem = do_div(hpet_rate, hpet_period); + if ( (rem * 2) > hpet_period ) + hpet_rate++; - return hpet_rate + (last * 2 > hpet_period); + return hpet_rate; } void hpet_resume(u32 *boot_cfg) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:23:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:23:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72193.129769 (Exim 4.92) (envelope-from ) id 1l2boJ-0006Hx-3A; Thu, 21 Jan 2021 15:23:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72193.129769; Thu, 21 Jan 2021 15: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 1l2boI-0006Hn-W7; Thu, 21 Jan 2021 15:23:46 +0000 Received: by outflank-mailman (input) for mailman id 72193; Thu, 21 Jan 2021 15:23:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2boI-0006Hg-DE for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2boI-0002hd-CT for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2boI-0004T6-Bi for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=y1YOnS/jAc6GBZGicx0Gvk9ZugMDoiYUU/xJ8ko1hsg=; b=TYSd4AKf68cIFJkD3Ld7fOeUO0 fEE6yPCmscolV+/UgbdZHvXdvD3gYS/lDsN4Iof3FhZQ8h2/EYbI04PioV8njXXCSedu55bkmXwfS 003J4GEjRgMo4Y+vfQ6HYeUAzl7fkJVNfkYGPuGF93abSHcWNqWXqZLt21C9Nm8xXJAM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/vPCI: tolerate (un)masking a disabled MSI-X entry Message-Id: Date: Thu, 21 Jan 2021 15:23:46 +0000 commit 5f9b0f90ee7dcc96ffbb5e0c8d284aeb89d7495d Author: Jan Beulich AuthorDate: Thu Jan 21 16:18:06 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:18:06 2021 +0100 x86/vPCI: tolerate (un)masking a disabled MSI-X entry None of the four reasons causing vpci_msix_arch_mask_entry() to get called (there's just a single call site) are impossible or illegal prior to an entry actually having got set up: - the entry may remain masked (in this case, however, a prior masked -> unmasked transition would already not have worked), - MSI-X may not be enabled, - the global mask bit may be set, - the entry may not otherwise have been updated. Hence the function asserting that the entry was previously set up was simply wrong. Since the caller tracks the masked state (and setting up of an entry would only be effected when that software bit is clear), it's okay to skip both masking and unmasking requests in this case. Fixes: d6281be9d0145 ('vpci/msix: add MSI-X handlers') Reported-by: Manuel Bouyer Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Tested-by: Manuel Bouyer master commit: 04b090366ca59e8a75837c822df261a8d0bd1a30 master date: 2021-01-05 13:17:54 +0100 --- xen/arch/x86/hvm/vmsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 5d4eddebee..9cc5109b7e 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -844,8 +844,8 @@ void vpci_msi_arch_print(const struct vpci_msi *msi) void vpci_msix_arch_mask_entry(struct vpci_msix_entry *entry, const struct pci_dev *pdev, bool mask) { - ASSERT(entry->arch.pirq != INVALID_PIRQ); - vpci_mask_pirq(pdev->domain, entry->arch.pirq, mask); + if ( entry->arch.pirq != INVALID_PIRQ ) + vpci_mask_pirq(pdev->domain, entry->arch.pirq, mask); } int vpci_msix_arch_enable_entry(struct vpci_msix_entry *entry, -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:23:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:23:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72194.129773 (Exim 4.92) (envelope-from ) id 1l2boT-0006J7-4w; Thu, 21 Jan 2021 15:23:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72194.129773; Thu, 21 Jan 2021 15:23: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 1l2boT-0006Iz-1X; Thu, 21 Jan 2021 15:23:57 +0000 Received: by outflank-mailman (input) for mailman id 72194; Thu, 21 Jan 2021 15:23:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2boS-0006Is-G9 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2boS-0002hs-FL for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2boS-0004US-Eg for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:23:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=f1g9E1I2YYljiFyPbjM8hDhdytPCGsXF7Q32zfi5HYc=; b=OiDTzT/30X+ssB7WJE6/AIIny/ h7U0zjBilaLK4S9rl0xZxg7//PUdTOSdP7XT5PpAVDElM5PWXX5+woN2lSTznNAfKRzPBrwCoA2YT zZNXJ/DnWMSBAj8CNos3BkPNj26QwO3TEcxUkZeXipNStOIQmWraKQQRmLr27YaGBd6o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/dpci: EOI interrupt regardless of its masking status Message-Id: Date: Thu, 21 Jan 2021 15:23:56 +0000 commit a3509dcd0fbb86cfe2e4b32996eed3afc363d7da Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:18:32 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:18:32 2021 +0100 x86/dpci: EOI interrupt regardless of its masking status Modify hvm_pirq_eoi to always EOI the interrupt if required, instead of not doing such EOI if the interrupt is routed through the vIO-APIC and the entry is masked at the time the EOI is performed. Further unmask of the vIO-APIC pin won't EOI the interrupt, and thus the guest OS has to wait for the timeout to expire and the automatic EOI to be performed. This allows to simplify the helpers and drop the vioapic_redir_entry parameter from all of them. Fixes: ccfe4e08455 ('Intel vt-d specific changes in arch/x86/hvm/vmx/vtd.') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: eb298f32fac5ac362eef30a66a9c9c42724d4ce6 master date: 2021-01-07 15:10:29 +0100 --- xen/arch/x86/hvm/vioapic.c | 2 +- xen/arch/x86/hvm/vpic.c | 3 +-- xen/drivers/passthrough/io.c | 21 ++++++++------------- xen/include/asm-x86/hvm/io.h | 3 +-- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index 52c5c636e3..abb27a5704 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -539,7 +539,7 @@ void vioapic_update_EOI(struct domain *d, u8 vector) if ( is_iommu_enabled(d) ) { spin_unlock(&d->arch.hvm.irq_lock); - hvm_dpci_eoi(d, vioapic->base_gsi + pin, ent); + hvm_dpci_eoi(d, vioapic->base_gsi + pin); spin_lock(&d->arch.hvm.irq_lock); } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 61f4b6784c..fcc3de5c0c 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -261,8 +261,7 @@ static void vpic_ioport_write( vpic_update_int_output(vpic); vpic_unlock(vpic); hvm_dpci_eoi(current->domain, - hvm_isa_irq_to_gsi((addr >> 7) ? (irq|8) : irq), - NULL); + hvm_isa_irq_to_gsi((addr >> 7) ? (irq | 8) : irq)); return; /* bail immediately */ case 6: /* Set Priority */ vpic->priority_add = (val + 1) & 7; diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index 6b1305a3e5..71eaf2c17e 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -950,8 +950,7 @@ static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) spin_unlock(&d->event_lock); } -static void hvm_pirq_eoi(struct pirq *pirq, - const union vioapic_redir_entry *ent) +static void hvm_pirq_eoi(struct pirq *pirq) { struct hvm_pirq_dpci *pirq_dpci; @@ -968,7 +967,6 @@ static void hvm_pirq_eoi(struct pirq *pirq, * since interrupt is still not EOIed */ if ( --pirq_dpci->pending || - (ent && ent->fields.mask) || !pt_irq_need_timer(pirq_dpci->flags) ) return; @@ -977,19 +975,17 @@ static void hvm_pirq_eoi(struct pirq *pirq, } static void __hvm_dpci_eoi(struct domain *d, - const struct hvm_girq_dpci_mapping *girq, - const union vioapic_redir_entry *ent) + const struct hvm_girq_dpci_mapping *girq) { struct pirq *pirq = pirq_info(d, girq->machine_gsi); if ( !hvm_domain_use_pirq(d, pirq) ) hvm_pci_intx_deassert(d, girq->device, girq->intx); - hvm_pirq_eoi(pirq, ent); + hvm_pirq_eoi(pirq); } -static void hvm_gsi_eoi(struct domain *d, unsigned int gsi, - const union vioapic_redir_entry *ent) +static void hvm_gsi_eoi(struct domain *d, unsigned int gsi) { struct pirq *pirq = pirq_info(d, gsi); @@ -998,11 +994,10 @@ static void hvm_gsi_eoi(struct domain *d, unsigned int gsi, return; hvm_gsi_deassert(d, gsi); - hvm_pirq_eoi(pirq, ent); + hvm_pirq_eoi(pirq); } -void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, - const union vioapic_redir_entry *ent) +void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi) { const struct hvm_irq_dpci *hvm_irq_dpci; const struct hvm_girq_dpci_mapping *girq; @@ -1013,7 +1008,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, if ( is_hardware_domain(d) ) { spin_lock(&d->event_lock); - hvm_gsi_eoi(d, guest_gsi, ent); + hvm_gsi_eoi(d, guest_gsi); goto unlock; } @@ -1030,7 +1025,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, goto unlock; list_for_each_entry ( girq, &hvm_irq_dpci->girq[guest_gsi], list ) - __hvm_dpci_eoi(d, girq, ent); + __hvm_dpci_eoi(d, girq); unlock: spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 558426b772..9453b9b2b7 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -118,8 +118,7 @@ bool handle_mmio_with_translation(unsigned long gla, unsigned long gpfn, struct npfec); bool handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); -void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, - const union vioapic_redir_entry *ent); +void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq); void msix_write_completion(struct vcpu *); #ifdef CONFIG_HVM -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:24:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:24:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72195.129778 (Exim 4.92) (envelope-from ) id 1l2bod-0006Lu-6Z; Thu, 21 Jan 2021 15:24:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72195.129778; Thu, 21 Jan 2021 15:24: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 1l2bod-0006Ll-36; Thu, 21 Jan 2021 15:24:07 +0000 Received: by outflank-mailman (input) for mailman id 72195; Thu, 21 Jan 2021 15:24:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2boc-0006Lf-Iu for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2boc-0002iD-IB for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2boc-0004VU-HS for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=D3P/l673ylfWH/vtFrA5e0N8bJVhJfFBfvq5tZsMwUw=; b=kObDvPF1MOsatjmblbRqsW0cTX rpQBPTd/eNkq5CjrOSicRzzV858bQg6Z8ph6DNhWeLQ8liIN5cCvxauDWu98Wk5Jl1iaZlposHQs4 FnCjtSNP6P6Z3x5PbwIhob9PZk1vB3Dt2wEnw1yybl+/wr921YkxulNe2Q93QMZRiRCA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/hypercall: fix gnttab hypercall args conditional build on pvshim Message-Id: Date: Thu, 21 Jan 2021 15:24:06 +0000 commit e44321d94f984890d8dd7488a0fbab9933fb29fc Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:19:09 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:19:09 2021 +0100 x86/hypercall: fix gnttab hypercall args conditional build on pvshim A pvshim build doesn't require the grant table functionality built in, but it does require knowing the number of arguments the hypercall has so the hypercall parameter clobbering works properly. Instead of also setting the argument count for the gnttab case if PV shim functionality is enabled, just drop all of the conditionals from hypercall_args_table, as a hypercall having a NULL handler won't get to use that information anyway. Note this hasn't been detected by osstest because the tools pvshim build is done without debug enabled, so the hypercall parameter clobbering doesn't happen. Fixes: d2151152dd2 ('xen: make grant table support configurable') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: b468b464c89e92629bd52cec58e9f51eee2e950a master date: 2021-01-08 16:51:52 +0100 --- xen/arch/x86/hypercall.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c index dd00983005..14da9bc4ad 100644 --- a/xen/arch/x86/hypercall.c +++ b/xen/arch/x86/hypercall.c @@ -47,9 +47,7 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(xen_version, 2), ARGS(console_io, 3), ARGS(physdev_op_compat, 1), -#ifdef CONFIG_GRANT_TABLE ARGS(grant_table_op, 3), -#endif ARGS(vm_assist, 2), COMP(update_va_mapping_otherdomain, 4, 5), ARGS(vcpu_op, 3), @@ -65,17 +63,11 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(sysctl, 1), ARGS(domctl, 1), ARGS(kexec_op, 2), -#ifdef CONFIG_ARGO ARGS(argo_op, 5), -#endif ARGS(xenpmu_op, 2), -#ifdef CONFIG_HVM ARGS(hvm_op, 2), ARGS(dm_op, 3), -#endif -#ifdef CONFIG_HYPFS ARGS(hypfs_op, 5), -#endif ARGS(mca, 1), ARGS(arch_1, 1), }; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:24:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:24:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72196.129781 (Exim 4.92) (envelope-from ) id 1l2bon-0006NC-7f; Thu, 21 Jan 2021 15:24:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72196.129781; Thu, 21 Jan 2021 15:24: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 1l2bon-0006N4-4g; Thu, 21 Jan 2021 15:24:17 +0000 Received: by outflank-mailman (input) for mailman id 72196; Thu, 21 Jan 2021 15:24:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bom-0006Mx-Lh for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bom-0002jr-Kz for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bom-0004WL-KG for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dyoHo6gg9gZg/Emmfdm9/E/jWdc87h/Ghd2xIvLiTew=; b=1gDgcDei7jlhmxLH4/5STeRF1E 2empXYt7SDLBk+00uaf3YQkGh4/JIhTIX7cgX9cPElkX9dBGFUR1ij4mzAVq0CQi52rxzx6YGy4sk Yg2yjVKoIco13nBI2V9aaQVyMQhFnBFG+g3fSE3l8ncDiBHihwEw4u+tzIlEMVIijOGQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/ACPI: don't overwrite FADT Message-Id: Date: Thu, 21 Jan 2021 15:24:16 +0000 commit cad784fb8fcfd8f32ca4a787a95abbabc0059736 Author: Jan Beulich AuthorDate: Thu Jan 21 16:19:34 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:19:34 2021 +0100 x86/ACPI: don't overwrite FADT When marking fields invalid for our own purposes, we should do so in our local copy (so we will notice later on), not in the firmware provided one (which another entity may want to look at again, e.g. after kexec). Also mark the function parameter const to notice such issues right away. Instead use the pointer at the firmware copy for specifying an adjacent printk()'s arguments. If nothing else this at least reduces the number of relocations the assembler hasto emit and the linker has to process. Fixes: 62d1a69a4e9f ("ACPI: support v5 (reduced HW) sleep interface") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: 654c917d94d24587bb6b4a8d862baf04b25cbe33 master date: 2021-01-11 14:55:52 +0100 --- xen/arch/x86/acpi/boot.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index ed40ce56b4..38c2b76e00 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -349,7 +349,7 @@ static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) /* Get pm1x_cnt and pm1x_evt information for ACPI sleep */ static void __init -acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) +acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt) { struct acpi_table_facs *facs = NULL; uint64_t facs_pa; @@ -362,10 +362,10 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) printk(KERN_INFO PREFIX "v5 SLEEP INFO: control[%d:%"PRIx64"]," " status[%d:%"PRIx64"]\n", - acpi_sinfo.sleep_control.space_id, - acpi_sinfo.sleep_control.address, - acpi_sinfo.sleep_status.space_id, - acpi_sinfo.sleep_status.address); + fadt->sleep_control.space_id, + fadt->sleep_control.address, + fadt->sleep_status.space_id, + fadt->sleep_status.address); if ((fadt->sleep_control.address && (fadt->sleep_control.bit_offset || @@ -384,8 +384,8 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) fadt->sleep_status.bit_offset, fadt->sleep_status.bit_width, fadt->sleep_status.access_width); - fadt->sleep_control.address = 0; - fadt->sleep_status.address = 0; + acpi_sinfo.sleep_control.address = 0; + acpi_sinfo.sleep_status.address = 0; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:24:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:24:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72197.129785 (Exim 4.92) (envelope-from ) id 1l2box-0006OR-9B; Thu, 21 Jan 2021 15:24:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72197.129785; Thu, 21 Jan 2021 15:24: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 1l2box-0006OI-6A; Thu, 21 Jan 2021 15:24:27 +0000 Received: by outflank-mailman (input) for mailman id 72197; Thu, 21 Jan 2021 15:24:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bow-0006OB-OU for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bow-0002jy-Nk for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bow-0004Yj-N0 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24: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=ENpSZCEHvTbCn1yuyeSrc+HMK/VNxCOwjGsm6fbTcww=; b=B8xJN0mkqj2rSlH4tvVqWCkLAa oGFV3wmTeBTKO0TTHy7q575F4cdX0ZAZUc7EJRxoQY5yeJfKxvp1CObiV17O+txYr/GLlYOLK3Qy9 tGXyKMiwOEb19/bM85Tob2N7hJlXQb48ZUnyaoUf2j4gbfhgYcRTh1RXoBcjBPaVaSi0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] xen/memory: Fix compat XENMEM_acquire_resource for size requests Message-Id: Date: Thu, 21 Jan 2021 15:24:26 +0000 commit 7f99c05ded1999e9cf85a9d1f3586dfa45daa531 Author: Andrew Cooper AuthorDate: Thu Jan 21 16:20:00 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:20:00 2021 +0100 xen/memory: Fix compat XENMEM_acquire_resource for size requests Copy the nr_frames from the structure which actually has the correct value, so the caller doesn't unconditionally receive 0. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant master commit: 414be7b66349e7dca42bc1fd47c2b2f5b2d27432 master date: 2021-01-12 18:17:02 +0000 --- xen/common/compat/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 3851f756c7..ed92e05b08 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -599,7 +599,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) if ( __copy_field_to_guest( guest_handle_cast(compat, compat_mem_acquire_resource_t), - &cmp.mar, nr_frames) ) + nat.mar, nr_frames) ) return -EFAULT; } else -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:24:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:24:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72198.129789 (Exim 4.92) (envelope-from ) id 1l2bp7-0006QC-C9; Thu, 21 Jan 2021 15:24:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72198.129789; Thu, 21 Jan 2021 15:24: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 1l2bp7-0006Q4-9A; Thu, 21 Jan 2021 15:24:37 +0000 Received: by outflank-mailman (input) for mailman id 72198; Thu, 21 Jan 2021 15:24:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bp6-0006Pg-S8 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bp6-0002k6-QO for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bp6-0004Zw-Pp for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24: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=j1lksQ92aLv7KSrMrTdNGhQ8zLHOJ/8t1bXm8ky8KOM=; b=reZmv0rmzQdl3q0p3UYKnmNxsi 9Tso6+e1K2ws5NblZyJ/kckZe2LlPzWaYilZ8knKtkevOcikIgT0EFne4hBzZ+NOtQ8paH0xPdMmQ jIZQjg0ek3COcAdzLIsxYJcTi5XGpiJHnK7Zm2wKc5mPZGvT4Wob4NfPXVfrNKEvEK4U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/mem_sharing: fix uninitialized 'preempted' variable Message-Id: Date: Thu, 21 Jan 2021 15:24:36 +0000 commit 9028fd493a69b1e216239542d986240fa1ea7167 Author: Tamas K Lengyel AuthorDate: Thu Jan 21 16:20:27 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:20:27 2021 +0100 x86/mem_sharing: fix uninitialized 'preempted' variable UBSAN catches an uninitialized use of the 'preempted' variable in fork_hap_allocation when there is no preemption. Fixes: 41548c5472a ("mem_sharing: VM forking") Signed-off-by: Tamas K Lengyel Acked-by: Andrew Cooper master commit: cb34a2fa162184b150d48a3b6f385bacbec22ce7 master date: 2021-01-18 17:50:11 +0000 --- xen/arch/x86/mm/mem_sharing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index c428fd16ce..468bbcfa67 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1628,7 +1628,7 @@ static int copy_vcpu_settings(struct domain *cd, const struct domain *d) static int fork_hap_allocation(struct domain *cd, struct domain *d) { int rc; - bool preempted; + bool preempted = false; unsigned long mb = hap_get_allocation(d); if ( mb == hap_get_allocation(cd) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:24:48 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:24:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72199.129793 (Exim 4.92) (envelope-from ) id 1l2bpI-0006Rb-Ds; Thu, 21 Jan 2021 15:24:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72199.129793; Thu, 21 Jan 2021 15:24:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bpI-0006RQ-Ak; Thu, 21 Jan 2021 15:24:48 +0000 Received: by outflank-mailman (input) for mailman id 72199; Thu, 21 Jan 2021 15:24:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bpG-0006RH-UF for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bpG-0002kU-TU for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bpG-0004al-Sn for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:24:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+T/7utC4+5pX23nMyXEh9ZheezqpvqYwtiHsPX0nNj4=; b=K/Z17XxgbPqFVlwd/PPHC913QI t6atqIXRHXIXg3WXpKlOxA/vr+ZSv+ix2/I56GIhZppOuArOYynDMQHFglN32A+4e3yVTSAHZryVy OUKhxhDFX4BrXcJNDRr85BN9FemNE+4lZwxp4zrLfTXnnFy4qIoeRSHkDqvKrGWqkBdY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/dpci: do not remove pirqs from domain tree on unbind Message-Id: Date: Thu, 21 Jan 2021 15:24:46 +0000 commit 4170218cb96546426664e5c1d00c5a848a26ae9e Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:21:04 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:21:04 2021 +0100 x86/dpci: do not remove pirqs from domain tree on unbind A fix for a previous issue removed the pirqs from the domain tree when they are unbound in order to prevent shared pirqs from triggering a BUG_ON in __pirq_guest_unbind if they are unbound multiple times. That caused free_domain_pirqs to no longer unmap the pirqs because they are gone from the domain pirq tree, thus leaving stale unbound pirqs after domain destruction if the domain had mapped dpci pirqs after shutdown. Take a different approach to fix the original issue, instead of removing the pirq from d->pirq_tree clear the flags of the dpci pirq struct to signal that the pirq is now unbound. This prevents calling pirq_guest_unbind multiple times for the same pirq without having to remove it from the domain pirq tree. This is XSA-360. Fixes: 5b58dad089 ('x86/pass-through: avoid double IRQ unbind during domain cleanup') Reported-by: Samuel Verschelde Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 58427889f5a420cc5226f88524b3228f90b72a58 master date: 2021-01-21 16:11:41 +0100 --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/pci.c | 27 ++++++++------------------- xen/include/asm-x86/hvm/irq.h | 2 -- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 37c86283cc..41800e1083 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1331,7 +1331,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d) } if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq ) - BUG_ON(!d->is_dying); + BUG(); } /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 2d6238a5bb..418b2cdf04 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -862,6 +862,10 @@ static int pci_clean_dpci_irq(struct domain *d, { struct dev_intx_gsi_link *digl, *tmp; + if ( !pirq_dpci->flags ) + /* Already processed. */ + return 0; + pirq_guest_unbind(d, dpci_pirq(pirq_dpci)); if ( pt_irq_need_timer(pirq_dpci->flags) ) @@ -872,15 +876,10 @@ static int pci_clean_dpci_irq(struct domain *d, list_del(&digl->list); xfree(digl); } + /* Note the pirq is now unbound. */ + pirq_dpci->flags = 0; - radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); - - if ( !pt_pirq_softirq_active(pirq_dpci) ) - return 0; - - domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; - - return -ERESTART; + return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; } static int pci_clean_dpci_irqs(struct domain *d) @@ -897,18 +896,8 @@ static int pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = 0; - - if ( hvm_irq_dpci->pending_pirq_dpci ) - { - if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) - ret = -ERESTART; - else - hvm_irq_dpci->pending_pirq_dpci = NULL; - } + int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); - if ( !ret ) - ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); if ( ret ) { spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index 532880d497..7f76f6c437 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -160,8 +160,6 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; - /* Clean up: Entry with a softirq invocation pending / in progress. */ - struct hvm_pirq_dpci *pending_pirq_dpci; }; /* Machine IRQ to guest device/intx mapping. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:33:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72200.129796 (Exim 4.92) (envelope-from ) id 1l2bxK-0007NY-29; Thu, 21 Jan 2021 15:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72200.129796; Thu, 21 Jan 2021 15: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 1l2bxJ-0007NQ-VX; Thu, 21 Jan 2021 15:33:05 +0000 Received: by outflank-mailman (input) for mailman id 72200; Thu, 21 Jan 2021 15:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxI-0007NL-PW for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxI-0002rx-MV for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bxI-0005DK-Kd for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=K7i+Y+LhIy/rAYVF8PrO+3pdUYGTisBvXxnDhg2t9tI=; b=MIo5UWwlaqBdem+SrsDn+f/bTu S5HlytUVCAXGV/DnDrrW/kXFPgR051UkNP5N6avXxwgbPZ83tYzivqpq6HBeNbTOxtD1T/DsaHgB4 vnDzSmXC75uC9F6aicMB9E8H5Swj6ldeV5ujtR87oRWBTMnRTE0iShEep7fCEN3pII2M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.13] x86/vPCI: tolerate (un)masking a disabled MSI-X entry Message-Id: Date: Thu, 21 Jan 2021 15:33:04 +0000 commit 0c78a9d38379a8217354d2f56a38de30fb90d6e1 Author: Jan Beulich AuthorDate: Thu Jan 21 16:23:23 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:23:23 2021 +0100 x86/vPCI: tolerate (un)masking a disabled MSI-X entry None of the four reasons causing vpci_msix_arch_mask_entry() to get called (there's just a single call site) are impossible or illegal prior to an entry actually having got set up: - the entry may remain masked (in this case, however, a prior masked -> unmasked transition would already not have worked), - MSI-X may not be enabled, - the global mask bit may be set, - the entry may not otherwise have been updated. Hence the function asserting that the entry was previously set up was simply wrong. Since the caller tracks the masked state (and setting up of an entry would only be effected when that software bit is clear), it's okay to skip both masking and unmasking requests in this case. Fixes: d6281be9d0145 ('vpci/msix: add MSI-X handlers') Reported-by: Manuel Bouyer Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Tested-by: Manuel Bouyer master commit: 04b090366ca59e8a75837c822df261a8d0bd1a30 master date: 2021-01-05 13:17:54 +0100 --- xen/arch/x86/hvm/vmsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 6597d9f719..f872fe45af 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -840,8 +840,8 @@ void vpci_msi_arch_print(const struct vpci_msi *msi) void vpci_msix_arch_mask_entry(struct vpci_msix_entry *entry, const struct pci_dev *pdev, bool mask) { - ASSERT(entry->arch.pirq != INVALID_PIRQ); - vpci_mask_pirq(pdev->domain, entry->arch.pirq, mask); + if ( entry->arch.pirq != INVALID_PIRQ ) + vpci_mask_pirq(pdev->domain, entry->arch.pirq, mask); } int vpci_msix_arch_enable_entry(struct vpci_msix_entry *entry, -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:33:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:33:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72201.129801 (Exim 4.92) (envelope-from ) id 1l2bxU-0007OO-3n; Thu, 21 Jan 2021 15:33:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72201.129801; Thu, 21 Jan 2021 15:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxU-0007OG-0l; Thu, 21 Jan 2021 15:33:16 +0000 Received: by outflank-mailman (input) for mailman id 72201; Thu, 21 Jan 2021 15:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxS-0007OA-T9 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxS-0002s3-Rc for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bxS-0005Dy-Op for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/kPVYwDLQVChVJ6ptlSocnFqmfjvRNx5xOYSW8EcW6I=; b=udnN0uPovCXjLc/rxlHSyb5a2g lB6ohkoLESCeusI1nZvP+LvbO1AE190UThMXUgSnUx7Yp9koRb6mwgAnthhyz13TFbEDwwtm0v6SX g7kN6fDG5MEoQVN7Lw8PkcX7+sGLMlmyHicvtMDkgYbKfT+uJZKfkIhJNven3xEXnX8k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.13] x86/dpci: EOI interrupt regardless of its masking status Message-Id: Date: Thu, 21 Jan 2021 15:33:14 +0000 commit dc36f72d2a2a94e5b41b7b0de0bad3b2902c529c Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:23:58 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:23:58 2021 +0100 x86/dpci: EOI interrupt regardless of its masking status Modify hvm_pirq_eoi to always EOI the interrupt if required, instead of not doing such EOI if the interrupt is routed through the vIO-APIC and the entry is masked at the time the EOI is performed. Further unmask of the vIO-APIC pin won't EOI the interrupt, and thus the guest OS has to wait for the timeout to expire and the automatic EOI to be performed. This allows to simplify the helpers and drop the vioapic_redir_entry parameter from all of them. Fixes: ccfe4e08455 ('Intel vt-d specific changes in arch/x86/hvm/vmx/vtd.') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: eb298f32fac5ac362eef30a66a9c9c42724d4ce6 master date: 2021-01-07 15:10:29 +0100 --- xen/arch/x86/hvm/vioapic.c | 2 +- xen/arch/x86/hvm/vpic.c | 3 +-- xen/drivers/passthrough/io.c | 21 ++++++++------------- xen/include/asm-x86/hvm/io.h | 3 +-- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index d899dd9707..da03b4d4b3 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -539,7 +539,7 @@ void vioapic_update_EOI(struct domain *d, u8 vector) if ( is_iommu_enabled(d) ) { spin_unlock(&d->arch.hvm.irq_lock); - hvm_dpci_eoi(d, vioapic->base_gsi + pin, ent); + hvm_dpci_eoi(d, vioapic->base_gsi + pin); spin_lock(&d->arch.hvm.irq_lock); } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 4897a0e05b..9ec4652222 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -261,8 +261,7 @@ static void vpic_ioport_write( vpic_update_int_output(vpic); vpic_unlock(vpic); hvm_dpci_eoi(current->domain, - hvm_isa_irq_to_gsi((addr >> 7) ? (irq|8) : irq), - NULL); + hvm_isa_irq_to_gsi((addr >> 7) ? (irq | 8) : irq)); return; /* bail immediately */ case 6: /* Set Priority */ vpic->priority_add = (val + 1) & 7; diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index 6b1305a3e5..71eaf2c17e 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -950,8 +950,7 @@ static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) spin_unlock(&d->event_lock); } -static void hvm_pirq_eoi(struct pirq *pirq, - const union vioapic_redir_entry *ent) +static void hvm_pirq_eoi(struct pirq *pirq) { struct hvm_pirq_dpci *pirq_dpci; @@ -968,7 +967,6 @@ static void hvm_pirq_eoi(struct pirq *pirq, * since interrupt is still not EOIed */ if ( --pirq_dpci->pending || - (ent && ent->fields.mask) || !pt_irq_need_timer(pirq_dpci->flags) ) return; @@ -977,19 +975,17 @@ static void hvm_pirq_eoi(struct pirq *pirq, } static void __hvm_dpci_eoi(struct domain *d, - const struct hvm_girq_dpci_mapping *girq, - const union vioapic_redir_entry *ent) + const struct hvm_girq_dpci_mapping *girq) { struct pirq *pirq = pirq_info(d, girq->machine_gsi); if ( !hvm_domain_use_pirq(d, pirq) ) hvm_pci_intx_deassert(d, girq->device, girq->intx); - hvm_pirq_eoi(pirq, ent); + hvm_pirq_eoi(pirq); } -static void hvm_gsi_eoi(struct domain *d, unsigned int gsi, - const union vioapic_redir_entry *ent) +static void hvm_gsi_eoi(struct domain *d, unsigned int gsi) { struct pirq *pirq = pirq_info(d, gsi); @@ -998,11 +994,10 @@ static void hvm_gsi_eoi(struct domain *d, unsigned int gsi, return; hvm_gsi_deassert(d, gsi); - hvm_pirq_eoi(pirq, ent); + hvm_pirq_eoi(pirq); } -void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, - const union vioapic_redir_entry *ent) +void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi) { const struct hvm_irq_dpci *hvm_irq_dpci; const struct hvm_girq_dpci_mapping *girq; @@ -1013,7 +1008,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, if ( is_hardware_domain(d) ) { spin_lock(&d->event_lock); - hvm_gsi_eoi(d, guest_gsi, ent); + hvm_gsi_eoi(d, guest_gsi); goto unlock; } @@ -1030,7 +1025,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, goto unlock; list_for_each_entry ( girq, &hvm_irq_dpci->girq[guest_gsi], list ) - __hvm_dpci_eoi(d, girq, ent); + __hvm_dpci_eoi(d, girq); unlock: spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index f5a8813b33..ac0a870bee 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -122,8 +122,7 @@ bool handle_mmio_with_translation(unsigned long gla, unsigned long gpfn, struct npfec); bool handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); -void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, - const union vioapic_redir_entry *ent); +void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq); void msix_write_completion(struct vcpu *); #ifdef CONFIG_HVM -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:33:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:33:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72202.129805 (Exim 4.92) (envelope-from ) id 1l2bxe-0007Pk-5E; Thu, 21 Jan 2021 15:33:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72202.129805; Thu, 21 Jan 2021 15:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxe-0007Pb-2L; Thu, 21 Jan 2021 15:33:26 +0000 Received: by outflank-mailman (input) for mailman id 72202; Thu, 21 Jan 2021 15:33:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxd-0007PT-0r for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxc-0002sD-UT for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bxc-0005Ec-Te for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Bm8lhvCY3IJGuVA1tNA85Ly0FHEamSOZDOsrUnN3IvQ=; b=cKj3QpWQSQC/kzaccaBQkWAfRL 776ZsOQajSrKlz3La0m/d+lp0PSEPxOK2OhSLVUyuAMQsFuAT6Qk9RiSU8X+dQPFWfhDobTkjttpR EljiYyWmm0LoKDIma7CyrAKEdBsImf7sKd/qK3/5TEaMN1UOG1ZbP+OQVnD7nC3jhLt0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.13] x86/hypercall: fix gnttab hypercall args conditional build on pvshim Message-Id: Date: Thu, 21 Jan 2021 15:33:24 +0000 commit 95b5283e83533f1f19f299742a2b54f715471d7c Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:24:37 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:24:37 2021 +0100 x86/hypercall: fix gnttab hypercall args conditional build on pvshim A pvshim build doesn't require the grant table functionality built in, but it does require knowing the number of arguments the hypercall has so the hypercall parameter clobbering works properly. Instead of also setting the argument count for the gnttab case if PV shim functionality is enabled, just drop all of the conditionals from hypercall_args_table, as a hypercall having a NULL handler won't get to use that information anyway. Note this hasn't been detected by osstest because the tools pvshim build is done without debug enabled, so the hypercall parameter clobbering doesn't happen. Fixes: d2151152dd2 ('xen: make grant table support configurable') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: b468b464c89e92629bd52cec58e9f51eee2e950a master date: 2021-01-08 16:51:52 +0100 --- xen/arch/x86/hypercall.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c index 1d42702c6a..3b749c61f9 100644 --- a/xen/arch/x86/hypercall.c +++ b/xen/arch/x86/hypercall.c @@ -47,9 +47,7 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(xen_version, 2), ARGS(console_io, 3), ARGS(physdev_op_compat, 1), -#ifdef CONFIG_GRANT_TABLE ARGS(grant_table_op, 3), -#endif ARGS(vm_assist, 2), COMP(update_va_mapping_otherdomain, 4, 5), ARGS(vcpu_op, 3), @@ -65,14 +63,10 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(sysctl, 1), ARGS(domctl, 1), ARGS(kexec_op, 2), -#ifdef CONFIG_ARGO ARGS(argo_op, 5), -#endif ARGS(xenpmu_op, 2), -#ifdef CONFIG_HVM ARGS(hvm_op, 2), ARGS(dm_op, 3), -#endif ARGS(mca, 1), ARGS(arch_1, 1), }; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:33:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:33:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72203.129809 (Exim 4.92) (envelope-from ) id 1l2bxo-0007RD-6e; Thu, 21 Jan 2021 15:33:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72203.129809; Thu, 21 Jan 2021 15:33:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxo-0007R5-3k; Thu, 21 Jan 2021 15:33:36 +0000 Received: by outflank-mailman (input) for mailman id 72203; Thu, 21 Jan 2021 15:33:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxn-0007Qu-5P for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxn-0002sL-1z for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bxn-0005FN-0F for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jdbTNUGKDP/SZXSwsLz8y7yvwrZpWttx9o3FhwBKqEk=; b=geqGyljtGLO3LsGFUW8GqDwOV1 bSFVsme3DZpLVzYHdVCqJLwVV3uzuBPaK1NeHKDSZ3lPxJTXnAqaBAfhvUhv0+mM1FMZIwOY9jPGP jlzuaFCo77i2o/3gXJEkJG6mSl+2oXEgOlR4eTZ+Diu7A67Y6wtPCICMl+P49Y5tpMCg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.13] x86/ACPI: don't overwrite FADT Message-Id: Date: Thu, 21 Jan 2021 15:33:35 +0000 commit bbce51a8da3985502a5d55f7b431a9a8c446b5b2 Author: Jan Beulich AuthorDate: Thu Jan 21 16:25:06 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:25:06 2021 +0100 x86/ACPI: don't overwrite FADT When marking fields invalid for our own purposes, we should do so in our local copy (so we will notice later on), not in the firmware provided one (which another entity may want to look at again, e.g. after kexec). Also mark the function parameter const to notice such issues right away. Instead use the pointer at the firmware copy for specifying an adjacent printk()'s arguments. If nothing else this at least reduces the number of relocations the assembler hasto emit and the linker has to process. Fixes: 62d1a69a4e9f ("ACPI: support v5 (reduced HW) sleep interface") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: 654c917d94d24587bb6b4a8d862baf04b25cbe33 master date: 2021-01-11 14:55:52 +0100 --- xen/arch/x86/acpi/boot.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 0b0a8f62e4..5dfa8e3dca 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -347,7 +347,7 @@ static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) /* Get pm1x_cnt and pm1x_evt information for ACPI sleep */ static void __init -acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) +acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt) { struct acpi_table_facs *facs = NULL; uint64_t facs_pa; @@ -360,10 +360,10 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) printk(KERN_INFO PREFIX "v5 SLEEP INFO: control[%d:%"PRIx64"]," " status[%d:%"PRIx64"]\n", - acpi_sinfo.sleep_control.space_id, - acpi_sinfo.sleep_control.address, - acpi_sinfo.sleep_status.space_id, - acpi_sinfo.sleep_status.address); + fadt->sleep_control.space_id, + fadt->sleep_control.address, + fadt->sleep_status.space_id, + fadt->sleep_status.address); if ((fadt->sleep_control.address && (fadt->sleep_control.bit_offset || @@ -382,8 +382,8 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) fadt->sleep_status.bit_offset, fadt->sleep_status.bit_width, fadt->sleep_status.access_width); - fadt->sleep_control.address = 0; - fadt->sleep_status.address = 0; + acpi_sinfo.sleep_control.address = 0; + acpi_sinfo.sleep_status.address = 0; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:33:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:33:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72204.129813 (Exim 4.92) (envelope-from ) id 1l2bxy-0007T4-9n; Thu, 21 Jan 2021 15:33:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72204.129813; Thu, 21 Jan 2021 15:33:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxy-0007Sw-6k; Thu, 21 Jan 2021 15:33:46 +0000 Received: by outflank-mailman (input) for mailman id 72204; Thu, 21 Jan 2021 15:33:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxx-0007Sn-5g for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2bxx-0002sm-4q for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2bxx-0005G2-43 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=W/fi2oSYNbcwNdu9im5ibUSGCH49h3AhGV+wC1zE/Ck=; b=k2NsJQoqGbbRW17AKlXIn5Rdjp OPdLL6TMkrmzYuE40DR2/dv0rhDRG9w2FGV6VVUvAAKOxgRjvC11QKDaukQOX9VHZcT+7lZWeAFsH wNoKCjnJqTbId+OI13cMC7+KXN1PpBqE0ZHoiPWAnGffBE8ij9RG6U90EY1vExEW4e9w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.13] xen/memory: Fix compat XENMEM_acquire_resource for size requests Message-Id: Date: Thu, 21 Jan 2021 15:33:45 +0000 commit 1dd564515d0023332f9447a4c19e1df31b13da09 Author: Andrew Cooper AuthorDate: Thu Jan 21 16:25:35 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:25:35 2021 +0100 xen/memory: Fix compat XENMEM_acquire_resource for size requests Copy the nr_frames from the structure which actually has the correct value, so the caller doesn't unconditionally receive 0. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant master commit: 414be7b66349e7dca42bc1fd47c2b2f5b2d27432 master date: 2021-01-12 18:17:02 +0000 --- xen/common/compat/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 3851f756c7..ed92e05b08 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -599,7 +599,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) if ( __copy_field_to_guest( guest_handle_cast(compat, compat_mem_acquire_resource_t), - &cmp.mar, nr_frames) ) + nat.mar, nr_frames) ) return -EFAULT; } else -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:33:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:33:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72205.129817 (Exim 4.92) (envelope-from ) id 1l2by8-0007UK-B8; Thu, 21 Jan 2021 15:33:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72205.129817; Thu, 21 Jan 2021 15:33:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2by8-0007UC-8D; Thu, 21 Jan 2021 15:33:56 +0000 Received: by outflank-mailman (input) for mailman id 72205; Thu, 21 Jan 2021 15:33:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2by7-0007U3-8z for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2by7-0002sy-8A for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:33:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2by7-0005HH-7H for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15: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=rWk5lPmo5Wdb8ZliGCTOOa+WOTkGcHpY3vAfWHmNmro=; b=nc2mG7+neOWkG/mO8UUZ9OUFAq 2mMq2sQqYKmzeNbrrUsia8XDZ3ONno1uoV/HpvQHUEklXhsrb7qApynVXI0V41PBJaMicH/ywnXjU ocEcR8Q9VOdCxQRDkPj+LQHr+0yDoCW+kzHpGgrvzDjAxBCEzOgsVhjaVYh6zdAW9fWw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.13] x86/dpci: do not remove pirqs from domain tree on unbind Message-Id: Date: Thu, 21 Jan 2021 15:33:55 +0000 commit e4161938b315f3b9c6a13ade30d16c11504a2d16 Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:26:16 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:26:16 2021 +0100 x86/dpci: do not remove pirqs from domain tree on unbind A fix for a previous issue removed the pirqs from the domain tree when they are unbound in order to prevent shared pirqs from triggering a BUG_ON in __pirq_guest_unbind if they are unbound multiple times. That caused free_domain_pirqs to no longer unmap the pirqs because they are gone from the domain pirq tree, thus leaving stale unbound pirqs after domain destruction if the domain had mapped dpci pirqs after shutdown. Take a different approach to fix the original issue, instead of removing the pirq from d->pirq_tree clear the flags of the dpci pirq struct to signal that the pirq is now unbound. This prevents calling pirq_guest_unbind multiple times for the same pirq without having to remove it from the domain pirq tree. This is XSA-360. Fixes: 5b58dad089 ('x86/pass-through: avoid double IRQ unbind during domain cleanup') Reported-by: Samuel Verschelde Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 58427889f5a420cc5226f88524b3228f90b72a58 master date: 2021-01-21 16:11:41 +0100 --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/pci.c | 27 ++++++++------------------- xen/include/asm-x86/hvm/irq.h | 2 -- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index f05defbd7d..47f41da4e5 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1504,7 +1504,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d) } if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq ) - BUG_ON(!d->is_dying); + BUG(); } /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 1efd8d0eeb..b59a17b19a 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -861,6 +861,10 @@ static int pci_clean_dpci_irq(struct domain *d, { struct dev_intx_gsi_link *digl, *tmp; + if ( !pirq_dpci->flags ) + /* Already processed. */ + return 0; + pirq_guest_unbind(d, dpci_pirq(pirq_dpci)); if ( pt_irq_need_timer(pirq_dpci->flags) ) @@ -871,15 +875,10 @@ static int pci_clean_dpci_irq(struct domain *d, list_del(&digl->list); xfree(digl); } + /* Note the pirq is now unbound. */ + pirq_dpci->flags = 0; - radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); - - if ( !pt_pirq_softirq_active(pirq_dpci) ) - return 0; - - domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; - - return -ERESTART; + return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; } static int pci_clean_dpci_irqs(struct domain *d) @@ -896,18 +895,8 @@ static int pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = 0; + int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); - if ( hvm_irq_dpci->pending_pirq_dpci ) - { - if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) - ret = -ERESTART; - else - hvm_irq_dpci->pending_pirq_dpci = NULL; - } - - if ( !ret ) - ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); if ( ret ) { spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index 532880d497..7f76f6c437 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -160,8 +160,6 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; - /* Clean up: Entry with a softirq invocation pending / in progress. */ - struct hvm_pirq_dpci *pending_pirq_dpci; }; /* Machine IRQ to guest device/intx mapping. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 15:34:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 15:34:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72206.129821 (Exim 4.92) (envelope-from ) id 1l2byJ-0007X7-Cn; Thu, 21 Jan 2021 15:34:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72206.129821; Thu, 21 Jan 2021 15:34:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2byJ-0007Wz-9i; Thu, 21 Jan 2021 15:34:07 +0000 Received: by outflank-mailman (input) for mailman id 72206; Thu, 21 Jan 2021 15:34:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2byH-0007Wp-PQ for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:34:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2byH-0002tM-Og for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15:34:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2byH-0005Im-Nr for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 15: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=DgM9b8WHtvun28tMhl3IUaAeigjLqSMJM/KagjP1/sI=; b=tngsJQsCN40ygEJTltP6JHaIbE ZZgtS5bjT8BhxVrKNt1gqVpGlOEYC8n1Zu9lM9ZesLnKgvwx95zEaF5ot32xUoBROqI/4l5Xh4S5W ILVq7w1knE07Lr8QNYF7/TbGyKjursu0u9TWMUwNgQzRsYADul8kFhriFWy9InbCQATk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.12] x86/dpci: do not remove pirqs from domain tree on unbind Message-Id: Date: Thu, 21 Jan 2021 15:34:05 +0000 commit cce7cbd986c122a86582ff3775b6b559d877407c Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:28:22 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:28:22 2021 +0100 x86/dpci: do not remove pirqs from domain tree on unbind A fix for a previous issue removed the pirqs from the domain tree when they are unbound in order to prevent shared pirqs from triggering a BUG_ON in __pirq_guest_unbind if they are unbound multiple times. That caused free_domain_pirqs to no longer unmap the pirqs because they are gone from the domain pirq tree, thus leaving stale unbound pirqs after domain destruction if the domain had mapped dpci pirqs after shutdown. Take a different approach to fix the original issue, instead of removing the pirq from d->pirq_tree clear the flags of the dpci pirq struct to signal that the pirq is now unbound. This prevents calling pirq_guest_unbind multiple times for the same pirq without having to remove it from the domain pirq tree. This is XSA-360. Fixes: 5b58dad089 ('x86/pass-through: avoid double IRQ unbind during domain cleanup') Reported-by: Samuel Verschelde Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 58427889f5a420cc5226f88524b3228f90b72a58 master date: 2021-01-21 16:11:41 +0100 --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/pci.c | 27 ++++++++------------------- xen/include/asm-x86/hvm/irq.h | 2 -- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 29af31a1db..6adffac44e 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1407,7 +1407,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d) } if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq ) - BUG_ON(!d->is_dying); + BUG(); } /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index f079238b78..6b87febc3d 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -866,6 +866,10 @@ static int pci_clean_dpci_irq(struct domain *d, { struct dev_intx_gsi_link *digl, *tmp; + if ( !pirq_dpci->flags ) + /* Already processed. */ + return 0; + pirq_guest_unbind(d, dpci_pirq(pirq_dpci)); if ( pt_irq_need_timer(pirq_dpci->flags) ) @@ -876,15 +880,10 @@ static int pci_clean_dpci_irq(struct domain *d, list_del(&digl->list); xfree(digl); } + /* Note the pirq is now unbound. */ + pirq_dpci->flags = 0; - radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); - - if ( !pt_pirq_softirq_active(pirq_dpci) ) - return 0; - - domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; - - return -ERESTART; + return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; } static int pci_clean_dpci_irqs(struct domain *d) @@ -901,18 +900,8 @@ static int pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = 0; + int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); - if ( hvm_irq_dpci->pending_pirq_dpci ) - { - if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) - ret = -ERESTART; - else - hvm_irq_dpci->pending_pirq_dpci = NULL; - } - - if ( !ret ) - ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); if ( ret ) { spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index d306cfeade..5b7e90c179 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -158,8 +158,6 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; - /* Clean up: Entry with a softirq invocation pending / in progress. */ - struct hvm_pirq_dpci *pending_pirq_dpci; }; /* Machine IRQ to guest device/intx mapping. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 16:11:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 16:11:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72252.129961 (Exim 4.92) (envelope-from ) id 1l2cY3-0004hF-6v; Thu, 21 Jan 2021 16:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72252.129961; Thu, 21 Jan 2021 16: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 1l2cY3-0004h6-2k; Thu, 21 Jan 2021 16:11:03 +0000 Received: by outflank-mailman (input) for mailman id 72252; Thu, 21 Jan 2021 16:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2cY2-0004gt-K8 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2cY2-00044N-Gk for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2cY2-00083R-Ew for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16: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=drUnCiwU5cjlXkWjrZW1rH4Dl185ncKM5efyNwWW17U=; b=LopRw2GwWv8koSLYiHFgJK2PvS t47fsR/xuHe8AtzpIhR7Jw/GuBPW1AuAQrW7LULhGW73MlCjfqcFVTAvWhxVO+aLrYkkIAA2oOE7E QbqQaxkk0m4ycylnwy5lapu0+Ebl9CEKSRN1txqm0k4I+v4Ry6IWOJB7abMqEccNUMRQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add defensive barrier in get_cycles for Arm64 Message-Id: Date: Thu, 21 Jan 2021 16:11:02 +0000 commit 7936671da9fbf645d6bb207608f7b81c27f992de Author: Wei Chen AuthorDate: Fri Jan 8 14:21:26 2021 +0800 Commit: Julien Grall CommitDate: Wed Jan 20 17:26:18 2021 +0000 xen/arm: Add defensive barrier in get_cycles for Arm64 Per the discussion [1] on the mailing list, we'd better to have a barrier after reading CNTPCT in get_cycles. If there is not any barrier there. When get_cycles being used in some seqlock critical context in the future, the seqlock can be speculated potentially. We import Linux commit 75a19a0202db21638a1c2b424afb867e1f9a2376: arm64: arch_timer: Ensure counter register reads occur with seqlock held When executing clock_gettime(), either in the vDSO or via a system call, we need to ensure that the read of the counter register occurs within the seqlock reader critical section. This ensures that updates to the clocksource parameters (e.g. the multiplier) are consistent with the counter value and therefore avoids the situation where time appears to go backwards across multiple reads. Extend the vDSO logic so that the seqlock critical section covers the read of the counter register as well as accesses to the data page. Since reads of the counter system registers are not ordered by memory barrier instructions, introduce dependency ordering from the counter read to a subsequent memory access so that the seqlock memory barriers apply to the counter access in both the vDSO and the system call paths. Cc: Cc: Marc Zyngier Tested-by: Vincenzo Frascino Link: https://lore.kernel.org/linux-arm-kernel/alpine.DEB.2.21.1902081950260.1662@nanos.tec.linutronix.de/ Reported-by: Thomas Gleixner Signed-off-by: Will Deacon While we are not aware of such use in Xen, it would be best to add the barrier to avoid any suprise. In order to reduce the impact of new barrier, we perfer to use enforce order instead of ISB [2]. Currently, enforce order is not applied to arm32 as this is not done in Linux at the date of this patch. If this is done in Linux it will need to be also done in Xen. To avoid adding read_cntpct_enforce_ordering everywhere, we introduced a new helper read_cntpct_stable to replace original get_cycles, and turn get_cycles to a wrapper which we can add read_cntpct_enforce_ordering easily. [1] https://lists.xenproject.org/archives/html/xen-devel/2020-12/msg00181.html [2] https://lkml.org/lkml/2020/3/13/645 Signed-off-by: Wei Chen Reviewed-by: Julien Grall --- xen/include/asm-arm/time.h | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index 5c4529ebb5..6b8fd839dd 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -11,9 +11,26 @@ typedef uint64_t cycles_t; -static inline cycles_t get_cycles(void) +/* + * Ensure that reads of the counter are treated the same as memory reads + * for the purposes of ordering by subsequent memory barriers. + */ +#if defined(CONFIG_ARM_64) +#define read_cntpct_enforce_ordering(val) do { \ + uint64_t tmp, _val = (val); \ + \ + asm volatile( \ + "eor %0, %1, %1\n" \ + "add %0, sp, %0\n" \ + "ldr xzr, [%0]" \ + : "=r" (tmp) : "r" (_val)); \ +} while (0) +#else +#define read_cntpct_enforce_ordering(val) do {} while (0) +#endif + +static inline cycles_t read_cntpct_stable(void) { - isb(); /* * ARM_WORKAROUND_858921: Cortex-A73 (all versions) counter read * can return a wrong value when the counter crosses a 32bit boundary. @@ -36,6 +53,28 @@ static inline cycles_t get_cycles(void) } } +static inline cycles_t get_cycles(void) +{ + cycles_t cnt; + + isb(); + cnt = read_cntpct_stable(); + + /* + * If there is not any barrier here. When get_cycles being used in + * some seqlock critical context in the future, the seqlock can be + * speculated potentially. + * + * To prevent seqlock from being speculated silently, we add a barrier + * here defensively. Normally, we just need an ISB here is enough, but + * considering the minimum performance cost. We prefer to use enforce + * order here. + */ + read_cntpct_enforce_ordering(cnt); + + return cnt; +} + /* List of timer's IRQ */ enum timer_ppi { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 16:11:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 16:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72253.129963 (Exim 4.92) (envelope-from ) id 1l2cYD-0004jM-7t; Thu, 21 Jan 2021 16:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72253.129963; Thu, 21 Jan 2021 16: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 1l2cYD-0004jE-4X; Thu, 21 Jan 2021 16:11:13 +0000 Received: by outflank-mailman (input) for mailman id 72253; Thu, 21 Jan 2021 16:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2cYC-0004j4-Lw for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2cYC-00044T-KF for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2cYC-000848-Iu for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16: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=W474Q2SfbZsnE+9a0TtcqSTljvxDhCaFkNb4qBdFA/Q=; b=Fb3iPVSI3/UH1o5m1nPrZ/C+2M H7zH7MH82hgDPPZkdlUNxV5yOaJVpA3IXcuAhdfIITxIGZ6RQdxBieTxRaavMEb7AAl9gI8BllWxQ UErgg7ZXZSlB2y4AeQ3PTO6EJI9r/F9De9ljSOL+Dcy36pmnu/nDUjyRXJezp8XEovfQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Hide Pointer Authentication (PAC) Message-Id: Date: Thu, 21 Jan 2021 16:11:12 +0000 commit 3d64806ba5cd2ac4a01844e63c023c8c2e0aca9f Author: Vladimir Murzin AuthorDate: Wed Jan 20 11:27:12 2021 +0000 Commit: Julien Grall CommitDate: Wed Jan 20 17:42:27 2021 +0000 xen/arm: Hide Pointer Authentication (PAC) The ARMv8.3 Pointer Authentication extension is not supported by Xen at the moment, so do not expose that via ID register. Signed-off-by: Vladimir Murzin Reviewed-by: Bertrand Marquis [julien: s/__res0/__res2/ to avoid name duplication] Reviewed-by: Julien Grall --- xen/arch/arm/cpufeature.c | 6 ++++++ xen/include/asm-arm/cpufeature.h | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 99fe4db280..1d88783809 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -187,6 +187,12 @@ static int __init create_guest_cpuinfo(void) /* Hide MTE support as Xen does not support it */ guest_cpuinfo.pfr64.mte = 0; + + /* Hide PAC support as Xen does not support it */ + guest_cpuinfo.isa64.apa = 0; + guest_cpuinfo.isa64.api = 0; + guest_cpuinfo.isa64.gpa = 0; + guest_cpuinfo.isa64.gpi = 0; #endif /* Hide AMU support */ diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 13a2739a69..70cb67301f 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -212,8 +212,44 @@ struct cpuinfo_arm { }; } mm64; - struct { + union { uint64_t bits[2]; + struct { + /* ISAR0 */ + unsigned long __res0:4; + unsigned long aes:4; + unsigned long sha1:4; + unsigned long sha2:4; + unsigned long crc32:4; + unsigned long atomic:4; + unsigned long __res1:4; + unsigned long rdm:4; + unsigned long sha3:4; + unsigned long sm3:4; + unsigned long sm4:4; + unsigned long dp:4; + unsigned long fhm:4; + unsigned long ts:4; + unsigned long tlb:4; + unsigned long rndr:4; + + /* ISAR1 */ + unsigned long dpb:4; + unsigned long apa:4; + unsigned long api:4; + unsigned long jscvt:4; + unsigned long fcma:4; + unsigned long lrcpc:4; + unsigned long gpa:4; + unsigned long gpi:4; + unsigned long frintts:4; + unsigned long sb:4; + unsigned long specres:4; + unsigned long bf16:4; + unsigned long dgh:4; + unsigned long i8mm:4; + unsigned long __res2:8; + }; } isa64; struct { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 16:11:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 16:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72254.129968 (Exim 4.92) (envelope-from ) id 1l2cYO-0004lV-A8; Thu, 21 Jan 2021 16:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72254.129968; Thu, 21 Jan 2021 16:11: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 1l2cYO-0004lM-6P; Thu, 21 Jan 2021 16:11:24 +0000 Received: by outflank-mailman (input) for mailman id 72254; Thu, 21 Jan 2021 16:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2cYM-0004l7-Nw for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2cYM-00044f-N7 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2cYM-00084z-MJ for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16: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=cpSr+P+Rw6vZTvnO10QkdA+aQ+TRwsmNMM0GsAMkL4M=; b=N0aXIqMv4/JfxLhCrXDVeT/poS 3h+GYCX/jDLUX6FF0M7NmC/NEjewF+e/C1Fh701quUdvIrOXmIZrNXeBgx/guYc5f4WBFhpXFXIVe qSWuNU3QtH90SuM0mh8tZJtRvMMmQEvnhQ9mw800E8e7CzAucdvqd5FA5sZoaaQYB4qI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Relax GIC version check Message-Id: Date: Thu, 21 Jan 2021 16:11:22 +0000 commit 74cbc59b9455b75cf7202ee8edf4190dad05d0b9 Author: Vladimir Murzin AuthorDate: Wed Jan 20 11:26:44 2021 +0000 Commit: Julien Grall CommitDate: Wed Jan 20 17:43:33 2021 +0000 xen/arm: Relax GIC version check Supported values are 0b0000 GIC CPU interface system registers not implemented. 0b0001 System register interface to versions 3.0 and 4.0 of the GIC CPU interface is supported. 0b0011 System register interface to version 4.1 of the GIC CPU interface is supported. 4.1 is still backward compatible with 4.0/3.0, moreover ARM ARM guarantees that future versions of the GIC CPU interface retain backwards compatible. Signed-off-by: Vladimir Murzin Reviewed-by: Bertrand Marquis Acked-by: Julien Grall Release-Acked-by: Ian Jackson --- xen/include/asm-arm/cpufeature.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 70cb67301f..9ea3970c70 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -17,7 +17,7 @@ #define cpu_has_el3_64 (boot_cpu_feature64(el3) >= 1) #define cpu_has_fp (boot_cpu_feature64(fp) < 8) #define cpu_has_simd (boot_cpu_feature64(simd) < 8) -#define cpu_has_gicv3 (boot_cpu_feature64(gic) == 1) +#define cpu_has_gicv3 (boot_cpu_feature64(gic) >= 1) #endif #define cpu_feature32(c, feat) ((c)->pfr32.feat) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 16:11:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 16:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72255.129972 (Exim 4.92) (envelope-from ) id 1l2cYY-0004nV-Ck; Thu, 21 Jan 2021 16:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72255.129972; Thu, 21 Jan 2021 16:11: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 1l2cYY-0004nN-9S; Thu, 21 Jan 2021 16:11:34 +0000 Received: by outflank-mailman (input) for mailman id 72255; Thu, 21 Jan 2021 16:11:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2cYX-0004nB-Cp for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16:11:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2cYX-00044n-As for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16:11:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2cYW-000864-PQ for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16: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=x8PwqmQ2b2KF3csp3dJgfOFdR6C2xhYsWV9wYbfvW1Y=; b=DSbYyVRDrJRrAQ6y0Amf3xi6Zx S/6PvfKfwqm+ojzaZVQddOQmCBigB5QM2AA2rWeQtI26We8OW2Zif/zfX08+l8C7uFWzuo099Qg4Z ofM4Vyl1O5NtVsNNKxcCwZPqcySTOt51LQOJCYA+IrwjlCPgUaR2MPWKYVzDd5ftSsqk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data() Message-Id: Date: Thu, 21 Jan 2021 16:11:32 +0000 commit 2bb32b809250923658dadff6a9eb66c0b8cbe403 Author: Julien Grall AuthorDate: Sat Nov 28 11:36:42 2020 +0000 Commit: Julien Grall CommitDate: Wed Jan 20 17:49:23 2021 +0000 xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data() init_one_desc_irq() can return an error if it is unable to allocate memory. While this is unlikely to happen during boot (called from init_{,local_}irq_data()), it is better to harden the code by propagting the return value. Spotted by coverity. CID: 106529 Signed-off-by: Julien Grall Reviewed-by: Roger Paul Monné Reviewed-by: Volodymyr Babchuk Reviewed-by: Bertrand Marquis Acked-by: Stefano Stabellini --- xen/arch/arm/irq.c | 12 ++++++++++-- xen/arch/x86/irq.c | 7 ++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 3877657a52..b71b099e6f 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -88,7 +88,11 @@ static int __init init_irq_data(void) for ( irq = NR_LOCAL_IRQS; irq < NR_IRQS; irq++ ) { struct irq_desc *desc = irq_to_desc(irq); - init_one_irq_desc(desc); + int rc = init_one_irq_desc(desc); + + if ( rc ) + return rc; + desc->irq = irq; desc->action = NULL; } @@ -105,7 +109,11 @@ static int init_local_irq_data(void) for ( irq = 0; irq < NR_LOCAL_IRQS; irq++ ) { struct irq_desc *desc = irq_to_desc(irq); - init_one_irq_desc(desc); + int rc = init_one_irq_desc(desc); + + if ( rc ) + return rc; + desc->irq = irq; desc->action = NULL; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 13b1af57f3..21881a1345 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -432,9 +432,14 @@ int __init init_irq_data(void) for ( irq = 0; irq < nr_irqs_gsi; irq++ ) { + int rc; + desc = irq_to_desc(irq); desc->irq = irq; - init_one_irq_desc(desc); + + rc = init_one_irq_desc(desc); + if ( rc ) + return rc; } for ( ; irq < nr_irqs; irq++ ) irq_to_desc(irq)->irq = irq; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 16:11:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 16:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72257.129976 (Exim 4.92) (envelope-from ) id 1l2cYi-0004pM-ED; Thu, 21 Jan 2021 16:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72257.129976; Thu, 21 Jan 2021 16:11: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 1l2cYi-0004pE-Aw; Thu, 21 Jan 2021 16:11:44 +0000 Received: by outflank-mailman (input) for mailman id 72257; Thu, 21 Jan 2021 16:11:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2cYh-0004p4-Ek for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16:11:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2cYh-00045F-E1 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16:11:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2cYh-00087D-D2 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 16:11: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=fyEEv8Bu2rCkirMRaFJt9eGqI+8hxF3+X38k8pCaXXY=; b=Wouw6AuRMI4K/WF7cGntOepRg4 fJ8IsGxWrtIdWRSlbba4eobwHTxlPzDwBt8UAntZMSrGySO9gn0vvH8/7Sns8Y/I48mntfyVQN9I6 6e/5v3rbHjWUllZjPprl7IIO+4gWY2TYouNWQ5wswfpiNTzl+t6CdrxKsRqs1YCQ5oL8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Don't ignore the affinity level 3 in the MPIDR Message-Id: Date: Thu, 21 Jan 2021 16:11:43 +0000 commit e8adbf680b56a3f4b9600c7bcc04fec1877a6213 Author: Wei Chen AuthorDate: Fri Jan 8 14:29:53 2021 +0800 Commit: Julien Grall CommitDate: Wed Jan 20 17:55:27 2021 +0000 xen/arm: Don't ignore the affinity level 3 in the MPIDR Currently, Xen is considering that all the affinity bits are defined below 32-bit. However, Arm64 define a 3rd level affinity in bits 32-39. The function gicv3_send_sgi_list in the GICv3 driver will compute the cluster using the following code: uint64_t cluster_id = cpu_logical_map(cpu) & ~MPIDR_AFF0_MASK; Because MPIDR_AFF0_MASK is defined as a 32-bit value, we will miss out the 3rd level affinity. As a consequence, the IPI would not be sent to the correct vCPU. This particular error can be solved by switching MPIDR_AFF0_MASK to use unsigned long. However, take the opportunity to switch all the MPIDR_* define to use unsigned long to avoid anymore issue. Signed-off-by: Wei Chen [julien: Reword the commit message] Reviewed-by: Julien Grall --- xen/include/asm-arm/processor.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 87c8136022..5c1768cdec 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -75,11 +75,11 @@ /* MPIDR Multiprocessor Affinity Register */ #define _MPIDR_UP (30) -#define MPIDR_UP (_AC(1,U) << _MPIDR_UP) +#define MPIDR_UP (_AC(1,UL) << _MPIDR_UP) #define _MPIDR_SMP (31) -#define MPIDR_SMP (_AC(1,U) << _MPIDR_SMP) +#define MPIDR_SMP (_AC(1,UL) << _MPIDR_SMP) #define MPIDR_AFF0_SHIFT (0) -#define MPIDR_AFF0_MASK (_AC(0xff,U) << MPIDR_AFF0_SHIFT) +#define MPIDR_AFF0_MASK (_AC(0xff,UL) << MPIDR_AFF0_SHIFT) #ifdef CONFIG_ARM_64 #define MPIDR_HWID_MASK _AC(0xff00ffffff,UL) #else -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:55:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:55:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72306.130076 (Exim 4.92) (envelope-from ) id 1l2eAk-00078d-GJ; Thu, 21 Jan 2021 17:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72306.130076; Thu, 21 Jan 2021 17: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 1l2eAk-00078V-D5; Thu, 21 Jan 2021 17:55:06 +0000 Received: by outflank-mailman (input) for mailman id 72306; Thu, 21 Jan 2021 17:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eAj-00078Q-CJ for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eAj-0005n5-74 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eAj-0005vW-67 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17: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=TmNr9J7ImuDFqheDSGEBfkz6khozMuDO65pNBChnXpw=; b=OCrvwiD29n21CWmdQeQp4tYa2p 7zwo+w4umkS0SdnCM6mNMV78ivgF/TtbKB5qeIOxf938hlYWRbX2bppzEvJCK/m94Kc2niE8BsBWM 1KEFh+LvCVdsOxcnlllTQklkQHI7wTrQqF7pE0kUlIxmo05mBW63tluBjN7EQfVqgPqk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: refactor XS_CONTROL handling Message-Id: Date: Thu, 21 Jan 2021 17:55:05 +0000 commit 7104017a130cba11fd807c23f804dd8eeec0d976 Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:17 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:29:41 2021 +0100 tools/xenstore: refactor XS_CONTROL handling In order to allow control commands with binary data refactor handling of XS_CONTROL: - get primary command first - add maximum number of additional parameters to pass to command handler Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Reviewed-by: Paul Durrant Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 34 +++++++++++++++++++++++----------- tools/xenstore/xenstored_core.c | 3 +-- tools/xenstore/xenstored_core.h | 1 + 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 8d48ab4820..8d29db8270 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -30,6 +30,14 @@ struct cmd_s { char *cmd; int (*func)(void *, struct connection *, char **, int); char *pars; + /* + * max_pars can be used to limit the size of the parameter vector, + * e.g. in case of large binary parts in the parameters. + * The command is included in the count, so 1 means just the command + * without any parameter. + * 0 == no limit (the default) + */ + unsigned int max_pars; }; static int do_control_check(void *ctx, struct connection *conn, @@ -194,25 +202,29 @@ static int do_control_help(void *ctx, struct connection *conn, int do_control(struct connection *conn, struct buffered_data *in) { - int num; - int cmd; - char **vec; + unsigned int cmd, num, off; + char **vec = NULL; if (conn->id != 0) return EACCES; - num = xs_count_strings(in->buffer, in->used); - if (num < 1) + off = get_string(in, 0); + if (!off) + return EINVAL; + for (cmd = 0; cmd < ARRAY_SIZE(cmds); cmd++) + if (streq(in->buffer, cmds[cmd].cmd)) + break; + if (cmd == ARRAY_SIZE(cmds)) return EINVAL; + + num = xs_count_strings(in->buffer, in->used); + if (cmds[cmd].max_pars) + num = min(num, cmds[cmd].max_pars); vec = talloc_array(in, char *, num); if (!vec) return ENOMEM; - if (get_strings(in, vec, num) != num) + if (get_strings(in, vec, num) < num) return EIO; - for (cmd = 0; cmd < ARRAY_SIZE(cmds); cmd++) - if (streq(vec[0], cmds[cmd].cmd)) - return cmds[cmd].func(in, conn, vec + 1, num - 1); - - return EINVAL; + return cmds[cmd].func(in, conn, vec + 1, num - 1); } diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 50986f8b29..e1b92c3dc8 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -620,8 +620,7 @@ static struct buffered_data *new_buffer(void *ctx) /* Return length of string (including nul) at this offset. * If there is no nul, returns 0 for failure. */ -static unsigned int get_string(const struct buffered_data *data, - unsigned int offset) +unsigned int get_string(const struct buffered_data *data, unsigned int offset) { const char *nul; diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index fb59d862a2..27826c125c 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -142,6 +142,7 @@ const char *onearg(struct buffered_data *in); /* Break input into vectors, return the number, fill in up to num of them. */ unsigned int get_strings(struct buffered_data *data, char *vec[], unsigned int num); +unsigned int get_string(const struct buffered_data *data, unsigned int offset); void send_reply(struct connection *conn, enum xsd_sockmsg_type type, const void *data, unsigned int len); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72307.130080 (Exim 4.92) (envelope-from ) id 1l2eAu-00079R-I1; Thu, 21 Jan 2021 17:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72307.130080; Thu, 21 Jan 2021 17: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 1l2eAu-00079J-Ec; Thu, 21 Jan 2021 17:55:16 +0000 Received: by outflank-mailman (input) for mailman id 72307; Thu, 21 Jan 2021 17:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eAt-00079B-Br for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eAt-0005nB-Az for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eAt-0005wB-9K for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17: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=rG7IhmgP5TXAXF3hoW+vUs4wzIak95n3UYiiiIOc5mU=; b=Cz8wp/V7iBePkjnp64b9N/NyNn F6lH20OfUv6lfeKNwMril7uFRJuqsoTIdhx27QgmXcKzEk/JnS8mgxt0J1as3aNEUJjR5K+ECLpeu ExQrnbNrBjHBaQ3O0RQwMPXVUO6bGTfRCIEqR8ccMgEAMfEIb2pKkxT3Of2Ap7Mtdqyo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add live update command to xenstore-control Message-Id: Date: Thu, 21 Jan 2021 17:55:15 +0000 commit 7f97193e6aa858df03be501440e0ade8cceb9ec5 Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:17 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:29:44 2021 +0100 tools/xenstore: add live update command to xenstore-control Add the "live-update" command to xenstore-control enabling updating xenstored to a new version in a running Xen system. With -c it is possible to pass a different command line to the new instance of xenstored. This will replace the command line used for the invocation of the just running xenstored instance. The running xenstored (or xenstore-stubdom) needs to support live updating, of course. For now just add a small dummy handler to C xenstore denying any live update action. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Reviewed-by: Julien Grall Acked-by: Wei Liu --- docs/misc/xenstore.txt | 21 +++ tools/xenstore/Makefile | 3 +- tools/xenstore/xenstore_control.c | 333 +++++++++++++++++++++++++++++++++++-- tools/xenstore/xenstored_control.c | 30 ++++ 4 files changed, 370 insertions(+), 17 deletions(-) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 2081f20f55..1480742330 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -317,6 +317,27 @@ CONTROL |[|] Current commands are: check checks xenstored innards + live-update||+ + perform a live-update of the Xenstore daemon, only to + be used via xenstore-control command. + are implementation specific and are used for + different steps of the live-update processing. Currently + supported are: + -f specify new daemon binary + -b specify size of new stubdom binary + -d transfer chunk of new + stubdom binary + -c specify new command line to use + -s [-t ] [-F] start live update process (-t specifies + timeout in seconds to wait for active transactions + to finish, default is 60 seconds; -F will force + live update to happen even with running transactions + after timeout elapsed) + -a abort live update handling + All sub-options will return "OK" in case of success or an + error string in case of failure. -s can return "BUSY" in case + of an active transaction, a retry of -s can be done in that + case. log|on turn xenstore logging on log|off diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 9a0f0d012d..ab89e22d3a 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -11,6 +11,7 @@ CFLAGS += -include $(XEN_ROOT)/tools/config.h CFLAGS += -I./include CFLAGS += $(CFLAGS_libxenevtchn) CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_libxenguest) CFLAGS += $(CFLAGS_libxentoolcore) CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\"" CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\"" @@ -81,7 +82,7 @@ xenstore: xenstore_client.o $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(LDLIBS_libxentoolcore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) xenstore-control: xenstore_control.o - $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(LDLIBS_libxentoolcore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) + $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxentoolcore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o $(CC) $^ $(LDFLAGS) -o $@ $(APPEND_LDFLAGS) diff --git a/tools/xenstore/xenstore_control.c b/tools/xenstore/xenstore_control.c index afa04495a7..6031f216c7 100644 --- a/tools/xenstore/xenstore_control.c +++ b/tools/xenstore/xenstore_control.c @@ -1,9 +1,312 @@ +#define _GNU_SOURCE +#include #include #include #include +#include +#include +#include #include "xenstore.h" +/* Add a string plus terminating 0 byte to buf, returning new len. */ +static int add_to_buf(char **buf, const char *val, int len) +{ + int vallen = strlen(val) + 1; + + if (len < 0) + return -1; + + *buf = realloc(*buf, len + vallen); + if (!*buf) + return -1; + + strcpy(*buf + len, val); + + return len + vallen; +} + +static int live_update_start(struct xs_handle *xsh, bool force, unsigned int to) +{ + int len = 0; + char *buf = NULL, *ret; + time_t time_start; + + if (asprintf(&ret, "%u", to) < 0) + return 1; + len = add_to_buf(&buf, "-s", len); + len = add_to_buf(&buf, "-t", len); + len = add_to_buf(&buf, ret, len); + free(ret); + if (force) + len = add_to_buf(&buf, "-F", len); + if (len < 0) + return 1; + + for (time_start = time(NULL); time(NULL) - time_start < to;) { + ret = xs_control_command(xsh, "live-update", buf, len); + if (!ret) + goto err; + if (strcmp(ret, "BUSY")) + break; + sleep(1); + } + + if (strcmp(ret, "OK")) + goto err; + + free(buf); + free(ret); + + return 0; + + err: + fprintf(stderr, "Starting live update failed:\n%s\n", + ret ? : strerror(errno)); + free(buf); + free(ret); + + return 3; +} + +static int live_update_cmdline(struct xs_handle *xsh, const char *cmdline) +{ + int len = 0, rc = 0; + char *buf = NULL, *ret; + + len = add_to_buf(&buf, "-c", len); + len = add_to_buf(&buf, cmdline, len); + if (len < 0) + return 1; + + ret = xs_control_command(xsh, "live-update", buf, len); + free(buf); + if (!ret || strcmp(ret, "OK")) { + fprintf(stderr, "Setting update binary failed:\n%s\n", + ret ? : strerror(errno)); + rc = 3; + } + free(ret); + + return rc; +} + +static int send_kernel_blob(struct xs_handle *xsh, const char *binary) +{ + int rc = 0, len = 0; + xc_interface *xch; + struct xc_dom_image *dom; + char *ret, *buf = NULL; + size_t off, sz; +#define BLOB_CHUNK_SZ 2048 + + xch = xc_interface_open(NULL, NULL, 0); + if (!xch) { + fprintf(stderr, "xc_interface_open() failed\n"); + return 1; + } + + dom = xc_dom_allocate(xch, NULL, NULL); + if (!dom) { + rc = 1; + goto out_close; + } + + rc = xc_dom_kernel_file(dom, binary); + if (rc) { + rc = 1; + goto out_rel; + } + + if (asprintf(&ret, "%zu", dom->kernel_size) < 0) { + rc = 1; + goto out_rel; + } + len = add_to_buf(&buf, "-b", len); + len = add_to_buf(&buf, ret, len); + free(ret); + if (len < 0) { + rc = 1; + goto out_rel; + } + ret = xs_control_command(xsh, "live-update", buf, len); + free(buf); + if (!ret || strcmp(ret, "OK")) { + fprintf(stderr, "Starting live update failed:\n%s\n", + ret ? : strerror(errno)); + rc = 3; + } + free(ret); + if (rc) + goto out_rel; + + /* buf capable to hold "-d" <1..2048> BLOB_CHUNK_SZ and a terminating 0. */ + buf = malloc(3 + 5 + BLOB_CHUNK_SZ + 1); + if (!buf) { + rc = 1; + goto out_rel; + } + + strcpy(buf, "-d"); + sz = BLOB_CHUNK_SZ; + for (off = 0; off < dom->kernel_size; off += BLOB_CHUNK_SZ) { + if (dom->kernel_size - off < BLOB_CHUNK_SZ) + sz = dom->kernel_size - off; + sprintf(buf + 3, "%zu", sz); + len = 3 + strlen(buf + 3) + 1; + memcpy(buf + len, dom->kernel_blob + off, sz); + buf[len + sz] = 0; + len += sz + 1; + ret = xs_control_command(xsh, "live-update", buf, len); + if (!ret || strcmp(ret, "OK")) { + fprintf(stderr, "Transfer of new binary failed:\n%s\n", + ret ? : strerror(errno)); + rc = 3; + free(ret); + break; + } + free(ret); + } + + free(buf); + + out_rel: + xc_dom_release(dom); + + out_close: + xc_interface_close(xch); + + return rc; +} + +/* + * Live update of Xenstore stubdom + * + * Sequence of actions: + * 1. transfer new stubdom binary + * a) specify size + * b) transfer unpacked binary in chunks + * 2. transfer new cmdline (optional) + * 3. start update (includes flags) + */ +static int live_update_stubdom(struct xs_handle *xsh, const char *binary, + const char *cmdline, bool force, unsigned int to) +{ + int rc; + + rc = send_kernel_blob(xsh, binary); + if (rc) + goto abort; + + if (cmdline) { + rc = live_update_cmdline(xsh, cmdline); + if (rc) + goto abort; + } + + rc = live_update_start(xsh, force, to); + if (rc) + goto abort; + + return 0; + + abort: + xs_control_command(xsh, "live-update", "-a", 3); + return rc; +} + +/* + * Live update of Xenstore daemon + * + * Sequence of actions: + * 1. transfer new binary filename + * 2. transfer new cmdline (optional) + * 3. start update (includes flags) + */ +static int live_update_daemon(struct xs_handle *xsh, const char *binary, + const char *cmdline, bool force, unsigned int to) +{ + int len = 0, rc; + char *buf = NULL, *ret; + + len = add_to_buf(&buf, "-f", len); + len = add_to_buf(&buf, binary, len); + if (len < 0) + return 1; + ret = xs_control_command(xsh, "live-update", buf, len); + free(buf); + if (!ret || strcmp(ret, "OK")) { + fprintf(stderr, "Setting update binary failed:\n%s\n", + ret ? : strerror(errno)); + free(ret); + return 3; + } + free(ret); + + if (cmdline) { + rc = live_update_cmdline(xsh, cmdline); + if (rc) + goto abort; + } + + rc = live_update_start(xsh, force, to); + if (rc) + goto abort; + + return 0; + + abort: + xs_control_command(xsh, "live-update", "-a", 3); + return rc; +} + +static int live_update(struct xs_handle *xsh, int argc, char **argv) +{ + int rc = 0; + unsigned int i, to = 60; + char *binary = NULL, *cmdline = NULL, *val; + bool force = false; + + for (i = 0; i < argc; i++) { + if (!strcmp(argv[i], "-c")) { + i++; + if (i == argc) { + fprintf(stderr, "Missing command line value\n"); + rc = 2; + goto out; + } + cmdline = argv[i]; + } else if (!strcmp(argv[i], "-t")) { + i++; + if (i == argc) { + fprintf(stderr, "Missing timeout value\n"); + rc = 2; + goto out; + } + to = atoi(argv[i]); + } else if (!strcmp(argv[i], "-F")) + force = true; + else + binary = argv[i]; + } + + if (!binary) { + fprintf(stderr, "Missing binary specification\n"); + rc = 2; + goto out; + } + + val = xs_read(xsh, XBT_NULL, "/tool/xenstored/domid", &i); + if (val) + rc = live_update_stubdom(xsh, binary, cmdline, force, to); + else + rc = live_update_daemon(xsh, binary, cmdline, force, to); + + free(val); + + out: + return rc; +} int main(int argc, char **argv) { @@ -20,22 +323,6 @@ int main(int argc, char **argv) goto out; } - for (p = 2; p < argc; p++) - len += strlen(argv[p]) + 1; - if (len) { - par = malloc(len); - if (!par) { - fprintf(stderr, "Allocation error.\n"); - rc = 1; - goto out; - } - len = 0; - for (p = 2; p < argc; p++) { - memcpy(par + len, argv[p], strlen(argv[p]) + 1); - len += strlen(argv[p]) + 1; - } - } - xsh = xs_open(0); if (xsh == NULL) { fprintf(stderr, "Failed to contact Xenstored.\n"); @@ -43,6 +330,19 @@ int main(int argc, char **argv) goto out; } + if (!strcmp(argv[1], "live-update")) { + rc = live_update(xsh, argc - 2, argv + 2); + goto out_close; + } + + for (p = 2; p < argc; p++) + len = add_to_buf(&par, argv[p], len); + if (len < 0) { + fprintf(stderr, "Allocation error.\n"); + rc = 1; + goto out_close; + } + ret = xs_control_command(xsh, argv[1], par, len); if (!ret) { rc = 3; @@ -59,6 +359,7 @@ int main(int argc, char **argv) } else if (strlen(ret) > 0) printf("%s\n", ret); + out_close: xs_close(xsh); out: diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 8d29db8270..00fda5acdb 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -149,11 +149,41 @@ static int do_control_print(void *ctx, struct connection *conn, return 0; } +static int do_control_lu(void *ctx, struct connection *conn, + char **vec, int num) +{ + const char *resp; + + resp = talloc_strdup(ctx, "NYI"); + send_reply(conn, XS_CONTROL, resp, strlen(resp) + 1); + return 0; +} + static int do_control_help(void *, struct connection *, char **, int); static struct cmd_s cmds[] = { { "check", do_control_check, "" }, { "log", do_control_log, "on|off" }, + + /* + * The parameters are those of the xenstore-control utility! + * Depending on environment (Mini-OS or daemon) the live-update + * sequence is split into several sub-operations: + * 1. Specification of new binary + * daemon: -f + * Mini-OS: -b + * -d (multiple of those) + * 2. New command-line (optional): -c + * 3. Start of update: -s [-F] [-t ] + * Any sub-operation needs to respond with the string "OK" in case + * of success, any other response indicates failure. + * A started live-update sequence can be aborted via "-a" (not + * needed in case of failure for the first or last live-update + * sub-operation). + */ + { "live-update", do_control_lu, + "[-c ] [-F] [-t ] \n" + " Default timeout is 60 seconds.", 4 }, #ifdef __MINIOS__ { "memreport", do_control_memreport, "" }, #else -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:55:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:55:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72308.130084 (Exim 4.92) (envelope-from ) id 1l2eB4-0007BH-Lp; Thu, 21 Jan 2021 17:55:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72308.130084; Thu, 21 Jan 2021 17: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 1l2eB4-0007B2-Hr; Thu, 21 Jan 2021 17:55:26 +0000 Received: by outflank-mailman (input) for mailman id 72308; Thu, 21 Jan 2021 17:55:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eB3-0007Aq-Ex for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eB3-0005nP-E5 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eB3-0005x3-D7 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17: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=hvMcywm/yPFezPGScFdIarg0ncE5VfVNIbVXOJBlccw=; b=MzMaL5lKnsI1uUPhMnUDjVKDiz +2SB/hrGGfOLH+IXkrr4Fc1yveBQx46j6du9G7b9VKsB+/IjlSaCA1Q1uA9nsTZs42ZpNsxRQQ9h2 xgV5QXtruHA9ppnpCEaMN93m4exnHmjXvpnoj8llx4sb/MQRBfZih7/RjR63pcO+uuiA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add basic live-update command parsing Message-Id: Date: Thu, 21 Jan 2021 17:55:25 +0000 commit fecab256d474a30311bd10a3d69d503366ae7e00 Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:17 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:29:46 2021 +0100 tools/xenstore: add basic live-update command parsing Add the basic parts for parsing the live-update control command. For now only add the parameter evaluation and calling appropriate functions. Those function only print a message for now and return success. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Reviewed-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 105 ++++++++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 00fda5acdb..e3f0d34528 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -19,7 +19,9 @@ #include #include #include +#include #include +#include #include "utils.h" #include "talloc.h" @@ -149,12 +151,113 @@ static int do_control_print(void *ctx, struct connection *conn, return 0; } +static const char *lu_abort(const void *ctx, struct connection *conn) +{ + syslog(LOG_INFO, "live-update: abort\n"); + return NULL; +} + +static const char *lu_cmdline(const void *ctx, struct connection *conn, + const char *cmdline) +{ + syslog(LOG_INFO, "live-update: cmdline %s\n", cmdline); + return NULL; +} + +#ifdef __MINIOS__ +static const char *lu_binary_alloc(const void *ctx, struct connection *conn, + unsigned long size) +{ + syslog(LOG_INFO, "live-update: binary size %lu\n", size); + return NULL; +} + +static const char *lu_binary_save(const void *ctx, struct connection *conn, + unsigned int size, const char *data) +{ + return NULL; +} + +static const char *lu_arch(const void *ctx, struct connection *conn, + char **vec, int num) +{ + if (num == 2 && !strcmp(vec[0], "-b")) + return lu_binary_alloc(ctx, conn, atol(vec[1])); + if (num > 2 && !strcmp(vec[0], "-d")) + return lu_binary_save(ctx, conn, atoi(vec[1]), vec[2]); + + errno = EINVAL; + return NULL; +} +#else +static const char *lu_binary(const void *ctx, struct connection *conn, + const char *filename) +{ + syslog(LOG_INFO, "live-update: binary %s\n", filename); + return NULL; +} + +static const char *lu_arch(const void *ctx, struct connection *conn, + char **vec, int num) +{ + if (num == 2 && !strcmp(vec[0], "-f")) + return lu_binary(ctx, conn, vec[1]); + + errno = EINVAL; + return NULL; +} +#endif + +static const char *lu_start(const void *ctx, struct connection *conn, + bool force, unsigned int to) +{ + syslog(LOG_INFO, "live-update: start, force=%d, to=%u\n", force, to); + return NULL; +} + static int do_control_lu(void *ctx, struct connection *conn, char **vec, int num) { const char *resp; + const char *ret = NULL; + unsigned int i; + bool force = false; + unsigned int to = 0; + + if (num < 1) + return EINVAL; + + if (!strcmp(vec[0], "-a")) { + if (num == 1) + ret = lu_abort(ctx, conn); + else + return EINVAL; + } else if (!strcmp(vec[0], "-c")) { + if (num == 2) + ret = lu_cmdline(ctx, conn, vec[1]); + else + return EINVAL; + } else if (!strcmp(vec[0], "-s")) { + for (i = 1; i < num; i++) { + if (!strcmp(vec[i], "-F")) + force = true; + else if (!strcmp(vec[i], "-t") && i < num - 1) { + i++; + to = atoi(vec[i]); + } else + return EINVAL; + } + ret = lu_start(ctx, conn, force, to); + } else { + errno = 0; + ret = lu_arch(ctx, conn, vec, num); + if (errno) + return errno; + } - resp = talloc_strdup(ctx, "NYI"); + if (!ret) + ret = "OK"; + resp = talloc_strdup(ctx, ret); send_reply(conn, XS_CONTROL, resp, strlen(resp) + 1); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:55:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:55:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72309.130088 (Exim 4.92) (envelope-from ) id 1l2eBE-0007CT-MU; Thu, 21 Jan 2021 17:55:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72309.130088; Thu, 21 Jan 2021 17: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 1l2eBE-0007CM-JW; Thu, 21 Jan 2021 17:55:36 +0000 Received: by outflank-mailman (input) for mailman id 72309; Thu, 21 Jan 2021 17:55:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eBD-0007CB-Ic for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:55:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eBD-0005ng-Hn for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:55:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eBD-0005y7-G5 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17: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=EF7Zj7ujj5AChtGM4fvNhmkAGeFSi9WO6IBvdyGVsPI=; b=0+GeJ3G7iQrgHGZfxbC1BjGPRu E446fvCHGMxV2O7H4RfcqxhBkz4JWyj6FhfsvARMUE/HUdaRpmyEU/mMonk/f8qVcpgTWmV4cjKcS HIf5xZRVzcPlrwhbkbwiA0CMjk9uaPVVUqzDTTkyU7QYwhboCmNmYU2kXbx1lslHODIk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: introduce live update status block Message-Id: Date: Thu, 21 Jan 2021 17:55:35 +0000 commit d95be0a2fe390aae7febc7c3f4735d528d690fe2 Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:17 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:30:52 2021 +0100 tools/xenstore: introduce live update status block Live update of Xenstore is done in multiple steps. It needs a status block holding the current state of live update and related data. It is allocated as child of the connection live update was started over in order to abort live update in case the connection is closed. Allocation of the block is done in lu_binary[_alloc](), freeing in lu_abort() (and for now in lu_start() as long as no real live-update is happening). Add tests in all live-update command handlers other than lu_abort() and lu_binary[_alloc]() for being started via the same connection as the begin of live-update. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Reviewed-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 63 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index e3f0d34528..7854b7f46f 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -28,6 +28,34 @@ #include "xenstored_core.h" #include "xenstored_control.h" +struct live_update { + /* For verification the correct connection is acting. */ + struct connection *conn; +}; + +static struct live_update *lu_status; + +static int lu_destroy(void *data) +{ + lu_status = NULL; + + return 0; +} + +static const char *lu_begin(struct connection *conn) +{ + if (lu_status) + return "live-update session already active."; + + lu_status = talloc_zero(conn, struct live_update); + if (!lu_status) + return "Allocation failure."; + lu_status->conn = conn; + talloc_set_destructor(lu_status, lu_destroy); + + return NULL; +} + struct cmd_s { char *cmd; int (*func)(void *, struct connection *, char **, int); @@ -154,6 +182,13 @@ static int do_control_print(void *ctx, struct connection *conn, static const char *lu_abort(const void *ctx, struct connection *conn) { syslog(LOG_INFO, "live-update: abort\n"); + + if (!lu_status) + return "No live-update session active."; + + /* Destructor will do the real abort handling. */ + talloc_free(lu_status); + return NULL; } @@ -161,6 +196,10 @@ static const char *lu_cmdline(const void *ctx, struct connection *conn, const char *cmdline) { syslog(LOG_INFO, "live-update: cmdline %s\n", cmdline); + + if (!lu_status || lu_status->conn != conn) + return "Not in live-update session."; + return NULL; } @@ -168,13 +207,23 @@ static const char *lu_cmdline(const void *ctx, struct connection *conn, static const char *lu_binary_alloc(const void *ctx, struct connection *conn, unsigned long size) { + const char *ret; + syslog(LOG_INFO, "live-update: binary size %lu\n", size); + + ret = lu_begin(conn); + if (ret) + return ret; + return NULL; } static const char *lu_binary_save(const void *ctx, struct connection *conn, unsigned int size, const char *data) { + if (!lu_status || lu_status->conn != conn) + return "Not in live-update session."; + return NULL; } @@ -193,7 +242,14 @@ static const char *lu_arch(const void *ctx, struct connection *conn, static const char *lu_binary(const void *ctx, struct connection *conn, const char *filename) { + const char *ret; + syslog(LOG_INFO, "live-update: binary %s\n", filename); + + ret = lu_begin(conn); + if (ret) + return ret; + return NULL; } @@ -212,6 +268,13 @@ static const char *lu_start(const void *ctx, struct connection *conn, bool force, unsigned int to) { syslog(LOG_INFO, "live-update: start, force=%d, to=%u\n", force, to); + + if (!lu_status || lu_status->conn != conn) + return "Not in live-update session."; + + /* Will be replaced by real live-update later. */ + talloc_free(lu_status); + return NULL; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:55:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:55:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72310.130092 (Exim 4.92) (envelope-from ) id 1l2eBP-0007E5-OM; Thu, 21 Jan 2021 17:55:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72310.130092; Thu, 21 Jan 2021 17: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 1l2eBP-0007Dx-LI; Thu, 21 Jan 2021 17:55:47 +0000 Received: by outflank-mailman (input) for mailman id 72310; Thu, 21 Jan 2021 17:55:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eBN-0007Dl-Md for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:55:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eBN-0005oC-Lp for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:55:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eBN-0005z6-Jw for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17: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=zzNnIVmu8p+e1dSMVDESEimys1yqL5sciam9djqA+JU=; b=moOPS26czRyF53ybFYoYlT8Qh6 1ugnM1dEBgCOmmb5WoARiDhwEO+EUB7T0Ltu02tfJkXqzZ7KkmSe+CHi/j/hwGezV82dYb/0+Yxuz 0PbbjIRZ388Hzsp5LPFO0nWLMi5UPIre/N4cvORKm4E2R17RnBX8Me3QQHFXGXqo5JJ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: save new binary for live update Message-Id: Date: Thu, 21 Jan 2021 17:55:45 +0000 commit e867af081d9418101ae85e716f9cacc4a7087bdd Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:17 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:30:55 2021 +0100 tools/xenstore: save new binary for live update Save the new binary name for the daemon case and the new kernel for stubdom in order to support live update of Xenstore.. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Reviewed-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 41 +++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 7854b7f46f..95ac1a1648 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -1,5 +1,5 @@ /* - Interactive commands for Xen Store Daemon. +Interactive commands for Xen Store Daemon. Copyright (C) 2017 Juergen Gross, SUSE Linux GmbH This program is free software; you can redistribute it and/or modify @@ -22,6 +22,9 @@ #include #include #include +#include +#include +#include #include "utils.h" #include "talloc.h" @@ -31,6 +34,14 @@ struct live_update { /* For verification the correct connection is acting. */ struct connection *conn; + +#ifdef __MINIOS__ + void *kernel; + unsigned int kernel_size; + unsigned int kernel_off; +#else + char *filename; +#endif }; static struct live_update *lu_status; @@ -215,6 +226,13 @@ static const char *lu_binary_alloc(const void *ctx, struct connection *conn, if (ret) return ret; + lu_status->kernel = talloc_size(lu_status, size); + if (!lu_status->kernel) + return "Allocation failure."; + + lu_status->kernel_size = size; + lu_status->kernel_off = 0; + return NULL; } @@ -224,6 +242,12 @@ static const char *lu_binary_save(const void *ctx, struct connection *conn, if (!lu_status || lu_status->conn != conn) return "Not in live-update session."; + if (lu_status->kernel_off + size > lu_status->kernel_size) + return "Too much kernel data."; + + memcpy(lu_status->kernel + lu_status->kernel_off, data, size); + lu_status->kernel_off += size; + return NULL; } @@ -243,13 +267,23 @@ static const char *lu_binary(const void *ctx, struct connection *conn, const char *filename) { const char *ret; + struct stat statbuf; syslog(LOG_INFO, "live-update: binary %s\n", filename); + if (stat(filename, &statbuf)) + return "File not accessible."; + if (!(statbuf.st_mode & (S_IXOTH | S_IXGRP | S_IXUSR))) + return "File not executable."; + ret = lu_begin(conn); if (ret) return ret; + lu_status->filename = talloc_strdup(lu_status, filename); + if (!lu_status->filename) + return "Allocation failure."; + return NULL; } @@ -272,6 +306,11 @@ static const char *lu_start(const void *ctx, struct connection *conn, if (!lu_status || lu_status->conn != conn) return "Not in live-update session."; +#ifdef __MINIOS__ + if (lu_status->kernel_size != lu_status->kernel_off) + return "Kernel not complete."; +#endif + /* Will be replaced by real live-update later. */ talloc_free(lu_status); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:55:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:55:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72311.130097 (Exim 4.92) (envelope-from ) id 1l2eBZ-0007FF-QS; Thu, 21 Jan 2021 17:55:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72311.130097; Thu, 21 Jan 2021 17: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 1l2eBZ-0007F7-Ml; Thu, 21 Jan 2021 17:55:57 +0000 Received: by outflank-mailman (input) for mailman id 72311; Thu, 21 Jan 2021 17:55:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eBX-0007Ev-Q2 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:55:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eBX-0005oN-PE for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:55:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eBX-0005zr-OL for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17: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=nY9yE/Je8JznPF97AR6YTjl6MxNi8XGhbLqAnFTGbGA=; b=1DeRfG/KZkJNr7Vt+uxgxtcM0r kD/5athxQEPW+QV/skXNu7RM4CtupsHKDGxiYXGak7otOSjfsffnRIkohFWZYtPy8dsTVGATVErrL XUTsYtb1jzq44itQiemjbSVJmF+1SyC34LTQLjom7/uUBSauges5G6AHoKUqvHLKYvt8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add command line handling for live update Message-Id: Date: Thu, 21 Jan 2021 17:55:55 +0000 commit 42f684d2ea6bfab74369c9e5974e1b0f3fa46c1a Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:18 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:30:57 2021 +0100 tools/xenstore: add command line handling for live update Updating an instance of Xenstore via live update needs to hand over the command line parameters to the updated instance. Those can be either the parameters used by the updated instance or new ones when supplied when starting the live update. So when supplied store the new command line parameters in lu_status. As it is related add a new option -U (or --live-update") to the command line of xenstored which will be added when starting the new instance. This enables to perform slightly different initializations when started as a result of live update. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Reviewed-by: Paul Durrant Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 6 ++++++ tools/xenstore/xenstored_core.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 95ac1a1648..2e0827b9ef 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -42,6 +42,8 @@ struct live_update { #else char *filename; #endif + + char *cmdline; }; static struct live_update *lu_status; @@ -211,6 +213,10 @@ static const char *lu_cmdline(const void *ctx, struct connection *conn, if (!lu_status || lu_status->conn != conn) return "Not in live-update session."; + lu_status->cmdline = talloc_strdup(lu_status, cmdline); + if (!lu_status->cmdline) + return "Allocation failure."; + return NULL; } diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index e1b92c3dc8..0dddf24327 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1969,6 +1969,7 @@ static struct option options[] = { { "internal-db", 0, NULL, 'I' }, { "verbose", 0, NULL, 'V' }, { "watch-nb", 1, NULL, 'W' }, + { "live-update", 0, NULL, 'U' }, { NULL, 0, NULL, 0 } }; extern void dump_conn(struct connection *conn); @@ -1983,11 +1984,12 @@ int main(int argc, char *argv[]) bool dofork = true; bool outputpid = false; bool no_domain_init = false; + bool live_update = false; const char *pidfile = NULL; int timeout; - while ((opt = getopt_long(argc, argv, "DE:F:HNPS:t:A:M:T:RVW:", options, + while ((opt = getopt_long(argc, argv, "DE:F:HNPS:t:A:M:T:RVW:U", options, NULL)) != -1) { switch (opt) { case 'D': @@ -2045,6 +2047,9 @@ int main(int argc, char *argv[]) case 'p': priv_domid = strtol(optarg, NULL, 10); break; + case 'U': + live_update = true; + break; } } if (optind != argc) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:56:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:56:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72312.130100 (Exim 4.92) (envelope-from ) id 1l2eBj-0007GY-RX; Thu, 21 Jan 2021 17:56:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72312.130100; Thu, 21 Jan 2021 17: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 1l2eBj-0007GN-OF; Thu, 21 Jan 2021 17:56:07 +0000 Received: by outflank-mailman (input) for mailman id 72312; Thu, 21 Jan 2021 17:56:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eBh-0007GA-U2 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eBh-0005ok-TC for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eBh-00061N-Rp for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17: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=rbuR7T8BtTC0qkAfflRfzc359Tf3O9Q1aQyTnzk60wU=; b=6MLUCnYQrZoZ66NZVjIltDpiV3 3fRvFGYQg7EcYXAE8hLTZDtP0XosCejLTGIX1Gdvo1CyEPNjyd0Tfyue8ZA0WPg6W/vXdpESWGHvq tkPfaeFZbdQ2nbCghkkPYOiKu5Ka4b2cEPpBBqo0FDRjuA74QTpo+4/Kt1riRVCWp7ms=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add support for delaying execution of a xenstore request Message-Id: Date: Thu, 21 Jan 2021 17:56:05 +0000 commit c5ca1404b47edef53a6b1245574ee9712404c5d4 Author: Juergen Gross AuthorDate: Thu Jan 14 12:41:32 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:30:58 2021 +0100 tools/xenstore: add support for delaying execution of a xenstore request Today a Xenstore request is processed as soon as it is seen by xenstored. Add the framework for being able to delay processing of a request if the right conditions aren't met. Any delayed requests are executed at the end of the main processing loop in xenstored. They can either delay themselves again or just do their job. In order to enable the possibility of a timeout, the main loop will be paused for max one second if any requests are delayed. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/xenstore/xenstored_core.c | 62 ++++++++++++++++++++++++++++++++++++++++- tools/xenstore/xenstored_core.h | 21 ++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 0dddf24327..6f556d49ef 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -69,6 +69,7 @@ static int xce_pollfd_idx = -1; static struct pollfd *fds; static unsigned int current_array_size; static unsigned int nr_fds; +static unsigned int delayed_requests; static int sock = -1; @@ -255,6 +256,53 @@ static bool write_messages(struct connection *conn) return true; } +static int undelay_request(void *_req) +{ + struct delayed_request *req = _req; + + list_del(&req->list); + delayed_requests--; + + return 0; +} + +static void call_delayed(struct connection *conn, struct delayed_request *req) +{ + assert(conn->in == NULL); + conn->in = req->in; + + if (req->func(req)) { + undelay_request(req); + talloc_set_destructor(req, NULL); + } + + conn->in = NULL; +} + +int delay_request(struct connection *conn, struct buffered_data *in, + bool (*func)(struct delayed_request *), void *data) +{ + struct delayed_request *req; + + req = talloc(in, struct delayed_request); + if (!req) + return ENOMEM; + + /* For the case of connection being closed. */ + talloc_set_destructor(req, undelay_request); + + req->in = in; + req->func = func; + req->data = data; + + delayed_requests++; + list_add(&req->list, &conn->delayed); + + conn->in = NULL; + + return 0; +} + static int destroy_conn(void *_conn) { struct connection *conn = _conn; @@ -321,7 +369,8 @@ static void initialize_fds(int *p_sock_pollfd_idx, int *ptimeout) memset(fds, 0, sizeof(struct pollfd) * current_array_size); nr_fds = 0; - *ptimeout = -1; + /* In case of delayed requests pause for max 1 second. */ + *ptimeout = delayed_requests ? 1000 : -1; if (sock != -1) *p_sock_pollfd_idx = set_fd(sock, POLLIN|POLLPRI); @@ -1524,6 +1573,7 @@ struct connection *new_connection(connwritefn_t *write, connreadfn_t *read) INIT_LIST_HEAD(&new->out_list); INIT_LIST_HEAD(&new->watches); INIT_LIST_HEAD(&new->transaction_list); + INIT_LIST_HEAD(&new->delayed); list_add_tail(&new->list, &connections); talloc_set_destructor(new, destroy_conn); @@ -2215,6 +2265,16 @@ int main(int argc, char *argv[]) } } + if (delayed_requests) { + list_for_each_entry(conn, &connections, list) { + struct delayed_request *req, *tmp; + + list_for_each_entry_safe(req, tmp, + &conn->delayed, list) + call_delayed(conn, req); + } + } + initialize_fds(&sock_pollfd_idx, &timeout); } } diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 27826c125c..d5cdf17160 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -61,6 +61,20 @@ struct buffered_data char default_buffer[DEFAULT_BUFFER_SIZE]; }; +struct delayed_request { + /* Next delayed request. */ + struct list_head list; + + /* The delayed request. */ + struct buffered_data *in; + + /* Function to call. */ + bool (*func)(struct delayed_request *req); + + /* Further data. */ + void *data; +}; + struct connection; typedef int connwritefn_t(struct connection *, const void *, unsigned int); typedef int connreadfn_t(struct connection *, void *, unsigned int); @@ -94,6 +108,9 @@ struct connection uint32_t next_transaction_id; unsigned int transaction_started; + /* List of delayed requests. */ + struct list_head delayed; + /* The domain I'm associated with, if any. */ struct domain *domain; @@ -177,6 +194,10 @@ bool is_valid_nodename(const char *node); /* Get name of parent node. */ char *get_parent(const void *ctx, const char *node); +/* Delay a request. */ +int delay_request(struct connection *conn, struct buffered_data *in, + bool (*func)(struct delayed_request *), void *data); + /* Tracing infrastructure. */ void trace_create(const void *data, const char *type); void trace_destroy(const void *data, const char *type); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:56:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:56:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72313.130103 (Exim 4.92) (envelope-from ) id 1l2eBt-0007Hr-T5; Thu, 21 Jan 2021 17:56:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72313.130103; Thu, 21 Jan 2021 17: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 1l2eBt-0007Hk-Pp; Thu, 21 Jan 2021 17:56:17 +0000 Received: by outflank-mailman (input) for mailman id 72313; Thu, 21 Jan 2021 17:56:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eBs-0007Hb-1l for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eBs-0005ou-10 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eBr-00062b-W0 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=B67oPSCAatB14G8HL5F8vCFSi8vyVDPhi9y27XuTKY0=; b=3n4pN8CeiR0Ngmrcl8FdfrZ/tU Gmxr6U92XXxswYZWTYZw2QiUaEfr2dwKtjmWQ5YwF6t0sTZc4081TgC8e/FMrjwyvb3YNmLxX4xLL ni6aaQARdGHYO9uODGY8YOJC1JFDZgyKEvOBu+O15vBcc5pN+JalVe4npC2ix1hZN1sM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add the basic framework for doing the live update Message-Id: Date: Thu, 21 Jan 2021 17:56:15 +0000 commit af216a99fb4ac21b6fd1d665f0502803c6e8573a Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:18 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:00 2021 +0100 tools/xenstore: add the basic framework for doing the live update Add the main framework for executing the live update. This for now only defines the basic execution steps with empty dummy functions. This final step returning means failure, as in case of success the new executable will have taken over. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 69 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 2e0827b9ef..d3da6b8111 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -22,6 +22,7 @@ Interactive commands for Xen Store Daemon. #include #include #include +#include #include #include #include @@ -44,6 +45,11 @@ struct live_update { #endif char *cmdline; + + /* Start parameters. */ + bool force; + unsigned int timeout; + time_t started_at; }; static struct live_update *lu_status; @@ -304,6 +310,58 @@ static const char *lu_arch(const void *ctx, struct connection *conn, } #endif +static bool lu_check_lu_allowed(void) +{ + return true; +} + +static const char *lu_reject_reason(const void *ctx) +{ + return "BUSY"; +} + +static const char *lu_dump_state(const void *ctx, struct connection *conn) +{ + return NULL; +} + +static const char *lu_activate_binary(const void *ctx) +{ + return "Not yet implemented."; +} + +static bool do_lu_start(struct delayed_request *req) +{ + time_t now = time(NULL); + const char *ret; + char *resp; + + if (!lu_check_lu_allowed()) { + if (now < lu_status->started_at + lu_status->timeout) + return false; + if (!lu_status->force) { + ret = lu_reject_reason(req); + goto out; + } + } + + /* Dump out internal state, including "OK" for live update. */ + ret = lu_dump_state(req->in, lu_status->conn); + if (!ret) { + /* Perform the activation of new binary. */ + ret = lu_activate_binary(req->in); + } + + /* We will reach this point only in case of failure. */ + out: + talloc_free(lu_status); + + resp = talloc_strdup(req->in, ret); + send_reply(lu_status->conn, XS_CONTROL, resp, strlen(resp) + 1); + + return true; +} + static const char *lu_start(const void *ctx, struct connection *conn, bool force, unsigned int to) { @@ -317,8 +375,11 @@ static const char *lu_start(const void *ctx, struct connection *conn, return "Kernel not complete."; #endif - /* Will be replaced by real live-update later. */ - talloc_free(lu_status); + lu_status->force = force; + lu_status->timeout = to; + lu_status->started_at = time(NULL); + + errno = delay_request(conn, conn->in, do_lu_start, NULL); return NULL; } @@ -356,6 +417,10 @@ static int do_control_lu(void *ctx, struct connection *conn, return EINVAL; } ret = lu_start(ctx, conn, force, to); + if (errno) + return errno; + if (!ret) + return 0; } else { errno = 0; ret = lu_arch(ctx, conn, vec, num); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:56:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:56:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72314.130108 (Exim 4.92) (envelope-from ) id 1l2eC2-0007JG-W5; Thu, 21 Jan 2021 17:56:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72314.130108; Thu, 21 Jan 2021 17: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 1l2eC2-0007J8-T0; Thu, 21 Jan 2021 17:56:26 +0000 Received: by outflank-mailman (input) for mailman id 72314; Thu, 21 Jan 2021 17:56:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eC2-0007J1-5R for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eC2-0005p4-4g for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eC2-00063P-3K for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17: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=maMNdnTo1FCv+YeWQA0w2J2VCzGD9X2d2fvOrS3skbQ=; b=sCQa2E7tBE033Nobclsl67M81+ 6kBSZXqjBQO4BE43NW8odAFo7ZpYWkElwtETUiXP5VOwjCkOzowyOHxdTSRxwtEllxDA3nXQjveM6 SnldD+px9F4FhTl2DUZ6PIxoX41oHIN3k/cGTht+3nUSS1j4ONB3BFzbIs9w4h18r4FA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: allow live update only with no transaction active Message-Id: Date: Thu, 21 Jan 2021 17:56:26 +0000 commit e04e53a5be20245320aa42e932aad967b42d79fd Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:18 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:02 2021 +0100 tools/xenstore: allow live update only with no transaction active In order to simplify live update state dumping only allow live update to happen when no transaction is active. A timeout is used to detect guests which have a transaction active for longer periods of time. In case such a guest is detected when trying to do a live update it will be reported and the update will fail. The admin can then either use a longer timeout, or use the force flag to just ignore the transactions of such a guest, or kill the guest before retrying. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 29 +++++++++++++++++++++++++++-- tools/xenstore/xenstored_core.h | 1 + tools/xenstore/xenstored_transaction.c | 5 +++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index d3da6b8111..52fbf31367 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -312,12 +312,37 @@ static const char *lu_arch(const void *ctx, struct connection *conn, static bool lu_check_lu_allowed(void) { - return true; + struct connection *conn; + time_t now = time(NULL); + unsigned int ta_total = 0, ta_long = 0; + + list_for_each_entry(conn, &connections, list) { + if (conn->ta_start_time) { + ta_total++; + if (conn->ta_start_time - now >= lu_status->timeout) + ta_long++; + } + } + + return ta_total ? (lu_status->force && ta_long == ta_total) : true; } static const char *lu_reject_reason(const void *ctx) { - return "BUSY"; + char *ret = NULL; + struct connection *conn; + time_t now = time(NULL); + + list_for_each_entry(conn, &connections, list) { + if (conn->ta_start_time - now >= lu_status->timeout) { + ret = talloc_asprintf(ctx, "%s\nDomain %u: %ld s", + ret ? : "Domains with long running transactions:", + conn->id, + conn->ta_start_time - now); + } + } + + return ret ? (const char *)ret : "Overlapping transactions"; } static const char *lu_dump_state(const void *ctx, struct connection *conn) diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index d5cdf17160..db70f61f0d 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -107,6 +107,7 @@ struct connection struct list_head transaction_list; uint32_t next_transaction_id; unsigned int transaction_started; + time_t ta_start_time; /* List of delayed requests. */ struct list_head delayed; diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index 52355f4ed8..cd07fb0f21 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -473,6 +473,8 @@ int do_transaction_start(struct connection *conn, struct buffered_data *in) list_add_tail(&trans->list, &conn->transaction_list); talloc_steal(conn, trans); talloc_set_destructor(trans, destroy_transaction); + if (!conn->transaction_started) + conn->ta_start_time = time(NULL); conn->transaction_started++; wrl_ntransactions++; @@ -511,6 +513,8 @@ int do_transaction_end(struct connection *conn, struct buffered_data *in) conn->transaction = NULL; list_del(&trans->list); conn->transaction_started--; + if (!conn->transaction_started) + conn->ta_start_time = 0; /* Attach transaction to in for auto-cleanup */ talloc_steal(in, trans); @@ -589,6 +593,7 @@ void conn_delete_all_transactions(struct connection *conn) assert(conn->transaction == NULL); conn->transaction_started = 0; + conn->ta_start_time = 0; } int check_transactions(struct hashtable *hash) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:56:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:56:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72315.130112 (Exim 4.92) (envelope-from ) id 1l2eCD-0007Ke-1K; Thu, 21 Jan 2021 17:56:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72315.130112; Thu, 21 Jan 2021 17: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 1l2eCC-0007KW-UZ; Thu, 21 Jan 2021 17:56:36 +0000 Received: by outflank-mailman (input) for mailman id 72315; Thu, 21 Jan 2021 17:56:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eCC-0007KP-8w for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eCC-0005pC-7j for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eCC-00064E-6j for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17: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=uCZxLZ6qtt3zDInLgLRr7GjC137yFoFDhe2ZqMyGm/g=; b=LQ5VNEmB7PcqdOI77TrQ1QMHvI gZ/H1YZOqmAtBybEXphzj8vbgSIVuP1y2N3I6S3+91EgYqBUVJT5neuv0nIp1ecAxp9j6uIJh9yBR 3rrA4F6GsXJPDce2wm1vsmrywCza7Z5JKnPKimV8USgFdmFCTEJf3jwjpOuWJm+AudRs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add include file for state structure definitions Message-Id: Date: Thu, 21 Jan 2021 17:56:36 +0000 commit 3fab4e4f3175c0da4c553d55e79e62fc23d5c1b2 Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:19 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:34 2021 +0100 tools/xenstore: add include file for state structure definitions Add an include file containing all structures and defines needed for dumping and restoring the internal Xenstore state. Signed-off-by: Juergen Gross Acked-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/include/xenstore_state.h | 131 ++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h new file mode 100644 index 0000000000..d2a9307400 --- /dev/null +++ b/tools/xenstore/include/xenstore_state.h @@ -0,0 +1,131 @@ +/* + * Xenstore internal state dump definitions. + * Copyright (C) Juergen Gross, SUSE Software Solutions Germany GmbH + * + * Used for live-update and migration, possibly across Xenstore implementations. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#ifndef XENSTORE_STATE_H +#define XENSTORE_STATE_H + +#include +#include + +#ifndef htobe32 +#if __BYTE_ORDER == __LITTLE_ENDIAN +#define htobe32(x) __builtin_bswap32(x) +#else +#define htobe32(x) (x) +#endif +#endif + +struct xs_state_preamble { + char ident[8]; +#define XS_STATE_IDENT "xenstore" /* To be used without the NUL byte. */ + uint32_t version; /* Version in big endian format. */ +#define XS_STATE_VERSION 0x00000001 + uint32_t flags; /* Endianess. */ +#if __BYTE_ORDER == __LITTLE_ENDIAN +#define XS_STATE_FLAGS 0x00000000 /* Little endian. */ +#else +#define XS_STATE_FLAGS 0x00000001 /* Big endian. */ +#endif +}; + +/* + * Each record is starting with xs_state_record_header. + * All records have a length of a multiple of 8 bytes. + */ + +/* Common record layout: */ +struct xs_state_record_header { + uint32_t type; +#define XS_STATE_TYPE_END 0x00000000 +#define XS_STATE_TYPE_GLOBAL 0x00000001 +#define XS_STATE_TYPE_CONN 0x00000002 +#define XS_STATE_TYPE_WATCH 0x00000003 +#define XS_STATE_TYPE_TA 0x00000004 +#define XS_STATE_TYPE_NODE 0x00000005 + uint32_t length; /* Length of record in bytes. */ +}; + +/* Global state of Xenstore: */ +struct xs_state_global { + int32_t socket_fd; /* File descriptor for socket connections or -1. */ + int32_t evtchn_fd; /* File descriptor for event channel operations. */ +}; + +/* Connection to Xenstore: */ +struct xs_state_connection { + uint32_t conn_id; /* Used as reference in watch and TA records. */ + uint16_t conn_type; +#define XS_STATE_CONN_TYPE_RING 0 +#define XS_STATE_CONN_TYPE_SOCKET 1 + uint16_t pad; + union { + struct { + uint16_t domid; /* Domain-Id. */ + uint16_t tdomid; /* Id of target domain or DOMID_INVALID. */ + uint32_t evtchn; /* Event channel port. */ + } ring; + int32_t socket_fd; /* File descriptor for socket connections. */ + } spec; + uint16_t data_in_len; /* Number of unprocessed bytes read from conn. */ + uint16_t data_resp_len; /* Size of partial response pending for conn. */ + uint32_t data_out_len; /* Number of bytes not yet written to conn. */ + uint8_t data[]; /* Pending data (read, written) + 0-7 pad bytes. */ +}; + +/* Watch: */ +struct xs_state_watch { + uint32_t conn_id; /* Connection this watch is associated with. */ + uint16_t path_length; /* Number of bytes of path watched (incl. 0). */ + uint16_t token_length; /* Number of bytes of watch token (incl. 0). */ + uint8_t data[]; /* Path bytes, token bytes, 0-7 pad bytes. */ +}; + +/* Transaction: */ +struct xs_state_transaction { + uint32_t conn_id; /* Connection this TA is associated with. */ + uint32_t ta_id; /* Transaction Id. */ +}; + +/* Node (either XS_STATE_TYPE_NODE or XS_STATE_TYPE_TANODE[_MOD]): */ +struct xs_state_node_perm { + uint8_t access; /* Access rights. */ +#define XS_STATE_NODE_PERM_NONE 'n' +#define XS_STATE_NODE_PERM_READ 'r' +#define XS_STATE_NODE_PERM_WRITE 'w' +#define XS_STATE_NODE_PERM_BOTH 'b' + uint8_t flags; +#define XS_STATE_NODE_PERM_IGNORE 0x01 /* Stale permission, ignore for check. */ + uint16_t domid; /* Domain-Id. */ +}; +struct xs_state_node { + uint32_t conn_id; /* Connection in case of transaction or 0. */ + uint32_t ta_id; /* Transaction Id or 0. */ + uint16_t path_len; /* Length of path string including NUL byte. */ + uint16_t data_len; /* Length of node data. */ + uint16_t ta_access; +#define XS_STATE_NODE_TA_DELETED 0x0000 +#define XS_STATE_NODE_TA_READ 0x0001 +#define XS_STATE_NODE_TA_WRITTEN 0x0002 + uint16_t perm_n; /* Number of permissions (0 in TA: node deleted). */ + /* Permissions (first is owner, has full access). */ + struct xs_state_node_perm perms[]; + /* Path and data follows, plus 0-7 pad bytes. */ +}; +#endif /* XENSTORE_STATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:56:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:56:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72316.130117 (Exim 4.92) (envelope-from ) id 1l2eCN-0007M8-4H; Thu, 21 Jan 2021 17:56:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72316.130117; Thu, 21 Jan 2021 17:56: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 1l2eCM-0007Ly-WF; Thu, 21 Jan 2021 17:56:47 +0000 Received: by outflank-mailman (input) for mailman id 72316; Thu, 21 Jan 2021 17:56:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eCM-0007Lr-DX for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eCM-0005pb-CH for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eCM-00065O-A3 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mG3OkYMqDoO1cuJdN9bo4HA3uoRxndfrqVShoOviV9M=; b=2jRQY6u/j1oKUY1wZ8w9NQJ0EL egovETnZRqeGS7xmZWi+2X+5iD98ye/1kGBohG+N/RDVxr4frdOSlPyJJiQVn+tHbFFvgIIdW8qiS eVvu7BM5CWLWkg6aEPxv1mQ6ZDpX+c0BwirhDq8noDx7URJ6wHO/ZqPZwnmOP+KqQCVg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: dump the xenstore state for live update Message-Id: Date: Thu, 21 Jan 2021 17:56:46 +0000 commit ed6eebf17d2c8f7d6ac1c2bb23a2c92abf434074 Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:19 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:36 2021 +0100 tools/xenstore: dump the xenstore state for live update Dump the complete Xenstore status to a file (daemon case) or memory (stubdom case). As we don't know the exact length of the needed area in advance we are using an anonymous rather large mapping in stubdom case, which will use only virtual address space until accessed. And as we are writing the area in a sequential manner this is fine. As the initial size we are choosing the double size of the memory allocated via talloc(), which should be more than enough. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Acked-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/utils.c | 17 +++ tools/xenstore/utils.h | 6 ++ tools/xenstore/xenstored_control.c | 102 +++++++++++++++++- tools/xenstore/xenstored_core.c | 213 +++++++++++++++++++++++++++++++++++++ tools/xenstore/xenstored_core.h | 12 +++ tools/xenstore/xenstored_domain.c | 105 ++++++++++++++++++ tools/xenstore/xenstored_domain.h | 3 + tools/xenstore/xenstored_watch.c | 57 +++++++++- tools/xenstore/xenstored_watch.h | 3 + 9 files changed, 512 insertions(+), 6 deletions(-) diff --git a/tools/xenstore/utils.c b/tools/xenstore/utils.c index 633ce3b4fc..0d80cb6de8 100644 --- a/tools/xenstore/utils.c +++ b/tools/xenstore/utils.c @@ -62,3 +62,20 @@ void barf_perror(const char *fmt, ...) } exit(1); } + +const char *dump_state_align(FILE *fp) +{ + long len; + static char nul[8] = {}; + + len = ftell(fp); + if (len < 0) + return "Dump state align error"; + len &= 7; + if (!len) + return NULL; + + if (fwrite(nul, 8 - len, 1, fp) != 1) + return "Dump state align error"; + return NULL; +} diff --git a/tools/xenstore/utils.h b/tools/xenstore/utils.h index 6a1b5de9bd..df1cb9a3ba 100644 --- a/tools/xenstore/utils.h +++ b/tools/xenstore/utils.h @@ -3,6 +3,7 @@ #include #include #include +#include #include @@ -21,6 +22,11 @@ static inline bool strends(const char *a, const char *b) return streq(a + strlen(a) - strlen(b), b); } +/* + * Write NUL bytes for aligning state data to 8 bytes. + */ +const char *dump_state_align(FILE *fp); + void barf(const char *fmt, ...) __attribute__((noreturn)); void barf_perror(const char *fmt, ...) __attribute__((noreturn)); diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 52fbf31367..72a03c99d4 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -25,12 +25,21 @@ Interactive commands for Xen Store Daemon. #include #include #include +#include +#include #include +#include #include "utils.h" #include "talloc.h" #include "xenstored_core.h" #include "xenstored_control.h" +#include "xenstored_domain.h" + +/* Mini-OS only knows about MAP_ANON. */ +#ifndef MAP_ANONYMOUS +#define MAP_ANONYMOUS MAP_ANON +#endif struct live_update { /* For verification the correct connection is acting. */ @@ -40,6 +49,9 @@ struct live_update { void *kernel; unsigned int kernel_size; unsigned int kernel_off; + + void *dump_state; + unsigned long dump_size; #else char *filename; #endif @@ -56,6 +68,10 @@ static struct live_update *lu_status; static int lu_destroy(void *data) { +#ifdef __MINIOS__ + if (lu_status->dump_state) + munmap(lu_status->dump_state, lu_status->dump_size); +#endif lu_status = NULL; return 0; @@ -274,6 +290,31 @@ static const char *lu_arch(const void *ctx, struct connection *conn, errno = EINVAL; return NULL; } + +static FILE *lu_dump_open(const void *ctx) +{ + lu_status->dump_size = ROUNDUP(talloc_total_size(NULL) * 2, + XC_PAGE_SHIFT); + lu_status->dump_state = mmap(NULL, lu_status->dump_size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (lu_status->dump_state == MAP_FAILED) + return NULL; + + return fmemopen(lu_status->dump_state, lu_status->dump_size, "w"); +} + +static void lu_dump_close(FILE *fp) +{ + size_t size; + + size = ftell(fp); + size = ROUNDUP(size, XC_PAGE_SHIFT); + munmap(lu_status->dump_state + size, lu_status->dump_size - size); + lu_status->dump_size = size; + + fclose(fp); +} #else static const char *lu_binary(const void *ctx, struct connection *conn, const char *filename) @@ -308,6 +349,27 @@ static const char *lu_arch(const void *ctx, struct connection *conn, errno = EINVAL; return NULL; } + +static FILE *lu_dump_open(const void *ctx) +{ + char *filename; + int fd; + + filename = talloc_asprintf(ctx, "%s/state_dump", xs_daemon_rootdir()); + if (!filename) + return NULL; + + fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); + if (fd < 0) + return NULL; + + return fdopen(fd, "w"); +} + +static void lu_dump_close(FILE *fp) +{ + fclose(fp); +} #endif static bool lu_check_lu_allowed(void) @@ -347,7 +409,45 @@ static const char *lu_reject_reason(const void *ctx) static const char *lu_dump_state(const void *ctx, struct connection *conn) { - return NULL; + FILE *fp; + const char *ret; + struct xs_state_record_header end; + struct xs_state_preamble pre; + + fp = lu_dump_open(ctx); + if (!fp) + return "Dump state open error"; + + memcpy(pre.ident, XS_STATE_IDENT, sizeof(pre.ident)); + pre.version = htobe32(XS_STATE_VERSION); + pre.flags = XS_STATE_FLAGS; + if (fwrite(&pre, sizeof(pre), 1, fp) != 1) { + ret = "Dump write error"; + goto out; + } + + ret = dump_state_global(fp); + if (ret) + goto out; + ret = dump_state_connections(fp, conn); + if (ret) + goto out; + ret = dump_state_special_nodes(fp); + if (ret) + goto out; + ret = dump_state_nodes(fp, ctx); + if (ret) + goto out; + + end.type = XS_STATE_TYPE_END; + end.length = 0; + if (fwrite(&end, sizeof(end), 1, fp) != 1) + ret = "Dump write error"; + + out: + lu_dump_close(fp); + + return ret; } static const char *lu_activate_binary(const void *ctx) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 6f556d49ef..97f9f0ffa9 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2279,6 +2279,219 @@ int main(int argc, char *argv[]) } } +const char *dump_state_global(FILE *fp) +{ + struct xs_state_record_header head; + struct xs_state_global glb; + + head.type = XS_STATE_TYPE_GLOBAL; + head.length = sizeof(glb); + if (fwrite(&head, sizeof(head), 1, fp) != 1) + return "Dump global state error"; + glb.socket_fd = sock; + glb.evtchn_fd = xenevtchn_fd(xce_handle); + if (fwrite(&glb, sizeof(glb), 1, fp) != 1) + return "Dump global state error"; + + return NULL; +} + +/* Called twice: first with fp == NULL to get length, then for writing data. */ +const char *dump_state_buffered_data(FILE *fp, const struct connection *c, + const struct connection *conn, + struct xs_state_connection *sc) +{ + unsigned int len = 0, used; + struct buffered_data *out, *in = c->in; + bool partial = true; + + if (in && c != conn) { + len = in->inhdr ? in->used : sizeof(in->hdr); + if (fp && fwrite(&in->hdr, len, 1, fp) != 1) + return "Dump read data error"; + if (!in->inhdr && in->used) { + len += in->used; + if (fp && fwrite(in->buffer, in->used, 1, fp) != 1) + return "Dump read data error"; + } + } + + if (sc) { + sc->data_in_len = len; + sc->data_resp_len = 0; + } + + len = 0; + + list_for_each_entry(out, &c->out_list, list) { + used = out->used; + if (out->inhdr) { + if (!used) + partial = false; + if (fp && fwrite(out->hdr.raw + out->used, + sizeof(out->hdr) - out->used, 1, fp) != 1) + return "Dump buffered data error"; + len += sizeof(out->hdr) - out->used; + used = 0; + } + if (fp && out->hdr.msg.len && + fwrite(out->buffer + used, out->hdr.msg.len - used, + 1, fp) != 1) + return "Dump buffered data error"; + len += out->hdr.msg.len - used; + if (partial && sc) + sc->data_resp_len = len; + partial = false; + } + + /* Add "OK" for live-update command. */ + if (c == conn) { + struct xsd_sockmsg msg = conn->in->hdr.msg; + + msg.len = sizeof("OK"); + if (fp && fwrite(&msg, sizeof(msg), 1, fp) != 1) + return "Dump buffered data error"; + len += sizeof(msg); + if (fp && fwrite("OK", msg.len, 1, fp) != 1) + + return "Dump buffered data error"; + len += msg.len; + } + + if (sc) + sc->data_out_len = len; + + return NULL; +} + +const char *dump_state_node_perms(FILE *fp, struct xs_state_node *sn, + const struct xs_permissions *perms, + unsigned int n_perms) +{ + unsigned int p; + + for (p = 0; p < n_perms; p++) { + switch ((int)perms[p].perms & ~XS_PERM_IGNORE) { + case XS_PERM_READ: + sn->perms[p].access = XS_STATE_NODE_PERM_READ; + break; + case XS_PERM_WRITE: + sn->perms[p].access = XS_STATE_NODE_PERM_WRITE; + break; + case XS_PERM_READ | XS_PERM_WRITE: + sn->perms[p].access = XS_STATE_NODE_PERM_BOTH; + break; + default: + sn->perms[p].access = XS_STATE_NODE_PERM_NONE; + break; + } + sn->perms[p].flags = (perms[p].perms & XS_PERM_IGNORE) + ? XS_STATE_NODE_PERM_IGNORE : 0; + sn->perms[p].domid = perms[p].id; + } + + if (fwrite(sn->perms, sizeof(*sn->perms), n_perms, fp) != n_perms) + return "Dump node permissions error"; + + return NULL; +} + +static const char *dump_state_node_tree(FILE *fp, char *path) +{ + unsigned int pathlen, childlen, p = 0; + struct xs_state_record_header head; + struct xs_state_node sn; + TDB_DATA key, data; + const struct xs_tdb_record_hdr *hdr; + const char *child; + const char *ret; + + pathlen = strlen(path) + 1; + + set_tdb_key(path, &key); + data = tdb_fetch(tdb_ctx, key); + if (data.dptr == NULL) + return "Error reading node"; + + /* Clean up in case of failure. */ + talloc_steal(path, data.dptr); + + hdr = (void *)data.dptr; + + head.type = XS_STATE_TYPE_NODE; + head.length = sizeof(sn); + sn.conn_id = 0; + sn.ta_id = 0; + sn.ta_access = 0; + sn.perm_n = hdr->num_perms; + sn.path_len = pathlen; + sn.data_len = hdr->datalen; + head.length += hdr->num_perms * sizeof(*sn.perms); + head.length += pathlen; + head.length += hdr->datalen; + head.length = ROUNDUP(head.length, 3); + + if (fwrite(&head, sizeof(head), 1, fp) != 1) + return "Dump node state error"; + if (fwrite(&sn, sizeof(sn), 1, fp) != 1) + return "Dump node state error"; + + ret = dump_state_node_perms(fp, &sn, hdr->perms, hdr->num_perms); + if (ret) + return ret; + + if (fwrite(path, pathlen, 1, fp) != 1) + return "Dump node path error"; + if (hdr->datalen && + fwrite(hdr->perms + hdr->num_perms, hdr->datalen, 1, fp) != 1) + return "Dump node data error"; + + ret = dump_state_align(fp); + if (ret) + return ret; + + child = (char *)(hdr->perms + hdr->num_perms) + hdr->datalen; + + /* + * Use path for constructing children paths. + * As we don't write out nodes without having written their parent + * already we will never clobber a part of the path we'll need later. + */ + pathlen--; + if (path[pathlen - 1] != '/') { + path[pathlen] = '/'; + pathlen++; + } + while (p < hdr->childlen) { + childlen = strlen(child) + 1; + if (pathlen + childlen > XENSTORE_ABS_PATH_MAX) + return "Dump node path length error"; + strcpy(path + pathlen, child); + ret = dump_state_node_tree(fp, path); + if (ret) + return ret; + p += childlen; + child += childlen; + } + + talloc_free(data.dptr); + + return NULL; +} + +const char *dump_state_nodes(FILE *fp, const void *ctx) +{ + char *path; + + path = talloc_size(ctx, XENSTORE_ABS_PATH_MAX); + if (!path) + return "Path buffer allocation error"; + + strcpy(path, "/"); + + return dump_state_node_tree(fp, path); +} + /* * Local variables: * mode: C diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index db70f61f0d..22287ddfe9 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -30,6 +30,7 @@ #include #include "xenstore_lib.h" +#include "xenstore_state.h" #include "list.h" #include "tdb.h" #include "hashtable.h" @@ -41,6 +42,8 @@ typedef int32_t wrl_creditt; #define WRL_CREDIT_MAX (1000*1000*1000) /* ^ satisfies non-overflow condition for wrl_xfer_credit */ +struct xs_state_connection; + struct buffered_data { struct list_head list; @@ -245,6 +248,15 @@ int remember_string(struct hashtable *hash, const char *str); void set_tdb_key(const char *name, TDB_DATA *key); +const char *dump_state_global(FILE *fp); +const char *dump_state_buffered_data(FILE *fp, const struct connection *c, + const struct connection *conn, + struct xs_state_connection *sc); +const char *dump_state_nodes(FILE *fp, const void *ctx); +const char *dump_state_node_perms(FILE *fp, struct xs_state_node *sn, + const struct xs_permissions *perms, + unsigned int n_perms); + #endif /* _XENSTORED_CORE_H */ /* diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index ed8e83b06b..919a4d98cf 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -1143,6 +1143,111 @@ void wrl_apply_debit_trans_commit(struct connection *conn) wrl_apply_debit_actual(conn->domain); } +const char *dump_state_connections(FILE *fp, struct connection *conn) +{ + const char *ret = NULL; + unsigned int conn_id = 1; + struct xs_state_connection sc; + struct xs_state_record_header head; + struct connection *c; + + list_for_each_entry(c, &connections, list) { + head.type = XS_STATE_TYPE_CONN; + head.length = sizeof(sc); + + sc.conn_id = conn_id++; + sc.pad = 0; + memset(&sc.spec, 0, sizeof(sc.spec)); + if (c->domain) { + sc.conn_type = XS_STATE_CONN_TYPE_RING; + sc.spec.ring.domid = c->id; + sc.spec.ring.tdomid = c->target ? c->target->id + : DOMID_INVALID; + sc.spec.ring.evtchn = c->domain->port; + } else { + sc.conn_type = XS_STATE_CONN_TYPE_SOCKET; + sc.spec.socket_fd = c->fd; + } + + ret = dump_state_buffered_data(NULL, c, conn, &sc); + if (ret) + return ret; + head.length += sc.data_in_len + sc.data_out_len; + head.length = ROUNDUP(head.length, 3); + if (fwrite(&head, sizeof(head), 1, fp) != 1) + return "Dump connection state error"; + if (fwrite(&sc, offsetof(struct xs_state_connection, data), + 1, fp) != 1) + return "Dump connection state error"; + ret = dump_state_buffered_data(fp, c, conn, NULL); + if (ret) + return ret; + ret = dump_state_align(fp); + if (ret) + return ret; + + ret = dump_state_watches(fp, c, sc.conn_id); + if (ret) + return ret; + } + + return ret; +} + +static const char *dump_state_special_node(FILE *fp, const char *name, + const struct node_perms *perms) +{ + struct xs_state_record_header head; + struct xs_state_node sn; + unsigned int pathlen; + const char *ret; + + pathlen = strlen(name) + 1; + + head.type = XS_STATE_TYPE_NODE; + head.length = sizeof(sn); + + sn.conn_id = 0; + sn.ta_id = 0; + sn.ta_access = 0; + sn.perm_n = perms->num; + sn.path_len = pathlen; + sn.data_len = 0; + head.length += perms->num * sizeof(*sn.perms); + head.length += pathlen; + head.length = ROUNDUP(head.length, 3); + if (fwrite(&head, sizeof(head), 1, fp) != 1) + return "Dump special node error"; + if (fwrite(&sn, sizeof(sn), 1, fp) != 1) + return "Dump special node error"; + + ret = dump_state_node_perms(fp, &sn, perms->p, perms->num); + if (ret) + return ret; + + if (fwrite(name, pathlen, 1, fp) != 1) + return "Dump special node path error"; + + ret = dump_state_align(fp); + + return ret; +} + +const char *dump_state_special_nodes(FILE *fp) +{ + const char *ret; + + ret = dump_state_special_node(fp, "@releaseDomain", + &dom_release_perms); + if (ret) + return ret; + + ret = dump_state_special_node(fp, "@introduceDomain", + &dom_introduce_perms); + + return ret; +} + /* * Local variables: * mode: C diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 66e0a12654..413b974375 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -97,4 +97,7 @@ void wrl_log_periodic(struct wrl_timestampt now); void wrl_apply_debit_direct(struct connection *conn); void wrl_apply_debit_trans_commit(struct connection *conn); +const char *dump_state_connections(FILE *fp, struct connection *conn); +const char *dump_state_special_nodes(FILE *fp); + #endif /* _XENSTORED_DOMAIN_H */ diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c index 9ff20690c0..9248f08bd9 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -72,6 +72,19 @@ static bool is_child(const char *child, const char *parent) return child[len] == '/' || child[len] == '\0'; } +static const char *get_watch_path(const struct watch *watch, const char *name) +{ + const char *path = name; + + if (watch->relative_path) { + path += strlen(watch->relative_path); + if (*path == '/') /* Could be "" */ + path++; + } + + return path; +} + /* * Send a watch event. * Temporary memory allocations are done with ctx. @@ -85,11 +98,7 @@ static void add_event(struct connection *conn, unsigned int len; char *data; - if (watch->relative_path) { - name += strlen(watch->relative_path); - if (*name == '/') /* Could be "" */ - name++; - } + name = get_watch_path(watch, name); len = strlen(name) + 1 + strlen(watch->token) + 1; /* Don't try to send over-long events. */ @@ -291,6 +300,44 @@ void conn_delete_all_watches(struct connection *conn) } } +const char *dump_state_watches(FILE *fp, struct connection *conn, + unsigned int conn_id) +{ + const char *ret = NULL; + struct watch *watch; + struct xs_state_watch sw; + struct xs_state_record_header head; + const char *path; + + head.type = XS_STATE_TYPE_WATCH; + + list_for_each_entry(watch, &conn->watches, list) { + head.length = sizeof(sw); + + sw.conn_id = conn_id; + path = get_watch_path(watch, watch->node); + sw.path_length = strlen(path) + 1; + sw.token_length = strlen(watch->token) + 1; + head.length += sw.path_length + sw.token_length; + head.length = ROUNDUP(head.length, 3); + if (fwrite(&head, sizeof(head), 1, fp) != 1) + return "Dump watch state error"; + if (fwrite(&sw, sizeof(sw), 1, fp) != 1) + return "Dump watch state error"; + + if (fwrite(path, sw.path_length, 1, fp) != 1) + return "Dump watch path error"; + if (fwrite(watch->token, sw.token_length, 1, fp) != 1) + return "Dump watch token error"; + + ret = dump_state_align(fp); + if (ret) + return ret; + } + + return ret; +} + /* * Local variables: * mode: C diff --git a/tools/xenstore/xenstored_watch.h b/tools/xenstore/xenstored_watch.h index 03094374f3..3d81645f45 100644 --- a/tools/xenstore/xenstored_watch.h +++ b/tools/xenstore/xenstored_watch.h @@ -30,4 +30,7 @@ void fire_watches(struct connection *conn, const void *tmp, const char *name, void conn_delete_all_watches(struct connection *conn); +const char *dump_state_watches(FILE *fp, struct connection *conn, + unsigned int conn_id); + #endif /* _XENSTORED_WATCH_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:56:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:56:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72317.130119 (Exim 4.92) (envelope-from ) id 1l2eCX-0007NZ-6O; Thu, 21 Jan 2021 17:56:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72317.130119; Thu, 21 Jan 2021 17: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 1l2eCX-0007NR-3V; Thu, 21 Jan 2021 17:56:57 +0000 Received: by outflank-mailman (input) for mailman id 72317; Thu, 21 Jan 2021 17:56:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eCW-0007NJ-Fz for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eCW-0005pk-FJ for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eCW-000669-Eb for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:56:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uUWk6nKZK0U15BiC0gbxvLinDL5jxXYWpzfK2CW3NUY=; b=doqQeQYl48tTopciKAFwrjcOHw NAK6UU+bFnz7D+R9Eigbshy5j2mAizyzpE+nbLDQSlbgWajaO5A31uicFuITHFu4OdgroMKjaDLsb biCqLiijIlvEkYgaTl0Wq4H/PogKqziTUOyrYKnVIaerwoYNz6e90Gikm2DRCzTSFCC8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: handle CLOEXEC flag for local files and pipes Message-Id: Date: Thu, 21 Jan 2021 17:56:56 +0000 commit cd831ee438471b9acd37582836d035d7d8aa7100 Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:19 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:37 2021 +0100 tools/xenstore: handle CLOEXEC flag for local files and pipes For support of live update the locally used files need to have the "close on exec" flag set. Fortunately the used Xen libraries are already doing this, so only the logging and tdb related files and pipes are affected. openlog() has the close on exec attribute, too. In order to be able to keep the event channels open specify the XENEVTCHN_NO_CLOEXEC flag when calling xenevtchn_open(). Signed-off-by: Juergen Gross Acked-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 6 ++++++ tools/xenstore/xenstored_core.c | 6 ++++-- tools/xenstore/xenstored_core.h | 8 ++++++++ tools/xenstore/xenstored_domain.c | 2 +- tools/xenstore/xenstored_posix.c | 12 ++++++++++++ 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 72a03c99d4..63b1f9a8b7 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -41,6 +41,7 @@ Interactive commands for Xen Store Daemon. #define MAP_ANONYMOUS MAP_ANON #endif +#ifndef NO_LIVE_UPDATE struct live_update { /* For verification the correct connection is acting. */ struct connection *conn; @@ -90,6 +91,7 @@ static const char *lu_begin(struct connection *conn) return NULL; } +#endif struct cmd_s { char *cmd; @@ -214,6 +216,7 @@ static int do_control_print(void *ctx, struct connection *conn, return 0; } +#ifndef NO_LIVE_UPDATE static const char *lu_abort(const void *ctx, struct connection *conn) { syslog(LOG_INFO, "live-update: abort\n"); @@ -559,6 +562,7 @@ static int do_control_lu(void *ctx, struct connection *conn, send_reply(conn, XS_CONTROL, resp, strlen(resp) + 1); return 0; } +#endif static int do_control_help(void *, struct connection *, char **, int); @@ -566,6 +570,7 @@ static struct cmd_s cmds[] = { { "check", do_control_check, "" }, { "log", do_control_log, "on|off" }, +#ifndef NO_LIVE_UPDATE /* * The parameters are those of the xenstore-control utility! * Depending on environment (Mini-OS or daemon) the live-update @@ -585,6 +590,7 @@ static struct cmd_s cmds[] = { { "live-update", do_control_lu, "[-c ] [-F] [-t ] \n" " Default timeout is 60 seconds.", 4 }, +#endif #ifdef __MINIOS__ { "memreport", do_control_memreport, "" }, #else diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 97f9f0ffa9..2ef4534de7 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -198,7 +198,8 @@ void reopen_log(void) if (tracefile) { close_log(); - tracefd = open(tracefile, O_WRONLY|O_CREAT|O_APPEND, 0600); + tracefd = open(tracefile, + O_WRONLY | O_CREAT | O_APPEND | O_CLOEXEC, 0600); if (tracefd < 0) perror("Could not open tracefile"); @@ -1696,7 +1697,8 @@ static void setup_structure(void) if (!(tdb_flags & TDB_INTERNAL)) unlink(tdbname); - tdb_ctx = tdb_open_ex(tdbname, 7919, tdb_flags, O_RDWR|O_CREAT|O_EXCL, + tdb_ctx = tdb_open_ex(tdbname, 7919, tdb_flags, + O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC, 0640, &tdb_logger, NULL); if (!tdb_ctx) barf_perror("Could not create tdb file %s", tdbname); diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 22287ddfe9..c7567eaf0b 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -35,6 +35,14 @@ #include "tdb.h" #include "hashtable.h" +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +/* O_CLOEXEC support is needed for Live Update in the daemon case. */ +#ifndef __MINIOS__ +#define NO_LIVE_UPDATE +#endif +#endif + /* DEFAULT_BUFFER_SIZE should be large enough for each errno string. */ #define DEFAULT_BUFFER_SIZE 16 diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 919a4d98cf..38d250fbed 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -743,7 +743,7 @@ void domain_init(void) talloc_set_destructor(xgt_handle, close_xgt_handle); - xce_handle = xenevtchn_open(NULL, 0); + xce_handle = xenevtchn_open(NULL, XENEVTCHN_NO_CLOEXEC); if (xce_handle == NULL) barf_perror("Failed to open evtchn device"); diff --git a/tools/xenstore/xenstored_posix.c b/tools/xenstore/xenstored_posix.c index 1f9603fea2..ae3e63e07f 100644 --- a/tools/xenstore/xenstored_posix.c +++ b/tools/xenstore/xenstored_posix.c @@ -90,9 +90,21 @@ void finish_daemonize(void) void init_pipe(int reopen_log_pipe[2]) { + int flags; + unsigned int i; + if (pipe(reopen_log_pipe)) { barf_perror("pipe"); } + + for (i = 0; i < 2; i++) { + flags = fcntl(reopen_log_pipe[i], F_GETFD); + if (flags < 0) + barf_perror("pipe get flags"); + flags |= FD_CLOEXEC; + if (fcntl(reopen_log_pipe[i], F_SETFD, flags) < 0) + barf_perror("pipe set flags"); + } } void unmap_xenbus(void *interface) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:57:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:57:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72318.130125 (Exim 4.92) (envelope-from ) id 1l2eCh-0007Ox-8T; Thu, 21 Jan 2021 17:57:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72318.130125; Thu, 21 Jan 2021 17:57: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 1l2eCh-0007Ol-50; Thu, 21 Jan 2021 17:57:07 +0000 Received: by outflank-mailman (input) for mailman id 72318; Thu, 21 Jan 2021 17:57:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eCg-0007Oc-Is for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eCg-0005q4-I3 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eCg-00066u-HP for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=B4IFbKoQSjYa6OhY/ICJXldY4SdqzQGp0fZxMiPn2QU=; b=dAvW233RHSovJCuw6KxStkAIWn w0s5NbOKoEDcu5UzFGA4nAIeb2xlRpj0whkmizlen8npSiB7UrKMpsQTweQCtiQsEXh9P9kC2cmT1 VaQr7ZcAbk8bGeWt3xHcKssn4opHFjEkl7TugN1cXHRfYK3jezwJx2CF6IZEB+S+sUZo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: split off domain introduction from do_introduce() Message-Id: Date: Thu, 21 Jan 2021 17:57:06 +0000 commit d4c275d4716233c864c6c3100b658cd2ba623a66 Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:19 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:39 2021 +0100 tools/xenstore: split off domain introduction from do_introduce() For live update the functionality to introduce a new domain similar to the XS_INTRODUCE command is needed, so split that functionality off into a dedicated function introduce_domain(). Switch initial dom0 initialization to use this function, too. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/xenstored_domain.c | 95 ++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 40 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 38d250fbed..71b078caf3 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -326,7 +326,7 @@ static struct domain *find_domain_struct(unsigned int domid) return NULL; } -static struct domain *alloc_domain(void *context, unsigned int domid) +static struct domain *alloc_domain(const void *context, unsigned int domid) { struct domain *domain; @@ -347,6 +347,14 @@ static struct domain *alloc_domain(void *context, unsigned int domid) return domain; } +static struct domain *find_or_alloc_domain(const void *ctx, unsigned int domid) +{ + struct domain *domain; + + domain = find_domain_struct(domid); + return domain ? : alloc_domain(ctx, domid); +} + static int new_domain(struct domain *domain, int port) { int rc; @@ -413,52 +421,41 @@ static void domain_conn_reset(struct domain *domain) domain->interface->rsp_cons = domain->interface->rsp_prod = 0; } -/* domid, gfn, evtchn, path */ -int do_introduce(struct connection *conn, struct buffered_data *in) +static struct domain *introduce_domain(const void *ctx, + unsigned int domid, + evtchn_port_t port) { struct domain *domain; - char *vec[3]; - unsigned int domid; - evtchn_port_t port; int rc; struct xenstore_domain_interface *interface; + bool is_master_domain = (domid == xenbus_master_domid()); - if (get_strings(in, vec, ARRAY_SIZE(vec)) < ARRAY_SIZE(vec)) - return EINVAL; - - domid = atoi(vec[0]); - /* Ignore the gfn, we don't need it. */ - port = atoi(vec[2]); - - /* Sanity check args. */ - if (port <= 0) - return EINVAL; - - domain = find_domain_struct(domid); - - if (domain == NULL) { - /* Hang domain off "in" until we're finished. */ - domain = alloc_domain(in, domid); - if (domain == NULL) - return ENOMEM; - } + domain = find_or_alloc_domain(ctx, domid); + if (!domain) + return NULL; if (!domain->introduced) { - interface = map_interface(domid); + interface = is_master_domain ? xenbus_map() + : map_interface(domid); if (!interface) - return errno; - /* Hang domain off "in" until we're finished. */ + return NULL; if (new_domain(domain, port)) { rc = errno; - unmap_interface(interface); - return rc; + if (is_master_domain) + unmap_xenbus(interface); + else + unmap_interface(interface); + errno = rc; + return NULL; } domain->interface = interface; /* Now domain belongs to its connection. */ talloc_steal(domain->conn, domain); - fire_watches(NULL, in, "@introduceDomain", NULL, false, NULL); + if (!is_master_domain) + fire_watches(NULL, ctx, "@introduceDomain", NULL, + false, NULL); } else { /* Use XS_INTRODUCE for recreating the xenbus event-channel. */ if (domain->port) @@ -467,6 +464,32 @@ int do_introduce(struct connection *conn, struct buffered_data *in) domain->port = (rc == -1) ? 0 : rc; } + return domain; +} + +/* domid, gfn, evtchn, path */ +int do_introduce(struct connection *conn, struct buffered_data *in) +{ + struct domain *domain; + char *vec[3]; + unsigned int domid; + evtchn_port_t port; + + if (get_strings(in, vec, ARRAY_SIZE(vec)) < ARRAY_SIZE(vec)) + return EINVAL; + + domid = atoi(vec[0]); + /* Ignore the gfn, we don't need it. */ + port = atoi(vec[2]); + + /* Sanity check args. */ + if (port <= 0) + return EINVAL; + + domain = introduce_domain(in, domid, port); + if (!domain) + return errno; + domain_conn_reset(domain); send_ack(conn, XS_INTRODUCE); @@ -692,17 +715,9 @@ static int dom0_init(void) if (port == -1) return -1; - dom0 = alloc_domain(NULL, xenbus_master_domid()); + dom0 = introduce_domain(NULL, xenbus_master_domid(), port); if (!dom0) return -1; - if (new_domain(dom0, port)) - return -1; - - dom0->interface = xenbus_map(); - if (dom0->interface == NULL) - return -1; - - talloc_steal(dom0->conn, dom0); xenevtchn_notify(xce_handle, dom0->port); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:57:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:57:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72319.130128 (Exim 4.92) (envelope-from ) id 1l2eCr-0007Q4-9T; Thu, 21 Jan 2021 17:57:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72319.130128; Thu, 21 Jan 2021 17:57: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 1l2eCr-0007Pw-6X; Thu, 21 Jan 2021 17:57:17 +0000 Received: by outflank-mailman (input) for mailman id 72319; Thu, 21 Jan 2021 17:57:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eCq-0007Pq-MD for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eCq-0005qC-LV for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eCq-00067T-KO for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3pxqgy9gOowvFTiODFICZld0ZyhKv2DPLTgW1eo1OMs=; b=tXw2sEavkDIL48dZMPkL7WV4BC Y4uGzZ13xCTnbRv3zsUyYspst/E0MI49qPJD6WNuSIx96stVca3+yUUXAfU7VU22z7dF5GzL0Pk3z snEx+QI6l5SNaNutS/vDho3cj2oett4RN3pZdArD6VOPN/t2KhzIeDV7nzwWK9pynQYI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: evaluate the live update flag when starting Message-Id: Date: Thu, 21 Jan 2021 17:57:16 +0000 commit 9777fa6b6ea02eebf83db4023effb1a1350e6a6d Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:19 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:41 2021 +0100 tools/xenstore: evaluate the live update flag when starting In the live update case several initialization steps of xenstore must be omitted or modified. Add the proper handling for that. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 5 +++++ tools/xenstore/xenstored_control.h | 1 + tools/xenstore/xenstored_core.c | 44 +++++++++++++++++++++++++++----------- tools/xenstore/xenstored_domain.c | 26 +++++++++++----------- tools/xenstore/xenstored_domain.h | 3 ++- tools/xenstore/xenstored_posix.c | 1 - 6 files changed, 51 insertions(+), 29 deletions(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 63b1f9a8b7..5151c1448e 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -453,6 +453,11 @@ static const char *lu_dump_state(const void *ctx, struct connection *conn) return ret; } +void lu_read_state(void) +{ + xprintf("live-update: read state\n"); +} + static const char *lu_activate_binary(const void *ctx) { return "Not yet implemented."; diff --git a/tools/xenstore/xenstored_control.h b/tools/xenstore/xenstored_control.h index 207e0a6fa3..aac61f0590 100644 --- a/tools/xenstore/xenstored_control.h +++ b/tools/xenstore/xenstored_control.h @@ -17,3 +17,4 @@ */ int do_control(struct connection *conn, struct buffered_data *in); +void lu_read_state(void); diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 2ef4534de7..4d88aeba3d 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1687,9 +1687,10 @@ static void tdb_logger(TDB_CONTEXT *tdb, int level, const char * fmt, ...) } } -static void setup_structure(void) +static void setup_structure(bool live_update) { char *tdbname; + tdbname = talloc_strdup(talloc_autofree_context(), xs_daemon_tdb()); if (!tdbname) barf_perror("Could not create tdbname"); @@ -1703,14 +1704,17 @@ static void setup_structure(void) if (!tdb_ctx) barf_perror("Could not create tdb file %s", tdbname); - manual_node("/", "tool"); - manual_node("/tool", "xenstored"); - manual_node("/tool/xenstored", NULL); + if (live_update) + manual_node("/", NULL); + else { + manual_node("/", "tool"); + manual_node("/tool", "xenstored"); + manual_node("/tool/xenstored", NULL); + } check_store(); } - static unsigned int hash_from_key_fn(void *k) { char *str = k; @@ -2116,7 +2120,8 @@ int main(int argc, char *argv[]) if (dofork) { openlog("xenstored", 0, LOG_DAEMON); - daemonize(); + if (!live_update) + daemonize(); } if (pidfile) write_pidfile(pidfile); @@ -2131,17 +2136,20 @@ int main(int argc, char *argv[]) talloc_enable_null_tracking(); #ifndef NO_SOCKETS - init_sockets(); + if (!live_update) + init_sockets(); #endif init_pipe(reopen_log_pipe); /* Setup the database */ - setup_structure(); + setup_structure(live_update); /* Listen to hypervisor. */ - if (!no_domain_init) - domain_init(); + if (!no_domain_init && !live_update) { + domain_init(-1); + dom0_init(); + } if (outputpid) { printf("%ld\n", (long)getpid()); @@ -2149,13 +2157,21 @@ int main(int argc, char *argv[]) } /* redirect to /dev/null now we're ready to accept connections */ - if (dofork) + if (dofork && !live_update) finish_daemonize(); +#ifndef __MINIOS__ + if (dofork) + xprintf = trace; +#endif signal(SIGHUP, trigger_reopen_log); if (tracefile) tracefile = talloc_strdup(NULL, tracefile); + /* Read state in case of live update. */ + if (live_update) + lu_read_state(); + /* Get ready to listen to the tools. */ initialize_fds(&sock_pollfd_idx, &timeout); @@ -2163,8 +2179,10 @@ int main(int argc, char *argv[]) xenbus_notify_running(); #if defined(XEN_SYSTEMD_ENABLED) - sd_notify(1, "READY=1"); - fprintf(stderr, SD_NOTICE "xenstored is ready\n"); + if (!live_update) { + sd_notify(1, "READY=1"); + fprintf(stderr, SD_NOTICE "xenstored is ready\n"); + } #endif /* Main loop. */ diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 71b078caf3..775546757b 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -706,29 +706,23 @@ bool check_perms_special(const char *name, struct connection *conn) return perm_for_conn(conn, p) & XS_PERM_READ; } -static int dom0_init(void) -{ +void dom0_init(void) +{ evtchn_port_t port; struct domain *dom0; port = xenbus_evtchn(); if (port == -1) - return -1; + barf_perror("Failed to initialize dom0 port"); dom0 = introduce_domain(NULL, xenbus_master_domid(), port); if (!dom0) - return -1; + barf_perror("Failed to initialize dom0"); xenevtchn_notify(xce_handle, dom0->port); - - if (set_dom_perms_default(&dom_release_perms) || - set_dom_perms_default(&dom_introduce_perms)) - return -1; - - return 0; } -void domain_init(void) +void domain_init(int evtfd) { int rc; @@ -758,13 +752,17 @@ void domain_init(void) talloc_set_destructor(xgt_handle, close_xgt_handle); - xce_handle = xenevtchn_open(NULL, XENEVTCHN_NO_CLOEXEC); + if (evtfd < 0) + xce_handle = xenevtchn_open(NULL, XENEVTCHN_NO_CLOEXEC); + else + xce_handle = xenevtchn_fdopen(NULL, evtfd, 0); if (xce_handle == NULL) barf_perror("Failed to open evtchn device"); - if (dom0_init() != 0) - barf_perror("Failed to initialize dom0 state"); + if (set_dom_perms_default(&dom_release_perms) || + set_dom_perms_default(&dom_introduce_perms)) + barf_perror("Failed to set special permissions"); if ((rc = xenevtchn_bind_virq(xce_handle, VIRQ_DOM_EXC)) == -1) barf_perror("Failed to bind to domain exception virq port"); diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 413b974375..b20269b038 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -42,7 +42,8 @@ int do_get_domain_path(struct connection *conn, struct buffered_data *in); /* Allow guest to reset all watches */ int do_reset_watches(struct connection *conn, struct buffered_data *in); -void domain_init(void); +void domain_init(int evtfd); +void dom0_init(void); /* Returns the implicit path of a connection (only domains have this) */ const char *get_implicit_path(const struct connection *conn); diff --git a/tools/xenstore/xenstored_posix.c b/tools/xenstore/xenstored_posix.c index ae3e63e07f..48c37ffe3e 100644 --- a/tools/xenstore/xenstored_posix.c +++ b/tools/xenstore/xenstored_posix.c @@ -85,7 +85,6 @@ void finish_daemonize(void) dup2(devnull, STDOUT_FILENO); dup2(devnull, STDERR_FILENO); close(devnull); - xprintf = trace; } void init_pipe(int reopen_log_pipe[2]) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:57:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:57:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72320.130132 (Exim 4.92) (envelope-from ) id 1l2eD1-0007RD-Au; Thu, 21 Jan 2021 17:57:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72320.130132; Thu, 21 Jan 2021 17:57: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 1l2eD1-0007R5-81; Thu, 21 Jan 2021 17:57:27 +0000 Received: by outflank-mailman (input) for mailman id 72320; Thu, 21 Jan 2021 17:57:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eD0-0007Qz-P1 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eD0-0005qJ-OJ for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eD0-000681-Ne for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57: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=9ks2TPJkd3tUTLrdmuVfGPwZoYzZZPPHdiMaiJtQS/s=; b=TYX4fZeHSkSQ3g+a5je5OWM2gT 27os1AQ1iMmyLD7o/IDltMk6E9+aXFnEiK1laks/yM0yjWHTsnVxjISFoPWmU5E+jaAKXlvIu+3Zr 7mN+P0PUeqXpPj8kINmu8s0Axsm9sd6qZpPoaEoPtZ8oG+/UlTH43rGplP0/2Ye1p3B0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: read internal state when doing live upgrade Message-Id: Date: Thu, 21 Jan 2021 17:57:26 +0000 commit c0dc6a3e7c41f86dfcf22262a68ccceaa022d64d Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:20 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:43 2021 +0100 tools/xenstore: read internal state when doing live upgrade When started due to a live upgrade read the internal state and apply it to the data base and internal structures. Add the main control functions for that. For now only handle the daemon case. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Acked-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 102 ++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 5151c1448e..3bced9e39e 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -67,6 +67,14 @@ struct live_update { static struct live_update *lu_status; +struct lu_dump_state { + void *buf; + unsigned int size; +#ifndef __MINIOS__ + int fd; +#endif +}; + static int lu_destroy(void *data) { #ifdef __MINIOS__ @@ -318,6 +326,14 @@ static void lu_dump_close(FILE *fp) fclose(fp); } + +static void lu_get_dump_state(struct lu_dump_state *state) +{ +} + +static void lu_close_dump_state(struct lu_dump_state *state) +{ +} #else static const char *lu_binary(const void *ctx, struct connection *conn, const char *filename) @@ -373,6 +389,50 @@ static void lu_dump_close(FILE *fp) { fclose(fp); } + +static void lu_get_dump_state(struct lu_dump_state *state) +{ + char *filename; + struct stat statbuf; + + state->size = 0; + + filename = talloc_asprintf(NULL, "%s/state_dump", xs_daemon_rootdir()); + if (!filename) + barf("Allocation failure"); + + state->fd = open(filename, O_RDONLY); + talloc_free(filename); + if (state->fd < 0) + return; + if (fstat(state->fd, &statbuf) != 0) + goto out_close; + state->size = statbuf.st_size; + + state->buf = mmap(NULL, state->size, PROT_READ, MAP_PRIVATE, + state->fd, 0); + if (state->buf == MAP_FAILED) { + state->size = 0; + goto out_close; + } + + return; + + out_close: + close(state->fd); +} + +static void lu_close_dump_state(struct lu_dump_state *state) +{ + char *filename; + + munmap(state->buf, state->size); + close(state->fd); + + filename = talloc_asprintf(NULL, "%s/state_dump", xs_daemon_rootdir()); + unlink(filename); + talloc_free(filename); +} #endif static bool lu_check_lu_allowed(void) @@ -455,7 +515,47 @@ static const char *lu_dump_state(const void *ctx, struct connection *conn) void lu_read_state(void) { - xprintf("live-update: read state\n"); + struct lu_dump_state state; + struct xs_state_record_header *head; + void *ctx = talloc_new(NULL); /* Work context for subfunctions. */ + struct xs_state_preamble *pre; + + syslog(LOG_INFO, "live-update: read state\n"); + lu_get_dump_state(&state); + if (state.size == 0) + barf_perror("No state found after live-update"); + + pre = state.buf; + if (memcmp(pre->ident, XS_STATE_IDENT, sizeof(pre->ident)) || + pre->version != htobe32(XS_STATE_VERSION) || + pre->flags != XS_STATE_FLAGS) + barf("Unknown record identifier"); + for (head = state.buf + sizeof(*pre); + head->type != XS_STATE_TYPE_END && + (void *)head - state.buf < state.size; + head = (void *)head + sizeof(*head) + head->length) { + switch (head->type) { + case XS_STATE_TYPE_GLOBAL: + break; + case XS_STATE_TYPE_CONN: + break; + case XS_STATE_TYPE_WATCH: + break; + case XS_STATE_TYPE_TA: + xprintf("live-update: ignore transaction record\n"); + break; + case XS_STATE_TYPE_NODE: + break; + default: + xprintf("live-update: unknown state record %08x\n", + head->type); + break; + } + } + + lu_close_dump_state(&state); + + talloc_free(ctx); } static const char *lu_activate_binary(const void *ctx) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:57:38 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:57:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72321.130135 (Exim 4.92) (envelope-from ) id 1l2eDC-0007SW-Ch; Thu, 21 Jan 2021 17:57:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72321.130135; Thu, 21 Jan 2021 17:57:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDC-0007SO-9Y; Thu, 21 Jan 2021 17:57:38 +0000 Received: by outflank-mailman (input) for mailman id 72321; Thu, 21 Jan 2021 17:57:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDA-0007SD-SU for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDA-0005qR-Rl for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eDA-00068n-Qw for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57: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=WgeKgry5z60FoKS/mI0eDahnwIDNotvL2paHZmIm8yM=; b=nBo0BoTfdK2jsQOV2ax2u5lEzz Dgf0GFHvQ1Tn3JfTuSmvsUPctXUduj6AkIS3SfEVtt7EuFU3vImE1PolCB/VUSR84ONC78KaELytD ZoxHvRMJzdQNr3DXimc0X10Gl/Y5GEIFbM/KL73VbJ/bd/t212ABmSLTHBv5dJ3PraRM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add reading global state for live update Message-Id: Date: Thu, 21 Jan 2021 17:57:36 +0000 commit e7217f0b69a87043797da21eda3bc37fd57115fe Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:20 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:45 2021 +0100 tools/xenstore: add reading global state for live update Add reading the global state for live update. Signed-off-by: Juergen Gross Acked-by: Julien Grall Reviewed-by: Paul Durrant Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 1 + tools/xenstore/xenstored_core.c | 9 +++++++++ tools/xenstore/xenstored_core.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 3bced9e39e..d94b558e99 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -536,6 +536,7 @@ void lu_read_state(void) head = (void *)head + sizeof(*head) + head->length) { switch (head->type) { case XS_STATE_TYPE_GLOBAL: + read_state_global(ctx, head + 1); break; case XS_STATE_TYPE_CONN: break; diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 4d88aeba3d..60e98104ad 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2512,6 +2512,15 @@ const char *dump_state_nodes(FILE *fp, const void *ctx) return dump_state_node_tree(fp, path); } +void read_state_global(const void *ctx, const void *state) +{ + const struct xs_state_global *glb = state; + + sock = glb->socket_fd; + + domain_init(glb->evtchn_fd); +} + /* * Local variables: * mode: C diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index c7567eaf0b..ac9fe1559e 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -265,6 +265,8 @@ const char *dump_state_node_perms(FILE *fp, struct xs_state_node *sn, const struct xs_permissions *perms, unsigned int n_perms); +void read_state_global(const void *ctx, const void *state); + #endif /* _XENSTORED_CORE_H */ /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:57:48 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:57:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72322.130140 (Exim 4.92) (envelope-from ) id 1l2eDM-0007U9-GC; Thu, 21 Jan 2021 17:57:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72322.130140; Thu, 21 Jan 2021 17:57:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDM-0007U1-DH; Thu, 21 Jan 2021 17:57:48 +0000 Received: by outflank-mailman (input) for mailman id 72322; Thu, 21 Jan 2021 17:57:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDK-0007Tq-Vf for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDK-0005qs-Uu for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eDK-00069R-UF for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Zw12x4Zk4KaemhBYnay1owqBX9kqXMal30VVLkB3xtM=; b=fpBU4X71IzS7Kp8bTLLKzIdMpT tuD7okM5FxFlHTUUnMYrtND3Y/RSt8tqik6+6SJqm1M4nleXGr/WzRQwMvVOqkPEsdsSRkwQh2vaA i41Exr4NukEBFuB/j5QM35RxIU872RBLp+TB1yBwhTDlQW6CjRF3DteZgrF31rYY6lT4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add read connection state for live update Message-Id: Date: Thu, 21 Jan 2021 17:57:46 +0000 commit 2ea411bc2c0a5a4c7ab145270f1949630460e72b Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:20 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:47 2021 +0100 tools/xenstore: add read connection state for live update Add the needed functions for reading connection state for live update. As the connection is identified by a unique connection id in the state records we need to add this to struct connection. Add a new function to return the connection based on a connection id. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 1 + tools/xenstore/xenstored_core.c | 102 ++++++++++++++++++++++++++++++++++++- tools/xenstore/xenstored_core.h | 10 ++++ tools/xenstore/xenstored_domain.c | 60 ++++++++++++++++++---- tools/xenstore/xenstored_domain.h | 2 + 5 files changed, 162 insertions(+), 13 deletions(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index d94b558e99..7428b836a5 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -539,6 +539,7 @@ void lu_read_state(void) read_state_global(ctx, head + 1); break; case XS_STATE_TYPE_CONN: + read_state_connection(ctx, head + 1); break; case XS_STATE_TYPE_WATCH: break; diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 60e98104ad..b2c544b165 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1582,12 +1582,35 @@ struct connection *new_connection(connwritefn_t *write, connreadfn_t *read) return new; } +struct connection *get_connection_by_id(unsigned int conn_id) +{ + struct connection *conn; + + list_for_each_entry(conn, &connections, list) + if (conn->conn_id == conn_id) + return conn; + + return NULL; +} + #ifdef NO_SOCKETS static void accept_connection(int sock) { } + +int writefd(struct connection *conn, const void *data, unsigned int len) +{ + errno = EBADF; + return -1; +} + +int readfd(struct connection *conn, void *data, unsigned int len) +{ + errno = EBADF; + return -1; +} #else -static int writefd(struct connection *conn, const void *data, unsigned int len) +int writefd(struct connection *conn, const void *data, unsigned int len) { int rc; @@ -1603,7 +1626,7 @@ static int writefd(struct connection *conn, const void *data, unsigned int len) return rc; } -static int readfd(struct connection *conn, void *data, unsigned int len) +int readfd(struct connection *conn, void *data, unsigned int len) { int rc; @@ -2521,6 +2544,81 @@ void read_state_global(const void *ctx, const void *state) domain_init(glb->evtchn_fd); } +static void add_buffered_data(struct buffered_data *bdata, + struct connection *conn, const uint8_t *data, + unsigned int len) +{ + bdata->hdr.msg.len = len; + if (len <= DEFAULT_BUFFER_SIZE) + bdata->buffer = bdata->default_buffer; + else + bdata->buffer = talloc_array(bdata, char, len); + if (!bdata->buffer) + barf("error restoring buffered data"); + + memcpy(bdata->buffer, data, len); + + /* Queue for later transmission. */ + list_add_tail(&bdata->list, &conn->out_list); +} + +void read_state_buffered_data(const void *ctx, struct connection *conn, + const struct xs_state_connection *sc) +{ + struct buffered_data *bdata; + const uint8_t *data; + unsigned int len; + bool partial = sc->data_resp_len; + + if (sc->data_in_len) { + bdata = new_buffer(conn); + if (!bdata) + barf("error restoring read data"); + if (sc->data_in_len < sizeof(bdata->hdr)) { + bdata->inhdr = true; + memcpy(&bdata->hdr, sc->data, sc->data_in_len); + bdata->used = sc->data_in_len; + } else { + bdata->inhdr = false; + memcpy(&bdata->hdr, sc->data, sizeof(bdata->hdr)); + if (bdata->hdr.msg.len <= DEFAULT_BUFFER_SIZE) + bdata->buffer = bdata->default_buffer; + else + bdata->buffer = talloc_array(bdata, char, + bdata->hdr.msg.len); + if (!bdata->buffer) + barf("Error allocating in buffer"); + bdata->used = sc->data_in_len - sizeof(bdata->hdr); + memcpy(bdata->buffer, sc->data + sizeof(bdata->hdr), + bdata->used); + } + + conn->in = bdata; + } + + for (data = sc->data + sc->data_in_len; + data < sc->data + sc->data_in_len + sc->data_out_len; + data += len) { + bdata = new_buffer(conn); + if (!bdata) + barf("error restoring buffered data"); + if (partial) { + bdata->inhdr = false; + /* Make trace look nice. */ + bdata->hdr.msg.type = XS_INVALID; + len = sc->data_resp_len; + add_buffered_data(bdata, conn, data, len); + partial = false; + continue; + } + + memcpy(&bdata->hdr, data, sizeof(bdata->hdr)); + data += sizeof(bdata->hdr); + len = bdata->hdr.msg.len; + add_buffered_data(bdata, conn, data, len); + } +} + /* * Local variables: * mode: C diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index ac9fe1559e..dcb3ad3e4b 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -135,6 +135,9 @@ struct connection /* Methods for communicating over this connection: write can be NULL */ connwritefn_t *write; connreadfn_t *read; + + /* Support for live update: connection id. */ + unsigned int conn_id; }; extern struct list_head connections; @@ -195,6 +198,7 @@ struct node *read_node(struct connection *conn, const void *ctx, const char *name); struct connection *new_connection(connwritefn_t *write, connreadfn_t *read); +struct connection *get_connection_by_id(unsigned int conn_id); void check_store(void); void corrupt(struct connection *conn, const char *fmt, ...); enum xs_perm_type perm_for_conn(struct connection *conn, @@ -250,6 +254,10 @@ void finish_daemonize(void); /* Open a pipe for signal handling */ void init_pipe(int reopen_log_pipe[2]); +int writefd(struct connection *conn, const void *data, unsigned int len); +int readfd(struct connection *conn, void *data, unsigned int len); + +extern struct interface_funcs socket_funcs; extern xengnttab_handle **xgt_handle; int remember_string(struct hashtable *hash, const char *str); @@ -266,6 +274,8 @@ const char *dump_state_node_perms(FILE *fp, struct xs_state_node *sn, unsigned int n_perms); void read_state_global(const void *ctx, const void *state); +void read_state_buffered_data(const void *ctx, struct connection *conn, + const struct xs_state_connection *sc); #endif /* _XENSTORED_CORE_H */ diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 775546757b..6934f1bc89 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -355,7 +355,7 @@ static struct domain *find_or_alloc_domain(const void *ctx, unsigned int domid) return domain ? : alloc_domain(ctx, domid); } -static int new_domain(struct domain *domain, int port) +static int new_domain(struct domain *domain, int port, bool restore) { int rc; @@ -369,11 +369,16 @@ static int new_domain(struct domain *domain, int port) wrl_domain_new(domain); - /* Tell kernel we're interested in this event. */ - rc = xenevtchn_bind_interdomain(xce_handle, domain->domid, port); - if (rc == -1) - return errno; - domain->port = rc; + if (restore) + domain->port = port; + else { + /* Tell kernel we're interested in this event. */ + rc = xenevtchn_bind_interdomain(xce_handle, domain->domid, + port); + if (rc == -1) + return errno; + domain->port = rc; + } domain->introduced = true; @@ -423,7 +428,7 @@ static void domain_conn_reset(struct domain *domain) static struct domain *introduce_domain(const void *ctx, unsigned int domid, - evtchn_port_t port) + evtchn_port_t port, bool restore) { struct domain *domain; int rc; @@ -439,7 +444,7 @@ static struct domain *introduce_domain(const void *ctx, : map_interface(domid); if (!interface) return NULL; - if (new_domain(domain, port)) { + if (new_domain(domain, port, restore)) { rc = errno; if (is_master_domain) unmap_xenbus(interface); @@ -453,7 +458,7 @@ static struct domain *introduce_domain(const void *ctx, /* Now domain belongs to its connection. */ talloc_steal(domain->conn, domain); - if (!is_master_domain) + if (!is_master_domain && !restore) fire_watches(NULL, ctx, "@introduceDomain", NULL, false, NULL); } else { @@ -486,7 +491,7 @@ int do_introduce(struct connection *conn, struct buffered_data *in) if (port <= 0) return EINVAL; - domain = introduce_domain(in, domid, port); + domain = introduce_domain(in, domid, port, false); if (!domain) return errno; @@ -715,7 +720,7 @@ void dom0_init(void) if (port == -1) barf_perror("Failed to initialize dom0 port"); - dom0 = introduce_domain(NULL, xenbus_master_domid(), port); + dom0 = introduce_domain(NULL, xenbus_master_domid(), port, false); if (!dom0) barf_perror("Failed to initialize dom0"); @@ -1261,6 +1266,39 @@ const char *dump_state_special_nodes(FILE *fp) return ret; } +void read_state_connection(const void *ctx, const void *state) +{ + const struct xs_state_connection *sc = state; + struct connection *conn; + struct domain *domain, *tdomain; + + if (sc->conn_type == XS_STATE_CONN_TYPE_SOCKET) { + conn = new_connection(writefd, readfd); + if (!conn) + barf("error restoring connection"); + conn->fd = sc->spec.socket_fd; + } else { + domain = introduce_domain(ctx, sc->spec.ring.domid, + sc->spec.ring.evtchn, true); + if (!domain) + barf("domain allocation error"); + + if (sc->spec.ring.tdomid != DOMID_INVALID) { + tdomain = find_or_alloc_domain(ctx, + sc->spec.ring.tdomid); + if (!tdomain) + barf("target domain allocation error"); + talloc_reference(domain->conn, tdomain->conn); + domain->conn->target = tdomain->conn; + } + conn = domain->conn; + } + + conn->conn_id = sc->conn_id; + + read_state_buffered_data(ctx, conn, sc); +} + /* * Local variables: * mode: C diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index b20269b038..8f3b4e0f8b 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -101,4 +101,6 @@ void wrl_apply_debit_trans_commit(struct connection *conn); const char *dump_state_connections(FILE *fp, struct connection *conn); const char *dump_state_special_nodes(FILE *fp); +void read_state_connection(const void *ctx, const void *state); + #endif /* _XENSTORED_DOMAIN_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:57:58 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:57:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72323.130144 (Exim 4.92) (envelope-from ) id 1l2eDW-0007VT-Hn; Thu, 21 Jan 2021 17:57:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72323.130144; Thu, 21 Jan 2021 17:57:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDW-0007VM-Eo; Thu, 21 Jan 2021 17:57:58 +0000 Received: by outflank-mailman (input) for mailman id 72323; Thu, 21 Jan 2021 17:57:57 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDV-0007V8-2Q for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:57 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDV-0005r3-1h for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eDV-00069x-0x for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:57:57 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dpdXkymT0SXeVi7zXA0jM1Y7dgyVI1DRPDGH2EmtdZ0=; b=0uzekXUdBvtPDxc0bKnFGUcSGB DmeTlBT5b9RQ/6sanH28vsb6IpiYjE7IS6jRbUYbOLHFkAruesDdBtpfs5zi2P4UWJek/hsqgTIFi +QiyHFzqEX5d4QGYbqLfr5hbssTRjpotJ+zHlMX4IMXI0O56vhiCQ9nWYdUU7UM6TT9A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add read node state for live update Message-Id: Date: Thu, 21 Jan 2021 17:57:57 +0000 commit 34ceff030e482efcd261cca7a7f9b15213345cb4 Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:20 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:49 2021 +0100 tools/xenstore: add read node state for live update Add the needed functions for reading node state for live update. This requires some refactoring of current node handling in Xenstore in order to avoid repeating the same code patterns multiple times. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Acked-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 1 + tools/xenstore/xenstored_core.c | 105 +++++++++++++++++++++++++++++++++---- tools/xenstore/xenstored_core.h | 1 + 3 files changed, 96 insertions(+), 11 deletions(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 7428b836a5..287417de6b 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -547,6 +547,7 @@ void lu_read_state(void) xprintf("live-update: ignore transaction record\n"); break; case XS_STATE_TYPE_NODE: + read_state_node(ctx, head + 1); break; default: xprintf("live-update: unknown state record %08x\n", diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index b2c544b165..a5c1a56c6c 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -979,13 +979,30 @@ static char *basename(const char *name) return strrchr(name, '/') + 1; } -static struct node *construct_node(struct connection *conn, const void *ctx, - const char *name) +static int add_child(const void *ctx, struct node *parent, const char *name) { const char *base; unsigned int baselen; + char *children; + + base = basename(name); + baselen = strlen(base) + 1; + children = talloc_array(ctx, char, parent->childlen + baselen); + if (!children) + return ENOMEM; + memcpy(children, parent->children, parent->childlen); + memcpy(children + parent->childlen, base, baselen); + parent->children = children; + parent->childlen += baselen; + + return 0; +} + +static struct node *construct_node(struct connection *conn, const void *ctx, + const char *name) +{ struct node *parent, *node; - char *children, *parentname = get_parent(ctx, name); + char *parentname = get_parent(ctx, name); if (!parentname) return NULL; @@ -998,15 +1015,8 @@ static struct node *construct_node(struct connection *conn, const void *ctx, return NULL; /* Add child to parent. */ - base = basename(name); - baselen = strlen(base) + 1; - children = talloc_array(ctx, char, parent->childlen + baselen); - if (!children) + if (add_child(ctx, parent, name)) goto nomem; - memcpy(children, parent->children, parent->childlen); - memcpy(children + parent->childlen, base, baselen); - parent->children = children; - parent->childlen += baselen; /* Allocate node */ node = talloc(ctx, struct node); @@ -2619,6 +2629,79 @@ void read_state_buffered_data(const void *ctx, struct connection *conn, } } +void read_state_node(const void *ctx, const void *state) +{ + const struct xs_state_node *sn = state; + struct node *node, *parent; + TDB_DATA key; + char *name, *parentname; + unsigned int i; + struct connection conn = { .id = priv_domid }; + + name = (char *)(sn->perms + sn->perm_n); + node = talloc(ctx, struct node); + if (!node) + barf("allocation error restoring node"); + + node->name = name; + node->generation = ++generation; + node->datalen = sn->data_len; + node->data = name + sn->path_len; + node->childlen = 0; + node->children = NULL; + node->perms.num = sn->perm_n; + node->perms.p = talloc_array(node, struct xs_permissions, + node->perms.num); + if (!node->perms.p) + barf("allocation error restoring node"); + for (i = 0; i < node->perms.num; i++) { + switch (sn->perms[i].access) { + case 'r': + node->perms.p[i].perms = XS_PERM_READ; + break; + case 'w': + node->perms.p[i].perms = XS_PERM_WRITE; + break; + case 'b': + node->perms.p[i].perms = XS_PERM_READ | XS_PERM_WRITE; + break; + default: + node->perms.p[i].perms = XS_PERM_NONE; + break; + } + if (sn->perms[i].flags & XS_STATE_NODE_PERM_IGNORE) + node->perms.p[i].perms |= XS_PERM_IGNORE; + node->perms.p[i].id = sn->perms[i].domid; + } + + if (strstarts(name, "@")) { + set_perms_special(&conn, name, &node->perms); + talloc_free(node); + return; + } + + parentname = get_parent(node, name); + if (!parentname) + barf("allocation error restoring node"); + parent = read_node(NULL, node, parentname); + if (!parent) + barf("read parent error restoring node"); + + if (add_child(node, parent, name)) + barf("allocation error restoring node"); + + set_tdb_key(parentname, &key); + if (write_node_raw(NULL, &key, parent, true)) + barf("write parent error restoring node"); + + set_tdb_key(name, &key); + if (write_node_raw(NULL, &key, node, true)) + barf("write node error restoring node"); + domain_entry_inc(&conn, node); + + talloc_free(node); +} + /* * Local variables: * mode: C diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index dcb3ad3e4b..6ac5a6fbfa 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -276,6 +276,7 @@ const char *dump_state_node_perms(FILE *fp, struct xs_state_node *sn, void read_state_global(const void *ctx, const void *state); void read_state_buffered_data(const void *ctx, struct connection *conn, const struct xs_state_connection *sc); +void read_state_node(const void *ctx, const void *state); #endif /* _XENSTORED_CORE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:58:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:58:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72324.130148 (Exim 4.92) (envelope-from ) id 1l2eDg-0007Wl-JV; Thu, 21 Jan 2021 17:58:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72324.130148; Thu, 21 Jan 2021 17:58:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDg-0007We-GT; Thu, 21 Jan 2021 17:58:08 +0000 Received: by outflank-mailman (input) for mailman id 72324; Thu, 21 Jan 2021 17:58:07 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDf-0007WV-5P for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:58:07 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDf-0005rQ-4Z for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:58:07 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eDf-0006Aj-3o for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:58:07 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CgWlYF0SMw/92sXpKbcgrm0VCU4m2gznkXhYKjzC7Ko=; b=ptE1vwY8hQNaHjwCRN0nL6tti/ Ngxuxu/YMpFVrxeF6e4X6wX564KRsM/g6tH0D9dtz4y+1A/h0p4Tn9aS2o6aW6Y1/vFFwqE8k1qdI WYQ7jD/Xd1jyQvJduIfe1v5Vab8h3n1kKnHYdHy4a3mjqxBXIHeIvQgXnRaSf+ewQ6D4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: add read watch state for live update Message-Id: Date: Thu, 21 Jan 2021 17:58:07 +0000 commit c6fde653593cc6d21511819213e3cf7516f7cdcd Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:20 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:50 2021 +0100 tools/xenstore: add read watch state for live update Add reading the watch state records for live update. This requires factoring out some of the add watch functionality into a dedicated function. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 2 + tools/xenstore/xenstored_watch.c | 114 +++++++++++++++++++++++++++---------- tools/xenstore/xenstored_watch.h | 2 + 3 files changed, 88 insertions(+), 30 deletions(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 287417de6b..b8195eed41 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -35,6 +35,7 @@ Interactive commands for Xen Store Daemon. #include "xenstored_core.h" #include "xenstored_control.h" #include "xenstored_domain.h" +#include "xenstored_watch.h" /* Mini-OS only knows about MAP_ANON. */ #ifndef MAP_ANONYMOUS @@ -542,6 +543,7 @@ void lu_read_state(void) read_state_connection(ctx, head + 1); break; case XS_STATE_TYPE_WATCH: + read_state_watch(ctx, head + 1); break; case XS_STATE_TYPE_TA: xprintf("live-update: ignore transaction record\n"); diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c index 9248f08bd9..db89e0141f 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -205,6 +205,62 @@ static int destroy_watch(void *_watch) return 0; } +static int check_watch_path(struct connection *conn, const void *ctx, + char **path, bool *relative) +{ + /* Check if valid event. */ + if (strstarts(*path, "@")) { + *relative = false; + if (strlen(*path) > XENSTORE_REL_PATH_MAX) + goto inval; + } else { + *relative = !strstarts(*path, "/"); + *path = canonicalize(conn, ctx, *path); + if (!*path) + return errno; + if (!is_valid_nodename(*path)) + goto inval; + } + + return 0; + + inval: + errno = EINVAL; + return errno; +} + +static struct watch *add_watch(struct connection *conn, char *path, char *token, + bool relative) +{ + struct watch *watch; + + watch = talloc(conn, struct watch); + if (!watch) + goto nomem; + watch->node = talloc_strdup(watch, path); + watch->token = talloc_strdup(watch, token); + if (!watch->node || !watch->token) + goto nomem; + + if (relative) + watch->relative_path = get_implicit_path(conn); + else + watch->relative_path = NULL; + + INIT_LIST_HEAD(&watch->events); + + domain_watch_inc(conn); + list_add_tail(&watch->list, &conn->watches); + talloc_set_destructor(watch, destroy_watch); + + return watch; + + nomem: + talloc_free(watch); + errno = ENOMEM; + return NULL; +} + int do_watch(struct connection *conn, struct buffered_data *in) { struct watch *watch; @@ -214,19 +270,9 @@ int do_watch(struct connection *conn, struct buffered_data *in) if (get_strings(in, vec, ARRAY_SIZE(vec)) != ARRAY_SIZE(vec)) return EINVAL; - if (strstarts(vec[0], "@")) { - relative = false; - if (strlen(vec[0]) > XENSTORE_REL_PATH_MAX) - return EINVAL; - /* check if valid event */ - } else { - relative = !strstarts(vec[0], "/"); - vec[0] = canonicalize(conn, in, vec[0]); - if (!vec[0]) - return ENOMEM; - if (!is_valid_nodename(vec[0])) - return EINVAL; - } + errno = check_watch_path(conn, in, &(vec[0]), &relative); + if (errno) + return errno; /* Check for duplicates. */ list_for_each_entry(watch, &conn->watches, list) { @@ -238,26 +284,11 @@ int do_watch(struct connection *conn, struct buffered_data *in) if (domain_watch(conn) > quota_nb_watch_per_domain) return E2BIG; - watch = talloc(conn, struct watch); + watch = add_watch(conn, vec[0], vec[1], relative); if (!watch) - return ENOMEM; - watch->node = talloc_strdup(watch, vec[0]); - watch->token = talloc_strdup(watch, vec[1]); - if (!watch->node || !watch->token) { - talloc_free(watch); - return ENOMEM; - } - if (relative) - watch->relative_path = get_implicit_path(conn); - else - watch->relative_path = NULL; + return errno; - INIT_LIST_HEAD(&watch->events); - - domain_watch_inc(conn); - list_add_tail(&watch->list, &conn->watches); trace_create(watch, "watch"); - talloc_set_destructor(watch, destroy_watch); send_ack(conn, XS_WATCH); /* We fire once up front: simplifies clients and restart. */ @@ -338,6 +369,29 @@ const char *dump_state_watches(FILE *fp, struct connection *conn, return ret; } +void read_state_watch(const void *ctx, const void *state) +{ + const struct xs_state_watch *sw = state; + struct connection *conn; + char *path, *token; + bool relative; + + conn = get_connection_by_id(sw->conn_id); + if (!conn) + barf("connection not found for read watch"); + + path = (char *)sw->data; + token = path + sw->path_length; + + /* Don't check success, we want the relative information only. */ + check_watch_path(conn, ctx, &path, &relative); + if (!path) + barf("allocation error for read watch"); + + if (!add_watch(conn, path, token, relative)) + barf("error adding watch"); +} + /* * Local variables: * mode: C diff --git a/tools/xenstore/xenstored_watch.h b/tools/xenstore/xenstored_watch.h index 3d81645f45..0e693f0839 100644 --- a/tools/xenstore/xenstored_watch.h +++ b/tools/xenstore/xenstored_watch.h @@ -33,4 +33,6 @@ void conn_delete_all_watches(struct connection *conn); const char *dump_state_watches(FILE *fp, struct connection *conn, unsigned int conn_id); +void read_state_watch(const void *ctx, const void *state); + #endif /* _XENSTORED_WATCH_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:58:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:58:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72325.130152 (Exim 4.92) (envelope-from ) id 1l2eDq-0007Y6-LZ; Thu, 21 Jan 2021 17:58:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72325.130152; Thu, 21 Jan 2021 17:58:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDq-0007Xy-IP; Thu, 21 Jan 2021 17:58:18 +0000 Received: by outflank-mailman (input) for mailman id 72325; Thu, 21 Jan 2021 17:58:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDp-0007Xr-8C for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:58:17 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDp-0005rX-7U for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:58:17 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eDp-0006BI-6n for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:58:17 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cNYPpxGqXBA1BbdvvU2oYK8n7sk/SP4D+3m1QpTaQk4=; b=kYApPnisMjDNBcviLYD/LtRoYL LQs/NWTFq6xl/N/q+fz2o8hVIJL/THY8QLxNRFxSEGQZ4RZEdjsAMg8Zp5PDeI/orPR4IW6HdFrY+ 2LC65XBFq5+0g1fGLVAnhPjFAFp1ypLopx1npGjg2EXwSBgtSsLTO4PHHhpL4xha9Rl0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: handle dying domains in live update Message-Id: Date: Thu, 21 Jan 2021 17:58:17 +0000 commit 939775cfd3ad6bce5aa350b7f60e0eb48914257f Author: Julien Grall AuthorDate: Wed Jan 13 14:00:21 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:52 2021 +0100 tools/xenstore: handle dying domains in live update A domain could just be dying when live updating Xenstore, so the case of not being able to map the ring page or to connect to the event channel must be handled gracefully. Signed-off-by: Julien Grall Reviewed-by: Paul Durrant Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 7 +++++++ tools/xenstore/xenstored_domain.c | 25 +++++++++++++++++-------- tools/xenstore/xenstored_domain.h | 2 ++ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index b8195eed41..3c212cc4d4 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -561,6 +561,13 @@ void lu_read_state(void) lu_close_dump_state(&state); talloc_free(ctx); + + /* + * We may have missed the VIRQ_DOM_EXC notification and a domain may + * have died while we were live-updating. So check all the domains are + * still alive. + */ + check_domains(true); } static const char *lu_activate_binary(const void *ctx) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 6934f1bc89..cbeb2a309c 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -220,7 +220,7 @@ static bool get_domain_info(unsigned int domid, xc_dominfo_t *dominfo) dominfo->domid == domid; } -static void domain_cleanup(void) +void check_domains(bool restore) { xc_dominfo_t dominfo; struct domain *domain; @@ -244,7 +244,14 @@ static void domain_cleanup(void) domain->shutdown = true; notify = 1; } - if (!dominfo.dying) + /* + * On Restore, we may have been unable to remap the + * interface and the port. As we don't know whether + * this was because of a dying domain, we need to + * check if the interface and port are still valid. + */ + if (!dominfo.dying && domain->port && + domain->interface) continue; } if (domain->conn) { @@ -270,7 +277,7 @@ void handle_event(void) barf_perror("Failed to read from event fd"); if (port == virq_port) - domain_cleanup(); + check_domains(false); if (xenevtchn_unmask(xce_handle, port) == -1) barf_perror("Failed to write to event fd"); @@ -442,14 +449,16 @@ static struct domain *introduce_domain(const void *ctx, if (!domain->introduced) { interface = is_master_domain ? xenbus_map() : map_interface(domid); - if (!interface) + if (!interface && !restore) return NULL; if (new_domain(domain, port, restore)) { rc = errno; - if (is_master_domain) - unmap_xenbus(interface); - else - unmap_interface(interface); + if (interface) { + if (is_master_domain) + unmap_xenbus(interface); + else + unmap_interface(interface); + } errno = rc; return NULL; } diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 8f3b4e0f8b..1cc1c03ed8 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -21,6 +21,8 @@ void handle_event(void); +void check_domains(bool restore); + /* domid, mfn, eventchn, path */ int do_introduce(struct connection *conn, struct buffered_data *in); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 17:58:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 17:58:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72326.130157 (Exim 4.92) (envelope-from ) id 1l2eE0-0007Zk-Or; Thu, 21 Jan 2021 17:58:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72326.130157; Thu, 21 Jan 2021 17:58:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eE0-0007ZZ-Lb; Thu, 21 Jan 2021 17:58:28 +0000 Received: by outflank-mailman (input) for mailman id 72326; Thu, 21 Jan 2021 17:58:27 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDz-0007ZP-BN for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:58:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2eDz-0005rf-Ab for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:58:27 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2eDz-0006Br-9w for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 17:58:27 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=32r+O1pU+A7+46hKFEZYmRjMZCJ0udj8o05TBWZ31Ac=; b=c7QpPeq6S9nK5PjeZmgYp0vrGT nInotiTQ82G6J7JlsDB+18ILioA9NF/K8GKzvkeU9J0Bh/OeFJjQ++KBgOMsnlfmySM3XDNImfs2q eQ1SIXlX+1LGaLoJugGP7xhHHjxvLwKVUfn5oFqOHFViN1IoBJG5sEEgnUBj/Zz32jyo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: activate new binary for live update Message-Id: Date: Thu, 21 Jan 2021 17:58:27 +0000 commit dbf22970f5df8d20b2a6b7107cb9d977630181a6 Author: Juergen Gross AuthorDate: Wed Jan 13 14:00:21 2021 +0100 Commit: Juergen Gross CommitDate: Thu Jan 21 17:31:55 2021 +0100 tools/xenstore: activate new binary for live update Add activation of the new binary for live update. The daemon case is handled completely, while for stubdom we only add stubs. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/xenstore/xenstored_control.c | 61 +++++++++++++++++++++++++++++++++++++- tools/xenstore/xenstored_core.c | 5 ++++ tools/xenstore/xenstored_core.h | 3 ++ tools/xenstore/xenstored_domain.c | 6 ++++ tools/xenstore/xenstored_domain.h | 1 + 5 files changed, 75 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 3c212cc4d4..1f733e0a04 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -16,6 +16,7 @@ Interactive commands for Xen Store Daemon. along with this program; If not, see . */ +#include #include #include #include @@ -335,6 +336,11 @@ static void lu_get_dump_state(struct lu_dump_state *state) static void lu_close_dump_state(struct lu_dump_state *state) { } + +static char *lu_exec(const void *ctx, int argc, char **argv) +{ + return "NYI"; +} #else static const char *lu_binary(const void *ctx, struct connection *conn, const char *filename) @@ -434,6 +440,14 @@ static void lu_close_dump_state(struct lu_dump_state *state) unlink(filename); talloc_free(filename); } + +static char *lu_exec(const void *ctx, int argc, char **argv) +{ + argv[0] = lu_status->filename; + execvp(argv[0], argv); + + return "Error activating new binary."; +} #endif static bool lu_check_lu_allowed(void) @@ -572,7 +586,52 @@ void lu_read_state(void) static const char *lu_activate_binary(const void *ctx) { - return "Not yet implemented."; + int argc; + char **argv; + unsigned int i; + + if (lu_status->cmdline) { + argc = 4; /* At least one arg + progname + "-U" + NULL. */ + for (i = 0; lu_status->cmdline[i]; i++) + if (isspace(lu_status->cmdline[i])) + argc++; + argv = talloc_array(ctx, char *, argc); + if (!argv) + return "Allocation failure."; + + i = 0; + argc = 1; + argv[1] = strtok(lu_status->cmdline, " \t"); + while (argv[argc]) { + if (!strcmp(argv[argc], "-U")) + i = 1; + argc++; + argv[argc] = strtok(NULL, " \t"); + } + + if (!i) { + argv[argc++] = "-U"; + argv[argc] = NULL; + } + } else { + for (i = 0; i < orig_argc; i++) + if (!strcmp(orig_argv[i], "-U")) + break; + + argc = orig_argc; + argv = talloc_array(ctx, char *, orig_argc + 2); + if (!argv) + return "Allocation failure."; + + memcpy(argv, orig_argv, orig_argc * sizeof(*argv)); + if (i == orig_argc) + argv[argc++] = "-U"; + argv[argc] = NULL; + } + + domain_deinit(); + + return lu_exec(ctx, argc, argv); } static bool do_lu_start(struct delayed_request *req) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index a5c1a56c6c..65ecdd0568 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -73,6 +73,9 @@ static unsigned int delayed_requests; static int sock = -1; +int orig_argc; +char **orig_argv; + static bool verbose = false; LIST_HEAD(connections); int tracefd = -1; @@ -2077,6 +2080,8 @@ int main(int argc, char *argv[]) const char *pidfile = NULL; int timeout; + orig_argc = argc; + orig_argv = argv; while ((opt = getopt_long(argc, argv, "DE:F:HNPS:t:A:M:T:RVW:U", options, NULL)) != -1) { diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 6ac5a6fbfa..589699e833 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -222,6 +222,9 @@ void dtrace_io(const struct connection *conn, const struct buffered_data *data, void reopen_log(void); void close_log(void); +extern int orig_argc; +extern char **orig_argv; + extern char *tracefile; extern int tracefd; diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index cbeb2a309c..3d4d0649a2 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -783,6 +783,12 @@ void domain_init(int evtfd) virq_port = rc; } +void domain_deinit(void) +{ + if (virq_port) + xenevtchn_unbind(xce_handle, virq_port); +} + void domain_entry_inc(struct connection *conn, struct node *node) { struct domain *d; diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 1cc1c03ed8..dc97591713 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -46,6 +46,7 @@ int do_reset_watches(struct connection *conn, struct buffered_data *in); void domain_init(int evtfd); void dom0_init(void); +void domain_deinit(void); /* Returns the implicit path of a connection (only domains have this) */ const char *get_implicit_path(const struct connection *conn); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jan 21 21:44:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Jan 2021 21:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72474.130509 (Exim 4.92) (envelope-from ) id 1l2hkM-0008Bz-8F; Thu, 21 Jan 2021 21:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72474.130509; Thu, 21 Jan 2021 21:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2hkM-0008Bq-4q; Thu, 21 Jan 2021 21:44:06 +0000 Received: by outflank-mailman (input) for mailman id 72474; Thu, 21 Jan 2021 21:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2hkK-0008Bl-QE for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 21:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2hkK-0001KM-MW for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 21:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2hkK-00058u-L1 for xen-changelog@lists.xenproject.org; Thu, 21 Jan 2021 21:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NTX+jYLZVx20XhPgtEmNdJLi51QnOtabbvqW8FBFfFM=; b=RNIP1McAEXnWJv9pTkmCCBCC99 F3UKqhpmo93icLT0172+rUn4JmiUv43ohU0PQhHJAipFzbXbVczY2jnXBDO9LBqkSnYUrSqreQ7A/ 7E2j9sqqCFqgDKW+2zxnfd4LZUi6Xify94wT5/ZyR1TTgjczHwC5CrhGK518on9tJBg8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Fix compilation error when early printk is enabled Message-Id: Date: Thu, 21 Jan 2021 21:44:04 +0000 commit 24114840ea4f82b6958ba0d7ac5e4cec44aafe11 Author: Michal Orzel AuthorDate: Thu Jan 21 10:30:41 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Jan 21 13:41:21 2021 -0800 xen/arm: Fix compilation error when early printk is enabled Fix compilation error when enabling early printk, introduced by commit aa4b9d1ee6538b5cbe218d4d3fcdf9548130a063: ``` debug.S: Assembler messages: debug.S:31: Error: constant expression expected at operand 2 -- `ldr x15,=((0x00400000+(0)*PAGE_SIZE)+(0x1c090000&~PAGE_MASK))` debug.S:38: Error: constant expression expected at operand 2 -- `ldr x15,=((0x00400000+(0)*PAGE_SIZE)+(0x1c090000&~PAGE_MASK))` ``` The fix is to include header which now contains definitions for page/size/mask etc. Fixes: aa4b9d1ee653 ("include: don't use asm/page.h from common headers") Signed-off-by: Michal Orzel Reviewed-by: Julien Grall Acked-by: Stefano Stabellini --- xen/include/asm-arm/early_printk.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/include/asm-arm/early_printk.h b/xen/include/asm-arm/early_printk.h index d5485decfa..8dc911cf48 100644 --- a/xen/include/asm-arm/early_printk.h +++ b/xen/include/asm-arm/early_printk.h @@ -10,6 +10,7 @@ #ifndef __ARM_EARLY_PRINTK_H__ #define __ARM_EARLY_PRINTK_H__ +#include #ifdef CONFIG_EARLY_PRINTK -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 11:22:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 11:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72689.130905 (Exim 4.92) (envelope-from ) id 1l2uVy-000808-Aw; Fri, 22 Jan 2021 11:22:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72689.130905; Fri, 22 Jan 2021 11: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 1l2uVy-000800-7n; Fri, 22 Jan 2021 11:22:06 +0000 Received: by outflank-mailman (input) for mailman id 72689; Fri, 22 Jan 2021 11:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uVw-0007zv-E0 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uVw-0006AF-CC for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2uVw-0006JD-A0 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11: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=re5WwsQoNyas7lckEBu7BKLmqWwZ0+wO9JeB4mSrO9c=; b=h3TDzt9l3//cuy6hn9z2n1iP9t uEugrfkNoSh5VwmoFquek/n+F4pf9PVhuSxgcdaOyVqaEbn5hfVhAbp9O4SG1c3ZrT64rw7+12fyo i9dmF7GTY/B6cRdsKHK2wKER6F9qkkkKZCpdF9Ji/ww/4Sak1Okop2woN61FBoTzhwIk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vioapic: check IRR before attempting to inject interrupt after EOI Message-Id: Date: Fri, 22 Jan 2021 11:22:04 +0000 commit ba584fb1a26c058ebd0e6a2779287b3e4400415c Author: Roger Pau Monné AuthorDate: Fri Jan 22 12:13:05 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 22 12:13:05 2021 +0100 x86/vioapic: check IRR before attempting to inject interrupt after EOI In vioapic_update_EOI the irq_lock will be dropped in order to forward the EOI to the dpci handler, so there's a window between clearing IRR and checking if the line is asserted where IRR can change behind our back. Fix this by checking whether IRR is set before attempting to inject a new interrupt. Fixes: 06e3f8f2766 ('vt-d: Do dpci eoi outside of irq_lock.') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/vioapic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index eb6c143f74..804bc77279 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -526,7 +526,7 @@ void vioapic_update_EOI(struct domain *d, u8 vector) } if ( (ent->fields.trig_mode == VIOAPIC_LEVEL_TRIG) && - !ent->fields.mask && + !ent->fields.mask && !ent->fields.remote_irr && hvm_irq->gsi_assert_count[vioapic->base_gsi + pin] ) { ent->fields.remote_irr = 1; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 11:22:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 11:22:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72690.130908 (Exim 4.92) (envelope-from ) id 1l2uW8-00080v-Bz; Fri, 22 Jan 2021 11:22:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72690.130908; Fri, 22 Jan 2021 11:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uW8-00080n-96; Fri, 22 Jan 2021 11:22:16 +0000 Received: by outflank-mailman (input) for mailman id 72690; Fri, 22 Jan 2021 11:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uW6-00080c-GB for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uW6-0006AL-FP for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2uW6-0006Jq-EK for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wb6o6nKWTfvgRStTyOcytrGH5Id2KwDHHo6V6QIbX8I=; b=e05fwRHNzXZOIyy4NyoZTvfjoA uoSZIm8WMdR0g/ixbgKkKmFLfgwCcnIEEEnk7ngUIIPbS7UHezC6wnV72QemDncNXvSbJY84MRLmK KXCwYbeE+V9t1lxDtBSCCTzeRbL504x7W/zquuznSS51KmaYKAPwkuNRHnu58NFDz5AE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/hypfs: support dynamic hypfs nodes Message-Id: Date: Fri, 22 Jan 2021 11:22:14 +0000 commit 0b3b53be8cf226d947a79c2535a9efbb2dd7bc38 Author: Juergen Gross AuthorDate: Fri Jan 22 12:13:40 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 22 12:13:40 2021 +0100 xen/hypfs: support dynamic hypfs nodes Add a HYPFS_VARDIR_INIT() macro for initializing such a directory statically, taking a struct hypfs_funcs pointer as parameter additional to those of HYPFS_DIR_INIT(). Modify HYPFS_VARSIZE_INIT() to take the function vector pointer as an additional parameter as this will be needed for dynamical entries. For being able to let the generic hypfs coding continue to work on normal struct hypfs_entry entities even for dynamical nodes add some infrastructure for allocating a working area for the current hypfs request in order to store needed information for traversing the tree. This area is anchored in a percpu pointer and can be retrieved by any level of the dynamic entries. The normal way to handle allocation and freeing is to allocate the data in the enter() callback of a node and to free it in the related exit() callback. Add a hypfs_add_dyndir() function for adding a dynamic directory template to the tree, which is needed for having the correct reference to its position in hypfs. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/common/hypfs.c | 43 +++++++++++++++++++++++++++++++++++++++++++ xen/include/xen/hypfs.h | 29 +++++++++++++++++++---------- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/xen/common/hypfs.c b/xen/common/hypfs.c index 73497ea1d7..6c0e59dedd 100644 --- a/xen/common/hypfs.c +++ b/xen/common/hypfs.c @@ -72,6 +72,7 @@ enum hypfs_lock_state { hypfs_write_locked }; static DEFINE_PER_CPU(enum hypfs_lock_state, hypfs_locked); +static DEFINE_PER_CPU(struct hypfs_dyndata *, hypfs_dyndata); static DEFINE_PER_CPU(const struct hypfs_entry *, hypfs_last_node_entered); @@ -155,6 +156,36 @@ static void node_exit_all(void) node_exit(*last); } +#undef hypfs_alloc_dyndata +void *hypfs_alloc_dyndata(unsigned long size) +{ + unsigned int cpu = smp_processor_id(); + struct hypfs_dyndata **dyndata = &per_cpu(hypfs_dyndata, cpu); + + ASSERT(per_cpu(hypfs_locked, cpu) != hypfs_unlocked); + ASSERT(*dyndata == NULL); + + *dyndata = xzalloc_bytes(size); + + return *dyndata; +} + +void *hypfs_get_dyndata(void) +{ + struct hypfs_dyndata *dyndata = this_cpu(hypfs_dyndata); + + ASSERT(dyndata); + + return dyndata; +} + +void hypfs_free_dyndata(void) +{ + struct hypfs_dyndata **dyndata = &this_cpu(hypfs_dyndata); + + XFREE(*dyndata); +} + static int add_entry(struct hypfs_entry_dir *parent, struct hypfs_entry *new) { int ret = -ENOENT; @@ -216,6 +247,18 @@ int hypfs_add_dir(struct hypfs_entry_dir *parent, return ret; } +void hypfs_add_dyndir(struct hypfs_entry_dir *parent, + struct hypfs_entry_dir *template) +{ + /* + * As the template is only a placeholder for possibly multiple dynamically + * generated directories, the link up to its parent can be static, while + * the "real" children of the parent are to be found via the parent's + * findentry function only. + */ + template->e.parent = &parent->e; +} + int hypfs_add_leaf(struct hypfs_entry_dir *parent, struct hypfs_entry_leaf *leaf, bool nofault) { diff --git a/xen/include/xen/hypfs.h b/xen/include/xen/hypfs.h index a6dfdb7d8e..d028c01283 100644 --- a/xen/include/xen/hypfs.h +++ b/xen/include/xen/hypfs.h @@ -76,7 +76,7 @@ struct hypfs_entry_dir { struct list_head dirlist; }; -#define HYPFS_DIR_INIT(var, nam) \ +#define HYPFS_DIR_INIT_FUNC(var, nam, fn) \ struct hypfs_entry_dir __read_mostly var = { \ .e.type = XEN_HYPFS_TYPE_DIR, \ .e.encoding = XEN_HYPFS_ENC_PLAIN, \ @@ -84,22 +84,25 @@ struct hypfs_entry_dir { .e.size = 0, \ .e.max_size = 0, \ .e.list = LIST_HEAD_INIT(var.e.list), \ - .e.funcs = &hypfs_dir_funcs, \ + .e.funcs = (fn), \ .dirlist = LIST_HEAD_INIT(var.dirlist), \ } -#define HYPFS_VARSIZE_INIT(var, typ, nam, msz) \ - struct hypfs_entry_leaf __read_mostly var = { \ - .e.type = (typ), \ - .e.encoding = XEN_HYPFS_ENC_PLAIN, \ - .e.name = (nam), \ - .e.max_size = (msz), \ - .e.funcs = &hypfs_leaf_ro_funcs, \ +#define HYPFS_DIR_INIT(var, nam) \ + HYPFS_DIR_INIT_FUNC(var, nam, &hypfs_dir_funcs) + +#define HYPFS_VARSIZE_INIT(var, typ, nam, msz, fn) \ + struct hypfs_entry_leaf __read_mostly var = { \ + .e.type = (typ), \ + .e.encoding = XEN_HYPFS_ENC_PLAIN, \ + .e.name = (nam), \ + .e.max_size = (msz), \ + .e.funcs = (fn), \ } /* Content and size need to be set via hypfs_string_set_reference(). */ #define HYPFS_STRING_INIT(var, nam) \ - HYPFS_VARSIZE_INIT(var, XEN_HYPFS_TYPE_STRING, nam, 0) + HYPFS_VARSIZE_INIT(var, XEN_HYPFS_TYPE_STRING, nam, 0, &hypfs_leaf_ro_funcs) /* * Set content and size of a XEN_HYPFS_TYPE_STRING node. The node will point @@ -150,6 +153,8 @@ extern struct hypfs_entry_dir hypfs_root; int hypfs_add_dir(struct hypfs_entry_dir *parent, struct hypfs_entry_dir *dir, bool nofault); +void hypfs_add_dyndir(struct hypfs_entry_dir *parent, + struct hypfs_entry_dir *template); int hypfs_add_leaf(struct hypfs_entry_dir *parent, struct hypfs_entry_leaf *leaf, bool nofault); const struct hypfs_entry *hypfs_node_enter(const struct hypfs_entry *entry); @@ -177,6 +182,10 @@ struct hypfs_entry *hypfs_leaf_findentry(const struct hypfs_entry_dir *dir, struct hypfs_entry *hypfs_dir_findentry(const struct hypfs_entry_dir *dir, const char *name, unsigned int name_len); +void *hypfs_alloc_dyndata(unsigned long size); +#define hypfs_alloc_dyndata(type) ((type *)hypfs_alloc_dyndata(sizeof(type))) +void *hypfs_get_dyndata(void); +void hypfs_free_dyndata(void); #endif #endif /* __XEN_HYPFS_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 11:22:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 11:22:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72691.130913 (Exim 4.92) (envelope-from ) id 1l2uWI-00082L-EU; Fri, 22 Jan 2021 11:22:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72691.130913; Fri, 22 Jan 2021 11:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uWI-00082C-Ai; Fri, 22 Jan 2021 11:22:26 +0000 Received: by outflank-mailman (input) for mailman id 72691; Fri, 22 Jan 2021 11:22:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uWG-00081v-Jg for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uWG-0006AT-I3 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2uWG-0006KW-HS for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SA1Ph+9R3daxQWygw5DGuBkforue6M3i/tqmhUobyVM=; b=QqZCvJAh1yrGz6FwsNRJibIAaR NFSKGqQycy3G9Q4SIUxPXvpW25swhjxTSC6NEh3xp/AKlw9O9o2yKtik3lWXa0RYgCG3PIDFwTZMa olp4ay+G1RT3PjuS3ibGuZ9CA23fwlf0vIzShVP7IGc4UnzJNXJqZrwJTl69w0rjbTAM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/hypfs: add support for id-based dynamic directories Message-Id: Date: Fri, 22 Jan 2021 11:22:24 +0000 commit 4f1e5ed49c2292d3dd18160b7e728b1aa9453206 Author: Juergen Gross AuthorDate: Fri Jan 22 12:14:07 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 22 12:14:07 2021 +0100 xen/hypfs: add support for id-based dynamic directories Add some helpers to hypfs.c to support dynamic directories with a numerical id as name. The dynamic directory is based on a template specified by the user allowing to use specific access functions and having a predefined set of entries in the directory. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/common/hypfs.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ xen/include/xen/hypfs.h | 18 +++++++++ 2 files changed, 116 insertions(+) diff --git a/xen/common/hypfs.c b/xen/common/hypfs.c index 6c0e59dedd..5468497404 100644 --- a/xen/common/hypfs.c +++ b/xen/common/hypfs.c @@ -365,6 +365,104 @@ unsigned int hypfs_getsize(const struct hypfs_entry *entry) return entry->size; } +/* + * Fill the direntry for a dynamically generated entry. Especially the + * generated name needs to be kept in sync with hypfs_gen_dyndir_id_entry(). + */ +int hypfs_read_dyndir_id_entry(const struct hypfs_entry_dir *template, + unsigned int id, bool is_last, + XEN_GUEST_HANDLE_PARAM(void) *uaddr) +{ + struct xen_hypfs_dirlistentry direntry; + char name[HYPFS_DYNDIR_ID_NAMELEN]; + unsigned int e_namelen, e_len; + + e_namelen = snprintf(name, sizeof(name), template->e.name, id); + e_len = DIRENTRY_SIZE(e_namelen); + direntry.e.pad = 0; + direntry.e.type = template->e.type; + direntry.e.encoding = template->e.encoding; + direntry.e.content_len = template->e.funcs->getsize(&template->e); + direntry.e.max_write_len = template->e.max_size; + direntry.off_next = is_last ? 0 : e_len; + if ( copy_to_guest(*uaddr, &direntry, 1) ) + return -EFAULT; + if ( copy_to_guest_offset(*uaddr, DIRENTRY_NAME_OFF, name, + e_namelen + 1) ) + return -EFAULT; + + guest_handle_add_offset(*uaddr, e_len); + + return 0; +} + +static const struct hypfs_entry *hypfs_dyndir_enter( + const struct hypfs_entry *entry) +{ + const struct hypfs_dyndir_id *data; + + data = hypfs_get_dyndata(); + + /* Use template with original enter function. */ + return data->template->e.funcs->enter(&data->template->e); +} + +static struct hypfs_entry *hypfs_dyndir_findentry( + const struct hypfs_entry_dir *dir, const char *name, unsigned int name_len) +{ + const struct hypfs_dyndir_id *data; + + data = hypfs_get_dyndata(); + + /* Use template with original findentry function. */ + return data->template->e.funcs->findentry(data->template, name, name_len); +} + +static int hypfs_read_dyndir(const struct hypfs_entry *entry, + XEN_GUEST_HANDLE_PARAM(void) uaddr) +{ + const struct hypfs_dyndir_id *data; + + data = hypfs_get_dyndata(); + + /* Use template with original read function. */ + return data->template->e.funcs->read(&data->template->e, uaddr); +} + +/* + * Fill dyndata with a dynamically generated entry based on a template + * and a numerical id. + * Needs to be kept in sync with hypfs_read_dyndir_id_entry() regarding the + * name generated. + */ +struct hypfs_entry *hypfs_gen_dyndir_id_entry( + const struct hypfs_entry_dir *template, unsigned int id, void *data) +{ + struct hypfs_dyndir_id *dyndata; + + dyndata = hypfs_get_dyndata(); + + dyndata->template = template; + dyndata->id = id; + dyndata->data = data; + snprintf(dyndata->name, sizeof(dyndata->name), template->e.name, id); + dyndata->dir = *template; + dyndata->dir.e.name = dyndata->name; + dyndata->dir.e.funcs = &dyndata->funcs; + dyndata->funcs = *template->e.funcs; + dyndata->funcs.enter = hypfs_dyndir_enter; + dyndata->funcs.findentry = hypfs_dyndir_findentry; + dyndata->funcs.read = hypfs_read_dyndir; + + return &dyndata->dir.e; +} + +unsigned int hypfs_dynid_entry_size(const struct hypfs_entry *template, + unsigned int id) +{ + return DIRENTRY_SIZE(snprintf(NULL, 0, template->name, id)); +} + int hypfs_read_dir(const struct hypfs_entry *entry, XEN_GUEST_HANDLE_PARAM(void) uaddr) { diff --git a/xen/include/xen/hypfs.h b/xen/include/xen/hypfs.h index d028c01283..e9d4c2555b 100644 --- a/xen/include/xen/hypfs.h +++ b/xen/include/xen/hypfs.h @@ -76,6 +76,17 @@ struct hypfs_entry_dir { struct list_head dirlist; }; +struct hypfs_dyndir_id { + struct hypfs_entry_dir dir; /* Modified copy of template. */ + struct hypfs_funcs funcs; /* Dynamic functions. */ + const struct hypfs_entry_dir *template; /* Template used. */ +#define HYPFS_DYNDIR_ID_NAMELEN 12 + char name[HYPFS_DYNDIR_ID_NAMELEN]; /* Name of hypfs entry. */ + + unsigned int id; /* Numerical id. */ + void *data; /* Data associated with id. */ +}; + #define HYPFS_DIR_INIT_FUNC(var, nam, fn) \ struct hypfs_entry_dir __read_mostly var = { \ .e.type = XEN_HYPFS_TYPE_DIR, \ @@ -186,6 +197,13 @@ void *hypfs_alloc_dyndata(unsigned long size); #define hypfs_alloc_dyndata(type) ((type *)hypfs_alloc_dyndata(sizeof(type))) void *hypfs_get_dyndata(void); void hypfs_free_dyndata(void); +int hypfs_read_dyndir_id_entry(const struct hypfs_entry_dir *template, + unsigned int id, bool is_last, + XEN_GUEST_HANDLE_PARAM(void) *uaddr); +struct hypfs_entry *hypfs_gen_dyndir_id_entry( + const struct hypfs_entry_dir *template, unsigned int id, void *data); +unsigned int hypfs_dynid_entry_size(const struct hypfs_entry *template, + unsigned int id); #endif #endif /* __XEN_HYPFS_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 11:22:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 11:22:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72692.130918 (Exim 4.92) (envelope-from ) id 1l2uWS-000845-HH; Fri, 22 Jan 2021 11:22:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72692.130918; Fri, 22 Jan 2021 11: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 1l2uWS-00083v-Dy; Fri, 22 Jan 2021 11:22:36 +0000 Received: by outflank-mailman (input) for mailman id 72692; Fri, 22 Jan 2021 11:22:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uWQ-00083g-MW for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uWQ-0006Ad-Le for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2uWQ-0006MK-K5 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22: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=OeD/x/3nbvs1QiEU1fpxAM8yq5JCK5NeOIPDmKJ7R5E=; b=J+cMRp1usa50gOmy+2/RD1MSDt I+cyL8M8JQMFPxbdyq3Y606Ozr7bhdmmEotlEbbrKmA0oFQN7b1TwUjS32jT6+jLiIJbFamQN7f0h bPSN/nPLY6QhAka6zHK1sCyLm28yASdrafVFgunKTx243NrVVIKsTelf9y386pL/nghc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/hypfs: add cpupool directories Message-Id: Date: Fri, 22 Jan 2021 11:22:34 +0000 commit 31bbb4db79fa166849698a15d661220eb3df2a64 Author: Juergen Gross AuthorDate: Fri Jan 22 12:14:33 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 22 12:14:33 2021 +0100 xen/hypfs: add cpupool directories Add /cpupool/ directories to hypfs. Those are completely dynamic, so the related hypfs access functions need to be implemented. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Reviewed-by: Dario Faggioli --- docs/misc/hypfs-paths.pandoc | 9 ++++ xen/common/sched/cpupool.c | 104 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/docs/misc/hypfs-paths.pandoc b/docs/misc/hypfs-paths.pandoc index 6c7b2f7ee3..aaca1cdf92 100644 --- a/docs/misc/hypfs-paths.pandoc +++ b/docs/misc/hypfs-paths.pandoc @@ -175,6 +175,15 @@ The major version of Xen. The minor version of Xen. +#### /cpupool/ + +A directory of all current cpupools. + +#### /cpupool/*/ + +The individual cpupools. Each entry is a directory with the name being the +cpupool-id (e.g. /cpupool/0/). + #### /params/ A directory of runtime parameters. diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index 0db7d77219..f293ba0cc4 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -13,6 +13,8 @@ #include #include +#include +#include #include #include #include @@ -33,6 +35,7 @@ static int cpupool_moving_cpu = -1; static struct cpupool *cpupool_cpu_moving = NULL; static cpumask_t cpupool_locked_cpus; +/* This lock nests inside sysctl or hypfs lock. */ static DEFINE_SPINLOCK(cpupool_lock); static enum sched_gran __read_mostly opt_sched_granularity = SCHED_GRAN_cpu; @@ -1003,12 +1006,113 @@ static struct notifier_block cpu_nfb = { .notifier_call = cpu_callback }; +#ifdef CONFIG_HYPFS + +static HYPFS_DIR_INIT(cpupool_pooldir, "%u"); + +static int cpupool_dir_read(const struct hypfs_entry *entry, + XEN_GUEST_HANDLE_PARAM(void) uaddr) +{ + int ret = 0; + const struct cpupool *c; + + list_for_each_entry(c, &cpupool_list, list) + { + ret = hypfs_read_dyndir_id_entry(&cpupool_pooldir, c->cpupool_id, + list_is_last(&c->list, &cpupool_list), + &uaddr); + if ( ret ) + break; + } + + return ret; +} + +static unsigned int cpupool_dir_getsize(const struct hypfs_entry *entry) +{ + const struct cpupool *c; + unsigned int size = 0; + + list_for_each_entry(c, &cpupool_list, list) + size += hypfs_dynid_entry_size(entry, c->cpupool_id); + + return size; +} + +static const struct hypfs_entry *cpupool_dir_enter( + const struct hypfs_entry *entry) +{ + struct hypfs_dyndir_id *data; + + data = hypfs_alloc_dyndata(struct hypfs_dyndir_id); + if ( !data ) + return ERR_PTR(-ENOMEM); + data->id = CPUPOOLID_NONE; + + spin_lock(&cpupool_lock); + + return entry; +} + +static void cpupool_dir_exit(const struct hypfs_entry *entry) +{ + spin_unlock(&cpupool_lock); + + hypfs_free_dyndata(); +} + +static struct hypfs_entry *cpupool_dir_findentry( + const struct hypfs_entry_dir *dir, const char *name, unsigned int name_len) +{ + unsigned long id; + const char *end; + struct cpupool *cpupool; + + id = simple_strtoul(name, &end, 10); + if ( end != name + name_len || id > UINT_MAX ) + return ERR_PTR(-ENOENT); + + cpupool = __cpupool_find_by_id(id, true); + + if ( !cpupool ) + return ERR_PTR(-ENOENT); + + return hypfs_gen_dyndir_id_entry(&cpupool_pooldir, id, cpupool); +} + +static const struct hypfs_funcs cpupool_dir_funcs = { + .enter = cpupool_dir_enter, + .exit = cpupool_dir_exit, + .read = cpupool_dir_read, + .write = hypfs_write_deny, + .getsize = cpupool_dir_getsize, + .findentry = cpupool_dir_findentry, +}; + +static HYPFS_DIR_INIT_FUNC(cpupool_dir, "cpupool", &cpupool_dir_funcs); + +static void cpupool_hypfs_init(void) +{ + hypfs_add_dir(&hypfs_root, &cpupool_dir, true); + hypfs_add_dyndir(&cpupool_dir, &cpupool_pooldir); +} + +#else /* CONFIG_HYPFS */ + +static void cpupool_hypfs_init(void) +{ +} + +#endif /* CONFIG_HYPFS */ + static int __init cpupool_init(void) { unsigned int cpu; cpupool_gran_init(); + cpupool_hypfs_init(); + cpupool0 = cpupool_create(0, 0); BUG_ON(IS_ERR(cpupool0)); cpupool_put(cpupool0); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 11:22:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 11:22:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72693.130921 (Exim 4.92) (envelope-from ) id 1l2uWc-00085L-Ip; Fri, 22 Jan 2021 11:22:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72693.130921; Fri, 22 Jan 2021 11: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 1l2uWc-00085D-FZ; Fri, 22 Jan 2021 11:22:46 +0000 Received: by outflank-mailman (input) for mailman id 72693; Fri, 22 Jan 2021 11:22:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uWa-000853-Qd for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uWa-0006Ak-Pr for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2uWa-0006NV-Nn for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22: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=CHlO6SqbFUjVtoCIrAHkKqHFk3N0XgFth2CFT+jUUws=; b=VUklbFGb881/9ba/HJ3Z+Oj8OD 1DeMYm5J/S8Jv+Nxh/YByOju7h9eSnl+qzcNxBTAN8FCZtC435vf7tqaU+r9kWO24cqb4bbiolDfW bLSvp+Kmz91/A26WSwEZYp4GrEAs+CBHki5vkqKokVs8FKVkCpc4o3d9/Uh2h3w5Wq/0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/cpupool: add scheduling granularity entry to hypfs entries Message-Id: Date: Fri, 22 Jan 2021 11:22:44 +0000 commit d6275b9a6452747e0f7e95828c57f57251cf0f06 Author: Juergen Gross AuthorDate: Fri Jan 22 12:14:58 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 22 12:14:58 2021 +0100 xen/cpupool: add scheduling granularity entry to hypfs entries Add a "sched-gran" entry to the per-cpupool hypfs directories. For now make this entry read-only and let it contain one of the strings "cpu", "core" or "socket". Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Reviewed-by: Dario Faggioli --- docs/misc/hypfs-paths.pandoc | 4 +++ xen/common/sched/cpupool.c | 72 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/docs/misc/hypfs-paths.pandoc b/docs/misc/hypfs-paths.pandoc index aaca1cdf92..f1ce24d7fe 100644 --- a/docs/misc/hypfs-paths.pandoc +++ b/docs/misc/hypfs-paths.pandoc @@ -184,6 +184,10 @@ A directory of all current cpupools. The individual cpupools. Each entry is a directory with the name being the cpupool-id (e.g. /cpupool/0/). +#### /cpupool/*/sched-gran = ("cpu" | "core" | "socket") + +The scheduling granularity of a cpupool. + #### /params/ A directory of runtime parameters. diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index f293ba0cc4..e2011367bd 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -41,9 +41,10 @@ static DEFINE_SPINLOCK(cpupool_lock); static enum sched_gran __read_mostly opt_sched_granularity = SCHED_GRAN_cpu; static unsigned int __read_mostly sched_granularity = 1; +#define SCHED_GRAN_NAME_LEN 8 struct sched_gran_name { enum sched_gran mode; - char name[8]; + char name[SCHED_GRAN_NAME_LEN]; }; static const struct sched_gran_name sg_name[] = { @@ -52,7 +53,7 @@ static const struct sched_gran_name sg_name[] = { {SCHED_GRAN_socket, "socket"}, }; -static void sched_gran_print(enum sched_gran mode, unsigned int gran) +static const char *sched_gran_get_name(enum sched_gran mode) { const char *name = ""; unsigned int i; @@ -66,8 +67,13 @@ static void sched_gran_print(enum sched_gran mode, unsigned int gran) } } + return name; +} + +static void sched_gran_print(enum sched_gran mode, unsigned int gran) +{ printk("Scheduling granularity: %s, %u CPU%s per sched-resource\n", - name, gran, gran == 1 ? "" : "s"); + sched_gran_get_name(mode), gran, gran == 1 ? "" : "s"); } #ifdef CONFIG_HAS_SCHED_GRANULARITY @@ -1014,10 +1020,16 @@ static int cpupool_dir_read(const struct hypfs_entry *entry, XEN_GUEST_HANDLE_PARAM(void) uaddr) { int ret = 0; - const struct cpupool *c; + struct cpupool *c; + struct hypfs_dyndir_id *data; + + data = hypfs_get_dyndata(); list_for_each_entry(c, &cpupool_list, list) { + data->id = c->cpupool_id; + data->data = c; + ret = hypfs_read_dyndir_id_entry(&cpupool_pooldir, c->cpupool_id, list_is_last(&c->list, &cpupool_list), &uaddr); @@ -1080,6 +1092,56 @@ static struct hypfs_entry *cpupool_dir_findentry( return hypfs_gen_dyndir_id_entry(&cpupool_pooldir, id, cpupool); } +static int cpupool_gran_read(const struct hypfs_entry *entry, + XEN_GUEST_HANDLE_PARAM(void) uaddr) +{ + const struct hypfs_dyndir_id *data; + const struct cpupool *cpupool; + const char *gran; + + data = hypfs_get_dyndata(); + cpupool = data->data; + ASSERT(cpupool); + + gran = sched_gran_get_name(cpupool->gran); + + if ( !*gran ) + return -ENOENT; + + return copy_to_guest(uaddr, gran, strlen(gran) + 1) ? -EFAULT : 0; +} + +static unsigned int hypfs_gran_getsize(const struct hypfs_entry *entry) +{ + const struct hypfs_dyndir_id *data; + const struct cpupool *cpupool; + const char *gran; + + data = hypfs_get_dyndata(); + cpupool = data->data; + ASSERT(cpupool); + + gran = sched_gran_get_name(cpupool->gran); + + return strlen(gran) + 1; +} + +static const struct hypfs_funcs cpupool_gran_funcs = { + .enter = hypfs_node_enter, + .exit = hypfs_node_exit, + .read = cpupool_gran_read, + .write = hypfs_write_deny, + .getsize = hypfs_gran_getsize, + .findentry = hypfs_leaf_findentry, +}; + +static HYPFS_VARSIZE_INIT(cpupool_gran, XEN_HYPFS_TYPE_STRING, "sched-gran", + 0, &cpupool_gran_funcs); +static char granstr[SCHED_GRAN_NAME_LEN] = { + [0 ... SCHED_GRAN_NAME_LEN - 2] = '?', + [SCHED_GRAN_NAME_LEN - 1] = 0 +}; + static const struct hypfs_funcs cpupool_dir_funcs = { .enter = cpupool_dir_enter, .exit = cpupool_dir_exit, @@ -1095,6 +1157,8 @@ static void cpupool_hypfs_init(void) { hypfs_add_dir(&hypfs_root, &cpupool_dir, true); hypfs_add_dyndir(&cpupool_dir, &cpupool_pooldir); + hypfs_string_set_reference(&cpupool_gran, granstr); + hypfs_add_leaf(&cpupool_pooldir, &cpupool_gran, true); } #else /* CONFIG_HYPFS */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 11:22:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 11:22:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72694.130925 (Exim 4.92) (envelope-from ) id 1l2uWm-00086l-KQ; Fri, 22 Jan 2021 11:22:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72694.130925; Fri, 22 Jan 2021 11: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 1l2uWm-00086d-HP; Fri, 22 Jan 2021 11:22:56 +0000 Received: by outflank-mailman (input) for mailman id 72694; Fri, 22 Jan 2021 11:22:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uWk-00086X-Tf for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2uWk-0006BF-So for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2uWk-0006OP-Rz for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:22: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=u4HbFN+A6r0c1GhiGeaGhxAtM/3/iDMUAjlSAwy9bQk=; b=FjyeC1/RKjZhdKr8SfYpPLv1BH BrO6faKjrjJ1OYjOQ6Vc1oxFwKq3aoLJ+BRfXZQzeIl665UmbOS27kBveMkfZjMPywvL9+IWh7w7w I5JbCYp5YskaFNr4u9svWg8SopGMOCHuhq0XNuXVVm45//MrWIUUFETo8H+2YngjJG6M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/cpupool: make per-cpupool sched-gran hypfs node writable Message-Id: Date: Fri, 22 Jan 2021 11:22:54 +0000 commit d7356c57ec71b5d5caeac0e3ce23ea14494d060f Author: Juergen Gross AuthorDate: Fri Jan 22 12:15:21 2021 +0100 Commit: Jan Beulich CommitDate: Fri Jan 22 12:15:21 2021 +0100 xen/cpupool: make per-cpupool sched-gran hypfs node writable Make /cpupool//sched-gran in hypfs writable. This will enable per cpupool selectable scheduling granularity. Writing this node is allowed only with no cpu assigned to the cpupool. Allowed are values "cpu", "core" and "socket". Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Reviewed-by: Dario Faggioli --- docs/misc/hypfs-paths.pandoc | 5 +++- xen/common/sched/cpupool.c | 71 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 64 insertions(+), 12 deletions(-) diff --git a/docs/misc/hypfs-paths.pandoc b/docs/misc/hypfs-paths.pandoc index f1ce24d7fe..e86f7d0dbe 100644 --- a/docs/misc/hypfs-paths.pandoc +++ b/docs/misc/hypfs-paths.pandoc @@ -184,10 +184,13 @@ A directory of all current cpupools. The individual cpupools. Each entry is a directory with the name being the cpupool-id (e.g. /cpupool/0/). -#### /cpupool/*/sched-gran = ("cpu" | "core" | "socket") +#### /cpupool/*/sched-gran = ("cpu" | "core" | "socket") [w] The scheduling granularity of a cpupool. +Writing a value is allowed only for cpupools with no cpu assigned and if the +architecture is supporting different scheduling granularities. + #### /params/ A directory of runtime parameters. diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index e2011367bd..8c6e6eb9cc 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -77,7 +77,7 @@ static void sched_gran_print(enum sched_gran mode, unsigned int gran) } #ifdef CONFIG_HAS_SCHED_GRANULARITY -static int __init sched_select_granularity(const char *str) +static int sched_gran_get(const char *str, enum sched_gran *mode) { unsigned int i; @@ -85,36 +85,43 @@ static int __init sched_select_granularity(const char *str) { if ( strcmp(sg_name[i].name, str) == 0 ) { - opt_sched_granularity = sg_name[i].mode; + *mode = sg_name[i].mode; return 0; } } return -EINVAL; } + +static int __init sched_select_granularity(const char *str) +{ + return sched_gran_get(str, &opt_sched_granularity); +} custom_param("sched-gran", sched_select_granularity); +#elif defined(CONFIG_HYPFS) +static int sched_gran_get(const char *str, enum sched_gran *mode) +{ + return -EINVAL; +} #endif -static unsigned int __init cpupool_check_granularity(void) +static unsigned int cpupool_check_granularity(enum sched_gran mode) { unsigned int cpu; unsigned int siblings, gran = 0; - if ( opt_sched_granularity == SCHED_GRAN_cpu ) + if ( mode == SCHED_GRAN_cpu ) return 1; for_each_online_cpu ( cpu ) { - siblings = cpumask_weight(sched_get_opt_cpumask(opt_sched_granularity, - cpu)); + siblings = cpumask_weight(sched_get_opt_cpumask(mode, cpu)); if ( gran == 0 ) gran = siblings; else if ( gran != siblings ) return 0; } - sched_disable_smt_switching = true; - return gran; } @@ -126,7 +133,7 @@ static void __init cpupool_gran_init(void) while ( gran == 0 ) { - gran = cpupool_check_granularity(); + gran = cpupool_check_granularity(opt_sched_granularity); if ( gran == 0 ) { @@ -152,6 +159,9 @@ static void __init cpupool_gran_init(void) if ( fallback ) warning_add(fallback); + if ( opt_sched_granularity != SCHED_GRAN_cpu ) + sched_disable_smt_switching = true; + sched_granularity = gran; sched_gran_print(opt_sched_granularity, sched_granularity); } @@ -1126,17 +1136,56 @@ static unsigned int hypfs_gran_getsize(const struct hypfs_entry *entry) return strlen(gran) + 1; } +static int cpupool_gran_write(struct hypfs_entry_leaf *leaf, + XEN_GUEST_HANDLE_PARAM(const_void) uaddr, + unsigned int ulen) +{ + const struct hypfs_dyndir_id *data; + struct cpupool *cpupool; + enum sched_gran gran; + unsigned int sched_gran = 0; + char name[SCHED_GRAN_NAME_LEN]; + int ret = 0; + + if ( ulen > SCHED_GRAN_NAME_LEN ) + return -ENOSPC; + + if ( copy_from_guest(name, uaddr, ulen) ) + return -EFAULT; + + if ( memchr(name, 0, ulen) == (name + ulen - 1) ) + sched_gran = sched_gran_get(name, &gran) ? + 0 : cpupool_check_granularity(gran); + if ( sched_gran == 0 ) + return -EINVAL; + + data = hypfs_get_dyndata(); + cpupool = data->data; + ASSERT(cpupool); + + /* Guarded by the cpupool_lock taken in cpupool_dir_enter(). */ + if ( !cpumask_empty(cpupool->cpu_valid) ) + ret = -EBUSY; + else + { + cpupool->gran = gran; + cpupool->sched_gran = sched_gran; + } + + return ret; +} + static const struct hypfs_funcs cpupool_gran_funcs = { .enter = hypfs_node_enter, .exit = hypfs_node_exit, .read = cpupool_gran_read, - .write = hypfs_write_deny, + .write = cpupool_gran_write, .getsize = hypfs_gran_getsize, .findentry = hypfs_leaf_findentry, }; static HYPFS_VARSIZE_INIT(cpupool_gran, XEN_HYPFS_TYPE_STRING, "sched-gran", - 0, &cpupool_gran_funcs); + SCHED_GRAN_NAME_LEN, &cpupool_gran_funcs); static char granstr[SCHED_GRAN_NAME_LEN] = { [0 ... SCHED_GRAN_NAME_LEN - 2] = '?', [SCHED_GRAN_NAME_LEN - 1] = 0 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 11:44:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 11:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72709.130965 (Exim 4.92) (envelope-from ) id 1l2urG-00020k-4P; Fri, 22 Jan 2021 11:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72709.130965; Fri, 22 Jan 2021 11:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2urG-00020c-1R; Fri, 22 Jan 2021 11:44:06 +0000 Received: by outflank-mailman (input) for mailman id 72709; Fri, 22 Jan 2021 11:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2urE-00020X-AO for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2urE-0006WD-5v for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2urE-0007ce-4H for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11: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=6EwD8xqN+IjP9hksBuYK+t/ZvPQ0fpcxqgmmkS2qLCA=; b=paxPhv1bm2hl5wR20uthKVrzrp pcoqvsMZPkzGHyBwXF2Td0DyNXAIR6sRmk2Gk3JraH/Z0VGui7AP2aRZqxSgweVa/pot3fEJtJajM zMCgQtN8xks0jgvlkZRqXBTgNbuX1hVl4K6A2GiwCtNVSXT5p3qq8BMXZ6+AspwvijiI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: fix unsigned < 0 compare in xenstore_control Message-Id: Date: Fri, 22 Jan 2021 11:44:04 +0000 commit a37b50c28e6749186011b333787b1ec4fe21415f Author: Juergen Gross AuthorDate: Fri Jan 22 07:08:57 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Jan 22 11:35:18 2021 +0000 tools/xenstore: fix unsigned < 0 compare in xenstore_control Commit 7f97193e6aa858df ("tools/xenstore: add live update command to xenstore-control") introduced testing an unsigned value to be less than 0. Fix that. Fixes: 7f97193e6aa858df ("tools/xenstore: add live update command to xenstore-control") Reported-by: Andrew Cooper Signed-off-by: Juergen Gross Acked-by: Andrew Cooper --- tools/xenstore/xenstore_control.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/xenstore_control.c b/tools/xenstore/xenstore_control.c index 6031f216c7..0c95cf767c 100644 --- a/tools/xenstore/xenstore_control.c +++ b/tools/xenstore/xenstore_control.c @@ -313,8 +313,8 @@ int main(int argc, char **argv) struct xs_handle *xsh; char *par = NULL; char *ret; - unsigned int p, len = 0; - int rc = 0; + unsigned int p; + int rc = 0, len = 0; if (argc < 2) { fprintf(stderr, "Usage:\n" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 11:55:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 11:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72713.130982 (Exim 4.92) (envelope-from ) id 1l2v1s-00036C-7C; Fri, 22 Jan 2021 11:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72713.130982; Fri, 22 Jan 2021 11:55: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 1l2v1s-000363-33; Fri, 22 Jan 2021 11:55:04 +0000 Received: by outflank-mailman (input) for mailman id 72713; Fri, 22 Jan 2021 11:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2v1p-00035y-Vq for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2v1p-0006hE-UL for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2v1p-0008Ni-SA for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 11:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=y9tCl/YCD2iBlEgj0hr4ouudkhSXn1AdhSfDfHYVlAk=; b=SGlJ/IY24Q8V1B7M5b4T/i5BPW zO6nfI57Ivpj0UqR5ppUW+OJn+bVt/NRaPwWUX/dnW6heXi8EHjgRzgZVrNmSkLJKUwAONj5kLDed UZlIjjcBysusCFIAtr4M3UFTBg9FvhqQE/k05sDCgoZrs48Wb7WfuU9OKhe3FuEskuw8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.12] x86/dpci: do not remove pirqs from domain tree on unbind Message-Id: Date: Fri, 22 Jan 2021 11:55:01 +0000 commit cce7cbd986c122a86582ff3775b6b559d877407c Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:28:22 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:28:22 2021 +0100 x86/dpci: do not remove pirqs from domain tree on unbind A fix for a previous issue removed the pirqs from the domain tree when they are unbound in order to prevent shared pirqs from triggering a BUG_ON in __pirq_guest_unbind if they are unbound multiple times. That caused free_domain_pirqs to no longer unmap the pirqs because they are gone from the domain pirq tree, thus leaving stale unbound pirqs after domain destruction if the domain had mapped dpci pirqs after shutdown. Take a different approach to fix the original issue, instead of removing the pirq from d->pirq_tree clear the flags of the dpci pirq struct to signal that the pirq is now unbound. This prevents calling pirq_guest_unbind multiple times for the same pirq without having to remove it from the domain pirq tree. This is XSA-360. Fixes: 5b58dad089 ('x86/pass-through: avoid double IRQ unbind during domain cleanup') Reported-by: Samuel Verschelde Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 58427889f5a420cc5226f88524b3228f90b72a58 master date: 2021-01-21 16:11:41 +0100 --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/pci.c | 27 ++++++++------------------- xen/include/asm-x86/hvm/irq.h | 2 -- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 29af31a1db..6adffac44e 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1407,7 +1407,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d) } if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq ) - BUG_ON(!d->is_dying); + BUG(); } /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index f079238b78..6b87febc3d 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -866,6 +866,10 @@ static int pci_clean_dpci_irq(struct domain *d, { struct dev_intx_gsi_link *digl, *tmp; + if ( !pirq_dpci->flags ) + /* Already processed. */ + return 0; + pirq_guest_unbind(d, dpci_pirq(pirq_dpci)); if ( pt_irq_need_timer(pirq_dpci->flags) ) @@ -876,15 +880,10 @@ static int pci_clean_dpci_irq(struct domain *d, list_del(&digl->list); xfree(digl); } + /* Note the pirq is now unbound. */ + pirq_dpci->flags = 0; - radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); - - if ( !pt_pirq_softirq_active(pirq_dpci) ) - return 0; - - domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; - - return -ERESTART; + return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; } static int pci_clean_dpci_irqs(struct domain *d) @@ -901,18 +900,8 @@ static int pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = 0; + int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); - if ( hvm_irq_dpci->pending_pirq_dpci ) - { - if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) - ret = -ERESTART; - else - hvm_irq_dpci->pending_pirq_dpci = NULL; - } - - if ( !ret ) - ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); if ( ret ) { spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index d306cfeade..5b7e90c179 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -158,8 +158,6 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; - /* Clean up: Entry with a softirq invocation pending / in progress. */ - struct hvm_pirq_dpci *pending_pirq_dpci; }; /* Machine IRQ to guest device/intx mapping. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 14:33:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 14:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72812.131180 (Exim 4.92) (envelope-from ) id 1l2xUo-0003jH-6l; Fri, 22 Jan 2021 14:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72812.131180; Fri, 22 Jan 2021 14: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 1l2xUo-0003j9-3b; Fri, 22 Jan 2021 14:33:06 +0000 Received: by outflank-mailman (input) for mailman id 72812; Fri, 22 Jan 2021 14:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xUm-0003j2-M4 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xUm-0000yj-KM for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2xUm-00037D-IZ for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14: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=+BlpH3r8tIHt8UDDpy81Jh7Oa5iN90PrX/L0aulRbaQ=; b=V/8ZaMMr6dm93par5LISflO8jC U7PESVc9rN7tvg1PA2O/JohhwlpJ6Go0x7fBwP9qcim8Ku9bw59Oid4n71QRyHD8HGoiHsr7PAbcW 7ZkGOaNaLCqdkN96mq5mWY6qtRaSu3jPFFOtkWMtFTK/ShvQthrN+Excrk7LnJAsqm00=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] golang/xenlight: Refresh generated files after recent libxl changes Message-Id: Date: Fri, 22 Jan 2021 14:33:04 +0000 commit a40deb3acb80648bbaf8701b52fbc54ec50a18e0 Author: Andrew Cooper AuthorDate: Fri Jan 22 13:16:51 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 14:28:44 2021 +0000 golang/xenlight: Refresh generated files after recent libxl changes Result of running: make -C tools/golang No manual changes. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/golang/xenlight/helpers.gen.go | 3 +++ tools/golang/xenlight/types.gen.go | 2 ++ 2 files changed, 5 insertions(+) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index c8605994e7..e0681ee14e 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -2025,6 +2025,7 @@ x.PowerMgmt = bool(xc.power_mgmt) x.Permissive = bool(xc.permissive) x.Seize = bool(xc.seize) x.RdmPolicy = RdmReservePolicy(xc.rdm_policy) +x.Name = C.GoString(xc.name) return nil} @@ -2044,6 +2045,8 @@ xc.power_mgmt = C.bool(x.PowerMgmt) xc.permissive = C.bool(x.Permissive) xc.seize = C.bool(x.Seize) xc.rdm_policy = C.libxl_rdm_reserve_policy(x.RdmPolicy) +if x.Name != "" { +xc.name = C.CString(x.Name)} return nil } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index b4c5df0f2c..ac78dea1af 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -210,6 +210,7 @@ ViridianEnlightenmentCrashCtl ViridianEnlightenment = 6 ViridianEnlightenmentSynic ViridianEnlightenment = 7 ViridianEnlightenmentStimer ViridianEnlightenment = 8 ViridianEnlightenmentHcallIpi ViridianEnlightenment = 9 +ViridianEnlightenmentExProcessorMasks ViridianEnlightenment = 10 ) type Hdtype int @@ -719,6 +720,7 @@ PowerMgmt bool Permissive bool Seize bool RdmPolicy RdmReservePolicy +Name string } type DeviceRdm struct { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 14:33:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 14:33:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72813.131184 (Exim 4.92) (envelope-from ) id 1l2xUy-0003kI-8O; Fri, 22 Jan 2021 14:33:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72813.131184; Fri, 22 Jan 2021 14: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 1l2xUy-0003k8-59; Fri, 22 Jan 2021 14:33:16 +0000 Received: by outflank-mailman (input) for mailman id 72813; Fri, 22 Jan 2021 14:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xUw-0003jz-Pt for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:33:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xUw-0000yr-OK for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2xUw-00037y-MR for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14: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=ZuWZkfbgwe1nAnwk/as2Wnd3NbNSN4UjNOUm+K8Zerk=; b=fHcgXHuuPjpiPjY8GIu80oH4a8 xHfCPyrNm9L2ABxldlKHGUNZRJqbDByOTsi7t0RaEmjWL+uF4WoG9x1MwPO/09YVQ89I6klK41Hz3 jPvOnOrBLNbh82CXNBI+C+AqO+QPXrRYquUFnFTZkwyO73j1mGAVzygdhBkeb9Rb0UvU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xl: use proper name for bash_completion file Message-Id: Date: Fri, 22 Jan 2021 14:33:14 +0000 commit bb9afb7a465d3b7b438f2e11105409d24400f8f4 Author: Olaf Hering AuthorDate: Tue Oct 20 14:39:28 2020 +0200 Commit: Andrew Cooper CommitDate: Fri Jan 22 14:28:44 2021 +0000 tools/xl: use proper name for bash_completion file Files in the bash-completion dirs should be named like the commands, without suffix. Without this change 'xl' will not be recognized as a command with completion support if BASH_COMPLETION_DIR is set to /usr/share/bash-completion/completions. Fixes: 9136a919b ("xl: Add basic bash completion for xl command.") Signed-off-by: Olaf Hering Acked-by: Andrew Cooper Release-Acked-by: Ian Jackson --- tools/xl/Makefile | 4 ++-- tools/xl/bash-completion | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/xl/Makefile b/tools/xl/Makefile index bdf67c8464..656b21c7da 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -45,11 +45,11 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_PROG) xl $(DESTDIR)$(sbindir) - $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh + $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl .PHONY: uninstall uninstall: - rm -f $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh + rm -f $(DESTDIR)$(BASH_COMPLETION_DIR)/xl rm -f $(DESTDIR)$(sbindir)/xl .PHONY: clean diff --git a/tools/xl/bash-completion b/tools/xl/bash-completion index b7cd6b3992..7c6ed32f88 100644 --- a/tools/xl/bash-completion +++ b/tools/xl/bash-completion @@ -1,4 +1,4 @@ -# Copy this file to /etc/bash_completion.d/xl.sh +# Copy this file to /etc/bash_completion.d/xl _xl() { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 14:33:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 14:33:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72814.131188 (Exim 4.92) (envelope-from ) id 1l2xV8-0003lh-9h; Fri, 22 Jan 2021 14:33:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72814.131188; Fri, 22 Jan 2021 14: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 1l2xV8-0003lY-6c; Fri, 22 Jan 2021 14:33:26 +0000 Received: by outflank-mailman (input) for mailman id 72814; Fri, 22 Jan 2021 14:33:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xV6-0003lM-SC for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:33:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xV6-0000z3-RI for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:33:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2xV6-00038S-QU for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14: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=zMQqatLrb8sCXcpzKG1axucVFtu2kfkyt1uCa92qqCU=; b=H+ea/eR/lkxd6ZN0TZq/8JmCRI UFUs7ycyO0g2SaNwejuOEIeIzCKMrBiG+q2RpY097m8lGy5TMWPMWERt/2hBzKCT32TcQTMYsXQcZ FEgj1JtAf4SqSdx3Sm4h/bahmyOmJyTZwN2XcWw4Kthns/pVDtzaw2++UolrtKclIrdU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenstat: Fix infinite loop when QEMU dies Message-Id: Date: Fri, 22 Jan 2021 14:33:24 +0000 commit cd5058316c2ce4966fd7c2852216c47a0dc11618 Author: Hans Reiser AuthorDate: Mon Nov 9 14:36:00 2020 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 14:28:44 2021 +0000 tools/libxenstat: Fix infinite loop when QEMU dies Occasionally, "dead" xentop processes consuming 100% CPU time have been observed. When the QEMU process the qmp_read() function is communicating with terminates, qmp_read() may enter an infinite loop. poll() signals EOF (POLLIN and POLLHUP set), the subsequent read() call returns 0, and then the function calls poll() again, which still sees the EOF condition and will return again immediately with POLLIN and POLLHUP set, repeating ad infinitum. A simple fix is to terminate the loop when read returns 0 (under "normal" instances, poll will return with POLLIN set only if there is data to read, so read will always read >0 bytes, except if the socket has been closed). Signed-off-by: Hans Reiser Acked-by: Andrew Cooper --- tools/libs/stat/xenstat_qmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/stat/xenstat_qmp.c b/tools/libs/stat/xenstat_qmp.c index 19b236e7b6..0c5748ba68 100644 --- a/tools/libs/stat/xenstat_qmp.c +++ b/tools/libs/stat/xenstat_qmp.c @@ -298,7 +298,7 @@ static int qmp_read(int qfd, unsigned char **qstats) pfd[0].events = POLLIN; while ((n = poll(pfd, 1, 10)) > 0) { if (pfd[0].revents & POLLIN) { - if ((n = read(qfd, buf, sizeof(buf))) < 0) { + if ((n = read(qfd, buf, sizeof(buf))) <= 0) { free(*qstats); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 14:44:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 14:44:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72816.131192 (Exim 4.92) (envelope-from ) id 1l2xfQ-0004mo-3k; Fri, 22 Jan 2021 14:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72816.131192; Fri, 22 Jan 2021 14:44: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 1l2xfQ-0004mg-0b; Fri, 22 Jan 2021 14:44:04 +0000 Received: by outflank-mailman (input) for mailman id 72816; Fri, 22 Jan 2021 14:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xfO-0004lp-Gg for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xfO-00019U-EM for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2xfO-0003mi-At for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1rfKFk1iom2U43722kPd3p2TzRflaoCV4eKuVgY8DJc=; b=yNv1aQtuqJ/YByxObTSRdxUunH kPBZGpRiPhygDCTOMUZHmaJlvziXP5bx679HrptMYpH2/2LJOIPOIzJZS1PTNl19y4Ie4wwP5XCbt weSXEPMNLEmAfens2PDtpeCBIVAFJC8iWoqIlDn59od8YQriU3nbByfJSmNRbhOpCpPY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.13] x86/vPCI: tolerate (un)masking a disabled MSI-X entry Message-Id: Date: Fri, 22 Jan 2021 14:44:02 +0000 commit 0c78a9d38379a8217354d2f56a38de30fb90d6e1 Author: Jan Beulich AuthorDate: Thu Jan 21 16:23:23 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:23:23 2021 +0100 x86/vPCI: tolerate (un)masking a disabled MSI-X entry None of the four reasons causing vpci_msix_arch_mask_entry() to get called (there's just a single call site) are impossible or illegal prior to an entry actually having got set up: - the entry may remain masked (in this case, however, a prior masked -> unmasked transition would already not have worked), - MSI-X may not be enabled, - the global mask bit may be set, - the entry may not otherwise have been updated. Hence the function asserting that the entry was previously set up was simply wrong. Since the caller tracks the masked state (and setting up of an entry would only be effected when that software bit is clear), it's okay to skip both masking and unmasking requests in this case. Fixes: d6281be9d0145 ('vpci/msix: add MSI-X handlers') Reported-by: Manuel Bouyer Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Tested-by: Manuel Bouyer master commit: 04b090366ca59e8a75837c822df261a8d0bd1a30 master date: 2021-01-05 13:17:54 +0100 --- xen/arch/x86/hvm/vmsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 6597d9f719..f872fe45af 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -840,8 +840,8 @@ void vpci_msi_arch_print(const struct vpci_msi *msi) void vpci_msix_arch_mask_entry(struct vpci_msix_entry *entry, const struct pci_dev *pdev, bool mask) { - ASSERT(entry->arch.pirq != INVALID_PIRQ); - vpci_mask_pirq(pdev->domain, entry->arch.pirq, mask); + if ( entry->arch.pirq != INVALID_PIRQ ) + vpci_mask_pirq(pdev->domain, entry->arch.pirq, mask); } int vpci_msix_arch_enable_entry(struct vpci_msix_entry *entry, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 14:44:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 14:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72819.131211 (Exim 4.92) (envelope-from ) id 1l2xfZ-0004pn-Ju; Fri, 22 Jan 2021 14:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72819.131211; Fri, 22 Jan 2021 14:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xfZ-0004pf-Gf; Fri, 22 Jan 2021 14:44:13 +0000 Received: by outflank-mailman (input) for mailman id 72819; Fri, 22 Jan 2021 14:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xfY-0004pQ-J2 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xfY-00019h-IA for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2xfY-0003nh-GX for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OWETeZyHIdnbMNDoNvisuPNwIivBkgSP6uOp2ZiOgUI=; b=lSRtaryXZHsDxZaGGVl/lAPsVz HVMzrxBgL5mQq9lYp5eLI5XYZq8jaFpMRfAi3u5j88cEoA+BDIJU/DRN0toCvtc30+LQB0fURXCIe P6xt+7QvqYUXGbxQ9codrXiUsLRQBnexmPmr6WfiNeOzhgBI7RfqTtJ9QAXk7yg2LLbs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.13] x86/dpci: EOI interrupt regardless of its masking status Message-Id: Date: Fri, 22 Jan 2021 14:44:12 +0000 commit dc36f72d2a2a94e5b41b7b0de0bad3b2902c529c Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:23:58 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:23:58 2021 +0100 x86/dpci: EOI interrupt regardless of its masking status Modify hvm_pirq_eoi to always EOI the interrupt if required, instead of not doing such EOI if the interrupt is routed through the vIO-APIC and the entry is masked at the time the EOI is performed. Further unmask of the vIO-APIC pin won't EOI the interrupt, and thus the guest OS has to wait for the timeout to expire and the automatic EOI to be performed. This allows to simplify the helpers and drop the vioapic_redir_entry parameter from all of them. Fixes: ccfe4e08455 ('Intel vt-d specific changes in arch/x86/hvm/vmx/vtd.') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: eb298f32fac5ac362eef30a66a9c9c42724d4ce6 master date: 2021-01-07 15:10:29 +0100 --- xen/arch/x86/hvm/vioapic.c | 2 +- xen/arch/x86/hvm/vpic.c | 3 +-- xen/drivers/passthrough/io.c | 21 ++++++++------------- xen/include/asm-x86/hvm/io.h | 3 +-- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index d899dd9707..da03b4d4b3 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -539,7 +539,7 @@ void vioapic_update_EOI(struct domain *d, u8 vector) if ( is_iommu_enabled(d) ) { spin_unlock(&d->arch.hvm.irq_lock); - hvm_dpci_eoi(d, vioapic->base_gsi + pin, ent); + hvm_dpci_eoi(d, vioapic->base_gsi + pin); spin_lock(&d->arch.hvm.irq_lock); } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 4897a0e05b..9ec4652222 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -261,8 +261,7 @@ static void vpic_ioport_write( vpic_update_int_output(vpic); vpic_unlock(vpic); hvm_dpci_eoi(current->domain, - hvm_isa_irq_to_gsi((addr >> 7) ? (irq|8) : irq), - NULL); + hvm_isa_irq_to_gsi((addr >> 7) ? (irq | 8) : irq)); return; /* bail immediately */ case 6: /* Set Priority */ vpic->priority_add = (val + 1) & 7; diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index 6b1305a3e5..71eaf2c17e 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -950,8 +950,7 @@ static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) spin_unlock(&d->event_lock); } -static void hvm_pirq_eoi(struct pirq *pirq, - const union vioapic_redir_entry *ent) +static void hvm_pirq_eoi(struct pirq *pirq) { struct hvm_pirq_dpci *pirq_dpci; @@ -968,7 +967,6 @@ static void hvm_pirq_eoi(struct pirq *pirq, * since interrupt is still not EOIed */ if ( --pirq_dpci->pending || - (ent && ent->fields.mask) || !pt_irq_need_timer(pirq_dpci->flags) ) return; @@ -977,19 +975,17 @@ static void hvm_pirq_eoi(struct pirq *pirq, } static void __hvm_dpci_eoi(struct domain *d, - const struct hvm_girq_dpci_mapping *girq, - const union vioapic_redir_entry *ent) + const struct hvm_girq_dpci_mapping *girq) { struct pirq *pirq = pirq_info(d, girq->machine_gsi); if ( !hvm_domain_use_pirq(d, pirq) ) hvm_pci_intx_deassert(d, girq->device, girq->intx); - hvm_pirq_eoi(pirq, ent); + hvm_pirq_eoi(pirq); } -static void hvm_gsi_eoi(struct domain *d, unsigned int gsi, - const union vioapic_redir_entry *ent) +static void hvm_gsi_eoi(struct domain *d, unsigned int gsi) { struct pirq *pirq = pirq_info(d, gsi); @@ -998,11 +994,10 @@ static void hvm_gsi_eoi(struct domain *d, unsigned int gsi, return; hvm_gsi_deassert(d, gsi); - hvm_pirq_eoi(pirq, ent); + hvm_pirq_eoi(pirq); } -void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, - const union vioapic_redir_entry *ent) +void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi) { const struct hvm_irq_dpci *hvm_irq_dpci; const struct hvm_girq_dpci_mapping *girq; @@ -1013,7 +1008,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, if ( is_hardware_domain(d) ) { spin_lock(&d->event_lock); - hvm_gsi_eoi(d, guest_gsi, ent); + hvm_gsi_eoi(d, guest_gsi); goto unlock; } @@ -1030,7 +1025,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, goto unlock; list_for_each_entry ( girq, &hvm_irq_dpci->girq[guest_gsi], list ) - __hvm_dpci_eoi(d, girq, ent); + __hvm_dpci_eoi(d, girq); unlock: spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index f5a8813b33..ac0a870bee 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -122,8 +122,7 @@ bool handle_mmio_with_translation(unsigned long gla, unsigned long gpfn, struct npfec); bool handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); -void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, - const union vioapic_redir_entry *ent); +void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq); void msix_write_completion(struct vcpu *); #ifdef CONFIG_HVM -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 14:44:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 14:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72821.131216 (Exim 4.92) (envelope-from ) id 1l2xfj-0004t2-Mo; Fri, 22 Jan 2021 14:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72821.131216; Fri, 22 Jan 2021 14:44: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 1l2xfj-0004ss-IX; Fri, 22 Jan 2021 14:44:23 +0000 Received: by outflank-mailman (input) for mailman id 72821; Fri, 22 Jan 2021 14:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xfi-0004sb-Lu for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xfi-00019q-L2 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2xfi-0003qG-KF for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Caqr9tOv7IRNJjq8V6HXSRbSlzcvK8kwrHOGZoy3im0=; b=IOChFOFO7ebGQO+0JwrwIi7TOj 7oLk0jmsCU64bHISbTPXQN+k2mWVPvg05mvyW2chackWlSqfswbPQLQSRCVu41JbV12KiArOx/+Gj B2hk0GV2tXWoUe8+bVkia9/OQm1mkHqVYZQRn5jDWLnt6aZJGbwACP4LIRAB1SIMm2Sk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.13] x86/hypercall: fix gnttab hypercall args conditional build on pvshim Message-Id: Date: Fri, 22 Jan 2021 14:44:22 +0000 commit 95b5283e83533f1f19f299742a2b54f715471d7c Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:24:37 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:24:37 2021 +0100 x86/hypercall: fix gnttab hypercall args conditional build on pvshim A pvshim build doesn't require the grant table functionality built in, but it does require knowing the number of arguments the hypercall has so the hypercall parameter clobbering works properly. Instead of also setting the argument count for the gnttab case if PV shim functionality is enabled, just drop all of the conditionals from hypercall_args_table, as a hypercall having a NULL handler won't get to use that information anyway. Note this hasn't been detected by osstest because the tools pvshim build is done without debug enabled, so the hypercall parameter clobbering doesn't happen. Fixes: d2151152dd2 ('xen: make grant table support configurable') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: b468b464c89e92629bd52cec58e9f51eee2e950a master date: 2021-01-08 16:51:52 +0100 --- xen/arch/x86/hypercall.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c index 1d42702c6a..3b749c61f9 100644 --- a/xen/arch/x86/hypercall.c +++ b/xen/arch/x86/hypercall.c @@ -47,9 +47,7 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(xen_version, 2), ARGS(console_io, 3), ARGS(physdev_op_compat, 1), -#ifdef CONFIG_GRANT_TABLE ARGS(grant_table_op, 3), -#endif ARGS(vm_assist, 2), COMP(update_va_mapping_otherdomain, 4, 5), ARGS(vcpu_op, 3), @@ -65,14 +63,10 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(sysctl, 1), ARGS(domctl, 1), ARGS(kexec_op, 2), -#ifdef CONFIG_ARGO ARGS(argo_op, 5), -#endif ARGS(xenpmu_op, 2), -#ifdef CONFIG_HVM ARGS(hvm_op, 2), ARGS(dm_op, 3), -#endif ARGS(mca, 1), ARGS(arch_1, 1), }; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 14:44:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 14:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72823.131232 (Exim 4.92) (envelope-from ) id 1l2xfu-0004xX-1j; Fri, 22 Jan 2021 14:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72823.131232; Fri, 22 Jan 2021 14:44:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xft-0004xN-TP; Fri, 22 Jan 2021 14:44:33 +0000 Received: by outflank-mailman (input) for mailman id 72823; Fri, 22 Jan 2021 14:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xfs-0004vo-Ox for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xfs-0001A4-OF for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2xfs-0003qt-N5 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4j1KDhKveIqohL+Uj1o5KSlvEwH7TgoEprIfmrAvNos=; b=RJZoN4HQVAiXAfzMSKLOBL1NbK d39uYSZ1Sl4EmM72dbQU1MQYNfYINQLiMyT7FcMp0DCKSrOEiQRoy9AVQTJ6MzsXvDthCDPB5yDW3 AWFq+OyI5Ymv34cJyRN2uSvvsnsB2e7kcr906Sib2/qlJPghILvmY/np28u4rFsX6z5w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.13] x86/ACPI: don't overwrite FADT Message-Id: Date: Fri, 22 Jan 2021 14:44:32 +0000 commit bbce51a8da3985502a5d55f7b431a9a8c446b5b2 Author: Jan Beulich AuthorDate: Thu Jan 21 16:25:06 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:25:06 2021 +0100 x86/ACPI: don't overwrite FADT When marking fields invalid for our own purposes, we should do so in our local copy (so we will notice later on), not in the firmware provided one (which another entity may want to look at again, e.g. after kexec). Also mark the function parameter const to notice such issues right away. Instead use the pointer at the firmware copy for specifying an adjacent printk()'s arguments. If nothing else this at least reduces the number of relocations the assembler hasto emit and the linker has to process. Fixes: 62d1a69a4e9f ("ACPI: support v5 (reduced HW) sleep interface") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: 654c917d94d24587bb6b4a8d862baf04b25cbe33 master date: 2021-01-11 14:55:52 +0100 --- xen/arch/x86/acpi/boot.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 0b0a8f62e4..5dfa8e3dca 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -347,7 +347,7 @@ static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) /* Get pm1x_cnt and pm1x_evt information for ACPI sleep */ static void __init -acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) +acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt) { struct acpi_table_facs *facs = NULL; uint64_t facs_pa; @@ -360,10 +360,10 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) printk(KERN_INFO PREFIX "v5 SLEEP INFO: control[%d:%"PRIx64"]," " status[%d:%"PRIx64"]\n", - acpi_sinfo.sleep_control.space_id, - acpi_sinfo.sleep_control.address, - acpi_sinfo.sleep_status.space_id, - acpi_sinfo.sleep_status.address); + fadt->sleep_control.space_id, + fadt->sleep_control.address, + fadt->sleep_status.space_id, + fadt->sleep_status.address); if ((fadt->sleep_control.address && (fadt->sleep_control.bit_offset || @@ -382,8 +382,8 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) fadt->sleep_status.bit_offset, fadt->sleep_status.bit_width, fadt->sleep_status.access_width); - fadt->sleep_control.address = 0; - fadt->sleep_status.address = 0; + acpi_sinfo.sleep_control.address = 0; + acpi_sinfo.sleep_status.address = 0; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 14:44:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 14:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72825.131234 (Exim 4.92) (envelope-from ) id 1l2xg4-00051y-4x; Fri, 22 Jan 2021 14:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72825.131234; Fri, 22 Jan 2021 14:44: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 1l2xg4-00051q-1R; Fri, 22 Jan 2021 14:44:44 +0000 Received: by outflank-mailman (input) for mailman id 72825; Fri, 22 Jan 2021 14:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xg2-00051F-Ro for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xg2-0001AC-R4 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2xg2-0003rW-QH for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Q4DjcoT+EiBSM6gAWB80qRPAaS85k4kRLcnUOJTHOIU=; b=zyHUcJWl8WVtRPofhrYl8R0l/D uT9cUtltr7wos3ik6KBvX1PaIIoKxcNaQvv3OLm6ein/13LIHF3G6toGoOcrfy7b2Vh0ySnzVP4YZ +b+rdhOfU/PrBxo80KXB2YcAvcomypXieoRT7KfXyd9qA1rwqqZIM/MzO6TWUuJ8bRGA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.13] xen/memory: Fix compat XENMEM_acquire_resource for size requests Message-Id: Date: Fri, 22 Jan 2021 14:44:42 +0000 commit 1dd564515d0023332f9447a4c19e1df31b13da09 Author: Andrew Cooper AuthorDate: Thu Jan 21 16:25:35 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:25:35 2021 +0100 xen/memory: Fix compat XENMEM_acquire_resource for size requests Copy the nr_frames from the structure which actually has the correct value, so the caller doesn't unconditionally receive 0. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant master commit: 414be7b66349e7dca42bc1fd47c2b2f5b2d27432 master date: 2021-01-12 18:17:02 +0000 --- xen/common/compat/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 3851f756c7..ed92e05b08 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -599,7 +599,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) if ( __copy_field_to_guest( guest_handle_cast(compat, compat_mem_acquire_resource_t), - &cmp.mar, nr_frames) ) + nat.mar, nr_frames) ) return -EFAULT; } else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 14:44:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 14:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72826.131238 (Exim 4.92) (envelope-from ) id 1l2xgE-00054k-6y; Fri, 22 Jan 2021 14:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72826.131238; Fri, 22 Jan 2021 14:44: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 1l2xgE-00054Z-3C; Fri, 22 Jan 2021 14:44:54 +0000 Received: by outflank-mailman (input) for mailman id 72826; Fri, 22 Jan 2021 14:44:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xgC-000543-Ut for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xgC-0001Aa-UB for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2xgC-0003sD-TJ for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ISNg5tNWoqTO0O96Hg/bYUwAcoc4i1TQe2EX6iXHgag=; b=bZgceHwqJ3cHHl2WO5ZeJoRXd3 GYe4wuAqMXu5gZwd2fBK53xnFmNy8Nh2Afbc1X9Pj87zxaFZG3cRdqxo9eK1Uf4Dk2iVLpP8Aupqx n60QBWX3BiumGV2vGrX6TUEkHOuvCrWwuqPwtROqxC7GiTvOdr38LUmtprG5NNXNpqpg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.13] x86/dpci: do not remove pirqs from domain tree on unbind Message-Id: Date: Fri, 22 Jan 2021 14:44:52 +0000 commit e4161938b315f3b9c6a13ade30d16c11504a2d16 Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:26:16 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:26:16 2021 +0100 x86/dpci: do not remove pirqs from domain tree on unbind A fix for a previous issue removed the pirqs from the domain tree when they are unbound in order to prevent shared pirqs from triggering a BUG_ON in __pirq_guest_unbind if they are unbound multiple times. That caused free_domain_pirqs to no longer unmap the pirqs because they are gone from the domain pirq tree, thus leaving stale unbound pirqs after domain destruction if the domain had mapped dpci pirqs after shutdown. Take a different approach to fix the original issue, instead of removing the pirq from d->pirq_tree clear the flags of the dpci pirq struct to signal that the pirq is now unbound. This prevents calling pirq_guest_unbind multiple times for the same pirq without having to remove it from the domain pirq tree. This is XSA-360. Fixes: 5b58dad089 ('x86/pass-through: avoid double IRQ unbind during domain cleanup') Reported-by: Samuel Verschelde Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 58427889f5a420cc5226f88524b3228f90b72a58 master date: 2021-01-21 16:11:41 +0100 --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/pci.c | 27 ++++++++------------------- xen/include/asm-x86/hvm/irq.h | 2 -- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index f05defbd7d..47f41da4e5 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1504,7 +1504,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d) } if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq ) - BUG_ON(!d->is_dying); + BUG(); } /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 1efd8d0eeb..b59a17b19a 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -861,6 +861,10 @@ static int pci_clean_dpci_irq(struct domain *d, { struct dev_intx_gsi_link *digl, *tmp; + if ( !pirq_dpci->flags ) + /* Already processed. */ + return 0; + pirq_guest_unbind(d, dpci_pirq(pirq_dpci)); if ( pt_irq_need_timer(pirq_dpci->flags) ) @@ -871,15 +875,10 @@ static int pci_clean_dpci_irq(struct domain *d, list_del(&digl->list); xfree(digl); } + /* Note the pirq is now unbound. */ + pirq_dpci->flags = 0; - radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); - - if ( !pt_pirq_softirq_active(pirq_dpci) ) - return 0; - - domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; - - return -ERESTART; + return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; } static int pci_clean_dpci_irqs(struct domain *d) @@ -896,18 +895,8 @@ static int pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = 0; + int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); - if ( hvm_irq_dpci->pending_pirq_dpci ) - { - if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) - ret = -ERESTART; - else - hvm_irq_dpci->pending_pirq_dpci = NULL; - } - - if ( !ret ) - ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); if ( ret ) { spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index 532880d497..7f76f6c437 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -160,8 +160,6 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; - /* Clean up: Entry with a softirq invocation pending / in progress. */ - struct hvm_pirq_dpci *pending_pirq_dpci; }; /* Machine IRQ to guest device/intx mapping. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 14:45:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 14:45:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72828.131243 (Exim 4.92) (envelope-from ) id 1l2xgS-00057K-8Z; Fri, 22 Jan 2021 14:45:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72828.131243; Fri, 22 Jan 2021 14:45:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xgS-00057A-57; Fri, 22 Jan 2021 14:45:08 +0000 Received: by outflank-mailman (input) for mailman id 72828; Fri, 22 Jan 2021 14:45:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xgQ-00056w-GW for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:45:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xgQ-0001B8-Fb for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:45:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2xgQ-00041E-Ew for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:45:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sl4UsxgwhtEJtWGc5e44vBYx5MpQ2B8vHTOU/1eZK50=; b=c0bfWrBsdPim+wFKfcwetFqjcx pLIEev1eqpTQu0EQhqod8DrCFEsxEG4RcoCUZvKOU2f7I5K/WujNa9UTUDdt/FT2GTbpeX0ktUiSZ 0IzI8xsMDFnsfGCqTjb7CcMdmN0QPKV0UFeXzBr0RAkThZgGWAIJbJJTSp+l0UQH8nPc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: Add Ubuntu:focal container Message-Id: Date: Fri, 22 Jan 2021 14:45:06 +0000 commit eb52442d7f2190a2bee7626f685bf21900592506 Author: Edwin Török AuthorDate: Tue Nov 17 18:24:10 2020 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 14:39:36 2021 +0000 automation: Add Ubuntu:focal container Signed-off-by: Edwin Török Acked-by: Doug Goldstein --- automation/build/ubuntu/focal.dockerfile | 48 ++++++++++++++++++++++++++++++++ automation/scripts/containerize | 1 + 2 files changed, 49 insertions(+) diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile new file mode 100644 index 0000000000..c1c1f8d58f --- /dev/null +++ b/automation/build/ubuntu/focal.dockerfile @@ -0,0 +1,48 @@ +FROM ubuntu:20.04 +LABEL maintainer.name="The Xen Project " \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + zlib1g-dev \ + libncurses5-dev \ + libssl-dev \ + python3-dev \ + xorg-dev \ + uuid-dev \ + libyajl-dev \ + libaio-dev \ + libglib2.0-dev \ + clang \ + libpixman-1-dev \ + pkg-config \ + flex \ + bison \ + gettext \ + acpica-tools \ + bin86 \ + bcc \ + liblzma-dev \ + libc6-dev-i386 \ + libnl-3-dev \ + ocaml-nox \ + libfindlib-ocaml-dev \ + libsystemd-dev \ + transfig \ + pandoc \ + checkpolicy \ + wget \ + git \ + nasm \ + && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* diff --git a/automation/scripts/containerize b/automation/scripts/containerize index c8c3c20fa2..da45baed4e 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -28,6 +28,7 @@ case "_${CONTAINER}" in _centos7) CONTAINER="${BASE}/centos:7" ;; _centos72) CONTAINER="${BASE}/centos:7.2" ;; _fedora) CONTAINER="${BASE}/fedora:29";; + _focal) CONTAINER="${BASE}/ubuntu:focal" ;; _jessie) CONTAINER="${BASE}/debian:jessie" ;; _stretch|_) CONTAINER="${BASE}/debian:stretch" ;; _unstable|_) CONTAINER="${BASE}/debian:unstable" ;; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 14:45:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 14:45:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72830.131246 (Exim 4.92) (envelope-from ) id 1l2xgc-00058n-9y; Fri, 22 Jan 2021 14:45:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72830.131246; Fri, 22 Jan 2021 14:45:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xgc-00058e-6r; Fri, 22 Jan 2021 14:45:18 +0000 Received: by outflank-mailman (input) for mailman id 72830; Fri, 22 Jan 2021 14:45:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xga-00058Q-JD for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:45:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xga-0001BL-IM for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:45:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2xga-00041v-Hg for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:45:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HLUEb50MEy+yhA00si1q4gPuiRNwJ9lYnt71SmRbNvE=; b=rdp5l+gYTxC0+MFJkeBnnAId4B kooCKCmOargV6yxBQhJHjNUbVbqLXAuz/5Ez72jlFqSLJRkIBPJiQBfenMkoNOi4yQLV5THpNUUlY YEVl6Xn3fBDDSPRcapc+TwhVLFxP7+iqbrZJ6zDk/880Ue/kOFl3uwrjA0stSii4BDrw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Makefile: Add build-tools-oxenstored Message-Id: Date: Fri, 22 Jan 2021 14:45:16 +0000 commit f437314e869fa4a041e30dc1d570c26fa852ca48 Author: Edwin Török AuthorDate: Fri Jan 8 11:57:37 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 14:39:48 2021 +0000 Makefile: Add build-tools-oxenstored As a convenience so that oxenstored patches can be compile-tested using upstream's build-system before submitting upstream. Signed-off-by: Edwin Török Acked-by: Wei Liu --- Makefile | 6 ++++++ tools/ocaml/Makefile | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/Makefile b/Makefile index 9ad2602f63..96d32cfd50 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,12 @@ build-xen: build-tools: build-tools-public-headers $(MAKE) -C tools build +.PHONY: build-tools-oxenstored +build-tools-oxenstored: build-tools-public-headers + $(MAKE) -s -C tools/ocaml clean + $(MAKE) -s -C tools/libs + $(MAKE) -C tools/ocaml build-tools-oxenstored + .PHONY: build-stubdom build-stubdom: mini-os-dir build-tools-public-headers $(MAKE) -C stubdom build diff --git a/tools/ocaml/Makefile b/tools/ocaml/Makefile index 66f2d6b131..a7c04b6546 100644 --- a/tools/ocaml/Makefile +++ b/tools/ocaml/Makefile @@ -26,3 +26,11 @@ clean: subdirs-clean .PHONY: distclean distclean: subdirs-distclean + +.PHONY: build-tools-oxenstored +build-tools-oxenstored: + $(MAKE) -s -C libs/eventchn + $(MAKE) -s -C libs/mmap + $(MAKE) -s -C libs/xb + $(MAKE) -s -C libs/xc + $(MAKE) -C xenstored -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 14:45:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 14:45:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72832.131252 (Exim 4.92) (envelope-from ) id 1l2xgm-0005AO-CI; Fri, 22 Jan 2021 14:45:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72832.131252; Fri, 22 Jan 2021 14:45:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xgm-0005AE-8j; Fri, 22 Jan 2021 14:45:28 +0000 Received: by outflank-mailman (input) for mailman id 72832; Fri, 22 Jan 2021 14:45:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xgk-0005A0-OV for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:45:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2xgk-0001D1-No for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:45:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2xgk-00042c-KU for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 14:45: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=qoriI+Huef02ygO++MZqY+CXHfEb6hp79Cvd2Z150xk=; b=UGgul74b0E7Z8DmSG4rfCrPQyf Q972P4JYj08FuawET9ThZ0x4UQ/trr3WBkCz/XYPPFL8YCdEh6KvTWG2Y9SPz9jdgmAH5rxiivmFW 1pRisU9T1CDCZLia6bTHFjIl7+iRGNNYJrUV/9T003CfIv0nSSdJGpNnItp6VsS2XZ34=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/ocaml/libs/xb: Do not crash after xenbus is unmapped Message-Id: Date: Fri, 22 Jan 2021 14:45:26 +0000 commit 5e317896342d553f0b55f72948bbf93a0f1147d3 Author: Edwin Török AuthorDate: Fri Jan 15 18:23:10 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 14:40:29 2021 +0000 tools/ocaml/libs/xb: Do not crash after xenbus is unmapped Xenmmap.unmap sets the address to MAP_FAILED in xenmmap_stubs.c. If due to a bug there were still references to the Xenbus and we attempt to use it then we crash. Raise an exception instead of crashing. Signed-off-by: Edwin Török Acked-by: Andrew Cooper --- tools/ocaml/libs/xb/xs_ring_stubs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c index 7537a23949..7a91fdee75 100644 --- a/tools/ocaml/libs/xb/xs_ring_stubs.c +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c @@ -32,6 +32,7 @@ #include #include +#include #include "mmap_stubs.h" #define GET_C_STRUCT(a) ((struct mmap_interface *) a) @@ -166,6 +167,8 @@ CAMLprim value ml_interface_set_server_features(value interface, value v) { CAMLparam2(interface, v); struct xenstore_domain_interface *intf = GET_C_STRUCT(interface)->addr; + if (intf == (void*)MAP_FAILED) + caml_failwith("Interface closed"); intf->server_features = Int_val(v); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 15:22:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 15:22:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72856.131296 (Exim 4.92) (envelope-from ) id 1l2yGA-0000yQ-Vq; Fri, 22 Jan 2021 15:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72856.131296; Fri, 22 Jan 2021 15: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 1l2yGA-0000yI-Su; Fri, 22 Jan 2021 15:22:02 +0000 Received: by outflank-mailman (input) for mailman id 72856; Fri, 22 Jan 2021 15:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yG9-0000yA-T7 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yG9-0001oc-RT for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2yG9-0006U0-Q5 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15: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=lJDe0arIiVL8/S8FzWhXmE7Gq1DgZCyy9cRQRtt7iSg=; b=5N9hoY9p98tMuzNBKvMJXp6gK6 4eJk5cp+5VhtMEZjJli4ObByDiMG2Nb2NM1dAc+hDjHvR7Vde7aXKoyXCwjpIte1ZXcm6DZ56YOsW Ii5kbh+5wVoloXFAo1XMZ5bXsmKEg8AfCoigXztJhBkWba4KIpXN1JzNvPoqy0j6rydg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] update Xen version to 4.14.2-pre Message-Id: Date: Fri, 22 Jan 2021 15:22:01 +0000 commit 1b09f3dcd4708309a21b4b088cedea86417dcd7b Author: Jan Beulich AuthorDate: Thu Jan 21 16:16:43 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:16:43 2021 +0100 update Xen version to 4.14.2-pre --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index df7cf10be3..5ccbd64ad9 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 14 -export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 15:22:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 15:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72857.131301 (Exim 4.92) (envelope-from ) id 1l2yGL-0000zt-1Y; Fri, 22 Jan 2021 15:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72857.131301; Fri, 22 Jan 2021 15: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 1l2yGK-0000zj-UQ; Fri, 22 Jan 2021 15:22:12 +0000 Received: by outflank-mailman (input) for mailman id 72857; Fri, 22 Jan 2021 15:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGK-0000zb-0O for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGJ-0001oi-Uv for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2yGJ-0006UU-TY for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15: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=80FnVGRWZDherSzMo+6aU7COlukMiMS/b/O4EcJG5oI=; b=6co3CChmPfvg6eXgkyDAsY1lSl 5CDwZKTR+OseGvbqdT8VVQasZZR2UgcKzpqPbG505BMqXaWUaA2y8EScwjddVLPGJizO0y/QFdpgM 52eD/y1TUsEiZdvSy+jdSWjrWFhQmjYzKZVVcW0oUwemH+iv/p4jmYsCiB8DloaceZvY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/hpet: Fix return value of hpet_setup() Message-Id: Date: Fri, 22 Jan 2021 15:22:11 +0000 commit a514c5ef5bda0da4020b22037d921b845a151116 Author: Andrew Cooper AuthorDate: Thu Jan 21 16:17:21 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:17:21 2021 +0100 x86/hpet: Fix return value of hpet_setup() hpet_setup() is idempotent if the rate has already been calculated, and returns the cached value. However, this only works correctly when the return statements are identical. Use a sensibly named local variable, rather than a dead one with a bad name. Fixes: a60bb68219 ("x86/time: reduce rounding errors in calculations") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné master commit: 83736c567d6b64dbce98f251ca72e7870f556421 master date: 2020-12-31 16:19:00 +0000 --- xen/arch/x86/hpet.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 154c67423b..f4951d7a20 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -769,7 +769,7 @@ u64 __init hpet_setup(void) { static u64 __initdata hpet_rate; u32 hpet_id, hpet_period; - unsigned int last; + unsigned int last, rem; if ( hpet_rate ) return hpet_rate; @@ -799,9 +799,11 @@ u64 __init hpet_setup(void) hpet_resume(hpet_boot_cfg); hpet_rate = 1000000000000000ULL; /* 10^15 */ - last = do_div(hpet_rate, hpet_period); + rem = do_div(hpet_rate, hpet_period); + if ( (rem * 2) > hpet_period ) + hpet_rate++; - return hpet_rate + (last * 2 > hpet_period); + return hpet_rate; } void hpet_resume(u32 *boot_cfg) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 15:22:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 15:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72858.131305 (Exim 4.92) (envelope-from ) id 1l2yGW-00011Y-3T; Fri, 22 Jan 2021 15:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72858.131305; Fri, 22 Jan 2021 15:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGV-00011P-W0; Fri, 22 Jan 2021 15:22:23 +0000 Received: by outflank-mailman (input) for mailman id 72858; Fri, 22 Jan 2021 15:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGU-00011A-2v for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGU-0001op-28 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2yGU-0006VT-0j for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15: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=UkzbEifzOes/gZAQODTHoem4x7MNezIW0Ik58aM9ouM=; b=yXfLlsK5GA/kkofTr8Aotl+wgS Flz4JKMF8ZEDCjZ85lwnC32XAY0Tq0Dn7PFSRNJM2lykv6kpJ4zn5ahtANRoK+3rqHSp3/qYEKIAp +YIDY5Ru4xYQQcLsoNu0WMLjXiUUalgtvGzoes8s4wK4wBD0SqevedBRZC2yprbs5ibY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/vPCI: tolerate (un)masking a disabled MSI-X entry Message-Id: Date: Fri, 22 Jan 2021 15:22:22 +0000 commit 5f9b0f90ee7dcc96ffbb5e0c8d284aeb89d7495d Author: Jan Beulich AuthorDate: Thu Jan 21 16:18:06 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:18:06 2021 +0100 x86/vPCI: tolerate (un)masking a disabled MSI-X entry None of the four reasons causing vpci_msix_arch_mask_entry() to get called (there's just a single call site) are impossible or illegal prior to an entry actually having got set up: - the entry may remain masked (in this case, however, a prior masked -> unmasked transition would already not have worked), - MSI-X may not be enabled, - the global mask bit may be set, - the entry may not otherwise have been updated. Hence the function asserting that the entry was previously set up was simply wrong. Since the caller tracks the masked state (and setting up of an entry would only be effected when that software bit is clear), it's okay to skip both masking and unmasking requests in this case. Fixes: d6281be9d0145 ('vpci/msix: add MSI-X handlers') Reported-by: Manuel Bouyer Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Tested-by: Manuel Bouyer master commit: 04b090366ca59e8a75837c822df261a8d0bd1a30 master date: 2021-01-05 13:17:54 +0100 --- xen/arch/x86/hvm/vmsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 5d4eddebee..9cc5109b7e 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -844,8 +844,8 @@ void vpci_msi_arch_print(const struct vpci_msi *msi) void vpci_msix_arch_mask_entry(struct vpci_msix_entry *entry, const struct pci_dev *pdev, bool mask) { - ASSERT(entry->arch.pirq != INVALID_PIRQ); - vpci_mask_pirq(pdev->domain, entry->arch.pirq, mask); + if ( entry->arch.pirq != INVALID_PIRQ ) + vpci_mask_pirq(pdev->domain, entry->arch.pirq, mask); } int vpci_msix_arch_enable_entry(struct vpci_msix_entry *entry, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 15:22:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 15:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72859.131309 (Exim 4.92) (envelope-from ) id 1l2yGg-00013H-6c; Fri, 22 Jan 2021 15:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72859.131309; Fri, 22 Jan 2021 15:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGg-00013A-3F; Fri, 22 Jan 2021 15:22:34 +0000 Received: by outflank-mailman (input) for mailman id 72859; Fri, 22 Jan 2021 15:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGe-00012y-66 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGe-0001ow-5D for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2yGe-0006WP-4G for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15: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=79sdWKoLqQFR7506LkzBbzLIhEGtYxCAkFwEaqxdlcc=; b=mDCKFGlQSCzSRx9jr93w3xCUtp 70IqfSy4g+/u80RP2IN4zVcSslkf9CNoI81OosAaYGXV+wMOzpf+rfD2M8/OlZu/otXUV8AWxkVin /f21qMtb08XGpVNGYuiplDdqz61g4m5JrUSt6bzDqZZ1buAXiNnBQ8mArrvSfYcuu460=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/dpci: EOI interrupt regardless of its masking status Message-Id: Date: Fri, 22 Jan 2021 15:22:32 +0000 commit a3509dcd0fbb86cfe2e4b32996eed3afc363d7da Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:18:32 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:18:32 2021 +0100 x86/dpci: EOI interrupt regardless of its masking status Modify hvm_pirq_eoi to always EOI the interrupt if required, instead of not doing such EOI if the interrupt is routed through the vIO-APIC and the entry is masked at the time the EOI is performed. Further unmask of the vIO-APIC pin won't EOI the interrupt, and thus the guest OS has to wait for the timeout to expire and the automatic EOI to be performed. This allows to simplify the helpers and drop the vioapic_redir_entry parameter from all of them. Fixes: ccfe4e08455 ('Intel vt-d specific changes in arch/x86/hvm/vmx/vtd.') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: eb298f32fac5ac362eef30a66a9c9c42724d4ce6 master date: 2021-01-07 15:10:29 +0100 --- xen/arch/x86/hvm/vioapic.c | 2 +- xen/arch/x86/hvm/vpic.c | 3 +-- xen/drivers/passthrough/io.c | 21 ++++++++------------- xen/include/asm-x86/hvm/io.h | 3 +-- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index 52c5c636e3..abb27a5704 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -539,7 +539,7 @@ void vioapic_update_EOI(struct domain *d, u8 vector) if ( is_iommu_enabled(d) ) { spin_unlock(&d->arch.hvm.irq_lock); - hvm_dpci_eoi(d, vioapic->base_gsi + pin, ent); + hvm_dpci_eoi(d, vioapic->base_gsi + pin); spin_lock(&d->arch.hvm.irq_lock); } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 61f4b6784c..fcc3de5c0c 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -261,8 +261,7 @@ static void vpic_ioport_write( vpic_update_int_output(vpic); vpic_unlock(vpic); hvm_dpci_eoi(current->domain, - hvm_isa_irq_to_gsi((addr >> 7) ? (irq|8) : irq), - NULL); + hvm_isa_irq_to_gsi((addr >> 7) ? (irq | 8) : irq)); return; /* bail immediately */ case 6: /* Set Priority */ vpic->priority_add = (val + 1) & 7; diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index 6b1305a3e5..71eaf2c17e 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -950,8 +950,7 @@ static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) spin_unlock(&d->event_lock); } -static void hvm_pirq_eoi(struct pirq *pirq, - const union vioapic_redir_entry *ent) +static void hvm_pirq_eoi(struct pirq *pirq) { struct hvm_pirq_dpci *pirq_dpci; @@ -968,7 +967,6 @@ static void hvm_pirq_eoi(struct pirq *pirq, * since interrupt is still not EOIed */ if ( --pirq_dpci->pending || - (ent && ent->fields.mask) || !pt_irq_need_timer(pirq_dpci->flags) ) return; @@ -977,19 +975,17 @@ static void hvm_pirq_eoi(struct pirq *pirq, } static void __hvm_dpci_eoi(struct domain *d, - const struct hvm_girq_dpci_mapping *girq, - const union vioapic_redir_entry *ent) + const struct hvm_girq_dpci_mapping *girq) { struct pirq *pirq = pirq_info(d, girq->machine_gsi); if ( !hvm_domain_use_pirq(d, pirq) ) hvm_pci_intx_deassert(d, girq->device, girq->intx); - hvm_pirq_eoi(pirq, ent); + hvm_pirq_eoi(pirq); } -static void hvm_gsi_eoi(struct domain *d, unsigned int gsi, - const union vioapic_redir_entry *ent) +static void hvm_gsi_eoi(struct domain *d, unsigned int gsi) { struct pirq *pirq = pirq_info(d, gsi); @@ -998,11 +994,10 @@ static void hvm_gsi_eoi(struct domain *d, unsigned int gsi, return; hvm_gsi_deassert(d, gsi); - hvm_pirq_eoi(pirq, ent); + hvm_pirq_eoi(pirq); } -void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, - const union vioapic_redir_entry *ent) +void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi) { const struct hvm_irq_dpci *hvm_irq_dpci; const struct hvm_girq_dpci_mapping *girq; @@ -1013,7 +1008,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, if ( is_hardware_domain(d) ) { spin_lock(&d->event_lock); - hvm_gsi_eoi(d, guest_gsi, ent); + hvm_gsi_eoi(d, guest_gsi); goto unlock; } @@ -1030,7 +1025,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, goto unlock; list_for_each_entry ( girq, &hvm_irq_dpci->girq[guest_gsi], list ) - __hvm_dpci_eoi(d, girq, ent); + __hvm_dpci_eoi(d, girq); unlock: spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 558426b772..9453b9b2b7 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -118,8 +118,7 @@ bool handle_mmio_with_translation(unsigned long gla, unsigned long gpfn, struct npfec); bool handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); -void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, - const union vioapic_redir_entry *ent); +void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq); void msix_write_completion(struct vcpu *); #ifdef CONFIG_HVM -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 15:22:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 15:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72860.131314 (Exim 4.92) (envelope-from ) id 1l2yGq-00014k-8J; Fri, 22 Jan 2021 15:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72860.131314; Fri, 22 Jan 2021 15:22:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGq-00014c-4q; Fri, 22 Jan 2021 15:22:44 +0000 Received: by outflank-mailman (input) for mailman id 72860; Fri, 22 Jan 2021 15:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGo-00014S-9o for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGo-0001p3-94 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2yGo-0006XD-7w for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15: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=VUd1dxnlF3PmiqXK9An/StS0kN/YSj+3zk3O2SCNl68=; b=v+XqIhKp8n+hS/nba1447XsyLJ wg1b0AkZrP+PEXYYxNwmox90LsMCxSeb0nWOJ4YKqPRpQyFr2BvRFkgZVpJu1s8EBtxWZeoZGsp1i KVGNbYhXTPLIauq99yl8cm/Lb4gGJTCGHtYEIUkIsp1WViJVNqjjnkvjEDN+um2C0pAY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/hypercall: fix gnttab hypercall args conditional build on pvshim Message-Id: Date: Fri, 22 Jan 2021 15:22:42 +0000 commit e44321d94f984890d8dd7488a0fbab9933fb29fc Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:19:09 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:19:09 2021 +0100 x86/hypercall: fix gnttab hypercall args conditional build on pvshim A pvshim build doesn't require the grant table functionality built in, but it does require knowing the number of arguments the hypercall has so the hypercall parameter clobbering works properly. Instead of also setting the argument count for the gnttab case if PV shim functionality is enabled, just drop all of the conditionals from hypercall_args_table, as a hypercall having a NULL handler won't get to use that information anyway. Note this hasn't been detected by osstest because the tools pvshim build is done without debug enabled, so the hypercall parameter clobbering doesn't happen. Fixes: d2151152dd2 ('xen: make grant table support configurable') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: b468b464c89e92629bd52cec58e9f51eee2e950a master date: 2021-01-08 16:51:52 +0100 --- xen/arch/x86/hypercall.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c index dd00983005..14da9bc4ad 100644 --- a/xen/arch/x86/hypercall.c +++ b/xen/arch/x86/hypercall.c @@ -47,9 +47,7 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(xen_version, 2), ARGS(console_io, 3), ARGS(physdev_op_compat, 1), -#ifdef CONFIG_GRANT_TABLE ARGS(grant_table_op, 3), -#endif ARGS(vm_assist, 2), COMP(update_va_mapping_otherdomain, 4, 5), ARGS(vcpu_op, 3), @@ -65,17 +63,11 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(sysctl, 1), ARGS(domctl, 1), ARGS(kexec_op, 2), -#ifdef CONFIG_ARGO ARGS(argo_op, 5), -#endif ARGS(xenpmu_op, 2), -#ifdef CONFIG_HVM ARGS(hvm_op, 2), ARGS(dm_op, 3), -#endif -#ifdef CONFIG_HYPFS ARGS(hypfs_op, 5), -#endif ARGS(mca, 1), ARGS(arch_1, 1), }; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 15:22:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 15:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72861.131317 (Exim 4.92) (envelope-from ) id 1l2yH0-00016I-9T; Fri, 22 Jan 2021 15:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72861.131317; Fri, 22 Jan 2021 15:22:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yH0-00016A-6M; Fri, 22 Jan 2021 15:22:54 +0000 Received: by outflank-mailman (input) for mailman id 72861; Fri, 22 Jan 2021 15:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGy-00015j-En for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yGy-0001pD-DC for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2yGy-0006Xn-Bb for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15: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=Fy1+bu3QN2ANhUyP0it6yzGHM2wDvGT/it2pQdOkIcI=; b=btbVt9U5ySVRlcKf9lPcx4Et8A lb8NQfPP75H8ln2HSu5Xs17ArScsAtTsjN1iIFAj+n8f8ohmKbFxsYP/EY+hNNq6qnkeGfkgvnisj vaScWmBuS+2ACoCueUeCi4GZmnEKbYwajTZ7upWI08tYVJViGjAc9oggE0SbMIOEuPTw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/ACPI: don't overwrite FADT Message-Id: Date: Fri, 22 Jan 2021 15:22:52 +0000 commit cad784fb8fcfd8f32ca4a787a95abbabc0059736 Author: Jan Beulich AuthorDate: Thu Jan 21 16:19:34 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:19:34 2021 +0100 x86/ACPI: don't overwrite FADT When marking fields invalid for our own purposes, we should do so in our local copy (so we will notice later on), not in the firmware provided one (which another entity may want to look at again, e.g. after kexec). Also mark the function parameter const to notice such issues right away. Instead use the pointer at the firmware copy for specifying an adjacent printk()'s arguments. If nothing else this at least reduces the number of relocations the assembler hasto emit and the linker has to process. Fixes: 62d1a69a4e9f ("ACPI: support v5 (reduced HW) sleep interface") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: 654c917d94d24587bb6b4a8d862baf04b25cbe33 master date: 2021-01-11 14:55:52 +0100 --- xen/arch/x86/acpi/boot.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index ed40ce56b4..38c2b76e00 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -349,7 +349,7 @@ static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) /* Get pm1x_cnt and pm1x_evt information for ACPI sleep */ static void __init -acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) +acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt) { struct acpi_table_facs *facs = NULL; uint64_t facs_pa; @@ -362,10 +362,10 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) printk(KERN_INFO PREFIX "v5 SLEEP INFO: control[%d:%"PRIx64"]," " status[%d:%"PRIx64"]\n", - acpi_sinfo.sleep_control.space_id, - acpi_sinfo.sleep_control.address, - acpi_sinfo.sleep_status.space_id, - acpi_sinfo.sleep_status.address); + fadt->sleep_control.space_id, + fadt->sleep_control.address, + fadt->sleep_status.space_id, + fadt->sleep_status.address); if ((fadt->sleep_control.address && (fadt->sleep_control.bit_offset || @@ -384,8 +384,8 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) fadt->sleep_status.bit_offset, fadt->sleep_status.bit_width, fadt->sleep_status.access_width); - fadt->sleep_control.address = 0; - fadt->sleep_status.address = 0; + acpi_sinfo.sleep_control.address = 0; + acpi_sinfo.sleep_status.address = 0; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 15:23:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 15:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72863.131322 (Exim 4.92) (envelope-from ) id 1l2yHA-00017v-CE; Fri, 22 Jan 2021 15:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72863.131322; Fri, 22 Jan 2021 15: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 1l2yHA-00017i-7v; Fri, 22 Jan 2021 15:23:04 +0000 Received: by outflank-mailman (input) for mailman id 72863; Fri, 22 Jan 2021 15:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yH8-00017W-Gm for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yH8-0001q0-G1 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2yH8-0006YS-FM for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15: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=uZfDRdJokSNo5ZWNVHGYEMSQ5sNGWfIdO3oCrJ66AC4=; b=Tf3/B4DVezVKICJENF5bCRko6y hx9MEbF1HUeMigy50soZTTI1tFLAwIjMQRP4TPI4vPVMh75gZ2OIfFraOYTXMdLJ1bhSew9qMQrp8 kX8YmneNgg02Y7XkgiTsAVVAK1/OKoDorP1VbRFZozSobwONrEsTBopXL1SmAjtf7n/E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] xen/memory: Fix compat XENMEM_acquire_resource for size requests Message-Id: Date: Fri, 22 Jan 2021 15:23:02 +0000 commit 7f99c05ded1999e9cf85a9d1f3586dfa45daa531 Author: Andrew Cooper AuthorDate: Thu Jan 21 16:20:00 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:20:00 2021 +0100 xen/memory: Fix compat XENMEM_acquire_resource for size requests Copy the nr_frames from the structure which actually has the correct value, so the caller doesn't unconditionally receive 0. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant master commit: 414be7b66349e7dca42bc1fd47c2b2f5b2d27432 master date: 2021-01-12 18:17:02 +0000 --- xen/common/compat/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 3851f756c7..ed92e05b08 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -599,7 +599,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) if ( __copy_field_to_guest( guest_handle_cast(compat, compat_mem_acquire_resource_t), - &cmp.mar, nr_frames) ) + nat.mar, nr_frames) ) return -EFAULT; } else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 15:23:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 15:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72865.131325 (Exim 4.92) (envelope-from ) id 1l2yHK-00019K-Cc; Fri, 22 Jan 2021 15:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72865.131325; Fri, 22 Jan 2021 15: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 1l2yHK-00019C-9V; Fri, 22 Jan 2021 15:23:14 +0000 Received: by outflank-mailman (input) for mailman id 72865; Fri, 22 Jan 2021 15:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yHI-000194-Ju for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yHI-0001q7-J7 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2yHI-0006ZM-IH for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15: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=V3O0y2jCnEMX1e4ctPL9BOAfnTwNqhe9toSoucv3XbY=; b=PUABGhT6azNCqVCSzTdPDzwPDt 81WI+v5ctzN4y/Z3+V15GEyoAfF2ftDzKhTIE4ScLXlyav2mBV9pk/3VVd1LfyzH7TGlqT86m6u7o mqdV+Im6t2e6TRLtKwtMTQuwI4ltJ5KYB+aNN2qM9e71Q/rfMC4jDCb+tM8/3zBT3dqE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/mem_sharing: fix uninitialized 'preempted' variable Message-Id: Date: Fri, 22 Jan 2021 15:23:12 +0000 commit 9028fd493a69b1e216239542d986240fa1ea7167 Author: Tamas K Lengyel AuthorDate: Thu Jan 21 16:20:27 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:20:27 2021 +0100 x86/mem_sharing: fix uninitialized 'preempted' variable UBSAN catches an uninitialized use of the 'preempted' variable in fork_hap_allocation when there is no preemption. Fixes: 41548c5472a ("mem_sharing: VM forking") Signed-off-by: Tamas K Lengyel Acked-by: Andrew Cooper master commit: cb34a2fa162184b150d48a3b6f385bacbec22ce7 master date: 2021-01-18 17:50:11 +0000 --- xen/arch/x86/mm/mem_sharing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index c428fd16ce..468bbcfa67 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1628,7 +1628,7 @@ static int copy_vcpu_settings(struct domain *cd, const struct domain *d) static int fork_hap_allocation(struct domain *cd, struct domain *d) { int rc; - bool preempted; + bool preempted = false; unsigned long mb = hap_get_allocation(d); if ( mb == hap_get_allocation(cd) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 15:23:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 15:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.72866.131328 (Exim 4.92) (envelope-from ) id 1l2yHU-0001Am-EP; Fri, 22 Jan 2021 15:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72866.131328; Fri, 22 Jan 2021 15: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 1l2yHU-0001Ae-Ax; Fri, 22 Jan 2021 15:23:24 +0000 Received: by outflank-mailman (input) for mailman id 72866; Fri, 22 Jan 2021 15:23:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yHS-0001AR-Mq for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:23:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2yHS-0001qJ-M4 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:23:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l2yHS-0006Zs-LU for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 15:23:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Xm+hi2nEbgWff/HilsuwJV13ePZFmLSrQNTw87U0U9Y=; b=jm40o7qCm2SNeT/D5g5koViJKK QJKmCxg8+6uv92llM9yVvrzq5eNWeDkvM6ucKDPUlY8GYz1BnerrOiVMV5OL71hr/aVU7KaO89Xfr mM4z8YoOKUNj1WF0g+HWjCrjq6MfKndAdbKOxKYeqTq0WwudX+hK3jVlbz1UuyD2D46Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/dpci: do not remove pirqs from domain tree on unbind Message-Id: Date: Fri, 22 Jan 2021 15:23:22 +0000 commit 4170218cb96546426664e5c1d00c5a848a26ae9e Author: Roger Pau Monné AuthorDate: Thu Jan 21 16:21:04 2021 +0100 Commit: Jan Beulich CommitDate: Thu Jan 21 16:21:04 2021 +0100 x86/dpci: do not remove pirqs from domain tree on unbind A fix for a previous issue removed the pirqs from the domain tree when they are unbound in order to prevent shared pirqs from triggering a BUG_ON in __pirq_guest_unbind if they are unbound multiple times. That caused free_domain_pirqs to no longer unmap the pirqs because they are gone from the domain pirq tree, thus leaving stale unbound pirqs after domain destruction if the domain had mapped dpci pirqs after shutdown. Take a different approach to fix the original issue, instead of removing the pirq from d->pirq_tree clear the flags of the dpci pirq struct to signal that the pirq is now unbound. This prevents calling pirq_guest_unbind multiple times for the same pirq without having to remove it from the domain pirq tree. This is XSA-360. Fixes: 5b58dad089 ('x86/pass-through: avoid double IRQ unbind during domain cleanup') Reported-by: Samuel Verschelde Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 58427889f5a420cc5226f88524b3228f90b72a58 master date: 2021-01-21 16:11:41 +0100 --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/pci.c | 27 ++++++++------------------- xen/include/asm-x86/hvm/irq.h | 2 -- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 37c86283cc..41800e1083 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1331,7 +1331,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d) } if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq ) - BUG_ON(!d->is_dying); + BUG(); } /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 2d6238a5bb..418b2cdf04 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -862,6 +862,10 @@ static int pci_clean_dpci_irq(struct domain *d, { struct dev_intx_gsi_link *digl, *tmp; + if ( !pirq_dpci->flags ) + /* Already processed. */ + return 0; + pirq_guest_unbind(d, dpci_pirq(pirq_dpci)); if ( pt_irq_need_timer(pirq_dpci->flags) ) @@ -872,15 +876,10 @@ static int pci_clean_dpci_irq(struct domain *d, list_del(&digl->list); xfree(digl); } + /* Note the pirq is now unbound. */ + pirq_dpci->flags = 0; - radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); - - if ( !pt_pirq_softirq_active(pirq_dpci) ) - return 0; - - domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; - - return -ERESTART; + return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; } static int pci_clean_dpci_irqs(struct domain *d) @@ -897,18 +896,8 @@ static int pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = 0; - - if ( hvm_irq_dpci->pending_pirq_dpci ) - { - if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) - ret = -ERESTART; - else - hvm_irq_dpci->pending_pirq_dpci = NULL; - } + int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); - if ( !ret ) - ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); if ( ret ) { spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index 532880d497..7f76f6c437 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -160,8 +160,6 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; - /* Clean up: Entry with a softirq invocation pending / in progress. */ - struct hvm_pirq_dpci *pending_pirq_dpci; }; /* Machine IRQ to guest device/intx mapping. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 18:44:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 18:44:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73053.131696 (Exim 4.92) (envelope-from ) id 1l31Pi-0007f7-Bs; Fri, 22 Jan 2021 18:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73053.131696; Fri, 22 Jan 2021 18:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Pi-0007ez-8u; Fri, 22 Jan 2021 18:44:06 +0000 Received: by outflank-mailman (input) for mailman id 73053; Fri, 22 Jan 2021 18:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Ph-0007eu-3R for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Ph-0005oV-0p for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l31Pg-0007Wq-VJ for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18: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=p7snx/ByjA9LuffJPYUHK/04fvfj+zJbI5JXFyJENW8=; b=Hd8h9/VLAIzaKmmdbfRPnmdTi8 WJsaX8VzYuz9W/670SzEsn95siH5W14sssMzDk5rVqpxfGtRg4MMSrnqMd9lMk8+LwyvTlntoHkmk GCmuF0M2IMGJ4MHWHumjJPoNVkAnyK1KrtX/lwXdaErnBs3sgFBTs9SoRHSfEhYp4Lcc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: Only quit on SIGTERM when a reload is possible Message-Id: Date: Fri, 22 Jan 2021 18:44:04 +0000 commit e663158bca89aa81ea567befc7c0f742568a6194 Author: Edwin Török AuthorDate: Fri Jan 8 11:57:37 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 14:55:10 2021 +0000 tools/oxenstored: Only quit on SIGTERM when a reload is possible Currently when oxenstored receives SIGTERM it dumps its state and quits. It is possible to then restart it if --restart is given, however that is not always safe: * Domains could have active transactions, and after a restart they would either reuse transaction IDs of already open transactions, or get an error back that the transaction doesn't exist * There could be pending data to send to a VM still in oxenstored's queue which would be lost * There could be pending input to be processed from a VM in oxenstored's queue which would be lost Prevent shutting down oxenstored via SIGTERM in the above situations. Also ignore domains marked as bad because oxenstored would never talk to them again. Signed-off-by: Edwin Török Reviewed-by: Pau Ruiz Safont Reviewed-by: Christian Lindig --- tools/ocaml/xenstored/connection.ml | 35 +++++++++++++++++++++++++++++++++++ tools/ocaml/xenstored/connections.ml | 8 ++++++++ tools/ocaml/xenstored/xenstored.ml | 13 +++++++++++-- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index fa0d3c4d92..bd02060cd0 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -290,6 +290,41 @@ let has_new_output con = Xenbus.Xb.has_new_output con.xb let peek_output con = Xenbus.Xb.peek_output con.xb let do_output con = Xenbus.Xb.output con.xb +let is_bad con = match con.dom with None -> false | Some dom -> Domain.is_bad_domain dom + +(* oxenstored currently only dumps limited information about its state. + A live update is only possible if any of the state that is not dumped would be empty. + Compared to https://xenbits.xen.org/docs/unstable/designs/xenstore-migration.html: + * GLOBAL_DATA: not strictly needed, systemd is giving the socket FDs to us + * CONNECTION_DATA: PARTIAL + * for domains: PARTIAL, see Connection.dump -> Domain.dump, only if data and tdomid is empty + * for sockets (Dom0 toolstack): NO + * WATCH_DATA: OK, see Connection.dump + * TRANSACTION_DATA: NO + * NODE_DATA: OK (except for transactions), see Store.dump_fct and DB.to_channel + + Also xenstored will never talk to a Domain once it is marked as bad, + so treat it as idle for live-update. + + Restrictions below can be relaxed once xenstored learns to dump more + of its live state in a safe way *) +let has_extra_connection_data con = + let has_in = has_input con in + let has_out = has_output con in + let has_socket = con.dom = None in + let has_nondefault_perms = make_perm con.dom <> con.perm in + has_in || has_out + || has_socket (* dom0 sockets not dumped yet *) + || has_nondefault_perms (* set_target not dumped yet *) + +let has_transaction_data con = + let n = number_of_transactions con in + dbg "%s: number of transactions = %d" (get_domstr con) n; + n > 0 + +let prevents_live_update con = not (is_bad con) + && (has_extra_connection_data con || has_transaction_data con) + let has_more_work con = has_more_input con || not (has_old_output con) && has_new_output con diff --git a/tools/ocaml/xenstored/connections.ml b/tools/ocaml/xenstored/connections.ml index 6ee3552ec2..82988f7e8d 100644 --- a/tools/ocaml/xenstored/connections.ml +++ b/tools/ocaml/xenstored/connections.ml @@ -194,3 +194,11 @@ let debug cons = let anonymous = Hashtbl.fold (fun _ con accu -> Connection.debug con :: accu) cons.anonymous [] in let domains = Hashtbl.fold (fun _ con accu -> Connection.debug con :: accu) cons.domains [] in String.concat "" (domains @ anonymous) + +let filter ~f cons = + let fold _ v acc = if f v then v :: acc else acc in + [] + |> Hashtbl.fold fold cons.anonymous + |> Hashtbl.fold fold cons.domains + +let prevents_quit cons = filter ~f:Connection.prevents_live_update cons diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 39d6d767e4..53d86618f2 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -20,6 +20,7 @@ open Parse_arg open Stdext let error fmt = Logging.error "xenstored" fmt +let warn fmt = Logging.warn "xenstored" fmt let debug fmt = Logging.debug "xenstored" fmt let info fmt = Logging.info "xenstored" fmt @@ -312,7 +313,9 @@ let _ = ); Sys.set_signal Sys.sighup (Sys.Signal_handle sighup_handler); - Sys.set_signal Sys.sigterm (Sys.Signal_handle (fun _ -> quit := true)); + Sys.set_signal Sys.sigterm (Sys.Signal_handle (fun _ -> + info "Received SIGTERM"; + quit := true)); Sys.set_signal Sys.sigusr1 (Sys.Signal_handle (fun _ -> sigusr1_handler store)); Sys.set_signal Sys.sigpipe Sys.Signal_ignore; @@ -424,6 +427,12 @@ let _ = ); let elapsed = Unix.gettimeofday () -. now in debug "periodic_ops took %F seconds." elapsed; + if !quit then ( + match Connections.prevents_quit cons with + | [] -> () + | domains -> List.iter (fun con -> warn "%s prevents live update" + (Connection.get_domstr con)) domains + ); delay_next_frequent_ops_by elapsed in @@ -475,7 +484,7 @@ let _ = in Systemd.sd_notify_ready (); - while not !quit + while not (!quit && Connections.prevents_quit cons = []) do try main_loop () -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 18:44:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 18:44:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73054.131700 (Exim 4.92) (envelope-from ) id 1l31Ps-0007g0-DM; Fri, 22 Jan 2021 18:44:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73054.131700; Fri, 22 Jan 2021 18:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Ps-0007fs-AS; Fri, 22 Jan 2021 18:44:16 +0000 Received: by outflank-mailman (input) for mailman id 73054; Fri, 22 Jan 2021 18:44:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Pr-0007fk-54 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Pr-0005oY-3o for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l31Pr-0007XM-2t for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qVdt4lYSJLi7DCMTBbj8x+4VUi6tCqjfEv8G9L16+sY=; b=Yw1vo7ybfokWMBNTzzUefM+j8Q 98PXnFzG5exKIlHVOcR5d1vU9+jjFx0gQ5GS/OFT3OKAJv0t5sHmF2ceEMG3GX6LOGhiYMaST5oMR F0TxdvViMq8PDih3AM+J3QLYIA3yL2+nkn1+cR5fHTKZ6Qnt6BCfOp80ynWJ7XT6i+RM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: Automatically resume when possible Message-Id: Date: Fri, 22 Jan 2021 18:44:15 +0000 commit 4387b4c771feaf0455ea3dc9b4b199f51166c721 Author: Edwin Török AuthorDate: Fri Jan 8 11:57:37 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 15:22:42 2021 +0000 tools/oxenstored: Automatically resume when possible When a `db` file exists use it to resume oxenstored. It will contains a xenstore tree, domain reconnection info, and watches. It is currently missing data about all active socket connections, so a toolstack should ideally be stopped and restarted too. Tell systemd about oxenstored's PID and allow it to restart on success. This should make updating oxenstored as easy as: `systemctl stop -s SIGTERM xenstored` on a suitable xenstored version. Signed-off-by: Edwin Török Reviewed-by: Pau Ruiz Safont Reviewed-by: Christian Lindig --- tools/ocaml/xenstored/xenstored.ml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 53d86618f2..a9894f0051 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -292,9 +292,8 @@ let _ = List.iter (fun path -> Store.write store Perms.Connection.full_rights path "") Store.Path.specials; - let filename = Paths.xen_run_stored ^ "/db" in - if cf.restart && Sys.file_exists filename then ( - DB.from_file store domains cons filename; + if cf.restart && Sys.file_exists Disk.xs_daemon_database then ( + DB.from_file store domains cons Disk.xs_daemon_database; Event.bind_dom_exc_virq eventchn ) else ( if !Disk.enable then ( @@ -320,7 +319,7 @@ let _ = Sys.set_signal Sys.sigpipe Sys.Signal_ignore; if cf.activate_access_log then begin - let post_rotate () = DB.to_file store cons (Paths.xen_run_stored ^ "/db") in + let post_rotate () = DB.to_file store cons Disk.xs_daemon_database in Logging.init_access_log post_rotate end; @@ -494,5 +493,8 @@ let _ = raise exc done; info "stopping xenstored"; - DB.to_file store cons (Paths.xen_run_stored ^ "/db"); + DB.to_file store cons Disk.xs_daemon_database; + (* unlink pidfile so that launch-xenstore works again *) + Unixext.unlink_safe pidfile; + (match cf.pidfile with Some pidfile -> Unixext.unlink_safe pidfile | None -> ()); () -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 18:44:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 18:44:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73055.131703 (Exim 4.92) (envelope-from ) id 1l31Q2-0007hI-Es; Fri, 22 Jan 2021 18:44:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73055.131703; Fri, 22 Jan 2021 18:44:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Q2-0007hA-Bx; Fri, 22 Jan 2021 18:44:26 +0000 Received: by outflank-mailman (input) for mailman id 73055; Fri, 22 Jan 2021 18:44:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Q1-0007h0-7w for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Q1-0005ol-7E for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l31Q1-0007Ze-5r for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18: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=x1JAk3rjLfgvucB92V+hPgFqlYchY5LwlJLKB6b4L5w=; b=6Bit3b+WbPQrCrK1mFNICAoCmI QaNorxhCwbAz2JETxE88J+ugTIlYkyYs2obuVRq5vRkLbg7BTBQmZfvj79ghVTO8NBlAJ8bTHNF7q RQXfMkOlkrZ1a623IY9f4PJC0VEu7InOrFThC+CU7hy0QF0oI5dDPiYp08PzClO4XWbM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: Add cooperative live-update command Message-Id: Date: Fri, 22 Jan 2021 18:44:25 +0000 commit 401c67e9bc8b80eff7589307dba498ae0bfdfea6 Author: Edwin Török AuthorDate: Fri Jan 8 11:57:37 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 16:49:21 2021 +0000 tools/oxenstored: Add cooperative live-update command See docs/misc/xenstore.txt for documentation on live-update command. Validate that the binary exists and that the cmdline is valid, to prevent typos from taking down xenstore; if live-update fails there is no way back due to the use of exec(). Live update only proceeds if there are no active transactions, and no unprocessed input or unflushed output. Signed-off-by: Edwin Török Reviewed-by: Pau Ruiz Safont Reviewed-by: Christian Lindig --- tools/ocaml/xenstored/process.ml | 109 +++++++++++++++++++++++++++++++++++++++ tools/ocaml/xenstored/stdext.ml | 6 +++ 2 files changed, 115 insertions(+) diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index 437d2dcf9e..bf18488094 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -15,6 +15,7 @@ *) let error fmt = Logging.error "process" fmt +let warn fmt = Logging.warn "process" fmt let info fmt = Logging.info "process" fmt let debug fmt = Logging.debug "process" fmt @@ -84,11 +85,119 @@ let create_implicit_path t perm path = List.iter (fun s -> Transaction.mkdir ~with_watch:false t perm s) ret ) +module LiveUpdate = struct +type t = + { binary: string + ; cmdline: string list + ; deadline: float + ; force: bool + ; pending: bool } + +let state = ref + { binary= Sys.executable_name + ; cmdline= [] + ; deadline= 0. + ; force= false + ; pending= false } + +let debug = Printf.eprintf + +let args_of_t t = (t.binary, "--restart" :: t.cmdline) + +let string_of_t t = + let executable, rest = args_of_t t in + Filename.quote_command executable rest + +let launch_exn t = + let executable, rest = args_of_t t in + let args = Array.of_list (executable :: rest) in + Unix.execv args.(0) args + +let validate_exn t = + (* --help must be last to check validity of earlier arguments *) + let t = {t with cmdline= t.cmdline @ ["--help"]} in + let cmd = string_of_t t in + debug "Executing %s" cmd ; + match Unix.fork () with + | 0 -> ( try launch_exn t with _ -> exit 2 ) + | pid -> ( + match Unix.waitpid [] pid with + | _, Unix.WEXITED 0 -> + debug "Live update validated cmdline %s" cmd; + t + | _, Unix.WEXITED n -> + invalid_arg (Printf.sprintf "Command %s exited with code %d" cmd n) + | _, Unix.WSIGNALED n -> + invalid_arg (Printf.sprintf "Command %s killed by ocaml signal number %d" cmd n) + | _, Unix.WSTOPPED n -> + invalid_arg (Printf.sprintf "Command %s stopped by ocaml signal number %d" cmd n) + ) + +let parse_live_update args = + try + (state := + match args with + | ["-f"; file] -> + validate_exn {!state with binary= file} + | ["-a"] -> + debug "Live update aborted" ; + {!state with pending= false} + | "-c" :: cmdline -> + validate_exn {!state with cmdline} + | "-s" :: _ -> + let timeout = ref 60 in + let force = ref false in + Arg.parse_argv ~current:(ref 1) (Array.of_list args) + [ ( "-t" + , Arg.Set_int timeout + , "timeout in seconds to wait for active transactions to finish" + ) + ; ( "-F" + , Arg.Set force + , "force live update to happen even with running transactions after timeout elapsed" + ) + ] + (fun x -> raise (Arg.Bad x)) + "live-update -s" ; + debug "Live update process queued" ; + {!state with deadline = Unix.gettimeofday () +. float !timeout + ; force= !force; pending= true} + | _ -> + invalid_arg ("Unknown arguments: " ^ String.concat "," args)) ; + None + with + | Arg.Bad s | Arg.Help s | Invalid_argument s -> + Some s + | Unix.Unix_error (e, fn, args) -> + Some (Printf.sprintf "%s(%s): %s" fn args (Unix.error_message e)) + + let should_run cons = + let t = !state in + if t.pending then begin + match Connections.prevents_quit cons with + | [] -> true + | _ when Unix.gettimeofday () < t.deadline -> false + | l -> + info "Live update timeout reached: %d active connections" (List.length l); + List.iter (fun con -> warn "%s prevents live update" (Connection.get_domstr con)) l; + if t.force then begin + warn "Live update forced, some domain connections may break!"; + true + end else begin + warn "Live update aborted, try migrating or shutting down the domains/toolstack"; + state := { t with pending = false }; + false + end + end else false +end + (* packets *) let do_debug con t _domains cons data = if not (Connection.is_dom0 con) && not !allow_debug then None else try match split None '\000' data with + | "live-update" :: params -> + LiveUpdate.parse_live_update params | "print" :: msg :: _ -> Logging.xb_op ~tid:0 ~ty:Xenbus.Xb.Op.Debug ~con:"=======>" msg; None diff --git a/tools/ocaml/xenstored/stdext.ml b/tools/ocaml/xenstored/stdext.ml index 4f2f3a2c8c..e1567c4dfa 100644 --- a/tools/ocaml/xenstored/stdext.ml +++ b/tools/ocaml/xenstored/stdext.ml @@ -44,6 +44,12 @@ let default d v = let maybe f v = match v with None -> () | Some x -> f x +module Filename = struct + include Filename + let quote_command cmd args = + cmd :: args |> List.map quote |> String.concat " " +end + module String = struct include String let of_char c = String.make 1 c -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 18:44:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 18:44:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73056.131709 (Exim 4.92) (envelope-from ) id 1l31QC-0007ik-H1; Fri, 22 Jan 2021 18:44:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73056.131709; Fri, 22 Jan 2021 18:44:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31QC-0007ia-DS; Fri, 22 Jan 2021 18:44:36 +0000 Received: by outflank-mailman (input) for mailman id 73056; Fri, 22 Jan 2021 18:44:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31QB-0007iR-BL for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31QB-0005ot-A7 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l31QB-0007aE-9Q for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=44q7s/x+qRtxvG3Pd4BasB9EhHOKUWGT08hYtSBARQY=; b=6uWznCW608K8XPxeVxwuc01aM6 jqAAc0omqCZiCnQ2zRpbQnkKqqkZt3cOfAE1NRdP9gQZqR62+4P8mMOWGSKF/Ijbt+P03TGvKk+Rj ZCl5T4TDIXIRbwb/HoSLG7YHWZMAbdyRNhq8hS1Voyl9m4sFIXm6npXhJxNlAhoe1Wqs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: Start live update process Message-Id: Date: Fri, 22 Jan 2021 18:44:35 +0000 commit 00c48f57ab3614e9ff1e16aa1d27ce4880d425ce Author: Edwin Török AuthorDate: Fri Jan 8 11:57:37 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 16:50:18 2021 +0000 tools/oxenstored: Start live update process Signed-off-by: Edwin Török Reviewed-by: Pau Ruiz Safont Reviewed-by: Christian Lindig --- tools/ocaml/xenstored/logging.ml | 3 +++ tools/ocaml/xenstored/process.ml | 6 ++++-- tools/ocaml/xenstored/xenstored.ml | 19 +++++++++++++++---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/tools/ocaml/xenstored/logging.ml b/tools/ocaml/xenstored/logging.ml index 1ede131329..39c3036155 100644 --- a/tools/ocaml/xenstored/logging.ml +++ b/tools/ocaml/xenstored/logging.ml @@ -327,6 +327,9 @@ let end_transaction ~tid ~con = if !access_log_transaction_ops && tid <> 0 then access_logging ~tid ~con (XbOp Xenbus.Xb.Op.Transaction_end) ~level:Debug +let live_update () = + xb_op ~tid:0 ~con:"" ~ty:Xenbus.Xb.Op.Debug "Live update begin" + let xb_answer ~tid ~con ~ty data = let print, level = match ty with | Xenbus.Xb.Op.Error when String.startswith "ENOENT" data -> !access_log_read_ops , Warn diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index bf18488094..7f7b72e1a1 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -111,6 +111,7 @@ let string_of_t t = let launch_exn t = let executable, rest = args_of_t t in let args = Array.of_list (executable :: rest) in + info "Launching %s, args: %s" executable (String.concat " " rest); Unix.execv args.(0) args let validate_exn t = @@ -147,7 +148,7 @@ let parse_live_update args = | "-s" :: _ -> let timeout = ref 60 in let force = ref false in - Arg.parse_argv ~current:(ref 1) (Array.of_list args) + Arg.parse_argv ~current:(ref 0) (Array.of_list args) [ ( "-t" , Arg.Set_int timeout , "timeout in seconds to wait for active transactions to finish" @@ -197,7 +198,8 @@ let do_debug con t _domains cons data = then None else try match split None '\000' data with | "live-update" :: params -> - LiveUpdate.parse_live_update params + let dropped_trailing_nul = params |> List.rev |> List.tl |> List.rev in + LiveUpdate.parse_live_update dropped_trailing_nul | "print" :: msg :: _ -> Logging.xb_op ~tid:0 ~ty:Xenbus.Xb.Op.Debug ~con:"=======>" msg; None diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index a9894f0051..b7b3b43f79 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -483,18 +483,29 @@ let _ = in Systemd.sd_notify_ready (); + let live_update = ref false in while not (!quit && Connections.prevents_quit cons = []) do try - main_loop () + main_loop (); + live_update := Process.LiveUpdate.should_run cons; + if !live_update || !quit then begin + (* don't initiate live update if saving state fails *) + DB.to_file store cons Disk.xs_daemon_database; + quit := true; + end with exc -> - error "caught exception %s" (Printexc.to_string exc); + let bt = Printexc.get_backtrace () in + error "caught exception %s: %s" (Printexc.to_string exc) bt; if cf.reraise_top_level then raise exc done; info "stopping xenstored"; - DB.to_file store cons Disk.xs_daemon_database; (* unlink pidfile so that launch-xenstore works again *) Unixext.unlink_safe pidfile; (match cf.pidfile with Some pidfile -> Unixext.unlink_safe pidfile | None -> ()); - () + + if !live_update then begin + Logging.live_update (); + Process.LiveUpdate.launch_exn !Process.LiveUpdate.state + end -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 18:44:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 18:44:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73057.131712 (Exim 4.92) (envelope-from ) id 1l31QM-0007k1-I6; Fri, 22 Jan 2021 18:44:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73057.131712; Fri, 22 Jan 2021 18:44:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31QM-0007jt-F7; Fri, 22 Jan 2021 18:44:46 +0000 Received: by outflank-mailman (input) for mailman id 73057; Fri, 22 Jan 2021 18:44:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31QL-0007jj-Ek for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31QL-0005p1-E2 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l31QL-0007au-CL for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pnX4KHrWGlfUmL2ME9qTES4a4r2ExmXMdCeAMlrkHUU=; b=nnZIg/+vYe0PiRZvJVtvGIDQcr f02c7srJT9Yi50Czx1Rcari/J9g6IinNZBIn4Ih+LQgG8NzscPAKquHRIX/EMqrBUeHhTtegrHKsw +Zj4xNU5AbwBv/FOU/LamAOLEz86l/zZD0geBumVgdJFEQN3x1UtEhvpCtq6rVsLBkiU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: Implement live update for socket connections Message-Id: Date: Fri, 22 Jan 2021 18:44:45 +0000 commit 42f0581a91d4340ae66768a29fd779f83415bdfe Author: Edwin Török AuthorDate: Fri Jan 8 11:57:37 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 18:01:33 2021 +0000 tools/oxenstored: Implement live update for socket connections Signed-off-by: Edwin Török Reviewed-by: Pau Ruiz Safont Reviewed-by: Christian Lindig --- tools/ocaml/xenstored/connection.ml | 25 +++++++---- tools/ocaml/xenstored/parse_arg.ml | 4 ++ tools/ocaml/xenstored/process.ml | 51 +++++++++++++++++------ tools/ocaml/xenstored/store.ml | 2 +- tools/ocaml/xenstored/utils.ml | 12 ++++++ tools/ocaml/xenstored/xenstored.ml | 82 ++++++++++++++++++++++++++++--------- 6 files changed, 134 insertions(+), 42 deletions(-) diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index bd02060cd0..a36ec4a821 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -281,6 +281,9 @@ let get_transaction con tid = let do_input con = Xenbus.Xb.input con.xb let has_input con = Xenbus.Xb.has_in_packet con.xb +let has_partial_input con = match con.xb.Xenbus.Xb.partial_in with + | HaveHdr _ -> true + | NoHdr (n, _) -> n < Xenbus.Partial.header_size () let pop_in con = Xenbus.Xb.get_in_packet con.xb let has_more_input con = Xenbus.Xb.has_more_input con.xb @@ -309,12 +312,13 @@ let is_bad con = match con.dom with None -> false | Some dom -> Domain.is_bad_do Restrictions below can be relaxed once xenstored learns to dump more of its live state in a safe way *) let has_extra_connection_data con = - let has_in = has_input con in + let has_in = has_input con || has_partial_input con in let has_out = has_output con in let has_socket = con.dom = None in let has_nondefault_perms = make_perm con.dom <> con.perm in has_in || has_out - || has_socket (* dom0 sockets not dumped yet *) + (* TODO: what about SIGTERM, should use systemd to store FDS + || has_socket (* dom0 sockets not * dumped yet *) *) || has_nondefault_perms (* set_target not dumped yet *) let has_transaction_data con = @@ -337,16 +341,21 @@ let stats con = Hashtbl.length con.watches, con.stat_nb_ops let dump con chan = - match con.dom with + let id = match con.dom with | Some dom -> let domid = Domain.get_id dom in (* dump domain *) Domain.dump dom chan; - (* dump watches *) - List.iter (fun (path, token) -> - Printf.fprintf chan "watch,%d,%s,%s\n" domid (Utils.hexify path) (Utils.hexify token) - ) (list_watches con); - | None -> () + domid + | None -> + let fd = con |> get_fd |> Utils.FD.to_int in + Printf.fprintf chan "socket,%d\n" fd; + -fd + in + (* dump watches *) + List.iter (fun (path, token) -> + Printf.fprintf chan "watch,%d,%s,%s\n" id (Utils.hexify path) (Utils.hexify token) + ) (list_watches con) let debug con = let domid = get_domstr con in diff --git a/tools/ocaml/xenstored/parse_arg.ml b/tools/ocaml/xenstored/parse_arg.ml index 2c4b5a8528..7c0478e76a 100644 --- a/tools/ocaml/xenstored/parse_arg.ml +++ b/tools/ocaml/xenstored/parse_arg.ml @@ -24,6 +24,7 @@ type config = pidfile: string option; (* old xenstored compatibility *) tracefile: string option; (* old xenstored compatibility *) restart: bool; + live_reload: bool; disable_socket: bool; } @@ -35,6 +36,7 @@ let do_argv = and reraise_top_level = ref false and config_file = ref "" and restart = ref false + and live_reload = ref false and disable_socket = ref false in @@ -52,6 +54,7 @@ let do_argv = ("--pid-file", Arg.Set_string pidfile, ""); (* for compatibility *) ("-T", Arg.Set_string tracefile, ""); (* for compatibility *) ("--restart", Arg.Set restart, "Read database on starting"); + ("--live", Arg.Set live_reload, "Read live dump on startup"); ("--disable-socket", Arg.Unit (fun () -> disable_socket := true), "Disable socket"); ] in let usage_msg = "usage : xenstored [--config-file ] [--no-domain-init] [--help] [--no-fork] [--reraise-top-level] [--restart] [--disable-socket]" in @@ -65,5 +68,6 @@ let do_argv = pidfile = if !pidfile <> "" then Some !pidfile else None; tracefile = if !tracefile <> "" then Some !tracefile else None; restart = !restart; + live_reload = !live_reload; disable_socket = !disable_socket; } diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index 7f7b72e1a1..584c03b332 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -91,18 +91,23 @@ type t = ; cmdline: string list ; deadline: float ; force: bool + ; result: string list ; pending: bool } let state = ref { binary= Sys.executable_name - ; cmdline= [] + ; cmdline= (Sys.argv |> Array.to_list |> List.tl) ; deadline= 0. ; force= false + ; result = [] ; pending= false } let debug = Printf.eprintf -let args_of_t t = (t.binary, "--restart" :: t.cmdline) +let forced_args = ["--live"; "--restart"] +let args_of_t t = + let filtered = List.filter (fun x -> not @@ List.mem x forced_args) t.cmdline in + (t.binary, forced_args @ filtered) let string_of_t t = let executable, rest = args_of_t t in @@ -116,11 +121,11 @@ let launch_exn t = let validate_exn t = (* --help must be last to check validity of earlier arguments *) - let t = {t with cmdline= t.cmdline @ ["--help"]} in - let cmd = string_of_t t in + let t' = {t with cmdline= t.cmdline @ ["--help"]} in + let cmd = string_of_t t' in debug "Executing %s" cmd ; match Unix.fork () with - | 0 -> ( try launch_exn t with _ -> exit 2 ) + | 0 -> ( try launch_exn t' with _ -> exit 2 ) | pid -> ( match Unix.waitpid [] pid with | _, Unix.WEXITED 0 -> @@ -142,10 +147,14 @@ let parse_live_update args = validate_exn {!state with binary= file} | ["-a"] -> debug "Live update aborted" ; - {!state with pending= false} + {!state with pending= false; result = []} | "-c" :: cmdline -> - validate_exn {!state with cmdline} + validate_exn {!state with cmdline = !state.cmdline @ cmdline} | "-s" :: _ -> + (match !state.pending, !state.result with + | true, _ -> !state (* no change to state, avoid resetting timeout *) + | false, _ :: _ -> !state (* we got a pending result to deliver *) + | false, [] -> let timeout = ref 60 in let force = ref false in Arg.parse_argv ~current:(ref 0) (Array.of_list args) @@ -162,10 +171,16 @@ let parse_live_update args = "live-update -s" ; debug "Live update process queued" ; {!state with deadline = Unix.gettimeofday () +. float !timeout - ; force= !force; pending= true} + ; force= !force; pending= true}) | _ -> invalid_arg ("Unknown arguments: " ^ String.concat "," args)) ; - None + match !state.pending, !state.result with + | true, _ -> Some "BUSY" + | false, (_ :: _ as result) -> + (* xenstore-control has read the result, clear it *) + state := { !state with result = [] }; + Some (String.concat "\n" result) + | false, [] -> None with | Arg.Bad s | Arg.Help s | Invalid_argument s -> Some s @@ -179,17 +194,27 @@ let parse_live_update args = | [] -> true | _ when Unix.gettimeofday () < t.deadline -> false | l -> - info "Live update timeout reached: %d active connections" (List.length l); - List.iter (fun con -> warn "%s prevents live update" (Connection.get_domstr con)) l; + warn "timeout reached: have to wait, migrate or shutdown %d domains:" (List.length l); + let msgs = List.rev_map (fun con -> Printf.sprintf "%s: %d tx, in: %b, out: %b, perm: %s" + (Connection.get_domstr con) + (Connection.number_of_transactions con) + (Connection.has_input con) + (Connection.has_output con) + (Connection.get_perm con |> Perms.Connection.to_string) + ) l in + List.iter (warn "Live-update: %s") msgs; if t.force then begin warn "Live update forced, some domain connections may break!"; true end else begin - warn "Live update aborted, try migrating or shutting down the domains/toolstack"; - state := { t with pending = false }; + warn "Live update aborted (see above for domains preventing it)"; + state := { t with pending = false; result = msgs}; false end end else false + + let completed () = + state := { !state with result = ["OK"] } end (* packets *) diff --git a/tools/ocaml/xenstored/store.ml b/tools/ocaml/xenstored/store.ml index e20767372f..a3be2e6bbe 100644 --- a/tools/ocaml/xenstored/store.ml +++ b/tools/ocaml/xenstored/store.ml @@ -366,7 +366,7 @@ let traversal root_node f = let rec _traversal path node = f path node; let node_path = Path.of_path_and_name path (Symbol.to_string node.Node.name) in - List.iter (_traversal node_path) node.Node.children + List.iter (_traversal node_path) (List.rev node.Node.children) in _traversal [] root_node diff --git a/tools/ocaml/xenstored/utils.ml b/tools/ocaml/xenstored/utils.ml index eb79bf0146..dd03b2b5bc 100644 --- a/tools/ocaml/xenstored/utils.ml +++ b/tools/ocaml/xenstored/utils.ml @@ -115,3 +115,15 @@ let path_validate path connection_path = if len > !Define.path_max then raise Define.Invalid_path; abs_path + +module FD : sig + type t = Unix.file_descr + val of_int: int -> t + val to_int : t -> int +end = struct + type t = Unix.file_descr + (* This is like Obj.magic but just for these types, + and relies on Unix.file_descr = int *) + external to_int : t -> int = "%identity" + external of_int : int -> t = "%identity" +end diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index b7b3b43f79..30edf4de6a 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -141,9 +141,12 @@ exception Bad_format of string let dump_format_header = "$xenstored-dump-format" -let from_channel_f chan domain_f watch_f store_f = +let from_channel_f chan global_f socket_f domain_f watch_f store_f = let unhexify s = Utils.unhexify s in - let getpath s = Store.Path.of_string (Utils.unhexify s) in + let getpath s = + let u = Utils.unhexify s in + debug "Path: %s" u; + Store.Path.of_string u in let header = input_line chan in if header <> dump_format_header then raise (Bad_format "header"); @@ -155,6 +158,12 @@ let from_channel_f chan domain_f watch_f store_f = let l = String.split ',' line in try match l with + | "global" :: rw :: _ -> + (* there might be more parameters here, + e.g. a RO socket from a previous version: ignore it *) + global_f ~rw + | "socket" :: fd :: [] -> + socket_f ~fd:(int_of_string fd) | "dom" :: domid :: mfn :: port :: []-> domain_f (int_of_string domid) (Nativeint.of_string mfn) @@ -175,12 +184,28 @@ let from_channel_f chan domain_f watch_f store_f = with End_of_file -> quit := true done; - () + info "Completed loading xenstore dump" let from_channel store cons doms chan = (* don't let the permission get on our way, full perm ! *) let op = Store.get_ops store Perms.Connection.full_rights in - + let rwro = ref (None) in + let global_f ~rw = + let get_listen_sock sockfd = + let fd = sockfd |> int_of_string |> Utils.FD.of_int in + Unix.listen fd 1; + Some fd + in + rwro := get_listen_sock rw + in + let socket_f ~fd = + let ufd = Utils.FD.of_int fd in + let is_valid = try (Unix.fstat ufd).Unix.st_kind = Unix.S_SOCK with _ -> false in + if is_valid then + Connections.add_anonymous cons ufd + else + warn "Ignoring invalid socket FD %d" fd + in let domain_f domid mfn port = let ndom = if domid > 0 then @@ -190,28 +215,38 @@ let from_channel store cons doms chan = in Connections.add_domain cons ndom; in - let watch_f domid path token = - let con = Connections.find_domain cons domid in - ignore (Connections.add_watch cons con path token) + let get_con id = + if id < 0 then Connections.find cons (Utils.FD.of_int (-id)) + else Connections.find_domain cons id + in + let watch_f id path token = + ignore (Connections.add_watch cons (get_con id) path token) in let store_f path perms value = op.Store.write path value; op.Store.setperms path perms in - from_channel_f chan domain_f watch_f store_f + from_channel_f chan global_f socket_f domain_f watch_f store_f; + !rwro let from_file store cons doms file = + info "Loading xenstore dump from %s" file; let channel = open_in file in finally (fun () -> from_channel store doms cons channel) (fun () -> close_in channel) -let to_channel store cons chan = +let to_channel store cons rw chan = let hexify s = Utils.hexify s in fprintf chan "%s\n" dump_format_header; + let fdopt = function None -> -1 | Some fd -> + (* systemd and utils.ml sets it close on exec *) + Unix.clear_close_on_exec fd; + Utils.FD.to_int fd in + fprintf chan "global,%d\n" (fdopt rw); - (* dump connections related to domains; domid, mfn, eventchn port, watches *) - Connections.iter_domains cons (fun con -> Connection.dump con chan); + (* dump connections related to domains: domid, mfn, eventchn port/ sockets, and watches *) + Connections.iter cons (fun con -> Connection.dump con chan); (* dump the store *) Store.dump_fct store (fun path node -> @@ -224,9 +259,9 @@ let to_channel store cons chan = () -let to_file store cons file = +let to_file store cons fds file = let channel = open_out_gen [ Open_wronly; Open_creat; Open_trunc; ] 0o600 file in - finally (fun () -> to_channel store cons channel) + finally (fun () -> to_channel store cons fds channel) (fun () -> close_out channel) end @@ -246,13 +281,13 @@ let _ = ); let rw_sock = - if cf.disable_socket then + if cf.disable_socket || cf.live_reload then None else Some (Unix.handle_unix_error Utils.create_unix_socket Define.xs_daemon_socket) in - if cf.daemonize then + if cf.daemonize && not cf.live_reload then Unixext.daemonize () else printf "Xen Storage Daemon, version %d.%d\n%!" @@ -292,10 +327,15 @@ let _ = List.iter (fun path -> Store.write store Perms.Connection.full_rights path "") Store.Path.specials; + let rw_sock = if cf.restart && Sys.file_exists Disk.xs_daemon_database then ( - DB.from_file store domains cons Disk.xs_daemon_database; - Event.bind_dom_exc_virq eventchn + let rwro = DB.from_file store domains cons Disk.xs_daemon_database in + info "Live reload: database loaded"; + Event.bind_dom_exc_virq eventchn; + Process.LiveUpdate.completed (); + rwro ) else ( + info "No live reload: regular startup"; if !Disk.enable then ( info "reading store from disk"; Disk.read store @@ -309,7 +349,8 @@ let _ = Connections.add_domain cons (Domains.create0 domains); Event.bind_dom_exc_virq eventchn ); - ); + rw_sock + ) in Sys.set_signal Sys.sighup (Sys.Signal_handle sighup_handler); Sys.set_signal Sys.sigterm (Sys.Signal_handle (fun _ -> @@ -319,7 +360,7 @@ let _ = Sys.set_signal Sys.sigpipe Sys.Signal_ignore; if cf.activate_access_log then begin - let post_rotate () = DB.to_file store cons Disk.xs_daemon_database in + let post_rotate () = DB.to_file store cons (None) Disk.xs_daemon_database in Logging.init_access_log post_rotate end; @@ -362,6 +403,7 @@ let _ = let ring_scan_checker dom = (* no need to scan domains already marked as for processing *) if not (Domain.get_io_credit dom > 0) then + debug "Looking up domid %d" (Domain.get_id dom); let con = Connections.find_domain cons (Domain.get_id dom) in if not (Connection.has_more_work con) then ( Process.do_output store cons domains con; @@ -491,7 +533,7 @@ let _ = live_update := Process.LiveUpdate.should_run cons; if !live_update || !quit then begin (* don't initiate live update if saving state fails *) - DB.to_file store cons Disk.xs_daemon_database; + DB.to_file store cons (rw_sock) Disk.xs_daemon_database; quit := true; end with exc -> -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 18:44:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 18:44:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73058.131716 (Exim 4.92) (envelope-from ) id 1l31QW-0007lh-L8; Fri, 22 Jan 2021 18:44:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73058.131716; Fri, 22 Jan 2021 18:44: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 1l31QW-0007lZ-IE; Fri, 22 Jan 2021 18:44:56 +0000 Received: by outflank-mailman (input) for mailman id 73058; Fri, 22 Jan 2021 18:44:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31QV-0007lD-Il for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31QV-0005pR-Hc for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l31QV-0007bm-Gl for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:44: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=NGQH23YarmixDpJJ5HJ326i1Kj4w9Ng3/f6YqmEaq3k=; b=ixyGF49wr3U6tdE9+jChM8iR6n rilrNODVmq8hNzOHJ5wSyqgU1kJhmuzxW7S7/7bo/6VpqQditygnceMsKf7qtTmBvnq+LuKu6hu5g 4ORxJQRhjLWki+5ShvhpdLJJ9zSQq60DJMQ2TtFTsawmpSfqK7CfANLrr9zTOEpyIsYc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: Trim txhistory on xenbus reconnect Message-Id: Date: Fri, 22 Jan 2021 18:44:55 +0000 commit 2a47797d1f3b14aab4f0368ab833abd311f94a70 Author: Edwin Török AuthorDate: Fri Jan 8 11:57:37 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 18:01:34 2021 +0000 tools/oxenstored: Trim txhistory on xenbus reconnect There is a global history, containing transactions from the past 0.05s, which get trimmed whenever any transaction commits or aborts. Destroying a domain will cause xenopsd to perform some transactions deleting the tree, so that is fine. But I think that a domain can abuse the xenbus reconnect facility to cause a large history to be recorded - provided that noone does any transactions on the system inbetween, which may be difficult to achieve given squeezed's constant pinging. The theoretical situation is like this: - a domain starts a transaction, creates as large a tree as it can, commits it. Then repeatedly: - start a transaction, do nothing with it, start a transaction, delete part of the large tree, write some new unique data there, don't commit - cause a xenbus reconnect (I think this can be done by writing something to the ring). This causes all transactions/watches for the connection to be cleared, but NOT the history, there were no commits, so nobody trimmed the history, i.e. it the history can contain transactions from more than just 0.05s - loop back and start more transactions, you can keep this up indefinitely without hitting quotas Now there is a periodic History.trim running every 0.05s, so I don't think you can do much damage with it. But lets be safe an trim the transaction history anyway on reconnect. Signed-off-by: Edwin Török Acked-by: Christian Lindig --- tools/ocaml/xenstored/connection.ml | 2 +- tools/ocaml/xenstored/history.ml | 4 ++++ tools/ocaml/xenstored/process.ml | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index a36ec4a821..684f7a3861 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -47,7 +47,7 @@ let mark_as_bad con = let initial_next_tid = 1 -let reconnect con = +let do_reconnect con = Xenbus.Xb.reconnect con.xb; (* dom is the same *) Hashtbl.clear con.transactions; diff --git a/tools/ocaml/xenstored/history.ml b/tools/ocaml/xenstored/history.ml index f39565bff5..3899353da8 100644 --- a/tools/ocaml/xenstored/history.ml +++ b/tools/ocaml/xenstored/history.ml @@ -53,6 +53,10 @@ let end_transaction txn con tid commit = trim ~txn (); success +let reconnect con = + trim (); + Connection.do_reconnect con + let push (x: history_record) = let dom = x.con.Connection.dom in match dom with diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index 584c03b332..27790d4a5c 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -702,7 +702,7 @@ let do_input store cons doms con = Connection.do_input con with Xenbus.Xb.Reconnect -> info "%s requests a reconnect" (Connection.get_domstr con); - Connection.reconnect con; + History.reconnect con; info "%s reconnection complete" (Connection.get_domstr con); false | Failure exp -> @@ -741,7 +741,7 @@ let do_output _store _cons _doms con = ignore (Connection.do_output con) with Xenbus.Xb.Reconnect -> info "%s requests a reconnect" (Connection.get_domstr con); - Connection.reconnect con; + History.reconnect con; info "%s reconnection complete" (Connection.get_domstr con) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 18:45:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 18:45:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73059.131720 (Exim 4.92) (envelope-from ) id 1l31Qg-0007n0-Ma; Fri, 22 Jan 2021 18:45:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73059.131720; Fri, 22 Jan 2021 18:45: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 1l31Qg-0007ms-Jl; Fri, 22 Jan 2021 18:45:06 +0000 Received: by outflank-mailman (input) for mailman id 73059; Fri, 22 Jan 2021 18:45:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Qf-0007mk-MO for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Qf-0005pz-LH for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l31Qf-0007cd-Jz for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45: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=PPOLSsiuDVt36NImcZ9WAAzI0fFU8yQ2UDlzcM/xH/8=; b=oooO4SR6UIcXrB+0ZW5WJgsX3A ANm3jolT/xBImghxs8S8c84IvhQ5nCLCOcmA7eRJnHd/xycbk0aX8n1f3XP7bDB7gbLh/uzNvis3Y 9z116hI2WIewsg5gp2+MdU+rKaQgkdOanOUzmk+WrSKdrlrSEvJxBpaZs5A8cJSHlqd4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/ocaml/libs/xc: Backward compatible domid control at domain creation time Message-Id: Date: Fri, 22 Jan 2021 18:45:05 +0000 commit 4522321ced5ddbda5e74e20c52b0b88f96914fb5 Author: Edwin Török AuthorDate: Fri Jan 8 11:57:37 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 18:01:34 2021 +0000 tools/ocaml/libs/xc: Backward compatible domid control at domain creation time One can specify the domid to use when creating the domain, but this was hardcoded to 0. Keep the existing `domain_create` function, and make domid an optional argument. When not specified, default to 0. Controlling the domid can be useful during testing or migration. Signed-off-by: Edwin Török Acked-by: Christian Lindig Acked-by: Andrew Cooper --- tools/ocaml/libs/xc/xenctrl.ml | 5 ++++- tools/ocaml/libs/xc/xenctrl.mli | 4 ++-- tools/ocaml/libs/xc/xenctrl_stubs.c | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index e878699b0a..e0a47c4769 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -179,9 +179,12 @@ let with_intf f = handle := Some h; f h -external domain_create: handle -> domctl_create_config -> domid +external domain_create_stub: handle -> domid -> domctl_create_config -> domid = "stub_xc_domain_create" +let domain_create handle ?(domid=0) config = + domain_create_stub handle domid config + external domain_sethandle: handle -> domid -> string -> unit = "stub_xc_domain_sethandle" diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index e64907df8e..84311fa33d 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -143,8 +143,8 @@ val get_handle: unit -> handle option * would invalidate the handle that with_intf passes to its argument. *) val close_handle: unit -> unit -external domain_create : handle -> domctl_create_config -> domid - = "stub_xc_domain_create" +val domain_create: handle -> ?domid:int -> domctl_create_config -> domid + external domain_sethandle : handle -> domid -> string -> unit = "stub_xc_domain_sethandle" external domain_max_vcpus : handle -> domid -> int -> unit = "stub_xc_domain_max_vcpus" diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 94aba38a42..9a8dbe5579 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -175,9 +175,9 @@ static unsigned int ocaml_list_to_c_bitmap(value l) return val; } -CAMLprim value stub_xc_domain_create(value xch, value config) +CAMLprim value stub_xc_domain_create(value xch, value wanted_domid, value config) { - CAMLparam2(xch, config); + CAMLparam3(xch, wanted_domid, config); CAMLlocal2(l, arch_domconfig); /* Mnemonics for the named fields inside domctl_create_config */ @@ -191,7 +191,7 @@ CAMLprim value stub_xc_domain_create(value xch, value config) #define VAL_MAX_MAPTRACK_FRAMES Field(config, 7) #define VAL_ARCH Field(config, 8) - uint32_t domid = 0; + uint32_t domid = Int_val(wanted_domid); int result; struct xen_domctl_createdomain cfg = { .ssidref = Int32_val(VAL_SSIDREF), -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 18:45:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 18:45:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73060.131724 (Exim 4.92) (envelope-from ) id 1l31Qq-0007ny-OA; Fri, 22 Jan 2021 18:45:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73060.131724; Fri, 22 Jan 2021 18:45: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 1l31Qq-0007nq-LI; Fri, 22 Jan 2021 18:45:16 +0000 Received: by outflank-mailman (input) for mailman id 73060; Fri, 22 Jan 2021 18:45:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Qp-0007nj-QB for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Qp-0005qA-OS for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l31Qp-0007dG-NX for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45: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=mzinjz7ZThR6Y/2O/5DbCpmxUMBpGa+7ybZt4W7XFnU=; b=IqDYDAbYvo0YyWQCwkGb5gnnGW uxKUL8w+GH7K4RWMGWgATyQNUdxAWGDokBwK8v3usWlrlr4mijVCGie587PKIc3Pz4kZp3u5oF/l/ a4+lZ5HWPvqRy6oIOP33XSxlggzOmcvGrFNmwmbcArKUaJLuE+tgc9jpf2f2tfzQZDSQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: Replace hand rolled GC with weak GC references Message-Id: Date: Fri, 22 Jan 2021 18:45:15 +0000 commit 5e115dcf76f61543fb734baf4a60fc1902398113 Author: Edwin Török AuthorDate: Fri Jan 8 11:57:37 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 18:01:34 2021 +0000 tools/oxenstored: Replace hand rolled GC with weak GC references The code here is attempting to reduce memory usage by sharing common substrings in the tree: it replaces strings with ints, and keeps a string->int map that gets manually garbage collected using a hand-rolled mark and sweep algorithm. This is unnecessary: OCaml already has a mark-and-sweep Garbage Collector runtime, and sharing of common strings in tree nodes can be achieved through Weak references: if the string hasn't been seen yet it gets added to the Weak reference table, and if it has we use the entry from the table instead, thus storing a string only once. When the string is no longer referenced OCaml's GC will drop it from the weak table: there is no need to manually do a mark-and-sweep, or to tell OCaml when to drop it. Signed-off-by: Edwin Török Acked-by: Christian Lindig --- tools/ocaml/xenstored/connection.ml | 3 -- tools/ocaml/xenstored/history.ml | 14 -------- tools/ocaml/xenstored/store.ml | 11 +++--- tools/ocaml/xenstored/symbol.ml | 68 ++++++++----------------------------- tools/ocaml/xenstored/symbol.mli | 21 +++--------- tools/ocaml/xenstored/xenstored.ml | 16 ++------- 6 files changed, 24 insertions(+), 109 deletions(-) diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index 684f7a3861..d09a0fa405 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -334,9 +334,6 @@ let has_more_work con = let incr_ops con = con.stat_nb_ops <- con.stat_nb_ops + 1 -let mark_symbols con = - Hashtbl.iter (fun _ t -> Store.mark_symbols (Transaction.get_store t)) con.transactions - let stats con = Hashtbl.length con.watches, con.stat_nb_ops diff --git a/tools/ocaml/xenstored/history.ml b/tools/ocaml/xenstored/history.ml index 3899353da8..ba5c9cb571 100644 --- a/tools/ocaml/xenstored/history.ml +++ b/tools/ocaml/xenstored/history.ml @@ -22,20 +22,6 @@ type history_record = { let history : history_record list ref = ref [] -(* Called from periodic_ops to ensure we don't discard symbols that are still needed. *) -(* There is scope for optimisation here, since in consecutive commits one commit's `after` - * is the same thing as the next commit's `before`, but not all commits in history are - * consecutive. *) -let mark_symbols () = - (* There are gaps where dom0's commits are missing. Otherwise we could assume that - * each element's `before` is the same thing as the next element's `after` - * since the next element is the previous commit *) - List.iter (fun hist_rec -> - Store.mark_symbols hist_rec.before; - Store.mark_symbols hist_rec.after; - ) - !history - (* Keep only enough commit-history to protect the running transactions that we are still tracking *) (* There is scope for optimisation here, replacing List.filter with something more efficient, * probably on a different list-like structure. *) diff --git a/tools/ocaml/xenstored/store.ml b/tools/ocaml/xenstored/store.ml index a3be2e6bbe..9c226e4ef7 100644 --- a/tools/ocaml/xenstored/store.ml +++ b/tools/ocaml/xenstored/store.ml @@ -46,18 +46,18 @@ let add_child node child = let exists node childname = let childname = Symbol.of_string childname in - List.exists (fun n -> n.name = childname) node.children + List.exists (fun n -> Symbol.equal n.name childname) node.children let find node childname = let childname = Symbol.of_string childname in - List.find (fun n -> n.name = childname) node.children + List.find (fun n -> Symbol.equal n.name childname) node.children let replace_child node child nchild = (* this is the on-steroid version of the filter one-replace one *) let rec replace_one_in_list l = match l with | [] -> [] - | h :: tl when h.name = child.name -> nchild :: tl + | h :: tl when Symbol.equal h.name child.name -> nchild :: tl | h :: tl -> h :: replace_one_in_list tl in { node with children = (replace_one_in_list node.children) } @@ -67,7 +67,7 @@ let del_childname node childname = let rec delete_one_in_list l = match l with | [] -> raise Not_found - | h :: tl when h.name = sym -> tl + | h :: tl when Symbol.equal h.name sym -> tl | h :: tl -> h :: delete_one_in_list tl in { node with children = (delete_one_in_list node.children) } @@ -489,9 +489,6 @@ let copy store = { quota = Quota.copy store.quota; } -let mark_symbols store = - Node.recurse (fun node -> Symbol.mark_as_used node.Node.name) store.root - let incr_transaction_coalesce store = store.stat_transaction_coalesce <- store.stat_transaction_coalesce + 1 let incr_transaction_abort store = diff --git a/tools/ocaml/xenstored/symbol.ml b/tools/ocaml/xenstored/symbol.ml index 4420c6a4d7..2b41d120f6 100644 --- a/tools/ocaml/xenstored/symbol.ml +++ b/tools/ocaml/xenstored/symbol.ml @@ -14,63 +14,23 @@ * GNU Lesser General Public License for more details. *) -type t = int +module WeakTable = Weak.Make(struct + type t = string + let equal (x:string) (y:string) = (x = y) + let hash = Hashtbl.hash +end) -type 'a record = { data: 'a; mutable garbage: bool } -let int_string_tbl : (int,string record) Hashtbl.t = Hashtbl.create 1024 -let string_int_tbl : (string,int) Hashtbl.t = Hashtbl.create 1024 +type t = string -let created_counter = ref 0 -let used_counter = ref 0 +let tbl = WeakTable.create 1024 -let count = ref 0 -let rec fresh () = - if Hashtbl.mem int_string_tbl !count - then begin - incr count; - fresh () - end else - !count +let of_string s = WeakTable.merge tbl s +let to_string s = s -let new_record v = { data=v; garbage=false } - -let of_string name = - if Hashtbl.mem string_int_tbl name - then begin - incr used_counter; - Hashtbl.find string_int_tbl name - end else begin - let i = fresh () in - incr created_counter; - Hashtbl.add string_int_tbl name i; - Hashtbl.add int_string_tbl i (new_record name); - i - end - -let to_string i = - (Hashtbl.find int_string_tbl i).data - -let mark_all_as_unused () = - Hashtbl.iter (fun _ v -> v.garbage <- true) int_string_tbl - -let mark_as_used symb = - let record1 = Hashtbl.find int_string_tbl symb in - record1.garbage <- false - -let garbage () = - let records = Hashtbl.fold (fun symb record accu -> - if record.garbage then (symb, record.data) :: accu else accu - ) int_string_tbl [] in - let remove (int,string) = - Hashtbl.remove int_string_tbl int; - Hashtbl.remove string_int_tbl string - in - created_counter := 0; - used_counter := 0; - List.iter remove records +let equal a b = + (* compare using physical equality, both members have to be part of the above weak table *) + a == b let stats () = - Hashtbl.length string_int_tbl - -let created () = !created_counter -let used () = !used_counter + let len, entries, _, _, _, _ = WeakTable.stats tbl in + len, entries diff --git a/tools/ocaml/xenstored/symbol.mli b/tools/ocaml/xenstored/symbol.mli index c3c9f6e2f8..586ab57507 100644 --- a/tools/ocaml/xenstored/symbol.mli +++ b/tools/ocaml/xenstored/symbol.mli @@ -29,24 +29,11 @@ val of_string : string -> t val to_string : t -> string (** Convert a symbol into a string. *) -(** {6 Garbage Collection} *) - -(** Symbols need to be regulary garbage collected. The following steps should be followed: -- mark all the knowns symbols as unused (with [mark_all_as_unused]); -- mark all the symbols really usefull as used (with [mark_as_used]); and -- finally, call [garbage] *) - -val mark_all_as_unused : unit -> unit -val mark_as_used : t -> unit -val garbage : unit -> unit +val equal: t -> t -> bool +(** Compare two symbols for equality *) (** {6 Statistics } *) -val stats : unit -> int -(** Get the number of used symbols. *) - -val created : unit -> int -(** Returns the number of symbols created since the last GC. *) +val stats : unit -> int * int +(** Get the table size and number of entries. *) -val used : unit -> int -(** Returns the number of existing symbols used since the last GC *) diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 30edf4de6a..d44ae673c4 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -424,18 +424,6 @@ let _ = let periodic_ops now = debug "periodic_ops starting"; - (* we garbage collect the string->int dictionary after a sizeable amount of operations, - * there's no need to be really fast even if we got loose - * objects since names are often reuse. - *) - if Symbol.created () > 1000 || Symbol.used () > 20000 - then begin - Symbol.mark_all_as_unused (); - Store.mark_symbols store; - Connections.iter cons Connection.mark_symbols; - History.mark_symbols (); - Symbol.garbage () - end; (* scan all the xs rings as a safenet for ill-behaved clients *) if !ring_scan_interval >= 0 && now > (!last_scan_time +. float !ring_scan_interval) then @@ -453,11 +441,11 @@ let _ = let (lanon, lanon_ops, lanon_watchs, ldom, ldom_ops, ldom_watchs) = Connections.stats cons in let store_nodes, store_abort, store_coalesce = Store.stats store in - let symtbl_len = Symbol.stats () in + let symtbl_len, symtbl_entries = Symbol.stats () in info "store stat: nodes(%d) t-abort(%d) t-coalesce(%d)" store_nodes store_abort store_coalesce; - info "sytbl stat: %d" symtbl_len; + info "sytbl stat: length(%d) entries(%d)" symtbl_len symtbl_entries; info " con stat: anonymous(%d, %d o, %d w) domains(%d, %d o, %d w)" lanon lanon_ops lanon_watchs ldom ldom_ops ldom_watchs; info " mem stat: minor(%.0f) promoted(%.0f) major(%.0f) heap(%d w, %d c) live(%d w, %d b) free(%d w, %d b)" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 18:45:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 18:45:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73061.131728 (Exim 4.92) (envelope-from ) id 1l31R0-0007p7-PX; Fri, 22 Jan 2021 18:45:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73061.131728; Fri, 22 Jan 2021 18:45: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 1l31R0-0007oz-Mi; Fri, 22 Jan 2021 18:45:26 +0000 Received: by outflank-mailman (input) for mailman id 73061; Fri, 22 Jan 2021 18:45:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Qz-0007os-S8 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31Qz-0005qH-RM for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l31Qz-0007eF-Qc for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45: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=yFRcln/V2xriwu+b/mt0P89UNFq6Z4/Ttv1aerrys48=; b=0WpmoAyg34nUtAFkX7ggGo4KE7 lJCL+ZobUKXD9YcPd2jcqN9HQruZ7eMAcR1mfP61976VhAQ/i/bjAqzUqnQ0/2EXhobrLnv8KSGWU rhBNiTCgV1/itVOEFhLyy1mjizPRZMDXV9426ww4M5hpm93r2DvP6BSFpqBnKSsRWpNE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: Backport find_opt/update from 4.06 Message-Id: Date: Fri, 22 Jan 2021 18:45:25 +0000 commit faf02c345ec0b2a5bbd45b4f94ffd59e75a42435 Author: Edwin Török AuthorDate: Fri Jan 8 11:57:37 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 18:01:34 2021 +0000 tools/oxenstored: Backport find_opt/update from 4.06 We are currently on OCaml 4.02 as minimum version. To make the followup optimizations compile backport these functions from OCaml 4.06. This implementation is less efficient than the one in the 4.06 standard library which has access to the internals of the Map. Signed-off-by: Edwin Török Acked-by: Christian Lindig --- tools/ocaml/xenstored/stdext.ml | 19 +++++++++++++++++++ tools/ocaml/xenstored/trie.ml | 2 ++ 2 files changed, 21 insertions(+) diff --git a/tools/ocaml/xenstored/stdext.ml b/tools/ocaml/xenstored/stdext.ml index e1567c4dfa..116920917a 100644 --- a/tools/ocaml/xenstored/stdext.ml +++ b/tools/ocaml/xenstored/stdext.ml @@ -50,6 +50,25 @@ module Filename = struct cmd :: args |> List.map quote |> String.concat " " end +module Map = struct + module Make(Ord: Map.OrderedType) = struct + + include Map.Make(Ord) + + let find_opt k t = try Some (find k t) with Not_found -> None + + let update k f t = + let r = find_opt k t in + let r' = f r in + match r, r' with + | None, None -> t + | Some _, None -> remove k t + | Some r, Some r' when r == r' -> t + | _, Some r' -> add k r' t + + end +end + module String = struct include String let of_char c = String.make 1 c diff --git a/tools/ocaml/xenstored/trie.ml b/tools/ocaml/xenstored/trie.ml index dc42535092..f513f4e608 100644 --- a/tools/ocaml/xenstored/trie.ml +++ b/tools/ocaml/xenstored/trie.ml @@ -13,6 +13,8 @@ * GNU Lesser General Public License for more details. *) +open Stdext + module Node = struct type ('a,'b) t = { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 18:45:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 18:45:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73062.131732 (Exim 4.92) (envelope-from ) id 1l31RA-0007qO-R6; Fri, 22 Jan 2021 18:45:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73062.131732; Fri, 22 Jan 2021 18:45: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 1l31RA-0007qG-OC; Fri, 22 Jan 2021 18:45:36 +0000 Received: by outflank-mailman (input) for mailman id 73062; Fri, 22 Jan 2021 18:45:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31R9-0007q5-Uw for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31R9-0005s8-UE for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l31R9-0007fA-TU for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45: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=CEBR/9f8tn0rrFJll1Ybnw7Kv2vg3QiKpp6kf/7yugw=; b=j4YCABGRgJetZMvKAHAxytwoTM lQkwnHd2A3K+6bO+D0pYkj1vJPVIjqNGME48vZMwpmZtXwvLslUoujTZLipT21lSSoxgASQYj3eBX /5pTC6QfOfZAYYXl0cGHmJM9EVWYhLKtnCrPXhZV1+WFnqTgd2ymgfnT1kxaGN+7Y1Co=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: Use more efficient node trees Message-Id: Date: Fri, 22 Jan 2021 18:45:35 +0000 commit 3068dfd6415ae7db06112853581b7cbbcecadc2c Author: Edwin Török AuthorDate: Fri Jan 8 11:57:37 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 18:01:35 2021 +0000 tools/oxenstored: Use more efficient node trees This changes the output of xenstore-ls to be sorted. Previously the keys were listed in the order in which they were inserted in. docs/misc/xenstore.txt doesn't specify in what order keys are listed. Map.update is used to retain semantics with replace_child: only an existing child is replaced, if it wasn't part of the original map we don't add it. Similarly exception behaviour is retained for del_childname and related functions. Entries are stored in reverse sort order, so that upon Map.fold the constructed list is sorted in ascending order and there is no need for a List.rev. This changes the semantics and is not suitable as is for a backport. It reveals bugs in buggy clients that depend on xenstore entry order, however those clients should be fixed. Signed-off-by: Edwin Török Acked-by: Christian Lindig --- tools/ocaml/xenstored/store.ml | 48 +++++++++++++++++++--------------------- tools/ocaml/xenstored/symbol.ml | 4 ++++ tools/ocaml/xenstored/symbol.mli | 3 +++ 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/tools/ocaml/xenstored/store.ml b/tools/ocaml/xenstored/store.ml index 9c226e4ef7..1bd0c81f6f 100644 --- a/tools/ocaml/xenstored/store.ml +++ b/tools/ocaml/xenstored/store.ml @@ -16,17 +16,19 @@ *) open Stdext +module SymbolMap = Map.Make(Symbol) + module Node = struct type t = { name: Symbol.t; perms: Perms.Node.t; value: string; - children: t list; + children: t SymbolMap.t; } let create _name _perms _value = - { name = Symbol.of_string _name; perms = _perms; value = _value; children = []; } + { name = Symbol.of_string _name; perms = _perms; value = _value; children = SymbolMap.empty; } let get_owner node = Perms.Node.get_owner node.perms let get_children node = node.children @@ -42,38 +44,34 @@ let set_value node nvalue = let set_perms node nperms = { node with perms = nperms } let add_child node child = - { node with children = child :: node.children } + let children = SymbolMap.add child.name child node.children in + { node with children } let exists node childname = let childname = Symbol.of_string childname in - List.exists (fun n -> Symbol.equal n.name childname) node.children + SymbolMap.mem childname node.children let find node childname = let childname = Symbol.of_string childname in - List.find (fun n -> Symbol.equal n.name childname) node.children + SymbolMap.find childname node.children let replace_child node child nchild = - (* this is the on-steroid version of the filter one-replace one *) - let rec replace_one_in_list l = - match l with - | [] -> [] - | h :: tl when Symbol.equal h.name child.name -> nchild :: tl - | h :: tl -> h :: replace_one_in_list tl - in - { node with children = (replace_one_in_list node.children) } + { node with + children = SymbolMap.update child.name + (function None -> None | Some _ -> Some nchild) + node.children + } let del_childname node childname = let sym = Symbol.of_string childname in - let rec delete_one_in_list l = - match l with - | [] -> raise Not_found - | h :: tl when Symbol.equal h.name sym -> tl - | h :: tl -> h :: delete_one_in_list tl - in - { node with children = (delete_one_in_list node.children) } + { node with children = + SymbolMap.update sym + (function None -> raise Not_found | Some _ -> None) + node.children + } let del_all_children node = - { node with children = [] } + { node with children = SymbolMap.empty } (* check if the current node can be accessed by the current connection with rperm permissions *) let check_perm node connection request = @@ -87,12 +85,12 @@ let check_owner node connection = raise Define.Permission_denied; end -let rec recurse fct node = fct node; List.iter (recurse fct) node.children +let rec recurse fct node = fct node; SymbolMap.iter (fun _ -> recurse fct) node.children (** [recurse_map f tree] applies [f] on each node in the tree recursively *) let recurse_map f = let rec walk node = - f { node with children = List.rev_map walk node.children |> List.rev } + f { node with children = SymbolMap.map walk node.children } in walk @@ -336,7 +334,7 @@ let ls store perm path = Node.check_perm cnode perm Perms.READ; cnode.Node.children in Path.apply store.root path do_ls in - List.rev (List.map (fun n -> Symbol.to_string n.Node.name) children) + SymbolMap.fold (fun k _ accu -> Symbol.to_string k :: accu) children [] let getperms store perm path = if path = [] then ( @@ -366,7 +364,7 @@ let traversal root_node f = let rec _traversal path node = f path node; let node_path = Path.of_path_and_name path (Symbol.to_string node.Node.name) in - List.iter (_traversal node_path) (List.rev node.Node.children) + SymbolMap.iter (fun _ -> _traversal node_path) node.Node.children in _traversal [] root_node diff --git a/tools/ocaml/xenstored/symbol.ml b/tools/ocaml/xenstored/symbol.ml index 2b41d120f6..301639f16f 100644 --- a/tools/ocaml/xenstored/symbol.ml +++ b/tools/ocaml/xenstored/symbol.ml @@ -31,6 +31,10 @@ let equal a b = (* compare using physical equality, both members have to be part of the above weak table *) a == b +let compare a b = + if equal a b then 0 + else -(String.compare a b) + let stats () = let len, entries, _, _, _, _ = WeakTable.stats tbl in len, entries diff --git a/tools/ocaml/xenstored/symbol.mli b/tools/ocaml/xenstored/symbol.mli index 586ab57507..dd0f014796 100644 --- a/tools/ocaml/xenstored/symbol.mli +++ b/tools/ocaml/xenstored/symbol.mli @@ -32,6 +32,9 @@ val to_string : t -> string val equal: t -> t -> bool (** Compare two symbols for equality *) +val compare: t -> t -> int +(** Compare two symbols *) + (** {6 Statistics } *) val stats : unit -> int * int -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jan 22 18:45:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Jan 2021 18:45:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73063.131736 (Exim 4.92) (envelope-from ) id 1l31RK-0007re-U6; Fri, 22 Jan 2021 18:45:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73063.131736; Fri, 22 Jan 2021 18:45: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 1l31RK-0007rW-R6; Fri, 22 Jan 2021 18:45:46 +0000 Received: by outflank-mailman (input) for mailman id 73063; Fri, 22 Jan 2021 18:45:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31RK-0007rQ-1d for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l31RK-0005sL-0p for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l31RK-0007g8-05 for xen-changelog@lists.xenproject.org; Fri, 22 Jan 2021 18:45:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6DhqxeGtiq5BTmcztXafizXOaOV7XrwM+Tjpr7I1x80=; b=6qHKVaD/e0mwBsrILkXScfq3dD vTh/padypvIhO+R+O1VLqjuBiZPkQ7gF8zxZ1pyQAR5mkMafgAn6Moan/0lg5FGGnCw1UwNNHXp3Z OELUGmAnAh+NL+uzr1EBittvPbQj0VxTtPIL+pMa/Ke0V+aQC00s8G6m+gKLCxEt19oY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: Use more efficient tries Message-Id: Date: Fri, 22 Jan 2021 18:45:46 +0000 commit b1278939db0b2eded9729a8e8c77c93fcbc9d870 Author: Edwin Török AuthorDate: Fri Jan 8 11:57:37 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 22 18:01:35 2021 +0000 tools/oxenstored: Use more efficient tries No functional change, just an optimization. Signed-off-by: Edwin Török Acked-by: Christian Lindig --- tools/ocaml/xenstored/connections.ml | 2 +- tools/ocaml/xenstored/symbol.ml | 6 ++-- tools/ocaml/xenstored/trie.ml | 59 ++++++++++++++++-------------------- tools/ocaml/xenstored/trie.mli | 26 ++++++++-------- 4 files changed, 43 insertions(+), 50 deletions(-) diff --git a/tools/ocaml/xenstored/connections.ml b/tools/ocaml/xenstored/connections.ml index 82988f7e8d..8a66eeec3a 100644 --- a/tools/ocaml/xenstored/connections.ml +++ b/tools/ocaml/xenstored/connections.ml @@ -21,7 +21,7 @@ type t = { anonymous: (Unix.file_descr, Connection.t) Hashtbl.t; domains: (int, Connection.t) Hashtbl.t; ports: (Xeneventchn.t, Connection.t) Hashtbl.t; - mutable watches: (string, Connection.watch list) Trie.t; + mutable watches: Connection.watch list Trie.t; } let create () = { diff --git a/tools/ocaml/xenstored/symbol.ml b/tools/ocaml/xenstored/symbol.ml index 301639f16f..72a84ebf80 100644 --- a/tools/ocaml/xenstored/symbol.ml +++ b/tools/ocaml/xenstored/symbol.ml @@ -31,9 +31,9 @@ let equal a b = (* compare using physical equality, both members have to be part of the above weak table *) a == b -let compare a b = - if equal a b then 0 - else -(String.compare a b) +(* the sort order is reversed here, so that Map.fold constructs a list + in ascending order *) +let compare a b = String.compare b a let stats () = let len, entries, _, _, _, _ = WeakTable.stats tbl in diff --git a/tools/ocaml/xenstored/trie.ml b/tools/ocaml/xenstored/trie.ml index f513f4e608..ca38b26632 100644 --- a/tools/ocaml/xenstored/trie.ml +++ b/tools/ocaml/xenstored/trie.ml @@ -15,24 +15,26 @@ open Stdext +module StringMap = Map.Make(String) + module Node = struct - type ('a,'b) t = { - key: 'a; - value: 'b option; - children: ('a,'b) t list; + type 'a t = { + key: string; + value: 'a option; + children: 'a t StringMap.t; } let _create key value = { key = key; value = Some value; - children = []; + children = StringMap.empty; } let empty key = { key = key; value = None; - children = [] + children = StringMap.empty; } let _get_key node = node.key @@ -49,41 +51,31 @@ struct { node with children = children } let _add_child node child = - { node with children = child :: node.children } + { node with children = StringMap.add child.key child node.children } end -type ('a,'b) t = ('a,'b) Node.t list +type 'a t = 'a Node.t StringMap.t let mem_node nodes key = - List.exists (fun n -> n.Node.key = key) nodes + StringMap.mem key nodes let find_node nodes key = - List.find (fun n -> n.Node.key = key) nodes + StringMap.find key nodes let replace_node nodes key node = - let rec aux = function - | [] -> [] - | h :: tl when h.Node.key = key -> node :: tl - | h :: tl -> h :: aux tl - in - aux nodes + StringMap.update key (function None -> None | Some _ -> Some node) nodes let remove_node nodes key = - let rec aux = function - | [] -> raise Not_found - | h :: tl when h.Node.key = key -> tl - | h :: tl -> h :: aux tl - in - aux nodes + StringMap.update key (function None -> raise Not_found | Some _ -> None) nodes -let create () = [] +let create () = StringMap.empty let rec iter f tree = - let aux node = - f node.Node.key node.Node.value; + let aux key node = + f key node.Node.value; iter f node.Node.children in - List.iter aux tree + StringMap.iter aux tree let rec map f tree = let aux node = @@ -94,13 +86,14 @@ let rec map f tree = in { node with Node.value = value; Node.children = map f node.Node.children } in - List.filter (fun n -> n.Node.value <> None || n.Node.children <> []) (List.map aux tree) + tree |> StringMap.map aux + |> StringMap.filter (fun _ n -> n.Node.value <> None || not (StringMap.is_empty n.Node.children)) let rec fold f tree acc = - let aux accu node = - fold f node.Node.children (f node.Node.key node.Node.value accu) + let aux key node accu = + fold f node.Node.children (f key node.Node.value accu) in - List.fold_left aux acc tree + StringMap.fold aux tree acc (* return a sub-trie *) let rec sub_node tree = function @@ -117,7 +110,7 @@ let rec sub_node tree = function let sub tree path = try (sub_node tree path).Node.children - with Not_found -> [] + with Not_found -> StringMap.empty let find tree path = Node.get_value (sub_node tree path) @@ -161,7 +154,7 @@ and set tree path value = replace_node tree h (set_node node t value) end else begin let node = Node.empty h in - set_node node t value :: tree + StringMap.add node.Node.key (set_node node t value) tree end let rec unset tree = function @@ -176,7 +169,7 @@ let rec unset tree = function then Node.set_children (Node.empty h) children else Node.set_children node children in - if children = [] && new_node.Node.value = None + if StringMap.is_empty children && new_node.Node.value = None then remove_node tree h else replace_node tree h new_node end else diff --git a/tools/ocaml/xenstored/trie.mli b/tools/ocaml/xenstored/trie.mli index 5dc53c1cb1..27785154f5 100644 --- a/tools/ocaml/xenstored/trie.mli +++ b/tools/ocaml/xenstored/trie.mli @@ -15,46 +15,46 @@ (** Basic Implementation of polymorphic tries (ie. prefix trees) *) -type ('a, 'b) t -(** The type of tries. ['a list] is the type of keys, ['b] the type of values. +type 'a t +(** The type of tries. ['a] the type of values. Internally, a trie is represented as a labeled tree, where node contains values - of type ['a * 'b option]. *) + of type [string * 'a option]. *) -val create : unit -> ('a,'b) t +val create : unit -> 'a t (** Creates an empty trie. *) -val mem : ('a,'b) t -> 'a list -> bool +val mem : 'a t -> string list -> bool (** [mem t k] returns true if a value is associated with the key [k] in the trie [t]. Otherwise, it returns false. *) -val find : ('a, 'b) t -> 'a list -> 'b +val find : 'a t -> string list -> 'a (** [find t k] returns the value associated with the key [k] in the trie [t]. Returns [Not_found] if no values are associated with [k] in [t]. *) -val set : ('a, 'b) t -> 'a list -> 'b -> ('a, 'b) t +val set : 'a t -> string list -> 'a -> 'a t (** [set t k v] associates the value [v] with the key [k] in the trie [t]. *) -val unset : ('a, 'b) t -> 'a list -> ('a, 'b) t +val unset : 'a t -> string list -> 'a t (** [unset k v] removes the association of value [v] with the key [k] in the trie [t]. Moreover, it automatically clean the trie, ie. it removes recursively every nodes of [t] containing no values and having no chil. *) -val iter : ('a -> 'b option -> unit) -> ('a, 'b) t -> unit +val iter : (string -> 'a option -> unit) -> 'a t -> unit (** [iter f t] applies the function [f] to every node of the trie [t]. As nodes of the trie [t] do not necessary contains a value, the second argument of [f] is an option type. *) -val iter_path : ('a -> 'b option -> unit) -> ('a, 'b) t -> 'a list -> unit +val iter_path : (string -> 'a option -> unit) -> 'a t -> string list -> unit (** [iter_path f t p] iterates [f] over nodes associated with the path [p] in the trie [t]. If [p] is not a valid path of [t], it iterates on the longest valid prefix of [p]. *) -val fold : ('a -> 'b option -> 'c -> 'c) -> ('a, 'b) t -> 'c -> 'c +val fold : (string -> 'a option -> 'c -> 'c) -> 'a t -> 'c -> 'c (** [fold f t x] fold [f] over every nodes of [t], with [x] as initial value. *) -val map : ('b -> 'c option) -> ('a,'b) t -> ('a,'c) t +val map : ('a -> 'b option) -> 'a t -> 'b t (** [map f t] maps [f] over every values stored in [t]. The return value of [f] is of type 'c option as one may wants to remove value associated to a key. This function is not tail-recursive. *) -val sub : ('a, 'b) t -> 'a list -> ('a,'b) t +val sub : 'a t -> string list -> 'a t (** [sub t p] returns the sub-trie associated with the path [p] in the trie [t]. If [p] is not a valid path of [t], it returns an empty trie. *) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 00:33:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 00:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73168.131929 (Exim 4.92) (envelope-from ) id 1l36rR-0001VF-V6; Sat, 23 Jan 2021 00:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73168.131929; Sat, 23 Jan 2021 00: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 1l36rR-0001V7-S8; Sat, 23 Jan 2021 00:33:05 +0000 Received: by outflank-mailman (input) for mailman id 73168; Sat, 23 Jan 2021 00:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l36rR-0001V2-92 for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 00:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l36rR-0003mi-50 for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 00:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l36rR-0005PR-3d for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 00: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=FIHKV/uB+wioJ0XUaohQAbBDD6PUTCsHGpMoxJJr4XY=; b=jHlNZ63O2WMtZfhGX30xlY1BGK 1fmJ1XewRvvnadS1ZhC4zMatwHlG9aknmkKmAHRIyZvV244dOm9KYMe0BMiMephAACKHEygBrK3UU +0OFtwY2aIT+IrIrx774vwBblol98UO4CfDBsBxv/H/x3MV3NIw4Zt5v6xmRNAHs9y8I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: fix qemu-alpine-arm64.sh Message-Id: Date: Sat, 23 Jan 2021 00:33:05 +0000 commit b4707372296874cbfd882b8f9351b7ae549d5463 Author: Stefano Stabellini AuthorDate: Fri Jan 22 15:53:37 2021 -0800 Commit: Stefano Stabellini CommitDate: Fri Jan 22 16:30:32 2021 -0800 automation: fix qemu-alpine-arm64.sh Remove copy/paste error introduced by f58976544ff4 ("automation: use test-artifacts/qemu-system-aarch64 instead of Debian's") Fixes: f58976544ff4 ("automation: use test-artifacts/qemu-system-aarch64 instead of Debian's") Signed-off-by: Stefano Stabellini Acked-by: Andrew Cooper --- automation/scripts/qemu-alpine-arm64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qemu-alpine-arm64.sh b/automation/scripts/qemu-alpine-arm64.sh index e2240f9ab4..f4ac2d856f 100755 --- a/automation/scripts/qemu-alpine-arm64.sh +++ b/automation/scripts/qemu-alpine-arm64.sh @@ -69,7 +69,7 @@ find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz cd ../.. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded -curl -fsSLO curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom +curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom ./binaries/qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:44:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73264.132047 (Exim 4.92) (envelope-from ) id 1l3HKo-0007Wo-BZ; Sat, 23 Jan 2021 11:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73264.132047; Sat, 23 Jan 2021 11:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HKo-0007We-8U; Sat, 23 Jan 2021 11:44:06 +0000 Received: by outflank-mailman (input) for mailman id 73264; Sat, 23 Jan 2021 11:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HKn-0007WZ-3Q for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HKm-0005Pr-Um for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HKm-00072K-SC for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11: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=DfkA6cWrb1YrilSPccotb6R15JKmO74XiuadqOqxKJc=; b=huYYyDHBkVtFIB5yiHZWCrHkdM 7Ul0KF30cueOeyDF27jvK263H7+c26cYxY7dvqnJILTlomJhsWHNgVNjYv9aIc9NhXXrULS5DnhWn 5m7Lqt8sa9WEnfM0QWQ8q0p6BpsJYwRoKXoiQJpZrM97xFbwb7/AjeT87nRG8wxim2rg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: add support for run_in_exception_handler() Message-Id: Date: Sat, 23 Jan 2021 11:44:04 +0000 commit c8d4b6304a5ee22bfd8a207973199b379c36604e Author: Juergen Gross AuthorDate: Sat Jan 16 11:33:37 2021 +0100 Commit: Julien Grall CommitDate: Sat Jan 23 11:30:32 2021 +0000 xen/arm: add support for run_in_exception_handler() Add support to run a function in an exception handler for Arm. Do it as on x86 via a bug_frame, but pass the function pointer via a register. This needs to be done that way because GCC will not allow to use "i" when PIE is enabled (Xen doesn't set the flag but instead rely on the default value from the compiler). Use the same BUGFRAME_* #defines as on x86 in order to make a future common header file more easily achievable. Signed-off-by: Juergen Gross [ julien: Add more details on the issue between "i" and -fpie ] Acked-by: Julien GralL --- xen/arch/arm/traps.c | 8 ++++++++ xen/arch/arm/xen.lds.S | 2 ++ xen/common/virtual_region.c | 2 -- xen/include/asm-arm/arm32/bug.h | 2 ++ xen/include/asm-arm/arm64/bug.h | 2 ++ xen/include/asm-arm/bug.h | 32 ++++++++++++++++++++++++++------ 6 files changed, 40 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 1af1bb9f1b..d0df33b218 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1236,6 +1236,14 @@ int do_bug_frame(const struct cpu_user_regs *regs, vaddr_t pc) if ( !bug ) return -ENOENT; + if ( id == BUGFRAME_run_fn ) + { + void (*fn)(const struct cpu_user_regs *) = (void *)regs->BUG_FN_REG; + + fn(regs); + return 0; + } + /* WARN, BUG or ASSERT: decode the filename pointer and line number. */ filename = bug_file(bug); if ( !is_kernel(filename) ) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index 6342ac4ead..004b182acb 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -49,6 +49,8 @@ SECTIONS __stop_bug_frames_1 = .; *(.bug_frames.2) __stop_bug_frames_2 = .; + *(.bug_frames.3) + __stop_bug_frames_3 = .; *(.rodata) *(.rodata.*) *(.data.rel.ro) diff --git a/xen/common/virtual_region.c b/xen/common/virtual_region.c index 4fbc02e35a..30b0b4ab9c 100644 --- a/xen/common/virtual_region.c +++ b/xen/common/virtual_region.c @@ -123,9 +123,7 @@ void __init setup_virtual_regions(const struct exception_table_entry *start, __stop_bug_frames_0, __stop_bug_frames_1, __stop_bug_frames_2, -#ifdef CONFIG_X86 __stop_bug_frames_3, -#endif NULL }; diff --git a/xen/include/asm-arm/arm32/bug.h b/xen/include/asm-arm/arm32/bug.h index 3e66f35969..25cce151dc 100644 --- a/xen/include/asm-arm/arm32/bug.h +++ b/xen/include/asm-arm/arm32/bug.h @@ -10,4 +10,6 @@ #define BUG_INSTR ".word " __stringify(BUG_OPCODE) +#define BUG_FN_REG r0 + #endif /* __ARM_ARM32_BUG_H__ */ diff --git a/xen/include/asm-arm/arm64/bug.h b/xen/include/asm-arm/arm64/bug.h index 59f664d7de..5e11c0dfd5 100644 --- a/xen/include/asm-arm/arm64/bug.h +++ b/xen/include/asm-arm/arm64/bug.h @@ -6,4 +6,6 @@ #define BUG_INSTR "brk " __stringify(BRK_BUG_FRAME_IMM) +#define BUG_FN_REG x0 + #endif /* __ARM_ARM64_BUG_H__ */ diff --git a/xen/include/asm-arm/bug.h b/xen/include/asm-arm/bug.h index 36c803357c..f4088d0913 100644 --- a/xen/include/asm-arm/bug.h +++ b/xen/include/asm-arm/bug.h @@ -26,16 +26,17 @@ struct bug_frame { #define bug_line(b) ((b)->line) #define bug_msg(b) ((const char *)(b) + (b)->msg_disp) -#define BUGFRAME_warn 0 -#define BUGFRAME_bug 1 -#define BUGFRAME_assert 2 +#define BUGFRAME_run_fn 0 +#define BUGFRAME_warn 1 +#define BUGFRAME_bug 2 +#define BUGFRAME_assert 3 -#define BUGFRAME_NR 3 +#define BUGFRAME_NR 4 /* Many versions of GCC doesn't support the asm %c parameter which would * be preferable to this unpleasantness. We use mergeable string * sections to avoid multiple copies of the string appearing in the - * Xen image. + * Xen image. BUGFRAME_run_fn needs to be handled separately. */ #define BUG_FRAME(type, line, file, has_msg, msg) do { \ BUILD_BUG_ON((line) >> 16); \ @@ -58,6 +59,24 @@ struct bug_frame { ".popsection"); \ } while (0) +/* + * GCC will not allow to use "i" when PIE is enabled (Xen doesn't set the + * flag but instead rely on the default value from the compiler). So the + * easiest way to implement run_in_exception_handler() is to pass the to + * be called function in a fixed register. + */ +#define run_in_exception_handler(fn) do { \ + asm ("mov " __stringify(BUG_FN_REG) ", %0\n" \ + "1:"BUG_INSTR"\n" \ + ".pushsection .bug_frames." __stringify(BUGFRAME_run_fn) "," \ + " \"a\", %%progbits\n" \ + "2:\n" \ + ".p2align 2\n" \ + ".long (1b - 2b)\n" \ + ".long 0, 0, 0\n" \ + ".popsection" :: "r" (fn) : __stringify(BUG_FN_REG) ); \ +} while (0) + #define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, 0, "") #define BUG() do { \ @@ -73,7 +92,8 @@ struct bug_frame { extern const struct bug_frame __start_bug_frames[], __stop_bug_frames_0[], __stop_bug_frames_1[], - __stop_bug_frames_2[]; + __stop_bug_frames_2[], + __stop_bug_frames_3[]; #endif /* __ARM_BUG_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:44:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:44:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73265.132051 (Exim 4.92) (envelope-from ) id 1l3HKy-0007Xp-D4; Sat, 23 Jan 2021 11:44:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73265.132051; Sat, 23 Jan 2021 11:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HKy-0007Xh-AD; Sat, 23 Jan 2021 11:44:16 +0000 Received: by outflank-mailman (input) for mailman id 73265; Sat, 23 Jan 2021 11:44:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HKx-0007Xc-3r for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HKx-0005QD-31 for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HKx-00072w-0Y for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=R5Pl25wPRxQO1cIl+RfGEazbxjeqD65HTcFLn66gWxA=; b=jaDJmF91Dr/MggdprHJ78quBEB VpJeWmjysffYjmX7bzNZzL/yKlCBHT3oDhErTBJRlb/YX7UqD3HEXNMX6HYZ0ty3A1R48LD/lh1ta C95Efiojgip/dSUXv4WGgtReKEBOSdPzLca3dUYyMCY8gPm0ykY4HBHEy7PxT114TYck=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: enable keyhandlers to work without register set specified Message-Id: Date: Sat, 23 Jan 2021 11:44:15 +0000 commit a4e8b178bfb4ee404cc7329032112d0c18ca4b66 Author: Juergen Gross AuthorDate: Sat Jan 16 11:33:38 2021 +0100 Commit: Julien Grall CommitDate: Sat Jan 23 11:31:32 2021 +0000 xen: enable keyhandlers to work without register set specified There are only two keyhandlers which make use of the cpu_user_regs struct passed to them. In order to be able to call any keyhandler in non-interrupt contexts, too, modify those two handlers to cope with a NULL regs pointer by using run_in_exception_handler() in that case. Suggested-by: Julien Grall Signed-off-by: Juergen Gross Acked-by: Julien Grall --- xen/common/keyhandler.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 68364e987d..38020a1360 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -181,7 +181,10 @@ static void dump_registers(unsigned char key, struct cpu_user_regs *regs) cpumask_copy(&dump_execstate_mask, &cpu_online_map); /* Get local execution state out immediately, in case we get stuck. */ - dump_execstate(regs); + if ( regs ) + dump_execstate(regs); + else + run_in_exception_handler(dump_execstate); /* Alt. handling: remaining CPUs are dumped asynchronously one-by-one. */ if ( alt_key_handling ) @@ -481,15 +484,23 @@ static void run_all_keyhandlers(unsigned char key, struct cpu_user_regs *regs) tasklet_schedule(&run_all_keyhandlers_tasklet); } -static void do_debug_key(unsigned char key, struct cpu_user_regs *regs) +static void do_debugger_trap_fatal(struct cpu_user_regs *regs) { - printk("'%c' pressed -> trapping into debugger\n", key); (void)debugger_trap_fatal(0xf001, regs); /* Prevent tail call optimisation, which confuses xendbg. */ barrier(); } +static void do_debug_key(unsigned char key, struct cpu_user_regs *regs) +{ + printk("'%c' pressed -> trapping into debugger\n", key); + if ( regs ) + do_debugger_trap_fatal(regs); + else + run_in_exception_handler(do_debugger_trap_fatal); +} + static void do_toggle_alt_key(unsigned char key, struct cpu_user_regs *regs) { alt_key_handling = !alt_key_handling; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:44:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:44:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73266.132055 (Exim 4.92) (envelope-from ) id 1l3HL8-0007ZI-FH; Sat, 23 Jan 2021 11:44:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73266.132055; Sat, 23 Jan 2021 11:44:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HL8-0007ZA-Bo; Sat, 23 Jan 2021 11:44:26 +0000 Received: by outflank-mailman (input) for mailman id 73266; Sat, 23 Jan 2021 11:44:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HL7-0007Yy-7E for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HL7-0005QL-6N for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HL7-000753-5P for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11: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=RUwBNYO/qMN6idT9d38UtN1J40RkXnG9Uk0fWw+7Kgg=; b=c4Yo549GZJS9GnUF3BSeu+0/bK lMEBfaf9Kohf5zEdvDx7xZivuvXUMnH7TNBvs90Op39nLhqgp8wy9XKd+h+z/3/F6UllCnqG6N7Qi Qc9bO6Wp/I4tweDPzmYPNgh87OpJXUIBxjrelMLiPCnV60+0UcPVoYF+ZN/76ICRlEdw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: add support for automatic debug key actions in case of crash Message-Id: Date: Sat, 23 Jan 2021 11:44:25 +0000 commit 7a02176b13f31185dd37323d61814ca3e54a80d6 Author: Juergen Gross AuthorDate: Sat Jan 16 11:33:39 2021 +0100 Commit: Julien Grall CommitDate: Sat Jan 23 11:31:32 2021 +0000 xen: add support for automatic debug key actions in case of crash When the host crashes it would sometimes be nice to have additional debug data available which could be produced via debug keys, but halting the server for manual intervention might be impossible due to the need to reboot/kexec rather sooner than later. Add support for automatic debug key actions in case of crashes which can be activated via boot- or runtime-parameter. Depending on the type of crash the desired data might be different, so support different settings for the possible types of crashes. The parameter is "crash-debug" with the following syntax: crash-debug-= with being one of: panic, hwdom, watchdog, kexeccmd, debugkey and a sequence of debug key characters with '+' having the special semantics of a 10 millisecond pause. So "crash-debug-watchdog=0+0qr" would result in special output in case of watchdog triggered crash (dom0 state, 10 ms pause, dom0 state, domain info, run queues). Don't call key handlers in early boot, as some (e.g. for 'd') require some initializations to be finished, like scheduler or idle domain. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 41 +++++++++++++++++++++++++++++ xen/common/kexec.c | 8 +++--- xen/common/keyhandler.c | 55 +++++++++++++++++++++++++++++++++++++++ xen/common/shutdown.c | 4 +-- xen/drivers/char/console.c | 2 +- xen/include/xen/kexec.h | 10 +++++-- xen/include/xen/keyhandler.h | 10 +++++++ 7 files changed, 122 insertions(+), 8 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 7ec1e804b7..a713a0535c 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -574,6 +574,47 @@ reduction of features at Xen's disposal to manage guests. ### cpuinfo (x86) > `= ` +### crash-debug-debugkey +### crash-debug-hwdom +### crash-debug-kexeccmd +### crash-debug-panic +### crash-debug-watchdog +> `= ` + +> Can be modified at runtime + +Specify debug-key actions in cases of crashes. Each of the parameters applies +to a different crash reason. The `` is a sequence of debug key +characters, with `+` having the special meaning of a 10 millisecond pause. + +`crash-debug-debugkey` will be used for crashes induced by the `C` debug +key (i.e. manually induced crash). + +`crash-debug-hwdom` denotes a crash of dom0. + +`crash-debug-kexeccmd` is an explicit request of dom0 to continue with the +kdump kernel via kexec. Only available on hypervisors built with CONFIG_KEXEC. + +`crash-debug-panic` is a crash of the hypervisor. + +`crash-debug-watchdog` is a crash due to the watchdog timer expiring. + +It should be noted that dumping diagnosis data to the console can fail in +multiple ways (missing data, hanging system, ...) depending on the reason +of the crash, which might have left the hypervisor in a bad state. In case +a debug-key action leads to another crash recursion will be avoided, so no +additional debug-key actions will be performed in this case. A crash in the +early boot phase will not result in any debug-key action, as the system +might not yet be in a state where the handlers can work. + +So e.g. `crash-debug-watchdog=0+0r` would dump dom0 state twice with 10 +milliseconds between the two state dumps, followed by the run queues of the +hypervisor, if the system crashes due to a watchdog timeout. + +Depending on the reason of the system crash it might happen that triggering +some debug key action will result in a hang instead of dumping data and then +doing a reboot or crash dump. + ### crashinfo_maxaddr > `= ` diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 52cdc4ebc3..ebeee6405a 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -373,10 +373,12 @@ static int kexec_common_shutdown(void) return 0; } -void kexec_crash(void) +void kexec_crash(enum crash_reason reason) { int pos; + keyhandler_crash_action(reason); + pos = (test_bit(KEXEC_FLAG_CRASH_POS, &kexec_flags) != 0); if ( !test_bit(KEXEC_IMAGE_CRASH_BASE + pos, &kexec_flags) ) return; @@ -409,7 +411,7 @@ static long kexec_reboot(void *_image) static void do_crashdump_trigger(unsigned char key) { printk("'%c' pressed -> triggering crashdump\n", key); - kexec_crash(); + kexec_crash(CRASHREASON_DEBUGKEY); printk(" * no crash kernel loaded!\n"); } @@ -840,7 +842,7 @@ static int kexec_exec(XEN_GUEST_HANDLE_PARAM(void) uarg) ret = continue_hypercall_on_cpu(0, kexec_reboot, image); break; case KEXEC_TYPE_CRASH: - kexec_crash(); /* Does not return */ + kexec_crash(CRASHREASON_KEXECCMD); /* Does not return */ break; } diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 38020a1360..8b9f378371 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -3,7 +3,9 @@ */ #include +#include #include +#include #include #include #include @@ -518,6 +520,59 @@ void __init initialize_keytable(void) } } +#define CRASHACTION_SIZE 32 +static char crash_debug_panic[CRASHACTION_SIZE]; +string_runtime_param("crash-debug-panic", crash_debug_panic); +static char crash_debug_hwdom[CRASHACTION_SIZE]; +string_runtime_param("crash-debug-hwdom", crash_debug_hwdom); +static char crash_debug_watchdog[CRASHACTION_SIZE]; +string_runtime_param("crash-debug-watchdog", crash_debug_watchdog); +#ifdef CONFIG_KEXEC +static char crash_debug_kexeccmd[CRASHACTION_SIZE]; +string_runtime_param("crash-debug-kexeccmd", crash_debug_kexeccmd); +#else +#define crash_debug_kexeccmd NULL +#endif +static char crash_debug_debugkey[CRASHACTION_SIZE]; +string_runtime_param("crash-debug-debugkey", crash_debug_debugkey); + +void keyhandler_crash_action(enum crash_reason reason) +{ + static const char *const crash_action[] = { + [CRASHREASON_PANIC] = crash_debug_panic, + [CRASHREASON_HWDOM] = crash_debug_hwdom, + [CRASHREASON_WATCHDOG] = crash_debug_watchdog, + [CRASHREASON_KEXECCMD] = crash_debug_kexeccmd, + [CRASHREASON_DEBUGKEY] = crash_debug_debugkey, + }; + static bool ignore; + const char *action; + + /* Some handlers are not functional too early. */ + if ( system_state < SYS_STATE_smp_boot ) + return; + + if ( (unsigned int)reason >= ARRAY_SIZE(crash_action) ) + return; + action = crash_action[reason]; + if ( !action ) + return; + + /* Avoid recursion. */ + if ( ignore ) + return; + ignore = true; + + while ( *action ) + { + if ( *action == '+' ) + mdelay(10); + else + handle_keypress(*action, NULL); + action++; + } +} + /* * Local variables: * mode: C diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c index 912593915b..abde48aa4c 100644 --- a/xen/common/shutdown.c +++ b/xen/common/shutdown.c @@ -43,7 +43,7 @@ void hwdom_shutdown(u8 reason) case SHUTDOWN_crash: debugger_trap_immediate(); printk("Hardware Dom%u crashed: ", hardware_domain->domain_id); - kexec_crash(); + kexec_crash(CRASHREASON_HWDOM); maybe_reboot(); break; /* not reached */ @@ -56,7 +56,7 @@ void hwdom_shutdown(u8 reason) case SHUTDOWN_watchdog: printk("Hardware Dom%u shutdown: watchdog rebooting machine\n", hardware_domain->domain_id); - kexec_crash(); + kexec_crash(CRASHREASON_WATCHDOG); machine_restart(0); break; /* not reached */ diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index e3c483fd13..2358375170 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1271,7 +1271,7 @@ void panic(const char *fmt, ...) debugger_trap_immediate(); - kexec_crash(); + kexec_crash(CRASHREASON_PANIC); if ( opt_noreboot ) machine_halt(); diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h index e85ba16405..9f7a912e97 100644 --- a/xen/include/xen/kexec.h +++ b/xen/include/xen/kexec.h @@ -1,6 +1,8 @@ #ifndef __XEN_KEXEC_H__ #define __XEN_KEXEC_H__ +#include + #ifdef CONFIG_KEXEC #include @@ -48,7 +50,7 @@ void machine_kexec_unload(struct kexec_image *image); void machine_kexec_reserved(xen_kexec_reserve_t *reservation); void machine_reboot_kexec(struct kexec_image *image); void machine_kexec(struct kexec_image *image); -void kexec_crash(void); +void kexec_crash(enum crash_reason reason); void kexec_crash_save_cpu(void); struct crash_xen_info *kexec_crash_save_info(void); void machine_crash_shutdown(void); @@ -82,7 +84,11 @@ void vmcoreinfo_append_str(const char *fmt, ...) #define kexecing 0 static inline void kexec_early_calculations(void) {} -static inline void kexec_crash(void) {} +static inline void kexec_crash(enum crash_reason reason) +{ + keyhandler_crash_action(reason); +} + static inline void kexec_crash_save_cpu(void) {} static inline void set_kexec_crash_area_size(u64 system_ram) {} diff --git a/xen/include/xen/keyhandler.h b/xen/include/xen/keyhandler.h index 5131e86cbc..9c5830a037 100644 --- a/xen/include/xen/keyhandler.h +++ b/xen/include/xen/keyhandler.h @@ -48,4 +48,14 @@ void register_irq_keyhandler(unsigned char key, /* Inject a keypress into the key-handling subsystem. */ extern void handle_keypress(unsigned char key, struct cpu_user_regs *regs); +enum crash_reason { + CRASHREASON_PANIC, + CRASHREASON_HWDOM, + CRASHREASON_WATCHDOG, + CRASHREASON_KEXECCMD, + CRASHREASON_DEBUGKEY, +}; + +void keyhandler_crash_action(enum crash_reason reason); + #endif /* __XEN_KEYHANDLER_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:44:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:44:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73267.132059 (Exim 4.92) (envelope-from ) id 1l3HLI-0007as-IZ; Sat, 23 Jan 2021 11:44:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73267.132059; Sat, 23 Jan 2021 11:44:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HLI-0007ak-FC; Sat, 23 Jan 2021 11:44:36 +0000 Received: by outflank-mailman (input) for mailman id 73267; Sat, 23 Jan 2021 11:44:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HLH-0007ab-Aw for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HLH-0005Qb-AG for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HLH-00075i-8U for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FICBNh+N2ZatgG+OZU9ShHmG9BYT19uxb4gI7AYDpTM=; b=3EUFJdaL8560L+SNN19V8wcv4i 4lP20wQIb7AZqs1Iq+V3df+kbWhoXF/kU5Og5WdU/ZW/5SeaKzvv+5yCyt69Eg7BV6e1Z/8dNaoV8 i4mwoXWcGELpbvVXjdJPIN0qiIGWAvJ8s99rqq4Knl6jbuk4xexJ6Pp5IB7l+85l0Rnk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: mm: Remove special case for CPU0 in dump_hyp_walk() Message-Id: Date: Sat, 23 Jan 2021 11:44:35 +0000 commit d90390d031554337f4fc9c98045d5a9ef71e6f23 Author: Stefano Stabellini AuthorDate: Thu Nov 19 19:07:46 2020 +0000 Commit: Julien Grall CommitDate: Sat Jan 23 11:41:29 2021 +0000 xen/arm: mm: Remove special case for CPU0 in dump_hyp_walk() There is no need to have a special case for CPU0 when converting the page-table virtual address into a physical address. The helper virt_to_maddr() is able to translate any address as long as the root page-tables is mapped in the virtual address. This is the case for all the CPUs at the moment. So use the same BUG_ON() regardless the CPU. Signed-off-by: Stefano Stabellini [julien: Rework the commit message] Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis --- xen/arch/arm/mm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 9c4b26bf07..4dd886f7c8 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -284,10 +284,7 @@ void dump_hyp_walk(vaddr_t addr) "on CPU%d via TTBR 0x%016"PRIx64"\n", addr, smp_processor_id(), ttbr); - if ( smp_processor_id() == 0 ) - BUG_ON( (lpae_t *)(unsigned long)(ttbr - phys_offset) != pgtable ); - else - BUG_ON( virt_to_maddr(pgtable) != ttbr ); + BUG_ON( virt_to_maddr(pgtable) != ttbr ); dump_pt_walk(ttbr, addr, HYP_PT_ROOT_LEVEL, 1); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:44:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:44:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73269.132075 (Exim 4.92) (envelope-from ) id 1l3HLT-0007f8-0Z; Sat, 23 Jan 2021 11:44:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73269.132075; Sat, 23 Jan 2021 11:44:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HLS-0007f0-To; Sat, 23 Jan 2021 11:44:46 +0000 Received: by outflank-mailman (input) for mailman id 73269; Sat, 23 Jan 2021 11:44:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HLR-0007eN-Dr for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HLR-0005Qn-D5 for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HLR-00076J-CJ for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NA2ccxQV2er0ZUQXVTEL/4OW+M+eWC5o8pYxQqlCEvo=; b=evsglNJNm5EqpB21NO3zcPdlfX 7k+UglTTbSHr+GiHeqzRZwagxtEbpAYzq5e0rL6VVWm1HHDPRESZsAO/2uOxvkCGHNEL9G3bnRtvY Unt27qlwotqOelWNy7zjuk7zbMg+mJ+H9a9Ovo+LCaqj1wcBQRg6KmPFK6lUDJQTTK9A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: mm: Remove ; at the end of mm_printk() Message-Id: Date: Sat, 23 Jan 2021 11:44:45 +0000 commit bfe67a17d4df2efbedaaf5cfbadc8a8627debf5c Author: Julien Grall AuthorDate: Thu Nov 19 19:07:47 2020 +0000 Commit: Julien Grall CommitDate: Sat Jan 23 11:41:45 2021 +0000 xen/arm: mm: Remove ; at the end of mm_printk() The ; at the end of mm_printk() means the following code will not build correctly: if ( ... ) mm_printk(...); else ... As we treat the macro as a function, we want to remove the ; at the end of it. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- 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 4dd886f7c8..59f8a3f15f 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -59,7 +59,7 @@ mm_printk(const char *fmt, ...) {} { \ dprintk(XENLOG_ERR, fmt, ## args); \ WARN(); \ - } while (0); + } while (0) #endif /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:44:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:44:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73271.132079 (Exim 4.92) (envelope-from ) id 1l3HLd-0007iE-2Z; Sat, 23 Jan 2021 11:44:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73271.132079; Sat, 23 Jan 2021 11:44: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 1l3HLc-0007i6-VM; Sat, 23 Jan 2021 11:44:56 +0000 Received: by outflank-mailman (input) for mailman id 73271; Sat, 23 Jan 2021 11:44:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HLb-0007hg-Gl for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HLb-0005Qu-G2 for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HLb-00076r-FD for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:44: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=NVKlJ8uUoPH/bDoSd40wUFFA0o9i9mI08372xTnIkgE=; b=N3ss0R4XtJrsMi+n1JRiZKPfnz 8T11b4C50e2AYSP8Kjm6meA0JSh/gzedQn4LRa+HJHbj6fLmR5j/3aGf1+kEg+w6d65hSouldHbR6 pDmbOxCGIo97VUO/ExkbMmumxFkHq4AkKvBY5KKnkxOnhGbjP09JGkESc/b1r1MeM8u0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: setup: Call unregister_init_virtual_region() after the last init function Message-Id: Date: Sat, 23 Jan 2021 11:44:55 +0000 commit cf6dbed22ac3c917fd5457014c66840addf2bf0f Author: Julien Grall AuthorDate: Thu Nov 19 19:07:48 2020 +0000 Commit: Julien Grall CommitDate: Sat Jan 23 11:42:03 2021 +0000 xen/arm: setup: Call unregister_init_virtual_region() after the last init function discard_init_modules() is an init function, if the path contains a BUG() or WARN() we still want to get the full stack trace. The init virtual region is now kept after the last init function has been called. Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis --- xen/arch/arm/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 7fcff9af2a..2532ec9739 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -72,10 +72,11 @@ domid_t __read_mostly max_init_domid; static __used void init_done(void) { + discard_initial_modules(); + /* Must be done past setting system_state. */ unregister_init_virtual_region(); - discard_initial_modules(); free_init_memory(); startup_cpu_idle_loop(); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:55:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73276.132083 (Exim 4.92) (envelope-from ) id 1l3HVS-0000J1-SV; Sat, 23 Jan 2021 11:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73276.132083; Sat, 23 Jan 2021 11: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 1l3HVS-0000Iu-Op; Sat, 23 Jan 2021 11:55:06 +0000 Received: by outflank-mailman (input) for mailman id 73276; Sat, 23 Jan 2021 11:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HVQ-0000Ip-Od for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HVQ-0005b1-L2 for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HVQ-0008DV-IU for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11: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=MIPfYyZ+1yRqzR+9stzySvl7niAxGGH2Mk1lY5gFaWE=; b=S1nYan4IAUVm0R7L0frKYHLN7C Tav1Nxqz3i4DdLetemMvncyqWhCYmLS33NGle4/LZe26CkUgp7UvropwL+PN3QNgoPufrrtvCtdtP oXb+qBjb5BG2KegtgflP0tfbuMMdNnApsYNbA5rMdAPr7V5nDeQq6zyixJMzFr8hC6s4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Import the SMMUv3 driver from Linux Message-Id: Date: Sat, 23 Jan 2021 11:55:04 +0000 commit 813b3fb5feb1043827862a4a4d5bff493295e342 Author: Rahul Singh AuthorDate: Wed Jan 20 14:52:35 2021 +0000 Commit: Julien Grall CommitDate: Sat Jan 23 11:48:33 2021 +0000 xen/arm: smmuv3: Import the SMMUv3 driver from Linux Based on tag Linux 5.8.18 commit ab435ce49bd1d02e33dfec24f76955dc1196970b Directory structure change for the SMMUv3 driver starting from Linux 5.9, to revert the patches smoothly using the "git revert" command we decided to choose Linux 5.8.18. Only difference between latest stable Linux 5.9.12 and Linux 5.8.18 SMMUv3 driver is the use of the "fallthrough" keyword. This patch will be merged once "fallthrough" keyword implementation is available in XEN. It's a copy of the Linux SMMUv3 driver. Xen specific code has not been added yet and code has not been compiled. Signed-off-by: Rahul Singh Acked-by: Julien Grall Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 4165 +++++++++++++++++++++++++++++++++ 1 file changed, 4165 insertions(+) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c new file mode 100644 index 0000000000..f578677a5c --- /dev/null +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -0,0 +1,4165 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * IOMMU API for ARM architected SMMUv3 implementations. + * + * Copyright (C) 2015 ARM Limited + * + * Author: Will Deacon + * + * This driver is powered by bad coffee and bombay mix. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +/* 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_IDR3 0xc +#define IDR3_RIL (1 << 10) + +#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 (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_PROD_OWNED_FLAG Q_OVERFLOW_FLAG + +/* + * This is used to size the command queue and therefore must be at least + * BITS_PER_LONG so that the valid_map works correctly (it relies on the + * total number of queue entries being a multiple of BITS_PER_LONG). + */ +#define CMDQ_BATCH_ENTRIES BITS_PER_LONG + +#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_NUM GENMASK_ULL(16, 12) +#define CMDQ_TLBI_RANGE_NUM_MAX 31 +#define CMDQ_TLBI_0_SCALE GENMASK_ULL(24, 20) +#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_TTL GENMASK_ULL(9, 8) +#define CMDQ_TLBI_1_TG GENMASK_ULL(11, 10) +#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 1000000 /* 1s! */ +#define ARM_SMMU_POLL_SPIN_COUNT 10 + +#define MSI_IOVA_BASE 0x8000000 +#define MSI_IOVA_LENGTH 0x100000 + +static bool disable_bypass = 1; +module_param_named(disable_bypass, disable_bypass, bool, S_IRUGO); +MODULE_PARM_DESC(disable_bypass, + "Disable bypass streams such that incoming transactions from devices that are not attached to an iommu domain will report an abort back to the device and will not be allowed to pass through the SMMU."); + +enum pri_resp { + PRI_RESP_DENY = 0, + PRI_RESP_FAIL = 1, + PRI_RESP_SUCC = 2, +}; + +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, + }, +}; + +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 + #define CMDQ_OP_CFGI_CD 0x5 + #define CMDQ_OP_CFGI_CD_ALL 0x6 + struct { + u32 sid; + u32 ssid; + union { + bool leaf; + u8 span; + }; + } cfgi; + + #define CMDQ_OP_TLBI_NH_ASID 0x11 + #define CMDQ_OP_TLBI_NH_VA 0x12 + #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 { + u8 num; + u8 scale; + u16 asid; + u16 vmid; + bool leaf; + u8 ttl; + u8 tg; + 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 { + u64 msiaddr; + } sync; + }; +}; + +struct arm_smmu_ll_queue { + union { + u64 val; + struct { + u32 prod; + u32 cons; + }; + struct { + atomic_t prod; + atomic_t cons; + } atomic; + u8 __pad[SMP_CACHE_BYTES]; + } ____cacheline_aligned_in_smp; + 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_queue_poll { + ktime_t timeout; + unsigned int delay; + unsigned int spin_cnt; + bool wfe; +}; + +struct arm_smmu_cmdq { + struct arm_smmu_queue q; + atomic_long_t *valid_map; + atomic_t owner_prod; + atomic_t lock; +}; + +struct arm_smmu_cmdq_batch { + u64 cmds[CMDQ_BATCH_ENTRIES * CMDQ_ENT_DWORDS]; + int num; +}; + +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_ctx_desc { + u16 asid; + u64 ttbr; + u64 tcr; + u64 mair; +}; + +struct arm_smmu_l1_ctx_desc { + __le64 *l2ptr; + dma_addr_t l2ptr_dma; +}; + +struct arm_smmu_ctx_desc_cfg { + __le64 *cdtab; + dma_addr_t cdtab_dma; + struct arm_smmu_l1_ctx_desc *l1_desc; + unsigned int num_l1_ents; +}; + +struct arm_smmu_s1_cfg { + struct arm_smmu_ctx_desc_cfg cdcfg; + struct arm_smmu_ctx_desc cd; + u8 s1fmt; + u8 s1cdmax; +}; + +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; +}; + +/* 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) +#define ARM_SMMU_FEAT_RANGE_INV (1 << 15) + 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; + + unsigned long ias; /* IPA */ + unsigned long oas; /* PA */ + unsigned long pgsize_bitmap; + +#define ARM_SMMU_MAX_ASIDS (1 << 16) + unsigned int asid_bits; + +#define ARM_SMMU_MAX_VMIDS (1 << 16) + unsigned int vmid_bits; + DECLARE_BITMAP(vmid_map, ARM_SMMU_MAX_VMIDS); + + unsigned int ssid_bits; + unsigned int sid_bits; + + struct arm_smmu_strtab_cfg strtab_cfg; + + /* IOMMU core code handle */ + struct iommu_device iommu; +}; + +/* 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; + unsigned int ssid_bits; +}; + +/* 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 */ + + struct io_pgtable_ops *pgtbl_ops; + bool non_strict; + atomic_t nr_ats_masters; + + enum arm_smmu_domain_stage stage; + union { + struct arm_smmu_s1_cfg s1_cfg; + struct arm_smmu_s2_cfg s2_cfg; + }; + + struct iommu_domain domain; + + struct list_head devices; + spinlock_t devices_lock; +}; + +struct arm_smmu_option_prop { + u32 opt; + const char *prop; +}; + +static DEFINE_XARRAY_ALLOC1(asid_xa); + +static struct arm_smmu_option_prop arm_smmu_options[] = { + { ARM_SMMU_OPT_SKIP_PREFETCH, "hisilicon,broken-prefetch-cmd" }, + { ARM_SMMU_OPT_PAGE0_REGS_ONLY, "cavium,cn9900-broken-page1-regspace"}, + { 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); +} + +static void parse_driver_options(struct arm_smmu_device *smmu) +{ + int i = 0; + + do { + if (of_property_read_bool(smmu->dev->of_node, + arm_smmu_options[i].prop)) { + smmu->options |= arm_smmu_options[i].opt; + dev_notice(smmu->dev, "option %s\n", + arm_smmu_options[i].prop); + } + } while (arm_smmu_options[++i].opt); +} + +/* Low-level queue manipulation functions */ +static bool queue_has_space(struct arm_smmu_ll_queue *q, u32 n) +{ + u32 space, prod, cons; + + prod = Q_IDX(q, q->prod); + cons = Q_IDX(q, q->cons); + + if (Q_WRP(q, q->prod) == Q_WRP(q, q->cons)) + space = (1 << q->max_n_shift) - (prod - cons); + else + space = cons - prod; + + return space >= n; +} + +static bool queue_full(struct arm_smmu_ll_queue *q) +{ + return Q_IDX(q, q->prod) == Q_IDX(q, q->cons) && + Q_WRP(q, q->prod) != Q_WRP(q, q->cons); +} + +static bool queue_empty(struct arm_smmu_ll_queue *q) +{ + return Q_IDX(q, q->prod) == Q_IDX(q, q->cons) && + Q_WRP(q, q->prod) == Q_WRP(q, q->cons); +} + +static bool queue_consumed(struct arm_smmu_ll_queue *q, u32 prod) +{ + return ((Q_WRP(q, q->cons) == Q_WRP(q, prod)) && + (Q_IDX(q, q->cons) > Q_IDX(q, prod))) || + ((Q_WRP(q, q->cons) != Q_WRP(q, prod)) && + (Q_IDX(q, q->cons) <= Q_IDX(q, prod))); +} + +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(); + writel_relaxed(q->llq.cons, q->cons_reg); +} + +static void queue_inc_cons(struct arm_smmu_ll_queue *q) +{ + u32 cons = (Q_WRP(q, q->cons) | Q_IDX(q, q->cons)) + 1; + q->cons = Q_OVF(q->cons) | Q_WRP(q, cons) | Q_IDX(q, cons); +} + +static int queue_sync_prod_in(struct arm_smmu_queue *q) +{ + int ret = 0; + u32 prod = readl_relaxed(q->prod_reg); + + if (Q_OVF(prod) != Q_OVF(q->llq.prod)) + ret = -EOVERFLOW; + + q->llq.prod = prod; + return ret; +} + +static u32 queue_inc_prod_n(struct arm_smmu_ll_queue *q, int n) +{ + u32 prod = (Q_WRP(q, q->prod) | Q_IDX(q, q->prod)) + n; + return Q_OVF(q->prod) | Q_WRP(q, prod) | Q_IDX(q, prod); +} + +static void queue_poll_init(struct arm_smmu_device *smmu, + struct arm_smmu_queue_poll *qp) +{ + qp->delay = 1; + qp->spin_cnt = 0; + qp->wfe = !!(smmu->features & ARM_SMMU_FEAT_SEV); + qp->timeout = ktime_add_us(ktime_get(), ARM_SMMU_POLL_TIMEOUT_US); +} + +static int queue_poll(struct arm_smmu_queue_poll *qp) +{ + if (ktime_compare(ktime_get(), qp->timeout) > 0) + return -ETIMEDOUT; + + if (qp->wfe) { + wfe(); + } else if (++qp->spin_cnt < ARM_SMMU_POLL_SPIN_COUNT) { + cpu_relax(); + } else { + udelay(qp->delay); + qp->delay *= 2; + qp->spin_cnt = 0; + } + + return 0; +} + +static void queue_write(__le64 *dst, u64 *src, size_t n_dwords) +{ + int i; + + for (i = 0; i < n_dwords; ++i) + *dst++ = cpu_to_le64(*src++); +} + +static void queue_read(__le64 *dst, u64 *src, size_t n_dwords) +{ + int i; + + for (i = 0; i < n_dwords; ++i) + *dst++ = le64_to_cpu(*src++); +} + +static int queue_remove_raw(struct arm_smmu_queue *q, u64 *ent) +{ + if (queue_empty(&q->llq)) + return -EAGAIN; + + queue_read(ent, Q_ENT(q, q->llq.cons), q->ent_dwords); + queue_inc_cons(&q->llq); + queue_sync_cons_out(q); + return 0; +} + +/* High-level queue accessors */ +static int arm_smmu_cmdq_build_cmd(u64 *cmd, struct arm_smmu_cmdq_ent *ent) +{ + memset(cmd, 0, 1 << CMDQ_ENT_SZ_SHIFT); + cmd[0] |= FIELD_PREP(CMDQ_0_OP, ent->opcode); + + switch (ent->opcode) { + case CMDQ_OP_TLBI_EL2_ALL: + case CMDQ_OP_TLBI_NSNH_ALL: + 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_CD: + cmd[0] |= FIELD_PREP(CMDQ_CFGI_0_SSID, ent->cfgi.ssid); + /* Fallthrough */ + case CMDQ_OP_CFGI_STE: + cmd[0] |= FIELD_PREP(CMDQ_CFGI_0_SID, ent->cfgi.sid); + cmd[1] |= FIELD_PREP(CMDQ_CFGI_1_LEAF, ent->cfgi.leaf); + break; + case CMDQ_OP_CFGI_CD_ALL: + cmd[0] |= FIELD_PREP(CMDQ_CFGI_0_SID, ent->cfgi.sid); + break; + case CMDQ_OP_CFGI_ALL: + /* Cover the entire SID range */ + cmd[1] |= FIELD_PREP(CMDQ_CFGI_1_RANGE, 31); + break; + case CMDQ_OP_TLBI_NH_VA: + cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_NUM, ent->tlbi.num); + cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_SCALE, ent->tlbi.scale); + cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_VMID, ent->tlbi.vmid); + cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_ASID, ent->tlbi.asid); + cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_LEAF, ent->tlbi.leaf); + cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_TTL, ent->tlbi.ttl); + cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_TG, ent->tlbi.tg); + cmd[1] |= ent->tlbi.addr & CMDQ_TLBI_1_VA_MASK; + break; + case CMDQ_OP_TLBI_S2_IPA: + cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_NUM, ent->tlbi.num); + cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_SCALE, ent->tlbi.scale); + cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_VMID, ent->tlbi.vmid); + cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_LEAF, ent->tlbi.leaf); + cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_TTL, ent->tlbi.ttl); + cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_TG, ent->tlbi.tg); + cmd[1] |= ent->tlbi.addr & CMDQ_TLBI_1_IPA_MASK; + break; + case CMDQ_OP_TLBI_NH_ASID: + cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_ASID, ent->tlbi.asid); + /* Fallthrough */ + case CMDQ_OP_TLBI_S12_VMALL: + cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_VMID, ent->tlbi.vmid); + break; + case CMDQ_OP_ATC_INV: + cmd[0] |= FIELD_PREP(CMDQ_0_SSV, ent->substream_valid); + cmd[0] |= FIELD_PREP(CMDQ_ATC_0_GLOBAL, ent->atc.global); + cmd[0] |= FIELD_PREP(CMDQ_ATC_0_SSID, ent->atc.ssid); + cmd[0] |= FIELD_PREP(CMDQ_ATC_0_SID, ent->atc.sid); + cmd[1] |= FIELD_PREP(CMDQ_ATC_1_SIZE, ent->atc.size); + cmd[1] |= ent->atc.addr & CMDQ_ATC_1_ADDR_MASK; + break; + case CMDQ_OP_PRI_RESP: + cmd[0] |= FIELD_PREP(CMDQ_0_SSV, ent->substream_valid); + cmd[0] |= FIELD_PREP(CMDQ_PRI_0_SSID, ent->pri.ssid); + cmd[0] |= FIELD_PREP(CMDQ_PRI_0_SID, ent->pri.sid); + cmd[1] |= FIELD_PREP(CMDQ_PRI_1_GRPID, ent->pri.grpid); + switch (ent->pri.resp) { + case PRI_RESP_DENY: + case PRI_RESP_FAIL: + case PRI_RESP_SUCC: + break; + default: + return -EINVAL; + } + cmd[1] |= FIELD_PREP(CMDQ_PRI_1_RESP, ent->pri.resp); + break; + case CMDQ_OP_CMD_SYNC: + if (ent->sync.msiaddr) { + cmd[0] |= FIELD_PREP(CMDQ_SYNC_0_CS, CMDQ_SYNC_0_CS_IRQ); + cmd[1] |= ent->sync.msiaddr & CMDQ_SYNC_1_MSIADDR_MASK; + } else { + cmd[0] |= FIELD_PREP(CMDQ_SYNC_0_CS, CMDQ_SYNC_0_CS_SEV); + } + cmd[0] |= FIELD_PREP(CMDQ_SYNC_0_MSH, ARM_SMMU_SH_ISH); + cmd[0] |= FIELD_PREP(CMDQ_SYNC_0_MSIATTR, ARM_SMMU_MEMATTR_OIWB); + break; + default: + return -ENOENT; + } + + return 0; +} + +static void arm_smmu_cmdq_build_sync_cmd(u64 *cmd, struct arm_smmu_device *smmu, + u32 prod) +{ + struct arm_smmu_queue *q = &smmu->cmdq.q; + struct arm_smmu_cmdq_ent ent = { + .opcode = CMDQ_OP_CMD_SYNC, + }; + + /* + * Beware that Hi16xx adds an extra 32 bits of goodness to its MSI + * payload, so the write will zero the entire command on that platform. + */ + if (smmu->features & ARM_SMMU_FEAT_MSI && + smmu->features & ARM_SMMU_FEAT_COHERENCY) { + ent.sync.msiaddr = q->base_dma + Q_IDX(&q->llq, prod) * + q->ent_dwords * 8; + } + + arm_smmu_cmdq_build_cmd(cmd, &ent); +} + +static void arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu) +{ + static const char *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", + [CMDQ_ERR_CERROR_ATC_INV_IDX] = "ATC invalidate timeout", + }; + + int i; + u64 cmd[CMDQ_ENT_DWORDS]; + struct arm_smmu_queue *q = &smmu->cmdq.q; + u32 cons = readl_relaxed(q->cons_reg); + u32 idx = FIELD_GET(CMDQ_CONS_ERR, cons); + struct arm_smmu_cmdq_ent cmd_sync = { + .opcode = CMDQ_OP_CMD_SYNC, + }; + + dev_err(smmu->dev, "CMDQ error (cons 0x%08x): %s\n", cons, + idx < ARRAY_SIZE(cerror_str) ? cerror_str[idx] : "Unknown"); + + switch (idx) { + case CMDQ_ERR_CERROR_ABT_IDX: + dev_err(smmu->dev, "retrying command fetch\n"); + case CMDQ_ERR_CERROR_NONE_IDX: + return; + case CMDQ_ERR_CERROR_ATC_INV_IDX: + /* + * ATC Invalidation Completion timeout. CONS is still pointing + * at the CMD_SYNC. Attempt to complete other pending commands + * by repeating the CMD_SYNC, though we might well end up back + * here since the ATC invalidation may still be pending. + */ + return; + case CMDQ_ERR_CERROR_ILL_IDX: + /* Fallthrough */ + default: + break; + } + + /* + * We may have concurrent producers, so we need to be careful + * not to touch any of the shadow cmdq state. + */ + queue_read(cmd, Q_ENT(q, cons), q->ent_dwords); + dev_err(smmu->dev, "skipping command in error state:\n"); + for (i = 0; i < ARRAY_SIZE(cmd); ++i) + dev_err(smmu->dev, "\t0x%016llx\n", (unsigned long long)cmd[i]); + + /* Convert the erroneous command into a CMD_SYNC */ + if (arm_smmu_cmdq_build_cmd(cmd, &cmd_sync)) { + dev_err(smmu->dev, "failed to convert to CMD_SYNC\n"); + return; + } + + queue_write(Q_ENT(q, cons), cmd, q->ent_dwords); +} + +/* + * Command queue locking. + * This is a form of bastardised rwlock with the following major changes: + * + * - The only LOCK routines are exclusive_trylock() and shared_lock(). + * Neither have barrier semantics, and instead provide only a control + * dependency. + * + * - The UNLOCK routines are supplemented with shared_tryunlock(), which + * fails if the caller appears to be the last lock holder (yes, this is + * racy). All successful UNLOCK routines have RELEASE semantics. + */ +static void arm_smmu_cmdq_shared_lock(struct arm_smmu_cmdq *cmdq) +{ + int val; + + /* + * We can try to avoid the cmpxchg() loop by simply incrementing the + * lock counter. When held in exclusive state, the lock counter is set + * to INT_MIN so these increments won't hurt as the value will remain + * negative. + */ + if (atomic_fetch_inc_relaxed(&cmdq->lock) >= 0) + return; + + do { + val = atomic_cond_read_relaxed(&cmdq->lock, VAL >= 0); + } while (atomic_cmpxchg_relaxed(&cmdq->lock, val, val + 1) != val); +} + +static void arm_smmu_cmdq_shared_unlock(struct arm_smmu_cmdq *cmdq) +{ + (void)atomic_dec_return_release(&cmdq->lock); +} + +static bool arm_smmu_cmdq_shared_tryunlock(struct arm_smmu_cmdq *cmdq) +{ + if (atomic_read(&cmdq->lock) == 1) + return false; + + arm_smmu_cmdq_shared_unlock(cmdq); + return true; +} + +#define arm_smmu_cmdq_exclusive_trylock_irqsave(cmdq, flags) \ +({ \ + bool __ret; \ + local_irq_save(flags); \ + __ret = !atomic_cmpxchg_relaxed(&cmdq->lock, 0, INT_MIN); \ + if (!__ret) \ + local_irq_restore(flags); \ + __ret; \ +}) + +#define arm_smmu_cmdq_exclusive_unlock_irqrestore(cmdq, flags) \ +({ \ + atomic_set_release(&cmdq->lock, 0); \ + local_irq_restore(flags); \ +}) + + +/* + * Command queue insertion. + * This is made fiddly by our attempts to achieve some sort of scalability + * since there is one queue shared amongst all of the CPUs in the system. If + * you like mixed-size concurrency, dependency ordering and relaxed atomics, + * then you'll *love* this monstrosity. + * + * The basic idea is to split the queue up into ranges of commands that are + * owned by a given CPU; the owner may not have written all of the commands + * itself, but is responsible for advancing the hardware prod pointer when + * the time comes. The algorithm is roughly: + * + * 1. Allocate some space in the queue. At this point we also discover + * whether the head of the queue is currently owned by another CPU, + * or whether we are the owner. + * + * 2. Write our commands into our allocated slots in the queue. + * + * 3. Mark our slots as valid in arm_smmu_cmdq.valid_map. + * + * 4. If we are an owner: + * a. Wait for the previous owner to finish. + * b. Mark the queue head as unowned, which tells us the range + * that we are responsible for publishing. + * c. Wait for all commands in our owned range to become valid. + * d. Advance the hardware prod pointer. + * e. Tell the next owner we've finished. + * + * 5. If we are inserting a CMD_SYNC (we may or may not have been an + * owner), then we need to stick around until it has completed: + * a. If we have MSIs, the SMMU can write back into the CMD_SYNC + * to clear the first 4 bytes. + * b. Otherwise, we spin waiting for the hardware cons pointer to + * advance past our command. + * + * The devil is in the details, particularly the use of locking for handling + * SYNC completion and freeing up space in the queue before we think that it is + * full. + */ +static void __arm_smmu_cmdq_poll_set_valid_map(struct arm_smmu_cmdq *cmdq, + u32 sprod, u32 eprod, bool set) +{ + u32 swidx, sbidx, ewidx, ebidx; + struct arm_smmu_ll_queue llq = { + .max_n_shift = cmdq->q.llq.max_n_shift, + .prod = sprod, + }; + + ewidx = BIT_WORD(Q_IDX(&llq, eprod)); + ebidx = Q_IDX(&llq, eprod) % BITS_PER_LONG; + + while (llq.prod != eprod) { + unsigned long mask; + atomic_long_t *ptr; + u32 limit = BITS_PER_LONG; + + swidx = BIT_WORD(Q_IDX(&llq, llq.prod)); + sbidx = Q_IDX(&llq, llq.prod) % BITS_PER_LONG; + + ptr = &cmdq->valid_map[swidx]; + + if ((swidx == ewidx) && (sbidx < ebidx)) + limit = ebidx; + + mask = GENMASK(limit - 1, sbidx); + + /* + * The valid bit is the inverse of the wrap bit. This means + * that a zero-initialised queue is invalid and, after marking + * all entries as valid, they become invalid again when we + * wrap. + */ + if (set) { + atomic_long_xor(mask, ptr); + } else { /* Poll */ + unsigned long valid; + + valid = (ULONG_MAX + !!Q_WRP(&llq, llq.prod)) & mask; + atomic_long_cond_read_relaxed(ptr, (VAL & mask) == valid); + } + + llq.prod = queue_inc_prod_n(&llq, limit - sbidx); + } +} + +/* Mark all entries in the range [sprod, eprod) as valid */ +static void arm_smmu_cmdq_set_valid_map(struct arm_smmu_cmdq *cmdq, + u32 sprod, u32 eprod) +{ + __arm_smmu_cmdq_poll_set_valid_map(cmdq, sprod, eprod, true); +} + +/* Wait for all entries in the range [sprod, eprod) to become valid */ +static void arm_smmu_cmdq_poll_valid_map(struct arm_smmu_cmdq *cmdq, + u32 sprod, u32 eprod) +{ + __arm_smmu_cmdq_poll_set_valid_map(cmdq, sprod, eprod, false); +} + +/* Wait for the command queue to become non-full */ +static int arm_smmu_cmdq_poll_until_not_full(struct arm_smmu_device *smmu, + struct arm_smmu_ll_queue *llq) +{ + unsigned long flags; + struct arm_smmu_queue_poll qp; + struct arm_smmu_cmdq *cmdq = &smmu->cmdq; + int ret = 0; + + /* + * Try to update our copy of cons by grabbing exclusive cmdq access. If + * that fails, spin until somebody else updates it for us. + */ + if (arm_smmu_cmdq_exclusive_trylock_irqsave(cmdq, flags)) { + WRITE_ONCE(cmdq->q.llq.cons, readl_relaxed(cmdq->q.cons_reg)); + arm_smmu_cmdq_exclusive_unlock_irqrestore(cmdq, flags); + llq->val = READ_ONCE(cmdq->q.llq.val); + return 0; + } + + queue_poll_init(smmu, &qp); + do { + llq->val = READ_ONCE(smmu->cmdq.q.llq.val); + if (!queue_full(llq)) + break; + + ret = queue_poll(&qp); + } while (!ret); + + return ret; +} + +/* + * Wait until the SMMU signals a CMD_SYNC completion MSI. + * Must be called with the cmdq lock held in some capacity. + */ +static int __arm_smmu_cmdq_poll_until_msi(struct arm_smmu_device *smmu, + struct arm_smmu_ll_queue *llq) +{ + int ret = 0; + struct arm_smmu_queue_poll qp; + struct arm_smmu_cmdq *cmdq = &smmu->cmdq; + u32 *cmd = (u32 *)(Q_ENT(&cmdq->q, llq->prod)); + + queue_poll_init(smmu, &qp); + + /* + * The MSI won't generate an event, since it's being written back + * into the command queue. + */ + qp.wfe = false; + smp_cond_load_relaxed(cmd, !VAL || (ret = queue_poll(&qp))); + llq->cons = ret ? llq->prod : queue_inc_prod_n(llq, 1); + return ret; +} + +/* + * Wait until the SMMU cons index passes llq->prod. + * Must be called with the cmdq lock held in some capacity. + */ +static int __arm_smmu_cmdq_poll_until_consumed(struct arm_smmu_device *smmu, + struct arm_smmu_ll_queue *llq) +{ + struct arm_smmu_queue_poll qp; + struct arm_smmu_cmdq *cmdq = &smmu->cmdq; + u32 prod = llq->prod; + int ret = 0; + + queue_poll_init(smmu, &qp); + llq->val = READ_ONCE(smmu->cmdq.q.llq.val); + do { + if (queue_consumed(llq, prod)) + break; + + ret = queue_poll(&qp); + + /* + * This needs to be a readl() so that our subsequent call + * to arm_smmu_cmdq_shared_tryunlock() can fail accurately. + * + * Specifically, we need to ensure that we observe all + * shared_lock()s by other CMD_SYNCs that share our owner, + * so that a failing call to tryunlock() means that we're + * the last one out and therefore we can safely advance + * cmdq->q.llq.cons. Roughly speaking: + * + * CPU 0 CPU1 CPU2 (us) + * + * if (sync) + * shared_lock(); + * + * dma_wmb(); + * set_valid_map(); + * + * if (owner) { + * poll_valid_map(); + * + * writel(prod_reg); + * + * readl(cons_reg); + * tryunlock(); + * + * Requires us to see CPU 0's shared_lock() acquisition. + */ + llq->cons = readl(cmdq->q.cons_reg); + } while (!ret); + + return ret; +} + +static int arm_smmu_cmdq_poll_until_sync(struct arm_smmu_device *smmu, + struct arm_smmu_ll_queue *llq) +{ + if (smmu->features & ARM_SMMU_FEAT_MSI && + smmu->features & ARM_SMMU_FEAT_COHERENCY) + return __arm_smmu_cmdq_poll_until_msi(smmu, llq); + + return __arm_smmu_cmdq_poll_until_consumed(smmu, llq); +} + +static void arm_smmu_cmdq_write_entries(struct arm_smmu_cmdq *cmdq, u64 *cmds, + u32 prod, int n) +{ + int i; + struct arm_smmu_ll_queue llq = { + .max_n_shift = cmdq->q.llq.max_n_shift, + .prod = prod, + }; + + for (i = 0; i < n; ++i) { + u64 *cmd = &cmds[i * CMDQ_ENT_DWORDS]; + + prod = queue_inc_prod_n(&llq, i); + queue_write(Q_ENT(&cmdq->q, prod), cmd, CMDQ_ENT_DWORDS); + } +} + +/* + * This is the actual insertion function, and provides the following + * ordering guarantees to callers: + * + * - There is a dma_wmb() before publishing any commands to the queue. + * This can be relied upon to order prior writes to data structures + * in memory (such as a CD or an STE) before the command. + * + * - On completion of a CMD_SYNC, there is a control dependency. + * This can be relied upon to order subsequent writes to memory (e.g. + * freeing an IOVA) after completion of the CMD_SYNC. + * + * - Command insertion is totally ordered, so if two CPUs each race to + * insert their own list of commands then all of the commands from one + * CPU will appear before any of the commands from the other CPU. + */ +static int arm_smmu_cmdq_issue_cmdlist(struct arm_smmu_device *smmu, + u64 *cmds, int n, bool sync) +{ + u64 cmd_sync[CMDQ_ENT_DWORDS]; + u32 prod; + unsigned long flags; + bool owner; + struct arm_smmu_cmdq *cmdq = &smmu->cmdq; + struct arm_smmu_ll_queue llq = { + .max_n_shift = cmdq->q.llq.max_n_shift, + }, head = llq; + int ret = 0; + + /* 1. Allocate some space in the queue */ + local_irq_save(flags); + llq.val = READ_ONCE(cmdq->q.llq.val); + do { + u64 old; + + while (!queue_has_space(&llq, n + sync)) { + local_irq_restore(flags); + if (arm_smmu_cmdq_poll_until_not_full(smmu, &llq)) + dev_err_ratelimited(smmu->dev, "CMDQ timeout\n"); + local_irq_save(flags); + } + + head.cons = llq.cons; + head.prod = queue_inc_prod_n(&llq, n + sync) | + CMDQ_PROD_OWNED_FLAG; + + old = cmpxchg_relaxed(&cmdq->q.llq.val, llq.val, head.val); + if (old == llq.val) + break; + + llq.val = old; + } while (1); + owner = !(llq.prod & CMDQ_PROD_OWNED_FLAG); + head.prod &= ~CMDQ_PROD_OWNED_FLAG; + llq.prod &= ~CMDQ_PROD_OWNED_FLAG; + + /* + * 2. Write our commands into the queue + * Dependency ordering from the cmpxchg() loop above. + */ + arm_smmu_cmdq_write_entries(cmdq, cmds, llq.prod, n); + if (sync) { + prod = queue_inc_prod_n(&llq, n); + arm_smmu_cmdq_build_sync_cmd(cmd_sync, smmu, prod); + queue_write(Q_ENT(&cmdq->q, prod), cmd_sync, CMDQ_ENT_DWORDS); + + /* + * In order to determine completion of our CMD_SYNC, we must + * ensure that the queue can't wrap twice without us noticing. + * We achieve that by taking the cmdq lock as shared before + * marking our slot as valid. + */ + arm_smmu_cmdq_shared_lock(cmdq); + } + + /* 3. Mark our slots as valid, ensuring commands are visible first */ + dma_wmb(); + arm_smmu_cmdq_set_valid_map(cmdq, llq.prod, head.prod); + + /* 4. If we are the owner, take control of the SMMU hardware */ + if (owner) { + /* a. Wait for previous owner to finish */ + atomic_cond_read_relaxed(&cmdq->owner_prod, VAL == llq.prod); + + /* b. Stop gathering work by clearing the owned flag */ + prod = atomic_fetch_andnot_relaxed(CMDQ_PROD_OWNED_FLAG, + &cmdq->q.llq.atomic.prod); + prod &= ~CMDQ_PROD_OWNED_FLAG; + + /* + * c. Wait for any gathered work to be written to the queue. + * Note that we read our own entries so that we have the control + * dependency required by (d). + */ + arm_smmu_cmdq_poll_valid_map(cmdq, llq.prod, prod); + + /* + * d. Advance the hardware prod pointer + * Control dependency ordering from the entries becoming valid. + */ + writel_relaxed(prod, cmdq->q.prod_reg); + + /* + * e. Tell the next owner we're done + * Make sure we've updated the hardware first, so that we don't + * race to update prod and potentially move it backwards. + */ + atomic_set_release(&cmdq->owner_prod, prod); + } + + /* 5. If we are inserting a CMD_SYNC, we must wait for it to complete */ + if (sync) { + llq.prod = queue_inc_prod_n(&llq, n); + ret = arm_smmu_cmdq_poll_until_sync(smmu, &llq); + if (ret) { + dev_err_ratelimited(smmu->dev, + "CMD_SYNC timeout at 0x%08x [hwprod 0x%08x, hwcons 0x%08x]\n", + llq.prod, + readl_relaxed(cmdq->q.prod_reg), + readl_relaxed(cmdq->q.cons_reg)); + } + + /* + * Try to unlock the cmq lock. This will fail if we're the last + * reader, in which case we can safely update cmdq->q.llq.cons + */ + if (!arm_smmu_cmdq_shared_tryunlock(cmdq)) { + WRITE_ONCE(cmdq->q.llq.cons, llq.cons); + arm_smmu_cmdq_shared_unlock(cmdq); + } + } + + local_irq_restore(flags); + return ret; +} + +static int arm_smmu_cmdq_issue_cmd(struct arm_smmu_device *smmu, + struct arm_smmu_cmdq_ent *ent) +{ + u64 cmd[CMDQ_ENT_DWORDS]; + + if (arm_smmu_cmdq_build_cmd(cmd, ent)) { + dev_warn(smmu->dev, "ignoring unknown CMDQ opcode 0x%x\n", + ent->opcode); + return -EINVAL; + } + + return arm_smmu_cmdq_issue_cmdlist(smmu, cmd, 1, false); +} + +static int arm_smmu_cmdq_issue_sync(struct arm_smmu_device *smmu) +{ + return arm_smmu_cmdq_issue_cmdlist(smmu, NULL, 0, true); +} + +static void arm_smmu_cmdq_batch_add(struct arm_smmu_device *smmu, + struct arm_smmu_cmdq_batch *cmds, + struct arm_smmu_cmdq_ent *cmd) +{ + if (cmds->num == CMDQ_BATCH_ENTRIES) { + arm_smmu_cmdq_issue_cmdlist(smmu, cmds->cmds, cmds->num, false); + cmds->num = 0; + } + arm_smmu_cmdq_build_cmd(&cmds->cmds[cmds->num * CMDQ_ENT_DWORDS], cmd); + cmds->num++; +} + +static int arm_smmu_cmdq_batch_submit(struct arm_smmu_device *smmu, + struct arm_smmu_cmdq_batch *cmds) +{ + return arm_smmu_cmdq_issue_cmdlist(smmu, cmds->cmds, cmds->num, true); +} + +/* Context descriptor manipulation functions */ +static void arm_smmu_sync_cd(struct arm_smmu_domain *smmu_domain, + int ssid, bool leaf) +{ + size_t i; + unsigned long flags; + struct arm_smmu_master *master; + struct arm_smmu_cmdq_batch cmds = {}; + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_cmdq_ent cmd = { + .opcode = CMDQ_OP_CFGI_CD, + .cfgi = { + .ssid = ssid, + .leaf = leaf, + }, + }; + + spin_lock_irqsave(&smmu_domain->devices_lock, flags); + list_for_each_entry(master, &smmu_domain->devices, domain_head) { + for (i = 0; i < master->num_sids; i++) { + cmd.cfgi.sid = master->sids[i]; + arm_smmu_cmdq_batch_add(smmu, &cmds, &cmd); + } + } + spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); + + arm_smmu_cmdq_batch_submit(smmu, &cmds); +} + +static int arm_smmu_alloc_cd_leaf_table(struct arm_smmu_device *smmu, + struct arm_smmu_l1_ctx_desc *l1_desc) +{ + size_t size = CTXDESC_L2_ENTRIES * (CTXDESC_CD_DWORDS << 3); + + l1_desc->l2ptr = dmam_alloc_coherent(smmu->dev, size, + &l1_desc->l2ptr_dma, GFP_KERNEL); + if (!l1_desc->l2ptr) { + dev_warn(smmu->dev, + "failed to allocate context descriptor table\n"); + return -ENOMEM; + } + return 0; +} + +static void arm_smmu_write_cd_l1_desc(__le64 *dst, + struct arm_smmu_l1_ctx_desc *l1_desc) +{ + u64 val = (l1_desc->l2ptr_dma & CTXDESC_L1_DESC_L2PTR_MASK) | + CTXDESC_L1_DESC_V; + + /* See comment in arm_smmu_write_ctx_desc() */ + WRITE_ONCE(*dst, cpu_to_le64(val)); +} + +static __le64 *arm_smmu_get_cd_ptr(struct arm_smmu_domain *smmu_domain, + u32 ssid) +{ + __le64 *l1ptr; + unsigned int idx; + struct arm_smmu_l1_ctx_desc *l1_desc; + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_ctx_desc_cfg *cdcfg = &smmu_domain->s1_cfg.cdcfg; + + if (smmu_domain->s1_cfg.s1fmt == STRTAB_STE_0_S1FMT_LINEAR) + return cdcfg->cdtab + ssid * CTXDESC_CD_DWORDS; + + idx = ssid >> CTXDESC_SPLIT; + l1_desc = &cdcfg->l1_desc[idx]; + if (!l1_desc->l2ptr) { + if (arm_smmu_alloc_cd_leaf_table(smmu, l1_desc)) + return NULL; + + l1ptr = cdcfg->cdtab + idx * CTXDESC_L1_DESC_DWORDS; + arm_smmu_write_cd_l1_desc(l1ptr, l1_desc); + /* An invalid L1CD can be cached */ + arm_smmu_sync_cd(smmu_domain, ssid, false); + } + idx = ssid & (CTXDESC_L2_ENTRIES - 1); + return l1_desc->l2ptr + idx * CTXDESC_CD_DWORDS; +} + +static int arm_smmu_write_ctx_desc(struct arm_smmu_domain *smmu_domain, + int ssid, struct arm_smmu_ctx_desc *cd) +{ + /* + * This function handles the following cases: + * + * (1) Install primary CD, for normal DMA traffic (SSID = 0). + * (2) Install a secondary CD, for SID+SSID traffic. + * (3) Update ASID of a CD. Atomically write the first 64 bits of the + * CD, then invalidate the old entry and mappings. + * (4) Remove a secondary CD. + */ + u64 val; + bool cd_live; + __le64 *cdptr; + struct arm_smmu_device *smmu = smmu_domain->smmu; + + if (WARN_ON(ssid >= (1 << smmu_domain->s1_cfg.s1cdmax))) + return -E2BIG; + + cdptr = arm_smmu_get_cd_ptr(smmu_domain, ssid); + if (!cdptr) + return -ENOMEM; + + val = le64_to_cpu(cdptr[0]); + cd_live = !!(val & CTXDESC_CD_0_V); + + if (!cd) { /* (4) */ + val = 0; + } else if (cd_live) { /* (3) */ + val &= ~CTXDESC_CD_0_ASID; + val |= FIELD_PREP(CTXDESC_CD_0_ASID, cd->asid); + /* + * Until CD+TLB invalidation, both ASIDs may be used for tagging + * this substream's traffic + */ + } else { /* (1) and (2) */ + cdptr[1] = cpu_to_le64(cd->ttbr & CTXDESC_CD_1_TTB0_MASK); + cdptr[2] = 0; + cdptr[3] = cpu_to_le64(cd->mair); + + /* + * STE is live, and the SMMU might read dwords of this CD in any + * order. Ensure that it observes valid values before reading + * V=1. + */ + arm_smmu_sync_cd(smmu_domain, ssid, true); + + val = cd->tcr | +#ifdef __BIG_ENDIAN + CTXDESC_CD_0_ENDI | +#endif + CTXDESC_CD_0_R | CTXDESC_CD_0_A | CTXDESC_CD_0_ASET | + CTXDESC_CD_0_AA64 | + FIELD_PREP(CTXDESC_CD_0_ASID, cd->asid) | + CTXDESC_CD_0_V; + + /* STALL_MODEL==0b10 && CD.S==0 is ILLEGAL */ + if (smmu->features & ARM_SMMU_FEAT_STALL_FORCE) + val |= CTXDESC_CD_0_S; + } + + /* + * The SMMU accesses 64-bit values atomically. See IHI0070Ca 3.21.3 + * "Configuration structures and configuration invalidation completion" + * + * The size of single-copy atomic reads made by the SMMU is + * IMPLEMENTATION DEFINED but must be at least 64 bits. Any single + * field within an aligned 64-bit span of a structure can be altered + * without first making the structure invalid. + */ + WRITE_ONCE(cdptr[0], cpu_to_le64(val)); + arm_smmu_sync_cd(smmu_domain, ssid, true); + return 0; +} + +static int arm_smmu_alloc_cd_tables(struct arm_smmu_domain *smmu_domain) +{ + int ret; + size_t l1size; + size_t max_contexts; + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg; + struct arm_smmu_ctx_desc_cfg *cdcfg = &cfg->cdcfg; + + max_contexts = 1 << cfg->s1cdmax; + + if (!(smmu->features & ARM_SMMU_FEAT_2_LVL_CDTAB) || + max_contexts <= CTXDESC_L2_ENTRIES) { + cfg->s1fmt = STRTAB_STE_0_S1FMT_LINEAR; + cdcfg->num_l1_ents = max_contexts; + + l1size = max_contexts * (CTXDESC_CD_DWORDS << 3); + } else { + cfg->s1fmt = STRTAB_STE_0_S1FMT_64K_L2; + cdcfg->num_l1_ents = DIV_ROUND_UP(max_contexts, + CTXDESC_L2_ENTRIES); + + cdcfg->l1_desc = devm_kcalloc(smmu->dev, cdcfg->num_l1_ents, + sizeof(*cdcfg->l1_desc), + GFP_KERNEL); + if (!cdcfg->l1_desc) + return -ENOMEM; + + l1size = cdcfg->num_l1_ents * (CTXDESC_L1_DESC_DWORDS << 3); + } + + cdcfg->cdtab = dmam_alloc_coherent(smmu->dev, l1size, &cdcfg->cdtab_dma, + GFP_KERNEL); + if (!cdcfg->cdtab) { + dev_warn(smmu->dev, "failed to allocate context descriptor\n"); + ret = -ENOMEM; + goto err_free_l1; + } + + return 0; + +err_free_l1: + if (cdcfg->l1_desc) { + devm_kfree(smmu->dev, cdcfg->l1_desc); + cdcfg->l1_desc = NULL; + } + return ret; +} + +static void arm_smmu_free_cd_tables(struct arm_smmu_domain *smmu_domain) +{ + int i; + size_t size, l1size; + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_ctx_desc_cfg *cdcfg = &smmu_domain->s1_cfg.cdcfg; + + if (cdcfg->l1_desc) { + size = CTXDESC_L2_ENTRIES * (CTXDESC_CD_DWORDS << 3); + + for (i = 0; i < cdcfg->num_l1_ents; i++) { + if (!cdcfg->l1_desc[i].l2ptr) + continue; + + dmam_free_coherent(smmu->dev, size, + cdcfg->l1_desc[i].l2ptr, + cdcfg->l1_desc[i].l2ptr_dma); + } + devm_kfree(smmu->dev, cdcfg->l1_desc); + cdcfg->l1_desc = NULL; + + l1size = cdcfg->num_l1_ents * (CTXDESC_L1_DESC_DWORDS << 3); + } else { + l1size = cdcfg->num_l1_ents * (CTXDESC_CD_DWORDS << 3); + } + + dmam_free_coherent(smmu->dev, l1size, cdcfg->cdtab, cdcfg->cdtab_dma); + cdcfg->cdtab_dma = 0; + cdcfg->cdtab = NULL; +} + +static void arm_smmu_free_asid(struct arm_smmu_ctx_desc *cd) +{ + if (!cd->asid) + return; + + xa_erase(&asid_xa, cd->asid); +} + +/* Stream table manipulation functions */ +static void +arm_smmu_write_strtab_l1_desc(__le64 *dst, struct arm_smmu_strtab_l1_desc *desc) +{ + u64 val = 0; + + val |= FIELD_PREP(STRTAB_L1_DESC_SPAN, desc->span); + val |= desc->l2ptr_dma & STRTAB_L1_DESC_L2PTR_MASK; + + /* See comment in arm_smmu_write_ctx_desc() */ + WRITE_ONCE(*dst, cpu_to_le64(val)); +} + +static void arm_smmu_sync_ste_for_sid(struct arm_smmu_device *smmu, u32 sid) +{ + struct arm_smmu_cmdq_ent cmd = { + .opcode = CMDQ_OP_CFGI_STE, + .cfgi = { + .sid = sid, + .leaf = true, + }, + }; + + arm_smmu_cmdq_issue_cmd(smmu, &cmd); + arm_smmu_cmdq_issue_sync(smmu); +} + +static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, + __le64 *dst) +{ + /* + * This is hideously complicated, but we only really care about + * three cases at the moment: + * + * 1. Invalid (all zero) -> bypass/fault (init) + * 2. Bypass/fault -> translation/bypass (attach) + * 3. Translation/bypass -> bypass/fault (detach) + * + * Given that we can't update the STE atomically and the SMMU + * doesn't read the thing in a defined order, that leaves us + * with the following maintenance requirements: + * + * 1. Update Config, return (init time STEs aren't live) + * 2. Write everything apart from dword 0, sync, write dword 0, sync + * 3. Update Config, sync + */ + u64 val = le64_to_cpu(dst[0]); + bool ste_live = false; + struct arm_smmu_device *smmu = NULL; + struct arm_smmu_s1_cfg *s1_cfg = NULL; + struct arm_smmu_s2_cfg *s2_cfg = NULL; + struct arm_smmu_domain *smmu_domain = NULL; + struct arm_smmu_cmdq_ent prefetch_cmd = { + .opcode = CMDQ_OP_PREFETCH_CFG, + .prefetch = { + .sid = sid, + }, + }; + + if (master) { + smmu_domain = master->domain; + smmu = master->smmu; + } + + if (smmu_domain) { + switch (smmu_domain->stage) { + case ARM_SMMU_DOMAIN_S1: + s1_cfg = &smmu_domain->s1_cfg; + break; + case ARM_SMMU_DOMAIN_S2: + case ARM_SMMU_DOMAIN_NESTED: + s2_cfg = &smmu_domain->s2_cfg; + break; + default: + break; + } + } + + if (val & STRTAB_STE_0_V) { + switch (FIELD_GET(STRTAB_STE_0_CFG, val)) { + case STRTAB_STE_0_CFG_BYPASS: + break; + case STRTAB_STE_0_CFG_S1_TRANS: + case STRTAB_STE_0_CFG_S2_TRANS: + ste_live = true; + break; + case STRTAB_STE_0_CFG_ABORT: + BUG_ON(!disable_bypass); + break; + default: + BUG(); /* STE corruption */ + } + } + + /* Nuke the existing STE_0 value, as we're going to rewrite it */ + val = STRTAB_STE_0_V; + + /* Bypass/fault */ + if (!smmu_domain || !(s1_cfg || s2_cfg)) { + if (!smmu_domain && disable_bypass) + val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_ABORT); + else + val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_BYPASS); + + dst[0] = cpu_to_le64(val); + dst[1] = cpu_to_le64(FIELD_PREP(STRTAB_STE_1_SHCFG, + STRTAB_STE_1_SHCFG_INCOMING)); + dst[2] = 0; /* Nuke the VMID */ + /* + * The SMMU can perform negative caching, so we must sync + * the STE regardless of whether the old value was live. + */ + if (smmu) + arm_smmu_sync_ste_for_sid(smmu, sid); + return; + } + + if (s1_cfg) { + BUG_ON(ste_live); + dst[1] = cpu_to_le64( + FIELD_PREP(STRTAB_STE_1_S1DSS, STRTAB_STE_1_S1DSS_SSID0) | + FIELD_PREP(STRTAB_STE_1_S1CIR, STRTAB_STE_1_S1C_CACHE_WBRA) | + FIELD_PREP(STRTAB_STE_1_S1COR, STRTAB_STE_1_S1C_CACHE_WBRA) | + FIELD_PREP(STRTAB_STE_1_S1CSH, ARM_SMMU_SH_ISH) | + FIELD_PREP(STRTAB_STE_1_STRW, STRTAB_STE_1_STRW_NSEL1)); + + if (smmu->features & ARM_SMMU_FEAT_STALLS && + !(smmu->features & ARM_SMMU_FEAT_STALL_FORCE)) + dst[1] |= cpu_to_le64(STRTAB_STE_1_S1STALLD); + + val |= (s1_cfg->cdcfg.cdtab_dma & STRTAB_STE_0_S1CTXPTR_MASK) | + FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_S1_TRANS) | + FIELD_PREP(STRTAB_STE_0_S1CDMAX, s1_cfg->s1cdmax) | + FIELD_PREP(STRTAB_STE_0_S1FMT, s1_cfg->s1fmt); + } + + if (s2_cfg) { + BUG_ON(ste_live); + dst[2] = cpu_to_le64( + FIELD_PREP(STRTAB_STE_2_S2VMID, s2_cfg->vmid) | + FIELD_PREP(STRTAB_STE_2_VTCR, s2_cfg->vtcr) | +#ifdef __BIG_ENDIAN + STRTAB_STE_2_S2ENDI | +#endif + STRTAB_STE_2_S2PTW | STRTAB_STE_2_S2AA64 | + STRTAB_STE_2_S2R); + + dst[3] = cpu_to_le64(s2_cfg->vttbr & STRTAB_STE_3_S2TTB_MASK); + + val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_S2_TRANS); + } + + if (master->ats_enabled) + dst[1] |= cpu_to_le64(FIELD_PREP(STRTAB_STE_1_EATS, + STRTAB_STE_1_EATS_TRANS)); + + arm_smmu_sync_ste_for_sid(smmu, sid); + /* See comment in arm_smmu_write_ctx_desc() */ + WRITE_ONCE(dst[0], cpu_to_le64(val)); + arm_smmu_sync_ste_for_sid(smmu, sid); + + /* It's likely that we'll want to use the new STE soon */ + if (!(smmu->options & ARM_SMMU_OPT_SKIP_PREFETCH)) + arm_smmu_cmdq_issue_cmd(smmu, &prefetch_cmd); +} + +static void arm_smmu_init_bypass_stes(u64 *strtab, unsigned int nent) +{ + unsigned int i; + + for (i = 0; i < nent; ++i) { + arm_smmu_write_strtab_ent(NULL, -1, strtab); + strtab += STRTAB_STE_DWORDS; + } +} + +static int arm_smmu_init_l2_strtab(struct arm_smmu_device *smmu, u32 sid) +{ + size_t size; + void *strtab; + struct arm_smmu_strtab_cfg *cfg = &smmu->strtab_cfg; + struct arm_smmu_strtab_l1_desc *desc = &cfg->l1_desc[sid >> STRTAB_SPLIT]; + + if (desc->l2ptr) + return 0; + + size = 1 << (STRTAB_SPLIT + ilog2(STRTAB_STE_DWORDS) + 3); + strtab = &cfg->strtab[(sid >> STRTAB_SPLIT) * STRTAB_L1_DESC_DWORDS]; + + desc->span = STRTAB_SPLIT + 1; + desc->l2ptr = dmam_alloc_coherent(smmu->dev, size, &desc->l2ptr_dma, + GFP_KERNEL); + if (!desc->l2ptr) { + dev_err(smmu->dev, + "failed to allocate l2 stream table for SID %u\n", + sid); + return -ENOMEM; + } + + arm_smmu_init_bypass_stes(desc->l2ptr, 1 << STRTAB_SPLIT); + arm_smmu_write_strtab_l1_desc(strtab, desc); + return 0; +} + +/* IRQ and event handlers */ +static irqreturn_t arm_smmu_evtq_thread(int irq, void *dev) +{ + int i; + struct arm_smmu_device *smmu = dev; + struct arm_smmu_queue *q = &smmu->evtq.q; + struct arm_smmu_ll_queue *llq = &q->llq; + u64 evt[EVTQ_ENT_DWORDS]; + + do { + while (!queue_remove_raw(q, evt)) { + u8 id = FIELD_GET(EVTQ_0_ID, evt[0]); + + dev_info(smmu->dev, "event 0x%02x received:\n", id); + for (i = 0; i < ARRAY_SIZE(evt); ++i) + dev_info(smmu->dev, "\t0x%016llx\n", + (unsigned long long)evt[i]); + + } + + /* + * Not much we can do on overflow, so scream and pretend we're + * trying harder. + */ + if (queue_sync_prod_in(q) == -EOVERFLOW) + dev_err(smmu->dev, "EVTQ overflow detected -- events lost\n"); + } while (!queue_empty(llq)); + + /* Sync our overflow flag, as we believe we're up to speed */ + llq->cons = Q_OVF(llq->prod) | Q_WRP(llq, llq->cons) | + Q_IDX(llq, llq->cons); + return IRQ_HANDLED; +} + +static void arm_smmu_handle_ppr(struct arm_smmu_device *smmu, u64 *evt) +{ + u32 sid, ssid; + u16 grpid; + bool ssv, last; + + sid = FIELD_GET(PRIQ_0_SID, evt[0]); + ssv = FIELD_GET(PRIQ_0_SSID_V, evt[0]); + ssid = ssv ? FIELD_GET(PRIQ_0_SSID, evt[0]) : 0; + last = FIELD_GET(PRIQ_0_PRG_LAST, evt[0]); + grpid = FIELD_GET(PRIQ_1_PRG_IDX, evt[1]); + + dev_info(smmu->dev, "unexpected PRI request received:\n"); + dev_info(smmu->dev, + "\tsid 0x%08x.0x%05x: [%u%s] %sprivileged %s%s%s access at iova 0x%016llx\n", + sid, ssid, grpid, last ? "L" : "", + evt[0] & PRIQ_0_PERM_PRIV ? "" : "un", + evt[0] & PRIQ_0_PERM_READ ? "R" : "", + evt[0] & PRIQ_0_PERM_WRITE ? "W" : "", + evt[0] & PRIQ_0_PERM_EXEC ? "X" : "", + evt[1] & PRIQ_1_ADDR_MASK); + + if (last) { + struct arm_smmu_cmdq_ent cmd = { + .opcode = CMDQ_OP_PRI_RESP, + .substream_valid = ssv, + .pri = { + .sid = sid, + .ssid = ssid, + .grpid = grpid, + .resp = PRI_RESP_DENY, + }, + }; + + arm_smmu_cmdq_issue_cmd(smmu, &cmd); + } +} + +static irqreturn_t arm_smmu_priq_thread(int irq, void *dev) +{ + struct arm_smmu_device *smmu = dev; + struct arm_smmu_queue *q = &smmu->priq.q; + struct arm_smmu_ll_queue *llq = &q->llq; + u64 evt[PRIQ_ENT_DWORDS]; + + do { + while (!queue_remove_raw(q, evt)) + arm_smmu_handle_ppr(smmu, evt); + + if (queue_sync_prod_in(q) == -EOVERFLOW) + dev_err(smmu->dev, "PRIQ overflow detected -- requests lost\n"); + } while (!queue_empty(llq)); + + /* Sync our overflow flag, as we believe we're up to speed */ + llq->cons = Q_OVF(llq->prod) | Q_WRP(llq, llq->cons) | + Q_IDX(llq, llq->cons); + queue_sync_cons_out(q); + return IRQ_HANDLED; +} + +static int arm_smmu_device_disable(struct arm_smmu_device *smmu); + +static irqreturn_t arm_smmu_gerror_handler(int irq, void *dev) +{ + u32 gerror, gerrorn, active; + struct arm_smmu_device *smmu = dev; + + gerror = readl_relaxed(smmu->base + ARM_SMMU_GERROR); + gerrorn = readl_relaxed(smmu->base + ARM_SMMU_GERRORN); + + active = gerror ^ gerrorn; + if (!(active & GERROR_ERR_MASK)) + return IRQ_NONE; /* No errors pending */ + + dev_warn(smmu->dev, + "unexpected global error reported (0x%08x), this could be serious\n", + active); + + if (active & GERROR_SFM_ERR) { + dev_err(smmu->dev, "device has entered Service Failure Mode!\n"); + arm_smmu_device_disable(smmu); + } + + if (active & GERROR_MSI_GERROR_ABT_ERR) + dev_warn(smmu->dev, "GERROR MSI write aborted\n"); + + if (active & GERROR_MSI_PRIQ_ABT_ERR) + dev_warn(smmu->dev, "PRIQ MSI write aborted\n"); + + if (active & GERROR_MSI_EVTQ_ABT_ERR) + dev_warn(smmu->dev, "EVTQ MSI write aborted\n"); + + if (active & GERROR_MSI_CMDQ_ABT_ERR) + dev_warn(smmu->dev, "CMDQ MSI write aborted\n"); + + if (active & GERROR_PRIQ_ABT_ERR) + dev_err(smmu->dev, "PRIQ write aborted -- events may have been lost\n"); + + if (active & GERROR_EVTQ_ABT_ERR) + dev_err(smmu->dev, "EVTQ write aborted -- events may have been lost\n"); + + if (active & GERROR_CMDQ_ERR) + arm_smmu_cmdq_skip_err(smmu); + + writel(gerror, smmu->base + ARM_SMMU_GERRORN); + return IRQ_HANDLED; +} + +static irqreturn_t arm_smmu_combined_irq_thread(int irq, void *dev) +{ + struct arm_smmu_device *smmu = dev; + + arm_smmu_evtq_thread(irq, dev); + if (smmu->features & ARM_SMMU_FEAT_PRI) + arm_smmu_priq_thread(irq, dev); + + return IRQ_HANDLED; +} + +static irqreturn_t arm_smmu_combined_irq_handler(int irq, void *dev) +{ + arm_smmu_gerror_handler(irq, dev); + return IRQ_WAKE_THREAD; +} + +static void +arm_smmu_atc_inv_to_cmd(int ssid, unsigned long iova, size_t size, + struct arm_smmu_cmdq_ent *cmd) +{ + size_t log2_span; + size_t span_mask; + /* ATC invalidates are always on 4096-bytes pages */ + size_t inval_grain_shift = 12; + unsigned long page_start, page_end; + + *cmd = (struct arm_smmu_cmdq_ent) { + .opcode = CMDQ_OP_ATC_INV, + .substream_valid = !!ssid, + .atc.ssid = ssid, + }; + + if (!size) { + cmd->atc.size = ATC_INV_SIZE_ALL; + return; + } + + page_start = iova >> inval_grain_shift; + page_end = (iova + size - 1) >> inval_grain_shift; + + /* + * In an ATS Invalidate Request, the address must be aligned on the + * range size, which must be a power of two number of page sizes. We + * thus have to choose between grossly over-invalidating the region, or + * splitting the invalidation into multiple commands. For simplicity + * we'll go with the first solution, but should refine it in the future + * if multiple commands are shown to be more efficient. + * + * Find the smallest power of two that covers the range. The most + * significant differing bit between the start and end addresses, + * fls(start ^ end), indicates the required span. For example: + * + * We want to invalidate pages [8; 11]. This is already the ideal range: + * x = 0b1000 ^ 0b1011 = 0b11 + * span = 1 << fls(x) = 4 + * + * To invalidate pages [7; 10], we need to invalidate [0; 15]: + * x = 0b0111 ^ 0b1010 = 0b1101 + * span = 1 << fls(x) = 16 + */ + log2_span = fls_long(page_start ^ page_end); + span_mask = (1ULL << log2_span) - 1; + + page_start &= ~span_mask; + + cmd->atc.addr = page_start << inval_grain_shift; + cmd->atc.size = log2_span; +} + +static int arm_smmu_atc_inv_master(struct arm_smmu_master *master) +{ + int i; + struct arm_smmu_cmdq_ent cmd; + + arm_smmu_atc_inv_to_cmd(0, 0, 0, &cmd); + + for (i = 0; i < master->num_sids; i++) { + cmd.atc.sid = master->sids[i]; + arm_smmu_cmdq_issue_cmd(master->smmu, &cmd); + } + + return arm_smmu_cmdq_issue_sync(master->smmu); +} + +static int arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain, + int ssid, unsigned long iova, size_t size) +{ + int i; + unsigned long flags; + struct arm_smmu_cmdq_ent cmd; + struct arm_smmu_master *master; + struct arm_smmu_cmdq_batch cmds = {}; + + if (!(smmu_domain->smmu->features & ARM_SMMU_FEAT_ATS)) + return 0; + + /* + * Ensure that we've completed prior invalidation of the main TLBs + * before we read 'nr_ats_masters' in case of a concurrent call to + * arm_smmu_enable_ats(): + * + * // unmap() // arm_smmu_enable_ats() + * TLBI+SYNC atomic_inc(&nr_ats_masters); + * smp_mb(); [...] + * atomic_read(&nr_ats_masters); pci_enable_ats() // writel() + * + * Ensures that we always see the incremented 'nr_ats_masters' count if + * ATS was enabled at the PCI device before completion of the TLBI. + */ + smp_mb(); + if (!atomic_read(&smmu_domain->nr_ats_masters)) + return 0; + + arm_smmu_atc_inv_to_cmd(ssid, iova, size, &cmd); + + spin_lock_irqsave(&smmu_domain->devices_lock, flags); + list_for_each_entry(master, &smmu_domain->devices, domain_head) { + if (!master->ats_enabled) + continue; + + for (i = 0; i < master->num_sids; i++) { + cmd.atc.sid = master->sids[i]; + arm_smmu_cmdq_batch_add(smmu_domain->smmu, &cmds, &cmd); + } + } + spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); + + return arm_smmu_cmdq_batch_submit(smmu_domain->smmu, &cmds); +} + +/* IO_PGTABLE API */ +static void arm_smmu_tlb_inv_context(void *cookie) +{ + struct arm_smmu_domain *smmu_domain = cookie; + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_cmdq_ent cmd; + + if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { + cmd.opcode = CMDQ_OP_TLBI_NH_ASID; + cmd.tlbi.asid = smmu_domain->s1_cfg.cd.asid; + cmd.tlbi.vmid = 0; + } else { + cmd.opcode = CMDQ_OP_TLBI_S12_VMALL; + cmd.tlbi.vmid = smmu_domain->s2_cfg.vmid; + } + + /* + * NOTE: when io-pgtable is in non-strict mode, we may get here with + * PTEs previously cleared by unmaps on the current CPU not yet visible + * to the SMMU. We are relying on the dma_wmb() implicit during cmd + * insertion to guarantee those are observed before the TLBI. Do be + * careful, 007. + */ + arm_smmu_cmdq_issue_cmd(smmu, &cmd); + arm_smmu_cmdq_issue_sync(smmu); + arm_smmu_atc_inv_domain(smmu_domain, 0, 0, 0); +} + +static void arm_smmu_tlb_inv_range(unsigned long iova, size_t size, + size_t granule, bool leaf, + struct arm_smmu_domain *smmu_domain) +{ + struct arm_smmu_device *smmu = smmu_domain->smmu; + unsigned long start = iova, end = iova + size, num_pages = 0, tg = 0; + size_t inv_range = granule; + struct arm_smmu_cmdq_batch cmds = {}; + struct arm_smmu_cmdq_ent cmd = { + .tlbi = { + .leaf = leaf, + }, + }; + + if (!size) + return; + + if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { + cmd.opcode = CMDQ_OP_TLBI_NH_VA; + cmd.tlbi.asid = smmu_domain->s1_cfg.cd.asid; + } else { + cmd.opcode = CMDQ_OP_TLBI_S2_IPA; + cmd.tlbi.vmid = smmu_domain->s2_cfg.vmid; + } + + if (smmu->features & ARM_SMMU_FEAT_RANGE_INV) { + /* Get the leaf page size */ + tg = __ffs(smmu_domain->domain.pgsize_bitmap); + + /* Convert page size of 12,14,16 (log2) to 1,2,3 */ + cmd.tlbi.tg = (tg - 10) / 2; + + /* Determine what level the granule is at */ + cmd.tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3)); + + num_pages = size >> tg; + } + + while (iova < end) { + if (smmu->features & ARM_SMMU_FEAT_RANGE_INV) { + /* + * On each iteration of the loop, the range is 5 bits + * worth of the aligned size remaining. + * The range in pages is: + * + * range = (num_pages & (0x1f << __ffs(num_pages))) + */ + unsigned long scale, num; + + /* Determine the power of 2 multiple number of pages */ + scale = __ffs(num_pages); + cmd.tlbi.scale = scale; + + /* Determine how many chunks of 2^scale size we have */ + num = (num_pages >> scale) & CMDQ_TLBI_RANGE_NUM_MAX; + cmd.tlbi.num = num - 1; + + /* range is num * 2^scale * pgsize */ + inv_range = num << (scale + tg); + + /* Clear out the lower order bits for the next iteration */ + num_pages -= num << scale; + } + + cmd.tlbi.addr = iova; + arm_smmu_cmdq_batch_add(smmu, &cmds, &cmd); + iova += inv_range; + } + arm_smmu_cmdq_batch_submit(smmu, &cmds); + + /* + * Unfortunately, this can't be leaf-only since we may have + * zapped an entire table. + */ + arm_smmu_atc_inv_domain(smmu_domain, 0, start, size); +} + +static void arm_smmu_tlb_inv_page_nosync(struct iommu_iotlb_gather *gather, + unsigned long iova, size_t granule, + void *cookie) +{ + struct arm_smmu_domain *smmu_domain = cookie; + struct iommu_domain *domain = &smmu_domain->domain; + + iommu_iotlb_gather_add_page(domain, gather, iova, granule); +} + +static void arm_smmu_tlb_inv_walk(unsigned long iova, size_t size, + size_t granule, void *cookie) +{ + arm_smmu_tlb_inv_range(iova, size, granule, false, cookie); +} + +static void arm_smmu_tlb_inv_leaf(unsigned long iova, size_t size, + size_t granule, void *cookie) +{ + arm_smmu_tlb_inv_range(iova, size, granule, true, cookie); +} + +static const struct iommu_flush_ops arm_smmu_flush_ops = { + .tlb_flush_all = arm_smmu_tlb_inv_context, + .tlb_flush_walk = arm_smmu_tlb_inv_walk, + .tlb_flush_leaf = arm_smmu_tlb_inv_leaf, + .tlb_add_page = arm_smmu_tlb_inv_page_nosync, +}; + +/* IOMMU API */ +static bool arm_smmu_capable(enum iommu_cap cap) +{ + switch (cap) { + case IOMMU_CAP_CACHE_COHERENCY: + return true; + case IOMMU_CAP_NOEXEC: + return true; + default: + return false; + } +} + +static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) +{ + struct arm_smmu_domain *smmu_domain; + + if (type != IOMMU_DOMAIN_UNMANAGED && + type != IOMMU_DOMAIN_DMA && + type != IOMMU_DOMAIN_IDENTITY) + return NULL; + + /* + * Allocate the domain and initialise some of its data structures. + * We can't really do anything meaningful until we've added a + * master. + */ + smmu_domain = kzalloc(sizeof(*smmu_domain), GFP_KERNEL); + if (!smmu_domain) + return NULL; + + if (type == IOMMU_DOMAIN_DMA && + iommu_get_dma_cookie(&smmu_domain->domain)) { + kfree(smmu_domain); + return NULL; + } + + mutex_init(&smmu_domain->init_mutex); + INIT_LIST_HEAD(&smmu_domain->devices); + spin_lock_init(&smmu_domain->devices_lock); + + return &smmu_domain->domain; +} + +static int arm_smmu_bitmap_alloc(unsigned long *map, int span) +{ + int idx, size = 1 << span; + + do { + idx = find_first_zero_bit(map, size); + if (idx == size) + return -ENOSPC; + } while (test_and_set_bit(idx, map)); + + return idx; +} + +static void arm_smmu_bitmap_free(unsigned long *map, int idx) +{ + clear_bit(idx, map); +} + +static void arm_smmu_domain_free(struct iommu_domain *domain) +{ + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + struct arm_smmu_device *smmu = smmu_domain->smmu; + + iommu_put_dma_cookie(domain); + free_io_pgtable_ops(smmu_domain->pgtbl_ops); + + /* Free the CD and ASID, if we allocated them */ + if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { + struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg; + + if (cfg->cdcfg.cdtab) + arm_smmu_free_cd_tables(smmu_domain); + arm_smmu_free_asid(&cfg->cd); + } else { + struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg; + if (cfg->vmid) + arm_smmu_bitmap_free(smmu->vmid_map, cfg->vmid); + } + + kfree(smmu_domain); +} + +static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, + struct arm_smmu_master *master, + struct io_pgtable_cfg *pgtbl_cfg) +{ + int ret; + u32 asid; + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg; + typeof(&pgtbl_cfg->arm_lpae_s1_cfg.tcr) tcr = &pgtbl_cfg->arm_lpae_s1_cfg.tcr; + + ret = xa_alloc(&asid_xa, &asid, &cfg->cd, + XA_LIMIT(1, (1 << smmu->asid_bits) - 1), GFP_KERNEL); + if (ret) + return ret; + + cfg->s1cdmax = master->ssid_bits; + + ret = arm_smmu_alloc_cd_tables(smmu_domain); + if (ret) + goto out_free_asid; + + cfg->cd.asid = (u16)asid; + cfg->cd.ttbr = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; + cfg->cd.tcr = FIELD_PREP(CTXDESC_CD_0_TCR_T0SZ, tcr->tsz) | + FIELD_PREP(CTXDESC_CD_0_TCR_TG0, tcr->tg) | + FIELD_PREP(CTXDESC_CD_0_TCR_IRGN0, tcr->irgn) | + FIELD_PREP(CTXDESC_CD_0_TCR_ORGN0, tcr->orgn) | + FIELD_PREP(CTXDESC_CD_0_TCR_SH0, tcr->sh) | + FIELD_PREP(CTXDESC_CD_0_TCR_IPS, tcr->ips) | + CTXDESC_CD_0_TCR_EPD1 | CTXDESC_CD_0_AA64; + cfg->cd.mair = pgtbl_cfg->arm_lpae_s1_cfg.mair; + + /* + * Note that this will end up calling arm_smmu_sync_cd() before + * the master has been added to the devices list for this domain. + * This isn't an issue because the STE hasn't been installed yet. + */ + ret = arm_smmu_write_ctx_desc(smmu_domain, 0, &cfg->cd); + if (ret) + goto out_free_cd_tables; + + return 0; + +out_free_cd_tables: + arm_smmu_free_cd_tables(smmu_domain); +out_free_asid: + arm_smmu_free_asid(&cfg->cd); + return ret; +} + +static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain, + struct arm_smmu_master *master, + struct io_pgtable_cfg *pgtbl_cfg) +{ + int vmid; + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg; + typeof(&pgtbl_cfg->arm_lpae_s2_cfg.vtcr) vtcr; + + vmid = arm_smmu_bitmap_alloc(smmu->vmid_map, smmu->vmid_bits); + if (vmid < 0) + return vmid; + + vtcr = &pgtbl_cfg->arm_lpae_s2_cfg.vtcr; + cfg->vmid = (u16)vmid; + cfg->vttbr = pgtbl_cfg->arm_lpae_s2_cfg.vttbr; + cfg->vtcr = FIELD_PREP(STRTAB_STE_2_VTCR_S2T0SZ, vtcr->tsz) | + FIELD_PREP(STRTAB_STE_2_VTCR_S2SL0, vtcr->sl) | + FIELD_PREP(STRTAB_STE_2_VTCR_S2IR0, vtcr->irgn) | + FIELD_PREP(STRTAB_STE_2_VTCR_S2OR0, vtcr->orgn) | + FIELD_PREP(STRTAB_STE_2_VTCR_S2SH0, vtcr->sh) | + FIELD_PREP(STRTAB_STE_2_VTCR_S2TG, vtcr->tg) | + FIELD_PREP(STRTAB_STE_2_VTCR_S2PS, vtcr->ps); + return 0; +} + +static int arm_smmu_domain_finalise(struct iommu_domain *domain, + struct arm_smmu_master *master) +{ + int ret; + unsigned long ias, oas; + enum io_pgtable_fmt fmt; + struct io_pgtable_cfg pgtbl_cfg; + struct io_pgtable_ops *pgtbl_ops; + int (*finalise_stage_fn)(struct arm_smmu_domain *, + struct arm_smmu_master *, + struct io_pgtable_cfg *); + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + struct arm_smmu_device *smmu = smmu_domain->smmu; + + if (domain->type == IOMMU_DOMAIN_IDENTITY) { + smmu_domain->stage = ARM_SMMU_DOMAIN_BYPASS; + return 0; + } + + /* Restrict the stage to what we can actually support */ + if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S1)) + smmu_domain->stage = ARM_SMMU_DOMAIN_S2; + if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S2)) + smmu_domain->stage = ARM_SMMU_DOMAIN_S1; + + switch (smmu_domain->stage) { + case ARM_SMMU_DOMAIN_S1: + ias = (smmu->features & ARM_SMMU_FEAT_VAX) ? 52 : 48; + ias = min_t(unsigned long, ias, VA_BITS); + oas = smmu->ias; + fmt = ARM_64_LPAE_S1; + finalise_stage_fn = arm_smmu_domain_finalise_s1; + break; + case ARM_SMMU_DOMAIN_NESTED: + case ARM_SMMU_DOMAIN_S2: + ias = smmu->ias; + oas = smmu->oas; + fmt = ARM_64_LPAE_S2; + finalise_stage_fn = arm_smmu_domain_finalise_s2; + break; + default: + return -EINVAL; + } + + pgtbl_cfg = (struct io_pgtable_cfg) { + .pgsize_bitmap = smmu->pgsize_bitmap, + .ias = ias, + .oas = oas, + .coherent_walk = smmu->features & ARM_SMMU_FEAT_COHERENCY, + .tlb = &arm_smmu_flush_ops, + .iommu_dev = smmu->dev, + }; + + if (smmu_domain->non_strict) + pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT; + + pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain); + if (!pgtbl_ops) + return -ENOMEM; + + domain->pgsize_bitmap = pgtbl_cfg.pgsize_bitmap; + domain->geometry.aperture_end = (1UL << pgtbl_cfg.ias) - 1; + domain->geometry.force_aperture = true; + + ret = finalise_stage_fn(smmu_domain, master, &pgtbl_cfg); + if (ret < 0) { + free_io_pgtable_ops(pgtbl_ops); + return ret; + } + + smmu_domain->pgtbl_ops = pgtbl_ops; + return 0; +} + +static __le64 *arm_smmu_get_step_for_sid(struct arm_smmu_device *smmu, u32 sid) +{ + __le64 *step; + struct arm_smmu_strtab_cfg *cfg = &smmu->strtab_cfg; + + if (smmu->features & ARM_SMMU_FEAT_2_LVL_STRTAB) { + struct arm_smmu_strtab_l1_desc *l1_desc; + int idx; + + /* Two-level walk */ + idx = (sid >> STRTAB_SPLIT) * STRTAB_L1_DESC_DWORDS; + l1_desc = &cfg->l1_desc[idx]; + idx = (sid & ((1 << STRTAB_SPLIT) - 1)) * STRTAB_STE_DWORDS; + step = &l1_desc->l2ptr[idx]; + } else { + /* Simple linear lookup */ + step = &cfg->strtab[sid * STRTAB_STE_DWORDS]; + } + + return step; +} + +static void arm_smmu_install_ste_for_dev(struct arm_smmu_master *master) +{ + int i, j; + struct arm_smmu_device *smmu = master->smmu; + + for (i = 0; i < master->num_sids; ++i) { + u32 sid = master->sids[i]; + __le64 *step = arm_smmu_get_step_for_sid(smmu, sid); + + /* Bridged PCI devices may end up with duplicated IDs */ + for (j = 0; j < i; j++) + if (master->sids[j] == sid) + break; + if (j < i) + continue; + + arm_smmu_write_strtab_ent(master, sid, step); + } +} + +static bool arm_smmu_ats_supported(struct arm_smmu_master *master) +{ + struct device *dev = master->dev; + struct arm_smmu_device *smmu = master->smmu; + struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); + + if (!(smmu->features & ARM_SMMU_FEAT_ATS)) + return false; + + if (!(fwspec->flags & IOMMU_FWSPEC_PCI_RC_ATS)) + return false; + + return dev_is_pci(dev) && pci_ats_supported(to_pci_dev(dev)); +} + +static void arm_smmu_enable_ats(struct arm_smmu_master *master) +{ + size_t stu; + struct pci_dev *pdev; + struct arm_smmu_device *smmu = master->smmu; + struct arm_smmu_domain *smmu_domain = master->domain; + + /* Don't enable ATS at the endpoint if it's not enabled in the STE */ + if (!master->ats_enabled) + return; + + /* Smallest Translation Unit: log2 of the smallest supported granule */ + stu = __ffs(smmu->pgsize_bitmap); + pdev = to_pci_dev(master->dev); + + atomic_inc(&smmu_domain->nr_ats_masters); + arm_smmu_atc_inv_domain(smmu_domain, 0, 0, 0); + if (pci_enable_ats(pdev, stu)) + dev_err(master->dev, "Failed to enable ATS (STU %zu)\n", stu); +} + +static void arm_smmu_disable_ats(struct arm_smmu_master *master) +{ + struct arm_smmu_domain *smmu_domain = master->domain; + + if (!master->ats_enabled) + return; + + pci_disable_ats(to_pci_dev(master->dev)); + /* + * Ensure ATS is disabled at the endpoint before we issue the + * ATC invalidation via the SMMU. + */ + wmb(); + arm_smmu_atc_inv_master(master); + atomic_dec(&smmu_domain->nr_ats_masters); +} + +static int arm_smmu_enable_pasid(struct arm_smmu_master *master) +{ + int ret; + int features; + int num_pasids; + struct pci_dev *pdev; + + if (!dev_is_pci(master->dev)) + return -ENODEV; + + pdev = to_pci_dev(master->dev); + + features = pci_pasid_features(pdev); + if (features < 0) + return features; + + num_pasids = pci_max_pasids(pdev); + if (num_pasids <= 0) + return num_pasids; + + ret = pci_enable_pasid(pdev, features); + if (ret) { + dev_err(&pdev->dev, "Failed to enable PASID\n"); + return ret; + } + + master->ssid_bits = min_t(u8, ilog2(num_pasids), + master->smmu->ssid_bits); + return 0; +} + +static void arm_smmu_disable_pasid(struct arm_smmu_master *master) +{ + struct pci_dev *pdev; + + if (!dev_is_pci(master->dev)) + return; + + pdev = to_pci_dev(master->dev); + + if (!pdev->pasid_enabled) + return; + + master->ssid_bits = 0; + pci_disable_pasid(pdev); +} + +static void arm_smmu_detach_dev(struct arm_smmu_master *master) +{ + unsigned long flags; + struct arm_smmu_domain *smmu_domain = master->domain; + + if (!smmu_domain) + return; + + arm_smmu_disable_ats(master); + + spin_lock_irqsave(&smmu_domain->devices_lock, flags); + list_del(&master->domain_head); + spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); + + master->domain = NULL; + master->ats_enabled = false; + arm_smmu_install_ste_for_dev(master); +} + +static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) +{ + int ret = 0; + unsigned long flags; + struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); + struct arm_smmu_device *smmu; + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + struct arm_smmu_master *master; + + if (!fwspec) + return -ENOENT; + + master = dev_iommu_priv_get(dev); + smmu = master->smmu; + + arm_smmu_detach_dev(master); + + mutex_lock(&smmu_domain->init_mutex); + + if (!smmu_domain->smmu) { + smmu_domain->smmu = smmu; + ret = arm_smmu_domain_finalise(domain, master); + if (ret) { + smmu_domain->smmu = NULL; + goto out_unlock; + } + } else if (smmu_domain->smmu != smmu) { + dev_err(dev, + "cannot attach to SMMU %s (upstream of %s)\n", + dev_name(smmu_domain->smmu->dev), + dev_name(smmu->dev)); + ret = -ENXIO; + goto out_unlock; + } else if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1 && + master->ssid_bits != smmu_domain->s1_cfg.s1cdmax) { + dev_err(dev, + "cannot attach to incompatible domain (%u SSID bits != %u)\n", + smmu_domain->s1_cfg.s1cdmax, master->ssid_bits); + ret = -EINVAL; + goto out_unlock; + } + + master->domain = smmu_domain; + + if (smmu_domain->stage != ARM_SMMU_DOMAIN_BYPASS) + master->ats_enabled = arm_smmu_ats_supported(master); + + arm_smmu_install_ste_for_dev(master); + + spin_lock_irqsave(&smmu_domain->devices_lock, flags); + list_add(&master->domain_head, &smmu_domain->devices); + spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); + + arm_smmu_enable_ats(master); + +out_unlock: + mutex_unlock(&smmu_domain->init_mutex); + return ret; +} + +static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, size_t size, int prot, gfp_t gfp) +{ + struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops; + + if (!ops) + return -ENODEV; + + return ops->map(ops, iova, paddr, size, prot); +} + +static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova, + size_t size, struct iommu_iotlb_gather *gather) +{ + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + struct io_pgtable_ops *ops = smmu_domain->pgtbl_ops; + + if (!ops) + return 0; + + return ops->unmap(ops, iova, size, gather); +} + +static void arm_smmu_flush_iotlb_all(struct iommu_domain *domain) +{ + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + + if (smmu_domain->smmu) + arm_smmu_tlb_inv_context(smmu_domain); +} + +static void arm_smmu_iotlb_sync(struct iommu_domain *domain, + struct iommu_iotlb_gather *gather) +{ + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + + arm_smmu_tlb_inv_range(gather->start, gather->end - gather->start, + gather->pgsize, true, smmu_domain); +} + +static phys_addr_t +arm_smmu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) +{ + struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops; + + if (domain->type == IOMMU_DOMAIN_IDENTITY) + return iova; + + if (!ops) + return 0; + + return ops->iova_to_phys(ops, iova); +} + +static struct platform_driver arm_smmu_driver; + +static +struct arm_smmu_device *arm_smmu_get_by_fwnode(struct fwnode_handle *fwnode) +{ + struct device *dev = driver_find_device_by_fwnode(&arm_smmu_driver.driver, + fwnode); + put_device(dev); + return dev ? dev_get_drvdata(dev) : NULL; +} + +static bool arm_smmu_sid_in_range(struct arm_smmu_device *smmu, u32 sid) +{ + unsigned long limit = smmu->strtab_cfg.num_l1_ents; + + if (smmu->features & ARM_SMMU_FEAT_2_LVL_STRTAB) + limit *= 1UL << STRTAB_SPLIT; + + return sid < limit; +} + +static struct iommu_ops arm_smmu_ops; + +static struct iommu_device *arm_smmu_probe_device(struct device *dev) +{ + int i, ret; + struct arm_smmu_device *smmu; + struct arm_smmu_master *master; + struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); + + if (!fwspec || fwspec->ops != &arm_smmu_ops) + return ERR_PTR(-ENODEV); + + if (WARN_ON_ONCE(dev_iommu_priv_get(dev))) + return ERR_PTR(-EBUSY); + + smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode); + if (!smmu) + return ERR_PTR(-ENODEV); + + master = kzalloc(sizeof(*master), GFP_KERNEL); + if (!master) + return ERR_PTR(-ENOMEM); + + master->dev = dev; + master->smmu = smmu; + master->sids = fwspec->ids; + master->num_sids = fwspec->num_ids; + dev_iommu_priv_set(dev, master); + + /* Check the SIDs are in range of the SMMU and our stream table */ + for (i = 0; i < master->num_sids; i++) { + u32 sid = master->sids[i]; + + if (!arm_smmu_sid_in_range(smmu, sid)) { + ret = -ERANGE; + goto err_free_master; + } + + /* Ensure l2 strtab is initialised */ + if (smmu->features & ARM_SMMU_FEAT_2_LVL_STRTAB) { + ret = arm_smmu_init_l2_strtab(smmu, sid); + if (ret) From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73278.132100 (Exim 4.92) (envelope-from ) id 1l3HVc-0000LT-9L; Sat, 23 Jan 2021 11:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73278.132100; Sat, 23 Jan 2021 11: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 1l3HVc-0000LL-5C; Sat, 23 Jan 2021 11:55:16 +0000 Received: by outflank-mailman (input) for mailman id 73278; Sat, 23 Jan 2021 11:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HVa-0000KO-PY for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HVa-0005bX-Og for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HVa-0008EG-NL for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11: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=xbF5x6A3GzvoVP1Kw/wM76HBJoZ4BSN2IYShuJ387AY=; b=aLqQC8HLC5XshhUYvFeZhqGPzI q1ik2LqUeD9b8pzUTu9WeqmCArn2JG8975UhXpstyL6XCNGSmLDyVYhc18H3J/0zidXQZbTmMPfyi 0LramGUHGUCxlp3Ea0CY7EJ5Nkvxz0I/j/X1B2AJyrZzD0QvK832CxSNFg3QjWBszzRw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Revert atomic operation related command-queue insertion patch Message-Id: Date: Sat, 23 Jan 2021 11:55:14 +0000 commit c46e7d6a0718e960c5662b85df75d57f6303fef6 Author: Rahul Singh AuthorDate: Wed Jan 20 14:52:36 2021 +0000 Commit: Julien Grall CommitDate: Sat Jan 23 11:48:33 2021 +0000 xen/arm: Revert atomic operation related command-queue insertion patch Linux SMMUv3 code implements the commands-queue insertion based on atomic operations implemented in Linux. Atomic functions used by the commands-queue insertion are not implemented in XEN therefore revert the patch that implemented the commands-queue insertion based on atomic operations. Reverted the other patches also that are implemented based on the code that introduced the atomic-operations. Atomic operations are introduced in the patch "iommu/arm-smmu-v3: Reduce contention during command-queue insertion" that fixed the bottleneck of the SMMU command queue insertion operation. A new algorithm for inserting commands into the queue is introduced in this patch, which is lock-free on the fast-path. Consequence of reverting the patch is that the command queue insertion will be slow for large systems as spinlock will be used to serializes accesses from all CPUs to the single queue supported by the hardware. Once the proper atomic operations will be available in XEN the driver can be updated. Following commits are reverted in this patch: 1. "iommu/arm-smmu-v3: Add SMMUv3.2 range invalidation support" commit 6a481a95d4c198a2dd0a61f8877b92a375757db8. 2. "iommu/arm-smmu-v3: Batch ATC invalidation commands" commit 9e773aee8c3e1b3ba019c5c7f8435aaa836c6130. 3. "iommu/arm-smmu-v3: Batch context descriptor invalidation" commit edd0351e7bc49555d8b5ad8438a65a7ca262c9f0. 4. "iommu/arm-smmu-v3: Add command queue batching helpers commit 4ce8da453640147101bda418640394637c1a7cfc. 5. "iommu/arm-smmu-v3: Fix ATC invalidation ordering wrt main TLBs" commit 353e3cf8590cf182a9f42e67993de3aca91e8090. 6. "iommu/arm-smmu-v3: Defer TLB invalidation until ->iotlb_sync()" commit 2af2e72b18b499fa36d3f7379fd010ff25d2a984. 7. "iommu/arm-smmu-v3: Reduce contention during command-queue insertion" commit 587e6c10a7ce89a5924fdbeff2ec524fbd6a124b. Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 878 +++++++--------------------------- 1 file changed, 186 insertions(+), 692 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index f578677a5c..8b7747ed38 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -69,9 +69,6 @@ #define IDR1_SSIDSIZE GENMASK(10, 6) #define IDR1_SIDSIZE GENMASK(5, 0) -#define ARM_SMMU_IDR3 0xc -#define IDR3_RIL (1 << 10) - #define ARM_SMMU_IDR5 0x14 #define IDR5_STALL_MAX GENMASK(31, 16) #define IDR5_GRAN64K (1 << 6) @@ -187,7 +184,7 @@ #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_OVERFLOW_FLAG (1 << 31) #define Q_OVF(p) ((p) & Q_OVERFLOW_FLAG) #define Q_ENT(q, p) ((q)->base + \ Q_IDX(&((q)->llq), p) * \ @@ -330,15 +327,6 @@ #define CMDQ_ERR_CERROR_ABT_IDX 2 #define CMDQ_ERR_CERROR_ATC_INV_IDX 3 -#define CMDQ_PROD_OWNED_FLAG Q_OVERFLOW_FLAG - -/* - * This is used to size the command queue and therefore must be at least - * BITS_PER_LONG so that the valid_map works correctly (it relies on the - * total number of queue entries being a multiple of BITS_PER_LONG). - */ -#define CMDQ_BATCH_ENTRIES BITS_PER_LONG - #define CMDQ_0_OP GENMASK_ULL(7, 0) #define CMDQ_0_SSV (1UL << 11) @@ -351,14 +339,9 @@ #define CMDQ_CFGI_1_LEAF (1UL << 0) #define CMDQ_CFGI_1_RANGE GENMASK_ULL(4, 0) -#define CMDQ_TLBI_0_NUM GENMASK_ULL(16, 12) -#define CMDQ_TLBI_RANGE_NUM_MAX 31 -#define CMDQ_TLBI_0_SCALE GENMASK_ULL(24, 20) #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_TTL GENMASK_ULL(9, 8) -#define CMDQ_TLBI_1_TG GENMASK_ULL(11, 10) #define CMDQ_TLBI_1_VA_MASK GENMASK_ULL(63, 12) #define CMDQ_TLBI_1_IPA_MASK GENMASK_ULL(51, 12) @@ -407,8 +390,9 @@ #define PRIQ_1_ADDR_MASK GENMASK_ULL(63, 12) /* High-level queue structures */ -#define ARM_SMMU_POLL_TIMEOUT_US 1000000 /* 1s! */ -#define ARM_SMMU_POLL_SPIN_COUNT 10 +#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 MSI_IOVA_BASE 0x8000000 #define MSI_IOVA_LENGTH 0x100000 @@ -483,13 +467,9 @@ struct arm_smmu_cmdq_ent { #define CMDQ_OP_TLBI_S2_IPA 0x2a #define CMDQ_OP_TLBI_NSNH_ALL 0x30 struct { - u8 num; - u8 scale; u16 asid; u16 vmid; bool leaf; - u8 ttl; - u8 tg; u64 addr; } tlbi; @@ -513,24 +493,15 @@ struct arm_smmu_cmdq_ent { #define CMDQ_OP_CMD_SYNC 0x46 struct { + u32 msidata; u64 msiaddr; } sync; }; }; struct arm_smmu_ll_queue { - union { - u64 val; - struct { - u32 prod; - u32 cons; - }; - struct { - atomic_t prod; - atomic_t cons; - } atomic; - u8 __pad[SMP_CACHE_BYTES]; - } ____cacheline_aligned_in_smp; + u32 prod; + u32 cons; u32 max_n_shift; }; @@ -548,23 +519,9 @@ struct arm_smmu_queue { u32 __iomem *cons_reg; }; -struct arm_smmu_queue_poll { - ktime_t timeout; - unsigned int delay; - unsigned int spin_cnt; - bool wfe; -}; - struct arm_smmu_cmdq { struct arm_smmu_queue q; - atomic_long_t *valid_map; - atomic_t owner_prod; - atomic_t lock; -}; - -struct arm_smmu_cmdq_batch { - u64 cmds[CMDQ_BATCH_ENTRIES * CMDQ_ENT_DWORDS]; - int num; + spinlock_t lock; }; struct arm_smmu_evtq { @@ -647,7 +604,6 @@ struct arm_smmu_device { #define ARM_SMMU_FEAT_HYP (1 << 12) #define ARM_SMMU_FEAT_STALL_FORCE (1 << 13) #define ARM_SMMU_FEAT_VAX (1 << 14) -#define ARM_SMMU_FEAT_RANGE_INV (1 << 15) u32 features; #define ARM_SMMU_OPT_SKIP_PREFETCH (1 << 0) @@ -660,6 +616,8 @@ struct arm_smmu_device { int gerr_irq; int combined_irq; + u32 sync_nr; + u8 prev_cmd_opcode; unsigned long ias; /* IPA */ unsigned long oas; /* PA */ @@ -677,6 +635,12 @@ struct arm_smmu_device { 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; + }; + /* IOMMU core code handle */ struct iommu_device iommu; }; @@ -763,21 +727,6 @@ static void parse_driver_options(struct arm_smmu_device *smmu) } /* Low-level queue manipulation functions */ -static bool queue_has_space(struct arm_smmu_ll_queue *q, u32 n) -{ - u32 space, prod, cons; - - prod = Q_IDX(q, q->prod); - cons = Q_IDX(q, q->cons); - - if (Q_WRP(q, q->prod) == Q_WRP(q, q->cons)) - space = (1 << q->max_n_shift) - (prod - cons); - else - space = cons - prod; - - return space >= n; -} - static bool queue_full(struct arm_smmu_ll_queue *q) { return Q_IDX(q, q->prod) == Q_IDX(q, q->cons) && @@ -790,12 +739,9 @@ static bool queue_empty(struct arm_smmu_ll_queue *q) Q_WRP(q, q->prod) == Q_WRP(q, q->cons); } -static bool queue_consumed(struct arm_smmu_ll_queue *q, u32 prod) +static void queue_sync_cons_in(struct arm_smmu_queue *q) { - return ((Q_WRP(q, q->cons) == Q_WRP(q, prod)) && - (Q_IDX(q, q->cons) > Q_IDX(q, prod))) || - ((Q_WRP(q, q->cons) != Q_WRP(q, prod)) && - (Q_IDX(q, q->cons) <= Q_IDX(q, prod))); + q->llq.cons = readl_relaxed(q->cons_reg); } static void queue_sync_cons_out(struct arm_smmu_queue *q) @@ -826,34 +772,46 @@ static int queue_sync_prod_in(struct arm_smmu_queue *q) return ret; } -static u32 queue_inc_prod_n(struct arm_smmu_ll_queue *q, int n) +static void queue_sync_prod_out(struct arm_smmu_queue *q) { - u32 prod = (Q_WRP(q, q->prod) | Q_IDX(q, q->prod)) + n; - return Q_OVF(q->prod) | Q_WRP(q, prod) | Q_IDX(q, prod); + writel(q->llq.prod, q->prod_reg); } -static void queue_poll_init(struct arm_smmu_device *smmu, - struct arm_smmu_queue_poll *qp) +static void queue_inc_prod(struct arm_smmu_ll_queue *q) { - qp->delay = 1; - qp->spin_cnt = 0; - qp->wfe = !!(smmu->features & ARM_SMMU_FEAT_SEV); - qp->timeout = ktime_add_us(ktime_get(), ARM_SMMU_POLL_TIMEOUT_US); + u32 prod = (Q_WRP(q, q->prod) | Q_IDX(q, q->prod)) + 1; + q->prod = Q_OVF(q->prod) | Q_WRP(q, prod) | Q_IDX(q, prod); } -static int queue_poll(struct arm_smmu_queue_poll *qp) +/* + * Wait for the SMMU to consume items. If sync is true, wait until the queue + * is empty. Otherwise, wait until there is at least one free slot. + */ +static int queue_poll_cons(struct arm_smmu_queue *q, bool sync, bool wfe) { - if (ktime_compare(ktime_get(), qp->timeout) > 0) - return -ETIMEDOUT; + ktime_t timeout; + unsigned int delay = 1, spin_cnt = 0; - if (qp->wfe) { - wfe(); - } else if (++qp->spin_cnt < ARM_SMMU_POLL_SPIN_COUNT) { - cpu_relax(); - } else { - udelay(qp->delay); - qp->delay *= 2; - qp->spin_cnt = 0; + /* Wait longer if it's a CMD_SYNC */ + timeout = ktime_add_us(ktime_get(), sync ? + ARM_SMMU_CMDQ_SYNC_TIMEOUT_US : + ARM_SMMU_POLL_TIMEOUT_US); + + while (queue_sync_cons_in(q), + (sync ? !queue_empty(&q->llq) : queue_full(&q->llq))) { + if (ktime_compare(ktime_get(), timeout) > 0) + return -ETIMEDOUT; + + if (wfe) { + wfe(); + } else if (++spin_cnt < ARM_SMMU_CMDQ_SYNC_SPIN_COUNT) { + cpu_relax(); + continue; + } else { + udelay(delay); + delay *= 2; + spin_cnt = 0; + } } return 0; @@ -867,6 +825,17 @@ static void queue_write(__le64 *dst, u64 *src, size_t n_dwords) *dst++ = cpu_to_le64(*src++); } +static int queue_insert_raw(struct arm_smmu_queue *q, u64 *ent) +{ + if (queue_full(&q->llq)) + return -ENOSPC; + + queue_write(Q_ENT(q, q->llq.prod), ent, q->ent_dwords); + queue_inc_prod(&q->llq); + queue_sync_prod_out(q); + return 0; +} + static void queue_read(__le64 *dst, u64 *src, size_t n_dwords) { int i; @@ -916,22 +885,14 @@ static int arm_smmu_cmdq_build_cmd(u64 *cmd, struct arm_smmu_cmdq_ent *ent) cmd[1] |= FIELD_PREP(CMDQ_CFGI_1_RANGE, 31); break; case CMDQ_OP_TLBI_NH_VA: - cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_NUM, ent->tlbi.num); - cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_SCALE, ent->tlbi.scale); cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_VMID, ent->tlbi.vmid); cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_ASID, ent->tlbi.asid); cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_LEAF, ent->tlbi.leaf); - cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_TTL, ent->tlbi.ttl); - cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_TG, ent->tlbi.tg); cmd[1] |= ent->tlbi.addr & CMDQ_TLBI_1_VA_MASK; break; case CMDQ_OP_TLBI_S2_IPA: - cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_NUM, ent->tlbi.num); - cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_SCALE, ent->tlbi.scale); cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_VMID, ent->tlbi.vmid); cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_LEAF, ent->tlbi.leaf); - cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_TTL, ent->tlbi.ttl); - cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_TG, ent->tlbi.tg); cmd[1] |= ent->tlbi.addr & CMDQ_TLBI_1_IPA_MASK; break; case CMDQ_OP_TLBI_NH_ASID: @@ -964,14 +925,20 @@ static int arm_smmu_cmdq_build_cmd(u64 *cmd, struct arm_smmu_cmdq_ent *ent) cmd[1] |= FIELD_PREP(CMDQ_PRI_1_RESP, ent->pri.resp); break; case CMDQ_OP_CMD_SYNC: - if (ent->sync.msiaddr) { + if (ent->sync.msiaddr) cmd[0] |= FIELD_PREP(CMDQ_SYNC_0_CS, CMDQ_SYNC_0_CS_IRQ); - cmd[1] |= ent->sync.msiaddr & CMDQ_SYNC_1_MSIADDR_MASK; - } else { + else cmd[0] |= FIELD_PREP(CMDQ_SYNC_0_CS, CMDQ_SYNC_0_CS_SEV); - } cmd[0] |= FIELD_PREP(CMDQ_SYNC_0_MSH, ARM_SMMU_SH_ISH); cmd[0] |= FIELD_PREP(CMDQ_SYNC_0_MSIATTR, ARM_SMMU_MEMATTR_OIWB); + /* + * Commands are written little-endian, but we want the SMMU to + * receive MSIData, and thus write it back to memory, in CPU + * byte order, so big-endian needs an extra byteswap here. + */ + cmd[0] |= FIELD_PREP(CMDQ_SYNC_0_MSIDATA, + cpu_to_le32(ent->sync.msidata)); + cmd[1] |= ent->sync.msiaddr & CMDQ_SYNC_1_MSIADDR_MASK; break; default: return -ENOENT; @@ -980,27 +947,6 @@ static int arm_smmu_cmdq_build_cmd(u64 *cmd, struct arm_smmu_cmdq_ent *ent) return 0; } -static void arm_smmu_cmdq_build_sync_cmd(u64 *cmd, struct arm_smmu_device *smmu, - u32 prod) -{ - struct arm_smmu_queue *q = &smmu->cmdq.q; - struct arm_smmu_cmdq_ent ent = { - .opcode = CMDQ_OP_CMD_SYNC, - }; - - /* - * Beware that Hi16xx adds an extra 32 bits of goodness to its MSI - * payload, so the write will zero the entire command on that platform. - */ - if (smmu->features & ARM_SMMU_FEAT_MSI && - smmu->features & ARM_SMMU_FEAT_COHERENCY) { - ent.sync.msiaddr = q->base_dma + Q_IDX(&q->llq, prod) * - q->ent_dwords * 8; - } - - arm_smmu_cmdq_build_cmd(cmd, &ent); -} - static void arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu) { static const char *cerror_str[] = { @@ -1059,474 +1005,109 @@ static void arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu) queue_write(Q_ENT(q, cons), cmd, q->ent_dwords); } -/* - * Command queue locking. - * This is a form of bastardised rwlock with the following major changes: - * - * - The only LOCK routines are exclusive_trylock() and shared_lock(). - * Neither have barrier semantics, and instead provide only a control - * dependency. - * - * - The UNLOCK routines are supplemented with shared_tryunlock(), which - * fails if the caller appears to be the last lock holder (yes, this is - * racy). All successful UNLOCK routines have RELEASE semantics. - */ -static void arm_smmu_cmdq_shared_lock(struct arm_smmu_cmdq *cmdq) -{ - int val; - - /* - * We can try to avoid the cmpxchg() loop by simply incrementing the - * lock counter. When held in exclusive state, the lock counter is set - * to INT_MIN so these increments won't hurt as the value will remain - * negative. - */ - if (atomic_fetch_inc_relaxed(&cmdq->lock) >= 0) - return; - - do { - val = atomic_cond_read_relaxed(&cmdq->lock, VAL >= 0); - } while (atomic_cmpxchg_relaxed(&cmdq->lock, val, val + 1) != val); -} - -static void arm_smmu_cmdq_shared_unlock(struct arm_smmu_cmdq *cmdq) -{ - (void)atomic_dec_return_release(&cmdq->lock); -} - -static bool arm_smmu_cmdq_shared_tryunlock(struct arm_smmu_cmdq *cmdq) +static void arm_smmu_cmdq_insert_cmd(struct arm_smmu_device *smmu, u64 *cmd) { - if (atomic_read(&cmdq->lock) == 1) - return false; - - arm_smmu_cmdq_shared_unlock(cmdq); - return true; -} - -#define arm_smmu_cmdq_exclusive_trylock_irqsave(cmdq, flags) \ -({ \ - bool __ret; \ - local_irq_save(flags); \ - __ret = !atomic_cmpxchg_relaxed(&cmdq->lock, 0, INT_MIN); \ - if (!__ret) \ - local_irq_restore(flags); \ - __ret; \ -}) - -#define arm_smmu_cmdq_exclusive_unlock_irqrestore(cmdq, flags) \ -({ \ - atomic_set_release(&cmdq->lock, 0); \ - local_irq_restore(flags); \ -}) - - -/* - * Command queue insertion. - * This is made fiddly by our attempts to achieve some sort of scalability - * since there is one queue shared amongst all of the CPUs in the system. If - * you like mixed-size concurrency, dependency ordering and relaxed atomics, - * then you'll *love* this monstrosity. - * - * The basic idea is to split the queue up into ranges of commands that are - * owned by a given CPU; the owner may not have written all of the commands - * itself, but is responsible for advancing the hardware prod pointer when - * the time comes. The algorithm is roughly: - * - * 1. Allocate some space in the queue. At this point we also discover - * whether the head of the queue is currently owned by another CPU, - * or whether we are the owner. - * - * 2. Write our commands into our allocated slots in the queue. - * - * 3. Mark our slots as valid in arm_smmu_cmdq.valid_map. - * - * 4. If we are an owner: - * a. Wait for the previous owner to finish. - * b. Mark the queue head as unowned, which tells us the range - * that we are responsible for publishing. - * c. Wait for all commands in our owned range to become valid. - * d. Advance the hardware prod pointer. - * e. Tell the next owner we've finished. - * - * 5. If we are inserting a CMD_SYNC (we may or may not have been an - * owner), then we need to stick around until it has completed: - * a. If we have MSIs, the SMMU can write back into the CMD_SYNC - * to clear the first 4 bytes. - * b. Otherwise, we spin waiting for the hardware cons pointer to - * advance past our command. - * - * The devil is in the details, particularly the use of locking for handling - * SYNC completion and freeing up space in the queue before we think that it is - * full. - */ -static void __arm_smmu_cmdq_poll_set_valid_map(struct arm_smmu_cmdq *cmdq, - u32 sprod, u32 eprod, bool set) -{ - u32 swidx, sbidx, ewidx, ebidx; - struct arm_smmu_ll_queue llq = { - .max_n_shift = cmdq->q.llq.max_n_shift, - .prod = sprod, - }; - - ewidx = BIT_WORD(Q_IDX(&llq, eprod)); - ebidx = Q_IDX(&llq, eprod) % BITS_PER_LONG; - - while (llq.prod != eprod) { - unsigned long mask; - atomic_long_t *ptr; - u32 limit = BITS_PER_LONG; - - swidx = BIT_WORD(Q_IDX(&llq, llq.prod)); - sbidx = Q_IDX(&llq, llq.prod) % BITS_PER_LONG; - - ptr = &cmdq->valid_map[swidx]; - - if ((swidx == ewidx) && (sbidx < ebidx)) - limit = ebidx; - - mask = GENMASK(limit - 1, sbidx); - - /* - * The valid bit is the inverse of the wrap bit. This means - * that a zero-initialised queue is invalid and, after marking - * all entries as valid, they become invalid again when we - * wrap. - */ - if (set) { - atomic_long_xor(mask, ptr); - } else { /* Poll */ - unsigned long valid; + struct arm_smmu_queue *q = &smmu->cmdq.q; + bool wfe = !!(smmu->features & ARM_SMMU_FEAT_SEV); - valid = (ULONG_MAX + !!Q_WRP(&llq, llq.prod)) & mask; - atomic_long_cond_read_relaxed(ptr, (VAL & mask) == valid); - } + smmu->prev_cmd_opcode = FIELD_GET(CMDQ_0_OP, cmd[0]); - llq.prod = queue_inc_prod_n(&llq, limit - sbidx); + while (queue_insert_raw(q, cmd) == -ENOSPC) { + if (queue_poll_cons(q, false, wfe)) + dev_err_ratelimited(smmu->dev, "CMDQ timeout\n"); } } -/* Mark all entries in the range [sprod, eprod) as valid */ -static void arm_smmu_cmdq_set_valid_map(struct arm_smmu_cmdq *cmdq, - u32 sprod, u32 eprod) -{ - __arm_smmu_cmdq_poll_set_valid_map(cmdq, sprod, eprod, true); -} - -/* Wait for all entries in the range [sprod, eprod) to become valid */ -static void arm_smmu_cmdq_poll_valid_map(struct arm_smmu_cmdq *cmdq, - u32 sprod, u32 eprod) -{ - __arm_smmu_cmdq_poll_set_valid_map(cmdq, sprod, eprod, false); -} - -/* Wait for the command queue to become non-full */ -static int arm_smmu_cmdq_poll_until_not_full(struct arm_smmu_device *smmu, - struct arm_smmu_ll_queue *llq) +static void arm_smmu_cmdq_issue_cmd(struct arm_smmu_device *smmu, + struct arm_smmu_cmdq_ent *ent) { + u64 cmd[CMDQ_ENT_DWORDS]; unsigned long flags; - struct arm_smmu_queue_poll qp; - struct arm_smmu_cmdq *cmdq = &smmu->cmdq; - int ret = 0; - /* - * Try to update our copy of cons by grabbing exclusive cmdq access. If - * that fails, spin until somebody else updates it for us. - */ - if (arm_smmu_cmdq_exclusive_trylock_irqsave(cmdq, flags)) { - WRITE_ONCE(cmdq->q.llq.cons, readl_relaxed(cmdq->q.cons_reg)); - arm_smmu_cmdq_exclusive_unlock_irqrestore(cmdq, flags); - llq->val = READ_ONCE(cmdq->q.llq.val); - return 0; + if (arm_smmu_cmdq_build_cmd(cmd, ent)) { + dev_warn(smmu->dev, "ignoring unknown CMDQ opcode 0x%x\n", + ent->opcode); + return; } - queue_poll_init(smmu, &qp); - do { - llq->val = READ_ONCE(smmu->cmdq.q.llq.val); - if (!queue_full(llq)) - break; - - ret = queue_poll(&qp); - } while (!ret); - - return ret; + spin_lock_irqsave(&smmu->cmdq.lock, flags); + arm_smmu_cmdq_insert_cmd(smmu, cmd); + spin_unlock_irqrestore(&smmu->cmdq.lock, flags); } /* - * Wait until the SMMU signals a CMD_SYNC completion MSI. - * Must be called with the cmdq lock held in some capacity. + * The difference between val and sync_idx is bounded by the maximum size of + * a queue at 2^20 entries, so 32 bits is plenty for wrap-safe arithmetic. */ -static int __arm_smmu_cmdq_poll_until_msi(struct arm_smmu_device *smmu, - struct arm_smmu_ll_queue *llq) -{ - int ret = 0; - struct arm_smmu_queue_poll qp; - struct arm_smmu_cmdq *cmdq = &smmu->cmdq; - u32 *cmd = (u32 *)(Q_ENT(&cmdq->q, llq->prod)); - - queue_poll_init(smmu, &qp); - - /* - * The MSI won't generate an event, since it's being written back - * into the command queue. - */ - qp.wfe = false; - smp_cond_load_relaxed(cmd, !VAL || (ret = queue_poll(&qp))); - llq->cons = ret ? llq->prod : queue_inc_prod_n(llq, 1); - return ret; -} - -/* - * Wait until the SMMU cons index passes llq->prod. - * Must be called with the cmdq lock held in some capacity. - */ -static int __arm_smmu_cmdq_poll_until_consumed(struct arm_smmu_device *smmu, - struct arm_smmu_ll_queue *llq) -{ - struct arm_smmu_queue_poll qp; - struct arm_smmu_cmdq *cmdq = &smmu->cmdq; - u32 prod = llq->prod; - int ret = 0; - - queue_poll_init(smmu, &qp); - llq->val = READ_ONCE(smmu->cmdq.q.llq.val); - do { - if (queue_consumed(llq, prod)) - break; - - ret = queue_poll(&qp); - - /* - * This needs to be a readl() so that our subsequent call - * to arm_smmu_cmdq_shared_tryunlock() can fail accurately. - * - * Specifically, we need to ensure that we observe all - * shared_lock()s by other CMD_SYNCs that share our owner, - * so that a failing call to tryunlock() means that we're - * the last one out and therefore we can safely advance - * cmdq->q.llq.cons. Roughly speaking: - * - * CPU 0 CPU1 CPU2 (us) - * - * if (sync) - * shared_lock(); - * - * dma_wmb(); - * set_valid_map(); - * - * if (owner) { - * poll_valid_map(); - * - * writel(prod_reg); - * - * readl(cons_reg); - * tryunlock(); - * - * Requires us to see CPU 0's shared_lock() acquisition. - */ - llq->cons = readl(cmdq->q.cons_reg); - } while (!ret); - - return ret; -} - -static int arm_smmu_cmdq_poll_until_sync(struct arm_smmu_device *smmu, - struct arm_smmu_ll_queue *llq) +static int __arm_smmu_sync_poll_msi(struct arm_smmu_device *smmu, u32 sync_idx) { - if (smmu->features & ARM_SMMU_FEAT_MSI && - smmu->features & ARM_SMMU_FEAT_COHERENCY) - return __arm_smmu_cmdq_poll_until_msi(smmu, llq); - - return __arm_smmu_cmdq_poll_until_consumed(smmu, llq); -} - -static void arm_smmu_cmdq_write_entries(struct arm_smmu_cmdq *cmdq, u64 *cmds, - u32 prod, int n) -{ - int i; - struct arm_smmu_ll_queue llq = { - .max_n_shift = cmdq->q.llq.max_n_shift, - .prod = prod, - }; + ktime_t timeout; + u32 val; - for (i = 0; i < n; ++i) { - u64 *cmd = &cmds[i * CMDQ_ENT_DWORDS]; + timeout = ktime_add_us(ktime_get(), ARM_SMMU_CMDQ_SYNC_TIMEOUT_US); + val = smp_cond_load_acquire(&smmu->sync_count, + (int)(VAL - sync_idx) >= 0 || + !ktime_before(ktime_get(), timeout)); - prod = queue_inc_prod_n(&llq, i); - queue_write(Q_ENT(&cmdq->q, prod), cmd, CMDQ_ENT_DWORDS); - } + return (int)(val - sync_idx) < 0 ? -ETIMEDOUT : 0; } -/* - * This is the actual insertion function, and provides the following - * ordering guarantees to callers: - * - * - There is a dma_wmb() before publishing any commands to the queue. - * This can be relied upon to order prior writes to data structures - * in memory (such as a CD or an STE) before the command. - * - * - On completion of a CMD_SYNC, there is a control dependency. - * This can be relied upon to order subsequent writes to memory (e.g. - * freeing an IOVA) after completion of the CMD_SYNC. - * - * - Command insertion is totally ordered, so if two CPUs each race to - * insert their own list of commands then all of the commands from one - * CPU will appear before any of the commands from the other CPU. - */ -static int arm_smmu_cmdq_issue_cmdlist(struct arm_smmu_device *smmu, - u64 *cmds, int n, bool sync) +static int __arm_smmu_cmdq_issue_sync_msi(struct arm_smmu_device *smmu) { - u64 cmd_sync[CMDQ_ENT_DWORDS]; - u32 prod; + u64 cmd[CMDQ_ENT_DWORDS]; unsigned long flags; - bool owner; - struct arm_smmu_cmdq *cmdq = &smmu->cmdq; - struct arm_smmu_ll_queue llq = { - .max_n_shift = cmdq->q.llq.max_n_shift, - }, head = llq; - int ret = 0; - - /* 1. Allocate some space in the queue */ - local_irq_save(flags); - llq.val = READ_ONCE(cmdq->q.llq.val); - do { - u64 old; - - while (!queue_has_space(&llq, n + sync)) { - local_irq_restore(flags); - if (arm_smmu_cmdq_poll_until_not_full(smmu, &llq)) - dev_err_ratelimited(smmu->dev, "CMDQ timeout\n"); - local_irq_save(flags); - } - - head.cons = llq.cons; - head.prod = queue_inc_prod_n(&llq, n + sync) | - CMDQ_PROD_OWNED_FLAG; - - old = cmpxchg_relaxed(&cmdq->q.llq.val, llq.val, head.val); - if (old == llq.val) - break; - - llq.val = old; - } while (1); - owner = !(llq.prod & CMDQ_PROD_OWNED_FLAG); - head.prod &= ~CMDQ_PROD_OWNED_FLAG; - llq.prod &= ~CMDQ_PROD_OWNED_FLAG; - - /* - * 2. Write our commands into the queue - * Dependency ordering from the cmpxchg() loop above. - */ - arm_smmu_cmdq_write_entries(cmdq, cmds, llq.prod, n); - if (sync) { - prod = queue_inc_prod_n(&llq, n); - arm_smmu_cmdq_build_sync_cmd(cmd_sync, smmu, prod); - queue_write(Q_ENT(&cmdq->q, prod), cmd_sync, CMDQ_ENT_DWORDS); - - /* - * In order to determine completion of our CMD_SYNC, we must - * ensure that the queue can't wrap twice without us noticing. - * We achieve that by taking the cmdq lock as shared before - * marking our slot as valid. - */ - arm_smmu_cmdq_shared_lock(cmdq); - } - - /* 3. Mark our slots as valid, ensuring commands are visible first */ - dma_wmb(); - arm_smmu_cmdq_set_valid_map(cmdq, llq.prod, head.prod); - - /* 4. If we are the owner, take control of the SMMU hardware */ - if (owner) { - /* a. Wait for previous owner to finish */ - atomic_cond_read_relaxed(&cmdq->owner_prod, VAL == llq.prod); - - /* b. Stop gathering work by clearing the owned flag */ - prod = atomic_fetch_andnot_relaxed(CMDQ_PROD_OWNED_FLAG, - &cmdq->q.llq.atomic.prod); - prod &= ~CMDQ_PROD_OWNED_FLAG; - - /* - * c. Wait for any gathered work to be written to the queue. - * Note that we read our own entries so that we have the control - * dependency required by (d). - */ - arm_smmu_cmdq_poll_valid_map(cmdq, llq.prod, prod); + struct arm_smmu_cmdq_ent ent = { + .opcode = CMDQ_OP_CMD_SYNC, + .sync = { + .msiaddr = virt_to_phys(&smmu->sync_count), + }, + }; - /* - * d. Advance the hardware prod pointer - * Control dependency ordering from the entries becoming valid. - */ - writel_relaxed(prod, cmdq->q.prod_reg); + spin_lock_irqsave(&smmu->cmdq.lock, flags); - /* - * e. Tell the next owner we're done - * Make sure we've updated the hardware first, so that we don't - * race to update prod and potentially move it backwards. - */ - atomic_set_release(&cmdq->owner_prod, prod); + /* Piggy-back on the previous command if it's a SYNC */ + if (smmu->prev_cmd_opcode == CMDQ_OP_CMD_SYNC) { + ent.sync.msidata = smmu->sync_nr; + } else { + ent.sync.msidata = ++smmu->sync_nr; + arm_smmu_cmdq_build_cmd(cmd, &ent); + arm_smmu_cmdq_insert_cmd(smmu, cmd); } - /* 5. If we are inserting a CMD_SYNC, we must wait for it to complete */ - if (sync) { - llq.prod = queue_inc_prod_n(&llq, n); - ret = arm_smmu_cmdq_poll_until_sync(smmu, &llq); - if (ret) { - dev_err_ratelimited(smmu->dev, - "CMD_SYNC timeout at 0x%08x [hwprod 0x%08x, hwcons 0x%08x]\n", - llq.prod, - readl_relaxed(cmdq->q.prod_reg), - readl_relaxed(cmdq->q.cons_reg)); - } + spin_unlock_irqrestore(&smmu->cmdq.lock, flags); - /* - * Try to unlock the cmq lock. This will fail if we're the last - * reader, in which case we can safely update cmdq->q.llq.cons - */ - if (!arm_smmu_cmdq_shared_tryunlock(cmdq)) { - WRITE_ONCE(cmdq->q.llq.cons, llq.cons); - arm_smmu_cmdq_shared_unlock(cmdq); - } - } - - local_irq_restore(flags); - return ret; + return __arm_smmu_sync_poll_msi(smmu, ent.sync.msidata); } -static int arm_smmu_cmdq_issue_cmd(struct arm_smmu_device *smmu, - struct arm_smmu_cmdq_ent *ent) +static int __arm_smmu_cmdq_issue_sync(struct arm_smmu_device *smmu) { u64 cmd[CMDQ_ENT_DWORDS]; + unsigned long flags; + bool wfe = !!(smmu->features & ARM_SMMU_FEAT_SEV); + struct arm_smmu_cmdq_ent ent = { .opcode = CMDQ_OP_CMD_SYNC }; + int ret; - if (arm_smmu_cmdq_build_cmd(cmd, ent)) { - dev_warn(smmu->dev, "ignoring unknown CMDQ opcode 0x%x\n", - ent->opcode); - return -EINVAL; - } + arm_smmu_cmdq_build_cmd(cmd, &ent); - return arm_smmu_cmdq_issue_cmdlist(smmu, cmd, 1, false); -} + spin_lock_irqsave(&smmu->cmdq.lock, flags); + arm_smmu_cmdq_insert_cmd(smmu, cmd); + ret = queue_poll_cons(&smmu->cmdq.q, true, wfe); + spin_unlock_irqrestore(&smmu->cmdq.lock, flags); -static int arm_smmu_cmdq_issue_sync(struct arm_smmu_device *smmu) -{ - return arm_smmu_cmdq_issue_cmdlist(smmu, NULL, 0, true); + return ret; } -static void arm_smmu_cmdq_batch_add(struct arm_smmu_device *smmu, - struct arm_smmu_cmdq_batch *cmds, - struct arm_smmu_cmdq_ent *cmd) +static int arm_smmu_cmdq_issue_sync(struct arm_smmu_device *smmu) { - if (cmds->num == CMDQ_BATCH_ENTRIES) { - arm_smmu_cmdq_issue_cmdlist(smmu, cmds->cmds, cmds->num, false); - cmds->num = 0; - } - arm_smmu_cmdq_build_cmd(&cmds->cmds[cmds->num * CMDQ_ENT_DWORDS], cmd); - cmds->num++; -} + int ret; + bool msi = (smmu->features & ARM_SMMU_FEAT_MSI) && + (smmu->features & ARM_SMMU_FEAT_COHERENCY); -static int arm_smmu_cmdq_batch_submit(struct arm_smmu_device *smmu, - struct arm_smmu_cmdq_batch *cmds) -{ - return arm_smmu_cmdq_issue_cmdlist(smmu, cmds->cmds, cmds->num, true); + ret = msi ? __arm_smmu_cmdq_issue_sync_msi(smmu) + : __arm_smmu_cmdq_issue_sync(smmu); + if (ret) + dev_err_ratelimited(smmu->dev, "CMD_SYNC timeout\n"); + return ret; } /* Context descriptor manipulation functions */ @@ -1536,7 +1117,6 @@ static void arm_smmu_sync_cd(struct arm_smmu_domain *smmu_domain, size_t i; unsigned long flags; struct arm_smmu_master *master; - struct arm_smmu_cmdq_batch cmds = {}; struct arm_smmu_device *smmu = smmu_domain->smmu; struct arm_smmu_cmdq_ent cmd = { .opcode = CMDQ_OP_CFGI_CD, @@ -1550,12 +1130,12 @@ static void arm_smmu_sync_cd(struct arm_smmu_domain *smmu_domain, list_for_each_entry(master, &smmu_domain->devices, domain_head) { for (i = 0; i < master->num_sids; i++) { cmd.cfgi.sid = master->sids[i]; - arm_smmu_cmdq_batch_add(smmu, &cmds, &cmd); + arm_smmu_cmdq_issue_cmd(smmu, &cmd); } } spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); - arm_smmu_cmdq_batch_submit(smmu, &cmds); + arm_smmu_cmdq_issue_sync(smmu); } static int arm_smmu_alloc_cd_leaf_table(struct arm_smmu_device *smmu, @@ -2190,16 +1770,17 @@ arm_smmu_atc_inv_to_cmd(int ssid, unsigned long iova, size_t size, cmd->atc.size = log2_span; } -static int arm_smmu_atc_inv_master(struct arm_smmu_master *master) +static int arm_smmu_atc_inv_master(struct arm_smmu_master *master, + struct arm_smmu_cmdq_ent *cmd) { int i; - struct arm_smmu_cmdq_ent cmd; - arm_smmu_atc_inv_to_cmd(0, 0, 0, &cmd); + if (!master->ats_enabled) + return 0; for (i = 0; i < master->num_sids; i++) { - cmd.atc.sid = master->sids[i]; - arm_smmu_cmdq_issue_cmd(master->smmu, &cmd); + cmd->atc.sid = master->sids[i]; + arm_smmu_cmdq_issue_cmd(master->smmu, cmd); } return arm_smmu_cmdq_issue_sync(master->smmu); @@ -2208,11 +1789,10 @@ static int arm_smmu_atc_inv_master(struct arm_smmu_master *master) static int arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain, int ssid, unsigned long iova, size_t size) { - int i; + int ret = 0; unsigned long flags; struct arm_smmu_cmdq_ent cmd; struct arm_smmu_master *master; - struct arm_smmu_cmdq_batch cmds = {}; if (!(smmu_domain->smmu->features & ARM_SMMU_FEAT_ATS)) return 0; @@ -2237,18 +1817,11 @@ static int arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain, arm_smmu_atc_inv_to_cmd(ssid, iova, size, &cmd); spin_lock_irqsave(&smmu_domain->devices_lock, flags); - list_for_each_entry(master, &smmu_domain->devices, domain_head) { - if (!master->ats_enabled) - continue; - - for (i = 0; i < master->num_sids; i++) { - cmd.atc.sid = master->sids[i]; - arm_smmu_cmdq_batch_add(smmu_domain->smmu, &cmds, &cmd); - } - } + list_for_each_entry(master, &smmu_domain->devices, domain_head) + ret |= arm_smmu_atc_inv_master(master, &cmd); spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); - return arm_smmu_cmdq_batch_submit(smmu_domain->smmu, &cmds); + return ret ? -ETIMEDOUT : 0; } /* IO_PGTABLE API */ @@ -2270,26 +1843,23 @@ static void arm_smmu_tlb_inv_context(void *cookie) /* * NOTE: when io-pgtable is in non-strict mode, we may get here with * PTEs previously cleared by unmaps on the current CPU not yet visible - * to the SMMU. We are relying on the dma_wmb() implicit during cmd - * insertion to guarantee those are observed before the TLBI. Do be - * careful, 007. + * to the SMMU. We are relying on the DSB implicit in + * queue_sync_prod_out() to guarantee those are observed before the + * TLBI. Do be careful, 007. */ arm_smmu_cmdq_issue_cmd(smmu, &cmd); arm_smmu_cmdq_issue_sync(smmu); - arm_smmu_atc_inv_domain(smmu_domain, 0, 0, 0); } -static void arm_smmu_tlb_inv_range(unsigned long iova, size_t size, - size_t granule, bool leaf, - struct arm_smmu_domain *smmu_domain) +static void arm_smmu_tlb_inv_range_nosync(unsigned long iova, size_t size, + size_t granule, bool leaf, void *cookie) { + struct arm_smmu_domain *smmu_domain = cookie; struct arm_smmu_device *smmu = smmu_domain->smmu; - unsigned long start = iova, end = iova + size, num_pages = 0, tg = 0; - size_t inv_range = granule; - struct arm_smmu_cmdq_batch cmds = {}; struct arm_smmu_cmdq_ent cmd = { .tlbi = { .leaf = leaf, + .addr = iova, }, }; @@ -2304,78 +1874,37 @@ static void arm_smmu_tlb_inv_range(unsigned long iova, size_t size, cmd.tlbi.vmid = smmu_domain->s2_cfg.vmid; } - if (smmu->features & ARM_SMMU_FEAT_RANGE_INV) { - /* Get the leaf page size */ - tg = __ffs(smmu_domain->domain.pgsize_bitmap); - - /* Convert page size of 12,14,16 (log2) to 1,2,3 */ - cmd.tlbi.tg = (tg - 10) / 2; - - /* Determine what level the granule is at */ - cmd.tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3)); - - num_pages = size >> tg; - } - - while (iova < end) { - if (smmu->features & ARM_SMMU_FEAT_RANGE_INV) { - /* - * On each iteration of the loop, the range is 5 bits - * worth of the aligned size remaining. - * The range in pages is: - * - * range = (num_pages & (0x1f << __ffs(num_pages))) - */ - unsigned long scale, num; - - /* Determine the power of 2 multiple number of pages */ - scale = __ffs(num_pages); - cmd.tlbi.scale = scale; - - /* Determine how many chunks of 2^scale size we have */ - num = (num_pages >> scale) & CMDQ_TLBI_RANGE_NUM_MAX; - cmd.tlbi.num = num - 1; - - /* range is num * 2^scale * pgsize */ - inv_range = num << (scale + tg); - - /* Clear out the lower order bits for the next iteration */ - num_pages -= num << scale; - } - - cmd.tlbi.addr = iova; - arm_smmu_cmdq_batch_add(smmu, &cmds, &cmd); - iova += inv_range; - } - arm_smmu_cmdq_batch_submit(smmu, &cmds); - - /* - * Unfortunately, this can't be leaf-only since we may have - * zapped an entire table. - */ - arm_smmu_atc_inv_domain(smmu_domain, 0, start, size); + do { + arm_smmu_cmdq_issue_cmd(smmu, &cmd); + cmd.tlbi.addr += granule; + } while (size -= granule); } static void arm_smmu_tlb_inv_page_nosync(struct iommu_iotlb_gather *gather, unsigned long iova, size_t granule, void *cookie) { - struct arm_smmu_domain *smmu_domain = cookie; - struct iommu_domain *domain = &smmu_domain->domain; - - iommu_iotlb_gather_add_page(domain, gather, iova, granule); + arm_smmu_tlb_inv_range_nosync(iova, granule, granule, true, cookie); } static void arm_smmu_tlb_inv_walk(unsigned long iova, size_t size, size_t granule, void *cookie) { - arm_smmu_tlb_inv_range(iova, size, granule, false, cookie); + struct arm_smmu_domain *smmu_domain = cookie; + struct arm_smmu_device *smmu = smmu_domain->smmu; + + arm_smmu_tlb_inv_range_nosync(iova, size, granule, false, cookie); + arm_smmu_cmdq_issue_sync(smmu); } static void arm_smmu_tlb_inv_leaf(unsigned long iova, size_t size, size_t granule, void *cookie) { - arm_smmu_tlb_inv_range(iova, size, granule, true, cookie); + struct arm_smmu_domain *smmu_domain = cookie; + struct arm_smmu_device *smmu = smmu_domain->smmu; + + arm_smmu_tlb_inv_range_nosync(iova, size, granule, true, cookie); + arm_smmu_cmdq_issue_sync(smmu); } static const struct iommu_flush_ops arm_smmu_flush_ops = { @@ -2701,6 +2230,7 @@ static void arm_smmu_enable_ats(struct arm_smmu_master *master) static void arm_smmu_disable_ats(struct arm_smmu_master *master) { + struct arm_smmu_cmdq_ent cmd; struct arm_smmu_domain *smmu_domain = master->domain; if (!master->ats_enabled) @@ -2712,7 +2242,8 @@ static void arm_smmu_disable_ats(struct arm_smmu_master *master) * ATC invalidation via the SMMU. */ wmb(); - arm_smmu_atc_inv_master(master); + arm_smmu_atc_inv_to_cmd(0, 0, 0, &cmd); + arm_smmu_atc_inv_master(master, &cmd); atomic_dec(&smmu_domain->nr_ats_masters); } @@ -2856,13 +2387,18 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova, static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size, struct iommu_iotlb_gather *gather) { + int ret; struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); struct io_pgtable_ops *ops = smmu_domain->pgtbl_ops; if (!ops) return 0; - return ops->unmap(ops, iova, size, gather); + ret = ops->unmap(ops, iova, size, gather); + if (ret && arm_smmu_atc_inv_domain(smmu_domain, 0, iova, size)) + return 0; + + return ret; } static void arm_smmu_flush_iotlb_all(struct iommu_domain *domain) @@ -2876,10 +2412,10 @@ static void arm_smmu_flush_iotlb_all(struct iommu_domain *domain) static void arm_smmu_iotlb_sync(struct iommu_domain *domain, struct iommu_iotlb_gather *gather) { - struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu; - arm_smmu_tlb_inv_range(gather->start, gather->end - gather->start, - gather->pgsize, true, smmu_domain); + if (smmu) + arm_smmu_cmdq_issue_sync(smmu); } static phys_addr_t @@ -3177,49 +2713,18 @@ static int arm_smmu_init_one_queue(struct arm_smmu_device *smmu, return 0; } -static void arm_smmu_cmdq_free_bitmap(void *data) -{ - unsigned long *bitmap = data; - bitmap_free(bitmap); -} - -static int arm_smmu_cmdq_init(struct arm_smmu_device *smmu) -{ - int ret = 0; - struct arm_smmu_cmdq *cmdq = &smmu->cmdq; - unsigned int nents = 1 << cmdq->q.llq.max_n_shift; - atomic_long_t *bitmap; - - atomic_set(&cmdq->owner_prod, 0); - atomic_set(&cmdq->lock, 0); - - bitmap = (atomic_long_t *)bitmap_zalloc(nents, GFP_KERNEL); - if (!bitmap) { - dev_err(smmu->dev, "failed to allocate cmdq bitmap\n"); - ret = -ENOMEM; - } else { - cmdq->valid_map = bitmap; - devm_add_action(smmu->dev, arm_smmu_cmdq_free_bitmap, bitmap); - } - - return ret; -} - static int arm_smmu_init_queues(struct arm_smmu_device *smmu) { int ret; /* 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"); if (ret) return ret; - ret = arm_smmu_cmdq_init(smmu); - 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, @@ -3800,15 +3305,9 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) /* Queue sizes, capped to ensure natural alignment */ smmu->cmdq.q.llq.max_n_shift = min_t(u32, CMDQ_MAX_SZ_SHIFT, FIELD_GET(IDR1_CMDQS, reg)); - if (smmu->cmdq.q.llq.max_n_shift <= ilog2(CMDQ_BATCH_ENTRIES)) { - /* - * We don't support splitting up batches, so one batch of - * commands plus an extra sync needs to fit inside the command - * queue. There's also no way we can handle the weird alignment - * restrictions on the base pointer for a unit-length queue. - */ - dev_err(smmu->dev, "command queue size <= %d entries not supported\n", - CMDQ_BATCH_ENTRIES); + if (!smmu->cmdq.q.llq.max_n_shift) { + /* Odd alignment restrictions on the base, so ignore for now */ + dev_err(smmu->dev, "unit-length command queue not supported\n"); return -ENXIO; } @@ -3828,11 +3327,6 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) if (smmu->sid_bits <= STRTAB_SPLIT) smmu->features &= ~ARM_SMMU_FEAT_2_LVL_STRTAB; - /* IDR3 */ - reg = readl_relaxed(smmu->base + ARM_SMMU_IDR3); - if (FIELD_GET(IDR3_RIL, reg)) - smmu->features |= ARM_SMMU_FEAT_RANGE_INV; - /* IDR5 */ reg = readl_relaxed(smmu->base + ARM_SMMU_IDR5); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:55:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:55:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73280.132103 (Exim 4.92) (envelope-from ) id 1l3HVm-0000Oz-C6; Sat, 23 Jan 2021 11:55:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73280.132103; Sat, 23 Jan 2021 11: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 1l3HVm-0000Or-95; Sat, 23 Jan 2021 11:55:26 +0000 Received: by outflank-mailman (input) for mailman id 73280; Sat, 23 Jan 2021 11:55:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HVk-0000OS-SX for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:55:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HVk-0005bh-Ri for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HVk-0008FJ-Qu for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11: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=+P7CZDFL1mRhqBaJerj7iOIA4BLzSdr86rxXKeCwIcI=; b=bUv7KS0yfuqGvsp9EKjubMHuYu hKJVLlfe9AhrCEjsROgAtiAKuirwbdFmOPEpyzJhduV0IAcpyMUacsvsjrb02MlTWV+QoI34+pzbP VJIv7DevKSY9ao5HM9Y8q4qIsyyukCkguaFoncabl6QQH62HsT6rtHaizMKcqLFDalCg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Revert patch related to XArray Message-Id: Date: Sat, 23 Jan 2021 11:55:24 +0000 commit 9ff2f78c062e5454b032ef3877c771c2eb8cce66 Author: Rahul Singh AuthorDate: Wed Jan 20 14:52:37 2021 +0000 Commit: Julien Grall CommitDate: Sat Jan 23 11:48:33 2021 +0000 xen/arm: smmuv3: Revert patch related to XArray XArray is not implemented in XEN revert the patch that introduce the XArray code in SMMUv3 driver. XArray is added in preparation for sharing some ASIDs with the CPU, As XEN support only Stage-2 translation, ASID is used for Stage-1 translation there is no consequences of reverting this patch for XEN. Once XArray is implemented in XEN this patch can be added in XEN if XEN supports Stage-1 translation. Reverted the commit 0299a1a81ca056e79c1a7fb751f936ec0d5c7afe Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 8b7747ed38..7b29ead48c 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -625,6 +625,7 @@ struct arm_smmu_device { #define ARM_SMMU_MAX_ASIDS (1 << 16) unsigned int asid_bits; + DECLARE_BITMAP(asid_map, ARM_SMMU_MAX_ASIDS); #define ARM_SMMU_MAX_VMIDS (1 << 16) unsigned int vmid_bits; @@ -690,8 +691,6 @@ struct arm_smmu_option_prop { const char *prop; }; -static DEFINE_XARRAY_ALLOC1(asid_xa); - static struct arm_smmu_option_prop arm_smmu_options[] = { { ARM_SMMU_OPT_SKIP_PREFETCH, "hisilicon,broken-prefetch-cmd" }, { ARM_SMMU_OPT_PAGE0_REGS_ONLY, "cavium,cn9900-broken-page1-regspace"}, @@ -1346,14 +1345,6 @@ static void arm_smmu_free_cd_tables(struct arm_smmu_domain *smmu_domain) cdcfg->cdtab = NULL; } -static void arm_smmu_free_asid(struct arm_smmu_ctx_desc *cd) -{ - if (!cd->asid) - return; - - xa_erase(&asid_xa, cd->asid); -} - /* Stream table manipulation functions */ static void arm_smmu_write_strtab_l1_desc(__le64 *dst, struct arm_smmu_strtab_l1_desc *desc) @@ -1988,9 +1979,10 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg; - if (cfg->cdcfg.cdtab) + if (cfg->cdcfg.cdtab) { arm_smmu_free_cd_tables(smmu_domain); - arm_smmu_free_asid(&cfg->cd); + arm_smmu_bitmap_free(smmu->asid_map, cfg->cd.asid); + } } else { struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg; if (cfg->vmid) @@ -2005,15 +1997,14 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, struct io_pgtable_cfg *pgtbl_cfg) { int ret; - u32 asid; + int asid; struct arm_smmu_device *smmu = smmu_domain->smmu; struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg; typeof(&pgtbl_cfg->arm_lpae_s1_cfg.tcr) tcr = &pgtbl_cfg->arm_lpae_s1_cfg.tcr; - ret = xa_alloc(&asid_xa, &asid, &cfg->cd, - XA_LIMIT(1, (1 << smmu->asid_bits) - 1), GFP_KERNEL); - if (ret) - return ret; + asid = arm_smmu_bitmap_alloc(smmu->asid_map, smmu->asid_bits); + if (asid < 0) + return asid; cfg->s1cdmax = master->ssid_bits; @@ -2046,7 +2037,7 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, out_free_cd_tables: arm_smmu_free_cd_tables(smmu_domain); out_free_asid: - arm_smmu_free_asid(&cfg->cd); + arm_smmu_bitmap_free(smmu->asid_map, asid); return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:55:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:55:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73282.132107 (Exim 4.92) (envelope-from ) id 1l3HVw-0000SD-E2; Sat, 23 Jan 2021 11:55:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73282.132107; Sat, 23 Jan 2021 11: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 1l3HVw-0000S5-Aj; Sat, 23 Jan 2021 11:55:36 +0000 Received: by outflank-mailman (input) for mailman id 73282; Sat, 23 Jan 2021 11:55:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HVv-0000Re-0N for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:55:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HVu-0005c0-Vo for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HVu-0008GG-Tn for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11: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=EXEpoUMY1lkgU3dtAIly2wkUo6Oni5ZoSF8jHohis+8=; b=IeZwTRuTdSD1KfIuc62HknoWEQ IktgSOBiSfPViguUQybF59Sg4HFEcH8ommypKrUbDQcUPfaL576F/HRgmH2g17ZESvHHGoP/Oiwcl zvr9l7PTjm/CNgLWdGrtmztyGIlC/F8cc3ARWIkChhH3EoclGT92AF6/t7E7EBcorpwM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Remove support for Stage-1 translation on SMMUv3. Message-Id: Date: Sat, 23 Jan 2021 11:55:34 +0000 commit 86e7167f48e8eb3277de242bd98ad0787944d243 Author: Rahul Singh AuthorDate: Wed Jan 20 14:52:38 2021 +0000 Commit: Julien Grall CommitDate: Sat Jan 23 11:48:33 2021 +0000 xen/arm: smmuv3: Remove support for Stage-1 translation on SMMUv3. Linux SMMUv3 driver supports both Stage-1 and Stage-2 translations. As of now only Stage-2 translation support has been tested. Once Stage-1 translation support is tested this patch can be added. Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 468 ++-------------------------------- 1 file changed, 15 insertions(+), 453 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 7b29ead48c..869f38b753 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -449,19 +449,14 @@ struct arm_smmu_cmdq_ent { #define CMDQ_OP_CFGI_STE 0x3 #define CMDQ_OP_CFGI_ALL 0x4 - #define CMDQ_OP_CFGI_CD 0x5 - #define CMDQ_OP_CFGI_CD_ALL 0x6 struct { u32 sid; - u32 ssid; union { bool leaf; u8 span; }; } cfgi; - #define CMDQ_OP_TLBI_NH_ASID 0x11 - #define CMDQ_OP_TLBI_NH_VA 0x12 #define CMDQ_OP_TLBI_EL2_ALL 0x20 #define CMDQ_OP_TLBI_S12_VMALL 0x28 #define CMDQ_OP_TLBI_S2_IPA 0x2a @@ -541,32 +536,6 @@ struct arm_smmu_strtab_l1_desc { dma_addr_t l2ptr_dma; }; -struct arm_smmu_ctx_desc { - u16 asid; - u64 ttbr; - u64 tcr; - u64 mair; -}; - -struct arm_smmu_l1_ctx_desc { - __le64 *l2ptr; - dma_addr_t l2ptr_dma; -}; - -struct arm_smmu_ctx_desc_cfg { - __le64 *cdtab; - dma_addr_t cdtab_dma; - struct arm_smmu_l1_ctx_desc *l1_desc; - unsigned int num_l1_ents; -}; - -struct arm_smmu_s1_cfg { - struct arm_smmu_ctx_desc_cfg cdcfg; - struct arm_smmu_ctx_desc cd; - u8 s1fmt; - u8 s1cdmax; -}; - struct arm_smmu_s2_cfg { u16 vmid; u64 vttbr; @@ -623,15 +592,10 @@ struct arm_smmu_device { unsigned long oas; /* PA */ unsigned long pgsize_bitmap; -#define ARM_SMMU_MAX_ASIDS (1 << 16) - unsigned int asid_bits; - DECLARE_BITMAP(asid_map, ARM_SMMU_MAX_ASIDS); - #define ARM_SMMU_MAX_VMIDS (1 << 16) unsigned int vmid_bits; DECLARE_BITMAP(vmid_map, ARM_SMMU_MAX_VMIDS); - unsigned int ssid_bits; unsigned int sid_bits; struct arm_smmu_strtab_cfg strtab_cfg; @@ -655,7 +619,6 @@ struct arm_smmu_master { u32 *sids; unsigned int num_sids; bool ats_enabled; - unsigned int ssid_bits; }; /* SMMU private data for an IOMMU domain */ @@ -675,10 +638,7 @@ struct arm_smmu_domain { atomic_t nr_ats_masters; enum arm_smmu_domain_stage stage; - union { - struct arm_smmu_s1_cfg s1_cfg; - struct arm_smmu_s2_cfg s2_cfg; - }; + struct arm_smmu_s2_cfg s2_cfg; struct iommu_domain domain; @@ -869,34 +829,19 @@ static int arm_smmu_cmdq_build_cmd(u64 *cmd, struct arm_smmu_cmdq_ent *ent) 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_CD: - cmd[0] |= FIELD_PREP(CMDQ_CFGI_0_SSID, ent->cfgi.ssid); - /* Fallthrough */ case CMDQ_OP_CFGI_STE: cmd[0] |= FIELD_PREP(CMDQ_CFGI_0_SID, ent->cfgi.sid); cmd[1] |= FIELD_PREP(CMDQ_CFGI_1_LEAF, ent->cfgi.leaf); break; - case CMDQ_OP_CFGI_CD_ALL: - cmd[0] |= FIELD_PREP(CMDQ_CFGI_0_SID, ent->cfgi.sid); - break; case CMDQ_OP_CFGI_ALL: /* Cover the entire SID range */ cmd[1] |= FIELD_PREP(CMDQ_CFGI_1_RANGE, 31); break; - case CMDQ_OP_TLBI_NH_VA: - cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_VMID, ent->tlbi.vmid); - cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_ASID, ent->tlbi.asid); - cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_LEAF, ent->tlbi.leaf); - cmd[1] |= ent->tlbi.addr & CMDQ_TLBI_1_VA_MASK; - break; case CMDQ_OP_TLBI_S2_IPA: cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_VMID, ent->tlbi.vmid); cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_LEAF, ent->tlbi.leaf); cmd[1] |= ent->tlbi.addr & CMDQ_TLBI_1_IPA_MASK; break; - case CMDQ_OP_TLBI_NH_ASID: - cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_ASID, ent->tlbi.asid); - /* Fallthrough */ case CMDQ_OP_TLBI_S12_VMALL: cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_VMID, ent->tlbi.vmid); break; @@ -1109,242 +1054,6 @@ static int arm_smmu_cmdq_issue_sync(struct arm_smmu_device *smmu) return ret; } -/* Context descriptor manipulation functions */ -static void arm_smmu_sync_cd(struct arm_smmu_domain *smmu_domain, - int ssid, bool leaf) -{ - size_t i; - unsigned long flags; - struct arm_smmu_master *master; - struct arm_smmu_device *smmu = smmu_domain->smmu; - struct arm_smmu_cmdq_ent cmd = { - .opcode = CMDQ_OP_CFGI_CD, - .cfgi = { - .ssid = ssid, - .leaf = leaf, - }, - }; - - spin_lock_irqsave(&smmu_domain->devices_lock, flags); - list_for_each_entry(master, &smmu_domain->devices, domain_head) { - for (i = 0; i < master->num_sids; i++) { - cmd.cfgi.sid = master->sids[i]; - arm_smmu_cmdq_issue_cmd(smmu, &cmd); - } - } - spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); - - arm_smmu_cmdq_issue_sync(smmu); -} - -static int arm_smmu_alloc_cd_leaf_table(struct arm_smmu_device *smmu, - struct arm_smmu_l1_ctx_desc *l1_desc) -{ - size_t size = CTXDESC_L2_ENTRIES * (CTXDESC_CD_DWORDS << 3); - - l1_desc->l2ptr = dmam_alloc_coherent(smmu->dev, size, - &l1_desc->l2ptr_dma, GFP_KERNEL); - if (!l1_desc->l2ptr) { - dev_warn(smmu->dev, - "failed to allocate context descriptor table\n"); - return -ENOMEM; - } - return 0; -} - -static void arm_smmu_write_cd_l1_desc(__le64 *dst, - struct arm_smmu_l1_ctx_desc *l1_desc) -{ - u64 val = (l1_desc->l2ptr_dma & CTXDESC_L1_DESC_L2PTR_MASK) | - CTXDESC_L1_DESC_V; - - /* See comment in arm_smmu_write_ctx_desc() */ - WRITE_ONCE(*dst, cpu_to_le64(val)); -} - -static __le64 *arm_smmu_get_cd_ptr(struct arm_smmu_domain *smmu_domain, - u32 ssid) -{ - __le64 *l1ptr; - unsigned int idx; - struct arm_smmu_l1_ctx_desc *l1_desc; - struct arm_smmu_device *smmu = smmu_domain->smmu; - struct arm_smmu_ctx_desc_cfg *cdcfg = &smmu_domain->s1_cfg.cdcfg; - - if (smmu_domain->s1_cfg.s1fmt == STRTAB_STE_0_S1FMT_LINEAR) - return cdcfg->cdtab + ssid * CTXDESC_CD_DWORDS; - - idx = ssid >> CTXDESC_SPLIT; - l1_desc = &cdcfg->l1_desc[idx]; - if (!l1_desc->l2ptr) { - if (arm_smmu_alloc_cd_leaf_table(smmu, l1_desc)) - return NULL; - - l1ptr = cdcfg->cdtab + idx * CTXDESC_L1_DESC_DWORDS; - arm_smmu_write_cd_l1_desc(l1ptr, l1_desc); - /* An invalid L1CD can be cached */ - arm_smmu_sync_cd(smmu_domain, ssid, false); - } - idx = ssid & (CTXDESC_L2_ENTRIES - 1); - return l1_desc->l2ptr + idx * CTXDESC_CD_DWORDS; -} - -static int arm_smmu_write_ctx_desc(struct arm_smmu_domain *smmu_domain, - int ssid, struct arm_smmu_ctx_desc *cd) -{ - /* - * This function handles the following cases: - * - * (1) Install primary CD, for normal DMA traffic (SSID = 0). - * (2) Install a secondary CD, for SID+SSID traffic. - * (3) Update ASID of a CD. Atomically write the first 64 bits of the - * CD, then invalidate the old entry and mappings. - * (4) Remove a secondary CD. - */ - u64 val; - bool cd_live; - __le64 *cdptr; - struct arm_smmu_device *smmu = smmu_domain->smmu; - - if (WARN_ON(ssid >= (1 << smmu_domain->s1_cfg.s1cdmax))) - return -E2BIG; - - cdptr = arm_smmu_get_cd_ptr(smmu_domain, ssid); - if (!cdptr) - return -ENOMEM; - - val = le64_to_cpu(cdptr[0]); - cd_live = !!(val & CTXDESC_CD_0_V); - - if (!cd) { /* (4) */ - val = 0; - } else if (cd_live) { /* (3) */ - val &= ~CTXDESC_CD_0_ASID; - val |= FIELD_PREP(CTXDESC_CD_0_ASID, cd->asid); - /* - * Until CD+TLB invalidation, both ASIDs may be used for tagging - * this substream's traffic - */ - } else { /* (1) and (2) */ - cdptr[1] = cpu_to_le64(cd->ttbr & CTXDESC_CD_1_TTB0_MASK); - cdptr[2] = 0; - cdptr[3] = cpu_to_le64(cd->mair); - - /* - * STE is live, and the SMMU might read dwords of this CD in any - * order. Ensure that it observes valid values before reading - * V=1. - */ - arm_smmu_sync_cd(smmu_domain, ssid, true); - - val = cd->tcr | -#ifdef __BIG_ENDIAN - CTXDESC_CD_0_ENDI | -#endif - CTXDESC_CD_0_R | CTXDESC_CD_0_A | CTXDESC_CD_0_ASET | - CTXDESC_CD_0_AA64 | - FIELD_PREP(CTXDESC_CD_0_ASID, cd->asid) | - CTXDESC_CD_0_V; - - /* STALL_MODEL==0b10 && CD.S==0 is ILLEGAL */ - if (smmu->features & ARM_SMMU_FEAT_STALL_FORCE) - val |= CTXDESC_CD_0_S; - } - - /* - * The SMMU accesses 64-bit values atomically. See IHI0070Ca 3.21.3 - * "Configuration structures and configuration invalidation completion" - * - * The size of single-copy atomic reads made by the SMMU is - * IMPLEMENTATION DEFINED but must be at least 64 bits. Any single - * field within an aligned 64-bit span of a structure can be altered - * without first making the structure invalid. - */ - WRITE_ONCE(cdptr[0], cpu_to_le64(val)); - arm_smmu_sync_cd(smmu_domain, ssid, true); - return 0; -} - -static int arm_smmu_alloc_cd_tables(struct arm_smmu_domain *smmu_domain) -{ - int ret; - size_t l1size; - size_t max_contexts; - struct arm_smmu_device *smmu = smmu_domain->smmu; - struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg; - struct arm_smmu_ctx_desc_cfg *cdcfg = &cfg->cdcfg; - - max_contexts = 1 << cfg->s1cdmax; - - if (!(smmu->features & ARM_SMMU_FEAT_2_LVL_CDTAB) || - max_contexts <= CTXDESC_L2_ENTRIES) { - cfg->s1fmt = STRTAB_STE_0_S1FMT_LINEAR; - cdcfg->num_l1_ents = max_contexts; - - l1size = max_contexts * (CTXDESC_CD_DWORDS << 3); - } else { - cfg->s1fmt = STRTAB_STE_0_S1FMT_64K_L2; - cdcfg->num_l1_ents = DIV_ROUND_UP(max_contexts, - CTXDESC_L2_ENTRIES); - - cdcfg->l1_desc = devm_kcalloc(smmu->dev, cdcfg->num_l1_ents, - sizeof(*cdcfg->l1_desc), - GFP_KERNEL); - if (!cdcfg->l1_desc) - return -ENOMEM; - - l1size = cdcfg->num_l1_ents * (CTXDESC_L1_DESC_DWORDS << 3); - } - - cdcfg->cdtab = dmam_alloc_coherent(smmu->dev, l1size, &cdcfg->cdtab_dma, - GFP_KERNEL); - if (!cdcfg->cdtab) { - dev_warn(smmu->dev, "failed to allocate context descriptor\n"); - ret = -ENOMEM; - goto err_free_l1; - } - - return 0; - -err_free_l1: - if (cdcfg->l1_desc) { - devm_kfree(smmu->dev, cdcfg->l1_desc); - cdcfg->l1_desc = NULL; - } - return ret; -} - -static void arm_smmu_free_cd_tables(struct arm_smmu_domain *smmu_domain) -{ - int i; - size_t size, l1size; - struct arm_smmu_device *smmu = smmu_domain->smmu; - struct arm_smmu_ctx_desc_cfg *cdcfg = &smmu_domain->s1_cfg.cdcfg; - - if (cdcfg->l1_desc) { - size = CTXDESC_L2_ENTRIES * (CTXDESC_CD_DWORDS << 3); - - for (i = 0; i < cdcfg->num_l1_ents; i++) { - if (!cdcfg->l1_desc[i].l2ptr) - continue; - - dmam_free_coherent(smmu->dev, size, - cdcfg->l1_desc[i].l2ptr, - cdcfg->l1_desc[i].l2ptr_dma); - } - devm_kfree(smmu->dev, cdcfg->l1_desc); - cdcfg->l1_desc = NULL; - - l1size = cdcfg->num_l1_ents * (CTXDESC_L1_DESC_DWORDS << 3); - } else { - l1size = cdcfg->num_l1_ents * (CTXDESC_CD_DWORDS << 3); - } - - dmam_free_coherent(smmu->dev, l1size, cdcfg->cdtab, cdcfg->cdtab_dma); - cdcfg->cdtab_dma = 0; - cdcfg->cdtab = NULL; -} - /* Stream table manipulation functions */ static void arm_smmu_write_strtab_l1_desc(__le64 *dst, struct arm_smmu_strtab_l1_desc *desc) @@ -1394,7 +1103,6 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, u64 val = le64_to_cpu(dst[0]); bool ste_live = false; struct arm_smmu_device *smmu = NULL; - struct arm_smmu_s1_cfg *s1_cfg = NULL; struct arm_smmu_s2_cfg *s2_cfg = NULL; struct arm_smmu_domain *smmu_domain = NULL; struct arm_smmu_cmdq_ent prefetch_cmd = { @@ -1409,25 +1117,13 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, smmu = master->smmu; } - if (smmu_domain) { - switch (smmu_domain->stage) { - case ARM_SMMU_DOMAIN_S1: - s1_cfg = &smmu_domain->s1_cfg; - break; - case ARM_SMMU_DOMAIN_S2: - case ARM_SMMU_DOMAIN_NESTED: - s2_cfg = &smmu_domain->s2_cfg; - break; - default: - break; - } - } + if (smmu_domain) + s2_cfg = &smmu_domain->s2_cfg; if (val & STRTAB_STE_0_V) { switch (FIELD_GET(STRTAB_STE_0_CFG, val)) { case STRTAB_STE_0_CFG_BYPASS: break; - case STRTAB_STE_0_CFG_S1_TRANS: case STRTAB_STE_0_CFG_S2_TRANS: ste_live = true; break; @@ -1443,7 +1139,7 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, val = STRTAB_STE_0_V; /* Bypass/fault */ - if (!smmu_domain || !(s1_cfg || s2_cfg)) { + if (!smmu_domain || !(s2_cfg)) { if (!smmu_domain && disable_bypass) val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_ABORT); else @@ -1462,25 +1158,6 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, return; } - if (s1_cfg) { - BUG_ON(ste_live); - dst[1] = cpu_to_le64( - FIELD_PREP(STRTAB_STE_1_S1DSS, STRTAB_STE_1_S1DSS_SSID0) | - FIELD_PREP(STRTAB_STE_1_S1CIR, STRTAB_STE_1_S1C_CACHE_WBRA) | - FIELD_PREP(STRTAB_STE_1_S1COR, STRTAB_STE_1_S1C_CACHE_WBRA) | - FIELD_PREP(STRTAB_STE_1_S1CSH, ARM_SMMU_SH_ISH) | - FIELD_PREP(STRTAB_STE_1_STRW, STRTAB_STE_1_STRW_NSEL1)); - - if (smmu->features & ARM_SMMU_FEAT_STALLS && - !(smmu->features & ARM_SMMU_FEAT_STALL_FORCE)) - dst[1] |= cpu_to_le64(STRTAB_STE_1_S1STALLD); - - val |= (s1_cfg->cdcfg.cdtab_dma & STRTAB_STE_0_S1CTXPTR_MASK) | - FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_S1_TRANS) | - FIELD_PREP(STRTAB_STE_0_S1CDMAX, s1_cfg->s1cdmax) | - FIELD_PREP(STRTAB_STE_0_S1FMT, s1_cfg->s1fmt); - } - if (s2_cfg) { BUG_ON(ste_live); dst[2] = cpu_to_le64( @@ -1502,7 +1179,6 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, STRTAB_STE_1_EATS_TRANS)); arm_smmu_sync_ste_for_sid(smmu, sid); - /* See comment in arm_smmu_write_ctx_desc() */ WRITE_ONCE(dst[0], cpu_to_le64(val)); arm_smmu_sync_ste_for_sid(smmu, sid); @@ -1822,14 +1498,8 @@ static void arm_smmu_tlb_inv_context(void *cookie) struct arm_smmu_device *smmu = smmu_domain->smmu; struct arm_smmu_cmdq_ent cmd; - if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { - cmd.opcode = CMDQ_OP_TLBI_NH_ASID; - cmd.tlbi.asid = smmu_domain->s1_cfg.cd.asid; - cmd.tlbi.vmid = 0; - } else { - cmd.opcode = CMDQ_OP_TLBI_S12_VMALL; - cmd.tlbi.vmid = smmu_domain->s2_cfg.vmid; - } + cmd.opcode = CMDQ_OP_TLBI_S12_VMALL; + cmd.tlbi.vmid = smmu_domain->s2_cfg.vmid; /* * NOTE: when io-pgtable is in non-strict mode, we may get here with @@ -1857,13 +1527,8 @@ static void arm_smmu_tlb_inv_range_nosync(unsigned long iova, size_t size, if (!size) return; - if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { - cmd.opcode = CMDQ_OP_TLBI_NH_VA; - cmd.tlbi.asid = smmu_domain->s1_cfg.cd.asid; - } else { - cmd.opcode = CMDQ_OP_TLBI_S2_IPA; - cmd.tlbi.vmid = smmu_domain->s2_cfg.vmid; - } + cmd.opcode = CMDQ_OP_TLBI_S2_IPA; + cmd.tlbi.vmid = smmu_domain->s2_cfg.vmid; do { arm_smmu_cmdq_issue_cmd(smmu, &cmd); @@ -1971,75 +1636,17 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) { struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg; iommu_put_dma_cookie(domain); free_io_pgtable_ops(smmu_domain->pgtbl_ops); - /* Free the CD and ASID, if we allocated them */ - if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { - struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg; - - if (cfg->cdcfg.cdtab) { - arm_smmu_free_cd_tables(smmu_domain); - arm_smmu_bitmap_free(smmu->asid_map, cfg->cd.asid); - } - } else { - struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg; - if (cfg->vmid) - arm_smmu_bitmap_free(smmu->vmid_map, cfg->vmid); - } + if (cfg->vmid) + arm_smmu_bitmap_free(smmu->vmid_map, cfg->vmid); kfree(smmu_domain); } -static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, - struct arm_smmu_master *master, - struct io_pgtable_cfg *pgtbl_cfg) -{ - int ret; - int asid; - struct arm_smmu_device *smmu = smmu_domain->smmu; - struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg; - typeof(&pgtbl_cfg->arm_lpae_s1_cfg.tcr) tcr = &pgtbl_cfg->arm_lpae_s1_cfg.tcr; - - asid = arm_smmu_bitmap_alloc(smmu->asid_map, smmu->asid_bits); - if (asid < 0) - return asid; - - cfg->s1cdmax = master->ssid_bits; - - ret = arm_smmu_alloc_cd_tables(smmu_domain); - if (ret) - goto out_free_asid; - - cfg->cd.asid = (u16)asid; - cfg->cd.ttbr = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; - cfg->cd.tcr = FIELD_PREP(CTXDESC_CD_0_TCR_T0SZ, tcr->tsz) | - FIELD_PREP(CTXDESC_CD_0_TCR_TG0, tcr->tg) | - FIELD_PREP(CTXDESC_CD_0_TCR_IRGN0, tcr->irgn) | - FIELD_PREP(CTXDESC_CD_0_TCR_ORGN0, tcr->orgn) | - FIELD_PREP(CTXDESC_CD_0_TCR_SH0, tcr->sh) | - FIELD_PREP(CTXDESC_CD_0_TCR_IPS, tcr->ips) | - CTXDESC_CD_0_TCR_EPD1 | CTXDESC_CD_0_AA64; - cfg->cd.mair = pgtbl_cfg->arm_lpae_s1_cfg.mair; - - /* - * Note that this will end up calling arm_smmu_sync_cd() before - * the master has been added to the devices list for this domain. - * This isn't an issue because the STE hasn't been installed yet. - */ - ret = arm_smmu_write_ctx_desc(smmu_domain, 0, &cfg->cd); - if (ret) - goto out_free_cd_tables; - - return 0; - -out_free_cd_tables: - arm_smmu_free_cd_tables(smmu_domain); -out_free_asid: - arm_smmu_bitmap_free(smmu->asid_map, asid); - return ret; -} static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain, struct arm_smmu_master *master, @@ -2075,9 +1682,6 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, enum io_pgtable_fmt fmt; struct io_pgtable_cfg pgtbl_cfg; struct io_pgtable_ops *pgtbl_ops; - int (*finalise_stage_fn)(struct arm_smmu_domain *, - struct arm_smmu_master *, - struct io_pgtable_cfg *); struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); struct arm_smmu_device *smmu = smmu_domain->smmu; @@ -2087,29 +1691,8 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, } /* Restrict the stage to what we can actually support */ - if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S1)) - smmu_domain->stage = ARM_SMMU_DOMAIN_S2; - if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S2)) - smmu_domain->stage = ARM_SMMU_DOMAIN_S1; - - switch (smmu_domain->stage) { - case ARM_SMMU_DOMAIN_S1: - ias = (smmu->features & ARM_SMMU_FEAT_VAX) ? 52 : 48; - ias = min_t(unsigned long, ias, VA_BITS); - oas = smmu->ias; - fmt = ARM_64_LPAE_S1; - finalise_stage_fn = arm_smmu_domain_finalise_s1; - break; - case ARM_SMMU_DOMAIN_NESTED: - case ARM_SMMU_DOMAIN_S2: - ias = smmu->ias; - oas = smmu->oas; - fmt = ARM_64_LPAE_S2; - finalise_stage_fn = arm_smmu_domain_finalise_s2; - break; - default: - return -EINVAL; - } + smmu_domain->stage = ARM_SMMU_DOMAIN_S2; + pgtbl_cfg = (struct io_pgtable_cfg) { .pgsize_bitmap = smmu->pgsize_bitmap, @@ -2131,7 +1714,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, domain->geometry.aperture_end = (1UL << pgtbl_cfg.ias) - 1; domain->geometry.force_aperture = true; - ret = finalise_stage_fn(smmu_domain, master, &pgtbl_cfg); + ret = arm_smmu_domain_finalise_s2(smmu_domain, master, &pgtbl_cfg); if (ret < 0) { free_io_pgtable_ops(pgtbl_ops); return ret; @@ -2264,8 +1847,6 @@ static int arm_smmu_enable_pasid(struct arm_smmu_master *master) return ret; } - master->ssid_bits = min_t(u8, ilog2(num_pasids), - master->smmu->ssid_bits); return 0; } @@ -2281,7 +1862,6 @@ static void arm_smmu_disable_pasid(struct arm_smmu_master *master) if (!pdev->pasid_enabled) return; - master->ssid_bits = 0; pci_disable_pasid(pdev); } @@ -2337,13 +1917,6 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) dev_name(smmu->dev)); ret = -ENXIO; goto out_unlock; - } else if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1 && - master->ssid_bits != smmu_domain->s1_cfg.s1cdmax) { - dev_err(dev, - "cannot attach to incompatible domain (%u SSID bits != %u)\n", - smmu_domain->s1_cfg.s1cdmax, master->ssid_bits); - ret = -EINVAL; - goto out_unlock; } master->domain = smmu_domain; @@ -2490,8 +2063,6 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) } } - master->ssid_bits = min(smmu->ssid_bits, fwspec->num_pasid_bits); - /* * Note that PASID must be enabled before, and disabled after ATS: * PCI Express Base 4.0r1.0 - 10.5.1.3 ATS Control Register @@ -2502,10 +2073,6 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) */ arm_smmu_enable_pasid(master); - if (!(smmu->features & ARM_SMMU_FEAT_2_LVL_CDTAB)) - master->ssid_bits = min_t(u8, master->ssid_bits, - CTXDESC_LINEAR_CDMAX); - return &smmu->iommu; err_free_master: @@ -3259,13 +2826,10 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) smmu->features |= ARM_SMMU_FEAT_STALLS; } - if (reg & IDR0_S1P) - smmu->features |= ARM_SMMU_FEAT_TRANS_S1; - if (reg & IDR0_S2P) smmu->features |= ARM_SMMU_FEAT_TRANS_S2; - if (!(reg & (IDR0_S1P | IDR0_S2P))) { + if (!(reg & IDR0_S2P)) { dev_err(smmu->dev, "no translation support!\n"); return -ENXIO; } @@ -3283,7 +2847,6 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) } /* ASID/VMID sizes */ - smmu->asid_bits = reg & IDR0_ASID16 ? 16 : 8; smmu->vmid_bits = reg & IDR0_VMID16 ? 16 : 8; /* IDR1 */ @@ -3308,7 +2871,6 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) FIELD_GET(IDR1_PRIQS, reg)); /* SID/SSID sizes */ - smmu->ssid_bits = FIELD_GET(IDR1_SSIDSIZE, reg); smmu->sid_bits = FIELD_GET(IDR1_SIDSIZE, reg); /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:55:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:55:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73283.132111 (Exim 4.92) (envelope-from ) id 1l3HW6-0000To-G8; Sat, 23 Jan 2021 11:55:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73283.132111; Sat, 23 Jan 2021 11:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HW6-0000Tg-CP; Sat, 23 Jan 2021 11:55:46 +0000 Received: by outflank-mailman (input) for mailman id 73283; Sat, 23 Jan 2021 11:55:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HW5-0000TV-3w for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:55:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HW5-0005cG-3C for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:55:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HW5-0008Gs-1d for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11: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=yFroKLuF9MVKA9ISG5UHueRDfNK0ADYPMnFflWxgt68=; b=Kn9vZOMF3uoUZkmvDmCmjFIOh8 JePY9IiumLleMAjBBZA3gz11W0qVbGfVkIsSR6SFwBi12+EEohg0c3Thv9SxsIxbvbcq00SIH52BT jkIj5CeUEnDsvqFV6Dl107NhrowaYvJ/Gd2g5ADzV7YXlKI453zYmRWx9ech4gWm1VDE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: smmuv3: Remove Linux specific code that is not usable in XEN Message-Id: Date: Sat, 23 Jan 2021 11:55:45 +0000 commit b3be6ffb009cc338ebf15fce841e93f5f846b63d Author: Rahul Singh AuthorDate: Wed Jan 20 14:52:39 2021 +0000 Commit: Julien Grall CommitDate: Sat Jan 23 11:48:33 2021 +0000 xen/arm: smmuv3: Remove Linux specific code that is not usable in XEN Remove code that is related to below functionality : 1. struct io_pgtable_ops 2. struct io_pgtable_cfg 3. struct iommu_flush_ops, 4. struct iommu_ops 5. module_param_named, MODULE_PARM_DESC, module_platform_driver, MODULE_* 6. IOMMU domain-types 7. arm_smmu_set_bus_ops 8. iommu_device_sysfs_add, iommu_device_register, iommu_device_set_fwnode Signed-off-by: Rahul Singh Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 475 ++-------------------------------- 1 file changed, 21 insertions(+), 454 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 869f38b753..5ce14850b4 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -394,13 +394,7 @@ #define ARM_SMMU_CMDQ_SYNC_TIMEOUT_US 1000000 /* 1s! */ #define ARM_SMMU_CMDQ_SYNC_SPIN_COUNT 10 -#define MSI_IOVA_BASE 0x8000000 -#define MSI_IOVA_LENGTH 0x100000 - static bool disable_bypass = 1; -module_param_named(disable_bypass, disable_bypass, bool, S_IRUGO); -MODULE_PARM_DESC(disable_bypass, - "Disable bypass streams such that incoming transactions from devices that are not attached to an iommu domain will report an abort back to the device and will not be allowed to pass through the SMMU."); enum pri_resp { PRI_RESP_DENY = 0, @@ -552,6 +546,19 @@ struct arm_smmu_strtab_cfg { 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; @@ -633,7 +640,6 @@ struct arm_smmu_domain { struct arm_smmu_device *smmu; struct mutex init_mutex; /* Protects smmu pointer */ - struct io_pgtable_ops *pgtbl_ops; bool non_strict; atomic_t nr_ats_masters; @@ -1491,7 +1497,6 @@ static int arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain, return ret ? -ETIMEDOUT : 0; } -/* IO_PGTABLE API */ static void arm_smmu_tlb_inv_context(void *cookie) { struct arm_smmu_domain *smmu_domain = cookie; @@ -1512,86 +1517,10 @@ static void arm_smmu_tlb_inv_context(void *cookie) arm_smmu_cmdq_issue_sync(smmu); } -static void arm_smmu_tlb_inv_range_nosync(unsigned long iova, size_t size, - size_t granule, bool leaf, void *cookie) -{ - struct arm_smmu_domain *smmu_domain = cookie; - struct arm_smmu_device *smmu = smmu_domain->smmu; - struct arm_smmu_cmdq_ent cmd = { - .tlbi = { - .leaf = leaf, - .addr = iova, - }, - }; - - if (!size) - return; - - cmd.opcode = CMDQ_OP_TLBI_S2_IPA; - cmd.tlbi.vmid = smmu_domain->s2_cfg.vmid; - - do { - arm_smmu_cmdq_issue_cmd(smmu, &cmd); - cmd.tlbi.addr += granule; - } while (size -= granule); -} - -static void arm_smmu_tlb_inv_page_nosync(struct iommu_iotlb_gather *gather, - unsigned long iova, size_t granule, - void *cookie) -{ - arm_smmu_tlb_inv_range_nosync(iova, granule, granule, true, cookie); -} - -static void arm_smmu_tlb_inv_walk(unsigned long iova, size_t size, - size_t granule, void *cookie) -{ - struct arm_smmu_domain *smmu_domain = cookie; - struct arm_smmu_device *smmu = smmu_domain->smmu; - - arm_smmu_tlb_inv_range_nosync(iova, size, granule, false, cookie); - arm_smmu_cmdq_issue_sync(smmu); -} - -static void arm_smmu_tlb_inv_leaf(unsigned long iova, size_t size, - size_t granule, void *cookie) -{ - struct arm_smmu_domain *smmu_domain = cookie; - struct arm_smmu_device *smmu = smmu_domain->smmu; - - arm_smmu_tlb_inv_range_nosync(iova, size, granule, true, cookie); - arm_smmu_cmdq_issue_sync(smmu); -} - -static const struct iommu_flush_ops arm_smmu_flush_ops = { - .tlb_flush_all = arm_smmu_tlb_inv_context, - .tlb_flush_walk = arm_smmu_tlb_inv_walk, - .tlb_flush_leaf = arm_smmu_tlb_inv_leaf, - .tlb_add_page = arm_smmu_tlb_inv_page_nosync, -}; - -/* IOMMU API */ -static bool arm_smmu_capable(enum iommu_cap cap) -{ - switch (cap) { - case IOMMU_CAP_CACHE_COHERENCY: - return true; - case IOMMU_CAP_NOEXEC: - return true; - default: - return false; - } -} - -static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) +static struct iommu_domain *arm_smmu_domain_alloc(void) { struct arm_smmu_domain *smmu_domain; - if (type != IOMMU_DOMAIN_UNMANAGED && - type != IOMMU_DOMAIN_DMA && - type != IOMMU_DOMAIN_IDENTITY) - return NULL; - /* * Allocate the domain and initialise some of its data structures. * We can't really do anything meaningful until we've added a @@ -1601,12 +1530,6 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) if (!smmu_domain) return NULL; - if (type == IOMMU_DOMAIN_DMA && - iommu_get_dma_cookie(&smmu_domain->domain)) { - kfree(smmu_domain); - return NULL; - } - mutex_init(&smmu_domain->init_mutex); INIT_LIST_HEAD(&smmu_domain->devices); spin_lock_init(&smmu_domain->devices_lock); @@ -1638,9 +1561,6 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) struct arm_smmu_device *smmu = smmu_domain->smmu; struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg; - iommu_put_dma_cookie(domain); - free_io_pgtable_ops(smmu_domain->pgtbl_ops); - if (cfg->vmid) arm_smmu_bitmap_free(smmu->vmid_map, cfg->vmid); @@ -1649,21 +1569,20 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain, - struct arm_smmu_master *master, - struct io_pgtable_cfg *pgtbl_cfg) + struct arm_smmu_master *master) { int vmid; + struct arm_lpae_s2_cfg arm_lpae_s2_cfg; struct arm_smmu_device *smmu = smmu_domain->smmu; struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg; - typeof(&pgtbl_cfg->arm_lpae_s2_cfg.vtcr) vtcr; + typeof(&arm_lpae_s2_cfg.vtcr) vtcr = &arm_lpae_s2_cfg.vtcr; vmid = arm_smmu_bitmap_alloc(smmu->vmid_map, smmu->vmid_bits); if (vmid < 0) return vmid; - vtcr = &pgtbl_cfg->arm_lpae_s2_cfg.vtcr; cfg->vmid = (u16)vmid; - cfg->vttbr = pgtbl_cfg->arm_lpae_s2_cfg.vttbr; + cfg->vttbr = arm_lpae_s2_cfg.vttbr; cfg->vtcr = FIELD_PREP(STRTAB_STE_2_VTCR_S2T0SZ, vtcr->tsz) | FIELD_PREP(STRTAB_STE_2_VTCR_S2SL0, vtcr->sl) | FIELD_PREP(STRTAB_STE_2_VTCR_S2IR0, vtcr->irgn) | @@ -1678,49 +1597,15 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, struct arm_smmu_master *master) { int ret; - unsigned long ias, oas; - enum io_pgtable_fmt fmt; - struct io_pgtable_cfg pgtbl_cfg; - struct io_pgtable_ops *pgtbl_ops; struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); - struct arm_smmu_device *smmu = smmu_domain->smmu; - - if (domain->type == IOMMU_DOMAIN_IDENTITY) { - smmu_domain->stage = ARM_SMMU_DOMAIN_BYPASS; - return 0; - } /* Restrict the stage to what we can actually support */ smmu_domain->stage = ARM_SMMU_DOMAIN_S2; - - pgtbl_cfg = (struct io_pgtable_cfg) { - .pgsize_bitmap = smmu->pgsize_bitmap, - .ias = ias, - .oas = oas, - .coherent_walk = smmu->features & ARM_SMMU_FEAT_COHERENCY, - .tlb = &arm_smmu_flush_ops, - .iommu_dev = smmu->dev, - }; - - if (smmu_domain->non_strict) - pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT; - - pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain); - if (!pgtbl_ops) - return -ENOMEM; - - domain->pgsize_bitmap = pgtbl_cfg.pgsize_bitmap; - domain->geometry.aperture_end = (1UL << pgtbl_cfg.ias) - 1; - domain->geometry.force_aperture = true; - - ret = arm_smmu_domain_finalise_s2(smmu_domain, master, &pgtbl_cfg); - if (ret < 0) { - free_io_pgtable_ops(pgtbl_ops); + ret = arm_smmu_domain_finalise_s2(smmu_domain, master); + if (ret < 0) return ret; - } - smmu_domain->pgtbl_ops = pgtbl_ops; return 0; } @@ -1937,76 +1822,6 @@ out_unlock: return ret; } -static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova, - phys_addr_t paddr, size_t size, int prot, gfp_t gfp) -{ - struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops; - - if (!ops) - return -ENODEV; - - return ops->map(ops, iova, paddr, size, prot); -} - -static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova, - size_t size, struct iommu_iotlb_gather *gather) -{ - int ret; - struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); - struct io_pgtable_ops *ops = smmu_domain->pgtbl_ops; - - if (!ops) - return 0; - - ret = ops->unmap(ops, iova, size, gather); - if (ret && arm_smmu_atc_inv_domain(smmu_domain, 0, iova, size)) - return 0; - - return ret; -} - -static void arm_smmu_flush_iotlb_all(struct iommu_domain *domain) -{ - struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); - - if (smmu_domain->smmu) - arm_smmu_tlb_inv_context(smmu_domain); -} - -static void arm_smmu_iotlb_sync(struct iommu_domain *domain, - struct iommu_iotlb_gather *gather) -{ - struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu; - - if (smmu) - arm_smmu_cmdq_issue_sync(smmu); -} - -static phys_addr_t -arm_smmu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) -{ - struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops; - - if (domain->type == IOMMU_DOMAIN_IDENTITY) - return iova; - - if (!ops) - return 0; - - return ops->iova_to_phys(ops, iova); -} - -static struct platform_driver arm_smmu_driver; - -static -struct arm_smmu_device *arm_smmu_get_by_fwnode(struct fwnode_handle *fwnode) -{ - struct device *dev = driver_find_device_by_fwnode(&arm_smmu_driver.driver, - fwnode); - put_device(dev); - return dev ? dev_get_drvdata(dev) : NULL; -} - static bool arm_smmu_sid_in_range(struct arm_smmu_device *smmu, u32 sid) { unsigned long limit = smmu->strtab_cfg.num_l1_ents; @@ -2017,8 +1832,6 @@ static bool arm_smmu_sid_in_range(struct arm_smmu_device *smmu, u32 sid) return sid < limit; } -static struct iommu_ops arm_smmu_ops; - static struct iommu_device *arm_smmu_probe_device(struct device *dev) { int i, ret; @@ -2026,16 +1839,12 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) struct arm_smmu_master *master; struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); - if (!fwspec || fwspec->ops != &arm_smmu_ops) + if (!fwspec) return ERR_PTR(-ENODEV); if (WARN_ON_ONCE(dev_iommu_priv_get(dev))) return ERR_PTR(-EBUSY); - smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode); - if (!smmu) - return ERR_PTR(-ENODEV); - master = kzalloc(sizeof(*master), GFP_KERNEL); if (!master) return ERR_PTR(-ENOMEM); @@ -2081,153 +1890,11 @@ err_free_master: return ERR_PTR(ret); } -static void arm_smmu_release_device(struct device *dev) -{ - struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); - struct arm_smmu_master *master; - - if (!fwspec || fwspec->ops != &arm_smmu_ops) - return; - - master = dev_iommu_priv_get(dev); - arm_smmu_detach_dev(master); - arm_smmu_disable_pasid(master); - kfree(master); - iommu_fwspec_free(dev); -} - -static struct iommu_group *arm_smmu_device_group(struct device *dev) -{ - struct iommu_group *group; - - /* - * We don't support devices sharing stream IDs other than PCI RID - * aliases, since the necessary ID-to-device lookup becomes rather - * impractical given a potential sparse 32-bit stream ID space. - */ - if (dev_is_pci(dev)) - group = pci_device_group(dev); - else - group = generic_device_group(dev); - - return group; -} - -static int arm_smmu_domain_get_attr(struct iommu_domain *domain, - enum iommu_attr attr, void *data) -{ - struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); - - switch (domain->type) { - case IOMMU_DOMAIN_UNMANAGED: - switch (attr) { - case DOMAIN_ATTR_NESTING: - *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED); - return 0; - default: - return -ENODEV; - } - break; - case IOMMU_DOMAIN_DMA: - switch (attr) { - case DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE: - *(int *)data = smmu_domain->non_strict; - return 0; - default: - return -ENODEV; - } - break; - default: - return -EINVAL; - } -} - -static int arm_smmu_domain_set_attr(struct iommu_domain *domain, - enum iommu_attr attr, void *data) -{ - int ret = 0; - struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); - - mutex_lock(&smmu_domain->init_mutex); - - switch (domain->type) { - case IOMMU_DOMAIN_UNMANAGED: - switch (attr) { - case DOMAIN_ATTR_NESTING: - if (smmu_domain->smmu) { - ret = -EPERM; - goto out_unlock; - } - - if (*(int *)data) - smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED; - else - smmu_domain->stage = ARM_SMMU_DOMAIN_S1; - break; - default: - ret = -ENODEV; - } - break; - case IOMMU_DOMAIN_DMA: - switch(attr) { - case DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE: - smmu_domain->non_strict = *(int *)data; - break; - default: - ret = -ENODEV; - } - break; - default: - ret = -EINVAL; - } - -out_unlock: - mutex_unlock(&smmu_domain->init_mutex); - return ret; -} - static int arm_smmu_of_xlate(struct device *dev, struct of_phandle_args *args) { return iommu_fwspec_add_ids(dev, args->args, 1); } -static void arm_smmu_get_resv_regions(struct device *dev, - struct list_head *head) -{ - struct iommu_resv_region *region; - int prot = IOMMU_WRITE | IOMMU_NOEXEC | IOMMU_MMIO; - - region = iommu_alloc_resv_region(MSI_IOVA_BASE, MSI_IOVA_LENGTH, - prot, IOMMU_RESV_SW_MSI); - if (!region) - return; - - list_add_tail(®ion->list, head); - - iommu_dma_get_resv_regions(dev, head); -} - -static struct iommu_ops arm_smmu_ops = { - .capable = arm_smmu_capable, - .domain_alloc = arm_smmu_domain_alloc, - .domain_free = arm_smmu_domain_free, - .attach_dev = arm_smmu_attach_dev, - .map = arm_smmu_map, - .unmap = arm_smmu_unmap, - .flush_iotlb_all = arm_smmu_flush_iotlb_all, - .iotlb_sync = arm_smmu_iotlb_sync, - .iova_to_phys = arm_smmu_iova_to_phys, - .probe_device = arm_smmu_probe_device, - .release_device = arm_smmu_release_device, - .device_group = arm_smmu_device_group, - .domain_get_attr = arm_smmu_domain_get_attr, - .domain_set_attr = arm_smmu_domain_set_attr, - .of_xlate = arm_smmu_of_xlate, - .get_resv_regions = arm_smmu_get_resv_regions, - .put_resv_regions = generic_iommu_put_resv_regions, - .pgsize_bitmap = -1UL, /* Restricted during device attach */ -}; - /* Probing and initialisation functions */ static int arm_smmu_init_one_queue(struct arm_smmu_device *smmu, struct arm_smmu_queue *q, @@ -2927,16 +2594,6 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) smmu->oas = 48; } - if (arm_smmu_ops.pgsize_bitmap == -1UL) - arm_smmu_ops.pgsize_bitmap = smmu->pgsize_bitmap; - else - arm_smmu_ops.pgsize_bitmap |= smmu->pgsize_bitmap; - - /* Set the DMA mask for our table walker */ - if (dma_set_mask_and_coherent(smmu->dev, DMA_BIT_MASK(smmu->oas))) - dev_warn(smmu->dev, - "failed to set DMA mask for table walker\n"); - smmu->ias = max(smmu->ias, smmu->oas); dev_info(smmu->dev, "ias %lu-bit, oas %lu-bit (features 0x%08x)\n", @@ -3016,43 +2673,6 @@ static unsigned long arm_smmu_resource_size(struct arm_smmu_device *smmu) return SZ_128K; } -static int arm_smmu_set_bus_ops(struct iommu_ops *ops) -{ - int err; - -#ifdef CONFIG_PCI - if (pci_bus_type.iommu_ops != ops) { - err = bus_set_iommu(&pci_bus_type, ops); - if (err) - return err; - } -#endif -#ifdef CONFIG_ARM_AMBA - if (amba_bustype.iommu_ops != ops) { - err = bus_set_iommu(&amba_bustype, ops); - if (err) - goto err_reset_pci_ops; - } -#endif - if (platform_bus_type.iommu_ops != ops) { - err = bus_set_iommu(&platform_bus_type, ops); - if (err) - goto err_reset_amba_ops; - } - - return 0; - -err_reset_amba_ops: -#ifdef CONFIG_ARM_AMBA - bus_set_iommu(&amba_bustype, NULL); -#endif -err_reset_pci_ops: __maybe_unused; -#ifdef CONFIG_PCI - bus_set_iommu(&pci_bus_type, NULL); -#endif - return err; -} - static void __iomem *arm_smmu_ioremap(struct device *dev, resource_size_t start, resource_size_t size) { @@ -3145,68 +2765,15 @@ static int arm_smmu_device_probe(struct platform_device *pdev) if (ret) return ret; - /* Record our private device structure */ - platform_set_drvdata(pdev, smmu); - /* Reset the device */ ret = arm_smmu_device_reset(smmu, bypass); if (ret) return ret; - /* And we're up. Go go go! */ - ret = iommu_device_sysfs_add(&smmu->iommu, dev, NULL, - "smmu3.%pa", &ioaddr); - if (ret) - return ret; - - iommu_device_set_ops(&smmu->iommu, &arm_smmu_ops); - iommu_device_set_fwnode(&smmu->iommu, dev->fwnode); - - ret = iommu_device_register(&smmu->iommu); - if (ret) { - dev_err(dev, "Failed to register iommu\n"); - return ret; - } - - return arm_smmu_set_bus_ops(&arm_smmu_ops); -} - -static int arm_smmu_device_remove(struct platform_device *pdev) -{ - struct arm_smmu_device *smmu = platform_get_drvdata(pdev); - - arm_smmu_set_bus_ops(NULL); - iommu_device_unregister(&smmu->iommu); - iommu_device_sysfs_remove(&smmu->iommu); - arm_smmu_device_disable(smmu); - return 0; } -static void arm_smmu_device_shutdown(struct platform_device *pdev) -{ - arm_smmu_device_remove(pdev); -} - static const struct of_device_id arm_smmu_of_match[] = { { .compatible = "arm,smmu-v3", }, { }, }; -MODULE_DEVICE_TABLE(of, arm_smmu_of_match); - -static struct platform_driver arm_smmu_driver = { - .driver = { - .name = "arm-smmu-v3", - .of_match_table = arm_smmu_of_match, - .suppress_bind_attrs = true, - }, - .probe = arm_smmu_device_probe, - .remove = arm_smmu_device_remove, - .shutdown = arm_smmu_device_shutdown, -}; -module_platform_driver(arm_smmu_driver); - -MODULE_DESCRIPTION("IOMMU API for ARM architected SMMUv3 implementations"); -MODULE_AUTHOR("Will Deacon "); -MODULE_ALIAS("platform:arm-smmu-v3"); -MODULE_LICENSE("GPL v2"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:55:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:55:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73285.132115 (Exim 4.92) (envelope-from ) id 1l3HWG-0000Vi-Jf; Sat, 23 Jan 2021 11:55:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73285.132115; Sat, 23 Jan 2021 11:55: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 1l3HWG-0000VZ-GM; Sat, 23 Jan 2021 11:55:56 +0000 Received: by outflank-mailman (input) for mailman id 73285; Sat, 23 Jan 2021 11:55:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HWF-0000VO-6k for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:55:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HWF-0005cO-5y for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:55:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HWF-0008Hh-5L for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11: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=B9HRT1ve6dUemssvJlNHx5C5B6l9rBYjfoPHZDLEe9s=; b=rcsshfVhF2FikQuukLZL0Dbwxn cWpTdUcmte2zOkmXOWQL31WaBKZ7R/2bFtPxgrm7vi6KlUo4xniRj9eUzpDUsE5JALy7eSDmMWFZM N7IKyJnACA/fpe47aM9h+Uh+GRoxq3j451Fcm3NPfXeVIN+CxA7vyfBWFEGHf3HcPcDY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/device-tree: Add dt_property_match_string helper Message-Id: Date: Sat, 23 Jan 2021 11:55:55 +0000 commit 51b444f84a21e71b2e7d642ac5fc2afde19f379c Author: Rahul Singh AuthorDate: Wed Jan 20 14:52:40 2021 +0000 Commit: Julien Grall CommitDate: Sat Jan 23 11:48:33 2021 +0000 xen/device-tree: Add dt_property_match_string helper Import the Linux helper of_property_match_string. This function searches a string list property and returns the index of a specific string value. Signed-off-by: Rahul Singh Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/common/device_tree.c | 27 +++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 12 ++++++++++++ 2 files changed, 39 insertions(+) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index e107c6f89f..18825e333e 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -208,6 +208,33 @@ int dt_property_read_string(const struct dt_device_node *np, return 0; } +int dt_property_match_string(const struct dt_device_node *np, + const char *propname, const char *string) +{ + const struct dt_property *dtprop = dt_find_property(np, propname, NULL); + size_t l; + int i; + const char *p, *end; + + if ( !dtprop ) + return -EINVAL; + if ( !dtprop->value ) + return -ENODATA; + + p = dtprop->value; + end = p + dtprop->length; + + for ( i = 0; p < end; i++, p += l ) + { + l = strnlen(p, end - p) + 1; + if ( p + l > end ) + return -EILSEQ; + if ( strcmp(string, p) == 0 ) + return i; /* Found it; return index */ + } + return -ENODATA; +} + bool_t dt_device_is_compatible(const struct dt_device_node *device, const char *compat) { diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index f2ad22b79c..b02696be94 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -400,6 +400,18 @@ static inline bool_t dt_property_read_bool(const struct dt_device_node *np, int dt_property_read_string(const struct dt_device_node *np, const char *propname, const char **out_string); +/** + * dt_property_match_string() - Find string in a list and return index + * @np: pointer to node containing string list property + * @propname: string list property name + * @string: pointer to string to search for in string list + * + * This function searches a string list property and returns the index + * of a specific string value. + */ +int dt_property_match_string(const struct dt_device_node *np, + const char *propname, const char *string); + /** * Checks if the given "compat" string matches one of the strings in * the device's "compatible" property -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jan 23 11:56:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Jan 2021 11:56:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.73286.132119 (Exim 4.92) (envelope-from ) id 1l3HWQ-0000XG-LA; Sat, 23 Jan 2021 11:56:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 73286.132119; Sat, 23 Jan 2021 11: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 1l3HWQ-0000X7-Hy; Sat, 23 Jan 2021 11:56:06 +0000 Received: by outflank-mailman (input) for mailman id 73286; Sat, 23 Jan 2021 11:56:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HWP-0000Wx-Am for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:56:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l3HWP-0005cl-9A for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11:56:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l3HWP-0008Io-81 for xen-changelog@lists.xenproject.org; Sat, 23 Jan 2021 11: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=d8esKrgGsP/1cpsJJ6WevM/xSRqEmMdOWbYG/acUWdQ=; b=45Terh0cdA39FJ9Xdy5D0Sw6E2 fcm6rudLWr/llECYOECA0yvHUi/Xg39NA6wt9atdAahyjmoo6neGHPCM1qLaBIcG9xKZyQQcfAcxl d8RYnOjKBUfwn0QKhi7AdMUXXVq5jA3AYtdAxMExOC9EhLcIaQ2wj8xV9iAKntPe5/UA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/compiler: import 'fallthrough' keyword from linux Message-Id: Date: Sat, 23 Jan 2021 11:56:05 +0000 commit be5dc0b90db68df57925ee951ccc480fcab14192 Author: Rahul Singh AuthorDate: Wed Jan 20 14:52:41 2021 +0000 Commit: Julien Grall CommitDate: Sat Jan 23 11:48:33 2021 +0000 xen/compiler: import 'fallthrough' keyword from linux -Wimplicit-fallthrough warns when a switch case falls through. Warning can be suppress by either adding a /* fallthrough */ comment, or by using a null statement: __attribute__ ((fallthrough)) Define the pseudo keyword 'fallthrough' for the ability to convert the various case block /* fallthrough */ style comments to null statement "__attribute__((__fallthrough__))" In C mode, GCC supports the __fallthrough__ attribute since 7.1, the same time the warning and the comment parsing were introduced. fallthrough devolves to an empty "do {} while (0)" if the compiler version (any version less than gcc 7) does not support the attribute. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- xen/include/xen/compiler.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index e643e69128..0ec0b4698e 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -33,6 +33,22 @@ #define unreachable() __builtin_unreachable() #endif +/* + * Add the pseudo keyword 'fallthrough' so case statement blocks + * must end with any of these keywords: + * break; + * fallthrough; + * goto