From xen-changelog-bounces@lists.xenproject.org Mon Feb 01 15:22:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 01 Feb 2021 15:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.79968.145937 (Exim 4.92) (envelope-from ) id 1l6b1i-0006Cs-FI; Mon, 01 Feb 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 79968.145937; Mon, 01 Feb 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 1l6b1i-0006Ck-CF; Mon, 01 Feb 2021 15:22:06 +0000 Received: by outflank-mailman (input) for mailman id 79968; Mon, 01 Feb 2021 15:22:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6b1h-0006Bn-4x for xen-changelog@lists.xenproject.org; Mon, 01 Feb 2021 15:22:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6b1h-0004Xl-39 for xen-changelog@lists.xenproject.org; Mon, 01 Feb 2021 15:22:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l6b1h-0005dd-0v for xen-changelog@lists.xenproject.org; Mon, 01 Feb 2021 15: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=ccQDvyFaa16DgSeWm8K9a7IVLoD7nsNyUemfS5NFs3I=; b=nDrY19SpGztyjHhg1w0m61Hghz HBUCUeRp2g0+2I0A6fMqb3/KpsBIcNdm0AZXIb+JUCxIsICisd0Fv6Oh/RupEV+n8U9W/xliisD2d kbA9tMGttH7DajLFL0PkA5cen37ESTCwYP/3XlXRsg8BqmfWKC4VzYF6TU6zb5Lg002M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xenpmd.c: use dynamic allocation Message-Id: Date: Mon, 01 Feb 2021 15:22:05 +0000 commit bbed98e7cedcd5072671c21605330075740382d3 Author: Manuel Bouyer AuthorDate: Sat Jan 30 19:27:10 2021 +0100 Commit: Ian Jackson CommitDate: Mon Feb 1 15:10:00 2021 +0000 xenpmd.c: use dynamic allocation On NetBSD, d_name is larger than 256, so file_name[284] may not be large enough (and gcc emits a format-truncation error). Use asprintf() instead of snprintf() on a static on-stack buffer. Signed-off-by: Manuel Bouyer Reviewed-by: Ian Jackson Reviewed-by: Roger Pau Monné Release-Acked-by: Ian Jackson Plus define GNU_SOURCE for asprintf() Harmless on NetBSD. Signed-off-by: Manuel Bouyer Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/xenpmd/xenpmd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c index 12b82cf43e..8e783181e1 100644 --- a/tools/xenpmd/xenpmd.c +++ b/tools/xenpmd/xenpmd.c @@ -32,6 +32,7 @@ * passed to the guest when appropriate battery ports are read/written to. */ +#define _GNU_SOURCE /* for asprintf() */ #include #include #include @@ -101,7 +102,7 @@ FILE *get_next_battery_file(DIR *battery_dir, { FILE *file = 0; struct dirent *dir_entries; - char file_name[284]; + char *file_name; int ret; do @@ -112,16 +113,16 @@ FILE *get_next_battery_file(DIR *battery_dir, if ( strlen(dir_entries->d_name) < 4 ) continue; if ( battery_info_type == BIF ) - ret = snprintf(file_name, sizeof(file_name), BATTERY_INFO_FILE_PATH, + ret = asprintf(&file_name, BATTERY_INFO_FILE_PATH, dir_entries->d_name); else - ret = snprintf(file_name, sizeof(file_name), BATTERY_STATE_FILE_PATH, + ret = asprintf(&file_name, BATTERY_STATE_FILE_PATH, dir_entries->d_name); /* This should not happen but is needed to pass gcc checks */ if (ret < 0) continue; - file_name[sizeof(file_name) - 1] = '\0'; file = fopen(file_name, "r"); + free(file_name); } while ( !file ); return file; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Feb 01 15:22:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 01 Feb 2021 15:22:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.79969.145941 (Exim 4.92) (envelope-from ) id 1l6b1s-0006Fm-Gg; Mon, 01 Feb 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 79969.145941; Mon, 01 Feb 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 1l6b1s-0006Fe-Dg; Mon, 01 Feb 2021 15:22:16 +0000 Received: by outflank-mailman (input) for mailman id 79969; Mon, 01 Feb 2021 15:22:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6b1r-0006FI-6q for xen-changelog@lists.xenproject.org; Mon, 01 Feb 2021 15:22:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6b1r-0004Xo-64 for xen-changelog@lists.xenproject.org; Mon, 01 Feb 2021 15:22:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l6b1r-0005eP-5F for xen-changelog@lists.xenproject.org; Mon, 01 Feb 2021 15: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=+5jzPDeSrrpaVmpmqbzc+4FFe+qiPcAuS6YMq84dhBY=; b=L/AtLkpArWfhmt3nnvfYj0kebA Ieso7jQxRJFwULFRE+t91UwDDD+1Yr0pzqnUgdeLRrM/S3wH0E8CM7rP/ihYFRNWPC+3FoYLp6uo1 RHhBxVxX90YqtQZuheLwvCsrhYHAcUgNfA7Z8IdLZLLvIKbhZWqzVD6u+wsZ8IwRjGBM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xenpmd.c: Remove hard tab Message-Id: Date: Mon, 01 Feb 2021 15:22:15 +0000 commit 419cd07895891c6642f29085aee07be72413f08c Author: Ian Jackson AuthorDate: Mon Feb 1 15:18:36 2021 +0000 Commit: Ian Jackson CommitDate: Mon Feb 1 15:18:36 2021 +0000 xenpmd.c: Remove hard tab bbed98e7cedc "xenpmd.c: use dynamic allocation" had a hard tab. I thought we had fixed that and I thought I had checked. Remove it now. Signed-off-by: Ian Jackson --- tools/xenpmd/xenpmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c index 8e783181e1..15e6169c44 100644 --- a/tools/xenpmd/xenpmd.c +++ b/tools/xenpmd/xenpmd.c @@ -122,7 +122,7 @@ FILE *get_next_battery_file(DIR *battery_dir, if (ret < 0) continue; file = fopen(file_name, "r"); - free(file_name); + free(file_name); } while ( !file ); return file; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Feb 01 18:33:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 01 Feb 2021 18:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80091.146211 (Exim 4.92) (envelope-from ) id 1l6e0Y-00031w-Lm; Mon, 01 Feb 2021 18:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80091.146211; Mon, 01 Feb 2021 18: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 1l6e0Y-00031o-Il; Mon, 01 Feb 2021 18:33:06 +0000 Received: by outflank-mailman (input) for mailman id 80091; Mon, 01 Feb 2021 18:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6e0X-00031j-5w for xen-changelog@lists.xenproject.org; Mon, 01 Feb 2021 18:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6e0X-0000Fz-3O for xen-changelog@lists.xenproject.org; Mon, 01 Feb 2021 18:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l6e0X-0000wn-17 for xen-changelog@lists.xenproject.org; Mon, 01 Feb 2021 18: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=BxYnCnXiwVuU9Ib42SRBinmPUr99meVeArocts74U94=; b=kgSt87yBFpR3PMl5aXcX/q6PFK 7X7b19brDFWov5BN1+o387Fm61zzwSyuvsI2e8pTEqy5uoZxkD0t2+zvj3O+Oyy7G7AqB2t4bK387 46DhDXJ2+z0kb3S5gqiJKjirqdesDqIWszbKG7CrBumOGEVuVpzEdDhc+9ywJ96lTZ6w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xenstore: fix build on {Net/Free}BSD Message-Id: Date: Mon, 01 Feb 2021 18:33:05 +0000 commit ffbb8aa282de262403275f2395d8540818cf576e Author: Roger Pau Monne AuthorDate: Mon Feb 1 16:53:17 2021 +0100 Commit: Wei Liu CommitDate: Mon Feb 1 18:27:50 2021 +0000 xenstore: fix build on {Net/Free}BSD The endian.h header is in sys/ on NetBSD and FreeBSD. Signed-off-by: Roger Pau Monné Acked-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/xenstore/include/xenstore_state.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h index d2a9307400..1bd443f61a 100644 --- a/tools/xenstore/include/xenstore_state.h +++ b/tools/xenstore/include/xenstore_state.h @@ -21,7 +21,11 @@ #ifndef XENSTORE_STATE_H #define XENSTORE_STATE_H +#if defined(__FreeBSD__) || defined(__NetBSD__) +#include +#else #include +#endif #include #ifndef htobe32 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Feb 02 10:44:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Feb 2021 10:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80474.147239 (Exim 4.92) (envelope-from ) id 1l6tAE-0006r3-U5; Tue, 02 Feb 2021 10:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80474.147239; Tue, 02 Feb 2021 10:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6tAE-0006qv-RA; Tue, 02 Feb 2021 10:44:06 +0000 Received: by outflank-mailman (input) for mailman id 80474; Tue, 02 Feb 2021 10:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6tAD-0006qp-1K for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6tAC-00036t-W0 for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l6tAC-0006vL-UI for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=E3GPXct1XCwsYCWep8NVxRbcrLhzfkJP5ns/dp5bym8=; b=sk4DuIKtrFVFerGPBgpXqjdEqK BLY+bJgZBW30C/HMFJ0rRhuJLU65bCjBkDGnkQVRjs82bCBdDRPB9+8F4Ix4DnrFxfmkUUDmc0jdE Pjd572rsHIVs32XyCi6o89FULiwK+v65LB+VWjzG9qVE2v3/CzRYtixn+Tw0wjfBtf7Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xenstore: Fix all builds Message-Id: Date: Tue, 02 Feb 2021 10:44:04 +0000 commit 3b6c0a9f42525e8e50d5988d8c7fa47e56bc7d1d Author: Andrew Cooper AuthorDate: Tue Feb 2 11:33:26 2021 +0100 Commit: Jan Beulich CommitDate: Tue Feb 2 11:33:26 2021 +0100 xenstore: Fix all builds This diff is easier viewed through `cat -A` diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h$ index 1bd443f61a..f7e4da2b2c 100644$ --- a/tools/xenstore/include/xenstore_state.h$ +++ b/tools/xenstore/include/xenstore_state.h$ @@ -21,7 +21,7 @@$ #ifndef XENSTORE_STATE_H$ #define XENSTORE_STATE_H$ $ -#if defined(__FreeBSD__) ||M-BM- defined(__NetBSD__)$ +#if defined(__FreeBSD__) || defined(__NetBSD__)$ #include $ #else$ #include $ A non-breaking space isn't a valid C preprocessor token. Fixes: ffbb8aa282de ("xenstore: fix build on {Net/Free}BSD") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/xenstore/include/xenstore_state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h index 1bd443f61a..f7e4da2b2c 100644 --- a/tools/xenstore/include/xenstore_state.h +++ b/tools/xenstore/include/xenstore_state.h @@ -21,7 +21,7 @@ #ifndef XENSTORE_STATE_H #define XENSTORE_STATE_H -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) #include #else #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Feb 02 10:44:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Feb 2021 10:44:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80475.147243 (Exim 4.92) (envelope-from ) id 1l6tAO-0006s4-Vr; Tue, 02 Feb 2021 10:44:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80475.147243; Tue, 02 Feb 2021 10:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6tAO-0006rw-Sj; Tue, 02 Feb 2021 10:44:16 +0000 Received: by outflank-mailman (input) for mailman id 80475; Tue, 02 Feb 2021 10:44:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6tAN-0006rn-3a for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6tAN-00036w-2m for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l6tAN-0006w2-1y for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NQQovPpP7Bjj3flK5kRhcZQOHYl+ddo+QB7syDMNtQQ=; b=0aB+txzUnB4ffpmWvL86gWEspH QbRqu/4Su5KpooLXW+QL/wr7s6hPr5kIpYVFf1KmwhK9x5FWit5uMLZ85aOUH2Y3nLlcWqzW9K8Ed nm1Ech+FGRHW4kJKcMqHOJLB/PX9b5TfMSC/NxYyOjm1h/MU49krSHEbmIA3qSOCMPr0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] memory: fix build with COVERAGE but !HVM Message-Id: Date: Tue, 02 Feb 2021 10:44:15 +0000 commit 119c98972c4e737508df827bbbc8453cc93292c7 Author: Julien Grall AuthorDate: Tue Feb 2 11:35:42 2021 +0100 Commit: Jan Beulich CommitDate: Tue Feb 2 11:35:42 2021 +0100 memory: fix build with COVERAGE but !HVM Xen is heavily relying on the DCE stage to remove unused code so the linker doesn't throw an error because a function is not implemented yet we defined a prototype for it. On some GCC versions (such as 9.4 provided by Debian sid), the compiler DCE stage will not manage to figure that out for xenmem_add_to_physmap_batch(): ld: ld: prelink.o: in function `xenmem_add_to_physmap_batch': /xen/xen/common/memory.c:942: undefined reference to `xenmem_add_to_physmap_one' /xen/xen/common/memory.c:942:(.text+0x22145): relocation truncated to fit: R_X86_64_PLT32 against undefined symbol `xenmem_add_to_physmap_one' prelink-efi.o: in function `xenmem_add_to_physmap_batch': /xen/xen/common/memory.c:942: undefined reference to `xenmem_add_to_physmap_one' make[2]: *** [Makefile:215: /root/xen/xen/xen.efi] Error 1 make[2]: *** Waiting for unfinished jobs.... ld: /xen/xen/.xen-syms.0: hidden symbol `xenmem_add_to_physmap_one' isn't defined ld: final link failed: bad value It is not entirely clear why the compiler DCE is not detecting the unused code. However, cloning the check introduced by the commit below into xenmem_add_to_physmap_batch() does the trick. No functional change intended. Fixes: d4f699a0df6c ("x86/mm: p2m_add_foreign() is HVM-only") Reported-by: Oleksandr Tyshchenko Signed-off-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Wei Liu Release-Acked-by: Ian Jackson --- xen/common/memory.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/xen/common/memory.c b/xen/common/memory.c index 01cab7e493..f23b001fd2 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -904,6 +904,17 @@ static int xenmem_add_to_physmap_batch(struct domain *d, { union add_to_physmap_extra extra = {}; + /* + * In some configurations, (!HVM, COVERAGE), the xenmem_add_to_physmap_one() + * call doesn't succumb to dead-code-elimination. Duplicate the short-circut + * from xatp_permission_check() to try and help the compiler out. + */ + if ( !paging_mode_translate(d) ) + { + ASSERT_UNREACHABLE(); + return -EACCES; + } + if ( unlikely(xatpb->size < extent) ) return -EILSEQ; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Feb 02 10:44:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Feb 2021 10:44:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80476.147248 (Exim 4.92) (envelope-from ) id 1l6tAZ-0006tV-1P; Tue, 02 Feb 2021 10:44:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80476.147248; Tue, 02 Feb 2021 10: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 1l6tAY-0006tJ-UK; Tue, 02 Feb 2021 10:44:26 +0000 Received: by outflank-mailman (input) for mailman id 80476; Tue, 02 Feb 2021 10:44:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6tAX-0006t3-Ck for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6tAX-000379-BV for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l6tAX-0006yO-9k for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=j39vehztoFt4kDxkE/y5tYcsXIlRzh7HuH2WwafKu9o=; b=0ambYh9aD3AByqckT6pRqQqB2M OLgpNiKjhgogBn+57VG4zVC/GbJUxJo0HU1RIpGu8FcHpVfiWTNPUyzdjtIv/CPZUtt2kyHba5POK g5g7NBHOje6zHEjs5Sj6Sns7QTY00RP2ZGVdZlhjC23Dtf+EdvuazmyfsUDa/WkiXF0o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xenstore: Fix all builds Message-Id: Date: Tue, 02 Feb 2021 10:44:25 +0000 commit 42d50392bf49b3d9d2edb6378f903232dc238feb Author: Andrew Cooper AuthorDate: Mon Feb 1 23:30:51 2021 +0000 Commit: Andrew Cooper CommitDate: Tue Feb 2 10:34:10 2021 +0000 xenstore: Fix all builds This diff is easier viewed through `cat -A` diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h$ index 1bd443f61a..f7e4da2b2c 100644$ --- a/tools/xenstore/include/xenstore_state.h$ +++ b/tools/xenstore/include/xenstore_state.h$ @@ -21,7 +21,7 @@$ #ifndef XENSTORE_STATE_H$ #define XENSTORE_STATE_H$ $ -#if defined(__FreeBSD__) ||M-BM- defined(__NetBSD__)$ +#if defined(__FreeBSD__) || defined(__NetBSD__)$ #include $ #else$ #include $ A non-breaking space isn't a valid C preprocessor token. Fixes: ffbb8aa282de ("xenstore: fix build on {Net/Free}BSD") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/xenstore/include/xenstore_state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h index 1bd443f61a..f7e4da2b2c 100644 --- a/tools/xenstore/include/xenstore_state.h +++ b/tools/xenstore/include/xenstore_state.h @@ -21,7 +21,7 @@ #ifndef XENSTORE_STATE_H #define XENSTORE_STATE_H -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) #include #else #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Feb 02 10:44:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Feb 2021 10:44:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80477.147251 (Exim 4.92) (envelope-from ) id 1l6tAj-0006uv-2j; Tue, 02 Feb 2021 10:44:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80477.147251; Tue, 02 Feb 2021 10: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 1l6tAi-0006ul-Vr; Tue, 02 Feb 2021 10:44:36 +0000 Received: by outflank-mailman (input) for mailman id 80477; Tue, 02 Feb 2021 10:44:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6tAh-0006uZ-F6 for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6tAh-00037G-EI for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l6tAh-0006zK-DU for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RPo8UUE7jHFZRVWMGwuB5BUHi58P8uLWeHU7NFxYMsE=; b=yL/8FhyWGeIcFN7tvgOBtjHnUp pLDDDeRD/14dcaB35+g3Hu27V9sEu5ZwGOQn0NxI+QYqXO9bs0pRLHadyGbiI+UXn1Ytudpn6Y3H3 UW5IkK8OKzdh4srsu6a8pGgENwZLK2uZgrUZtIcMhWS6raw+/1uCgZ+xEUCpa8jebk44=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging Message-Id: Date: Tue, 02 Feb 2021 10:44:35 +0000 commit 7978d05dbc35373a2e50472f775c9995897fe6c1 Merge: 119c98972c4e737508df827bbbc8453cc93292c7 42d50392bf49b3d9d2edb6378f903232dc238feb Author: Jan Beulich AuthorDate: Tue Feb 2 11:36:28 2021 +0100 Commit: Jan Beulich CommitDate: Tue Feb 2 11:36:28 2021 +0100 Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Feb 02 10:44:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Feb 2021 10:44:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80478.147255 (Exim 4.92) (envelope-from ) id 1l6tAt-0006wE-3w; Tue, 02 Feb 2021 10:44:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80478.147255; Tue, 02 Feb 2021 10:44: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 1l6tAt-0006w5-10; Tue, 02 Feb 2021 10:44:47 +0000 Received: by outflank-mailman (input) for mailman id 80478; Tue, 02 Feb 2021 10:44:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6tAr-0006vv-Hu for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l6tAr-00037h-HB for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l6tAr-00070E-GK for xen-changelog@lists.xenproject.org; Tue, 02 Feb 2021 10:44:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=X6YQMvBT0esdt8vcdqoR7JWkfLJWJjQNxQFDcoIfVA8=; b=jEJQB+Zj4lWOKMjmdWMYUPRGV7 A05I8LTIHEzeDOUQUTn5Rcrk0OfV/ouht2r55PKr71zvwdm4joqNHVJ3V2E6FcXPdXhEWXLh6V6jg nQEkrhQdoaw4AMHy3CwS/AZgTNOfbu4T1ijWaU4X1y7o/LPLVdvE6hD5ikkne2Leziao=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/build: correctly record dependencies of asm-offsets.s Message-Id: Date: Tue, 02 Feb 2021 10:44:45 +0000 commit 5e7aa904405fa2f268c3af213516bae271de3265 Author: Jan Beulich AuthorDate: Tue Feb 2 11:36:50 2021 +0100 Commit: Jan Beulich CommitDate: Tue Feb 2 11:36:50 2021 +0100 x86/build: correctly record dependencies of asm-offsets.s Going through an intermediate *.new file requires telling the compiler what the real target is, so that the inclusion of the resulting .*.d file will actually be useful. Fixes: 7d2d7a43d014 ("x86/build: limit rebuilding of asm-offsets.h") Reported-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Release-Acked-by: Ian Jackson --- xen/arch/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 7769bb40d7..3a9b7e7b2e 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -241,7 +241,7 @@ 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 -g0 -o $@.new $< + $(CC) $(filter-out -Wa$(comma)% -flto,$(c_flags)) -S -g0 -o $@.new -MQ $@ $< $(call move-if-changed,$@.new,$@) asm-macros.i: CFLAGS-y += -D__ASSEMBLY__ -P -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Feb 03 08:11:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Feb 2021 08:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80843.148144 (Exim 4.92) (envelope-from ) id 1l7DFf-0007Nu-Cr; Wed, 03 Feb 2021 08:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80843.148144; Wed, 03 Feb 2021 08: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 1l7DFf-0007Nm-9g; Wed, 03 Feb 2021 08:11:03 +0000 Received: by outflank-mailman (input) for mailman id 80843; Wed, 03 Feb 2021 08:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DFe-0007Nh-EB for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DFe-0003Ra-B6 for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7DFe-00025L-9H for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08: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=kjBoCwyW8k4vwrxIAisdlWl1M+Hxlag0ZcRG7FEAw54=; b=Tm6rlvLyYzWleD4dqHj/pRWDBV XW3HEyEyBHGVAW0pO21+04YC9qxt8lwPl+5qS+Zz7zV44xpyw0nWto3UjbYarwvMyjr2XoCiM6FBv uLq7rGGflj2Qp4nCNXa7py/0eYpJ1ai1SVMLrY0tcAafwrawX+1NPElhVHlSrgJwYyoo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xenpmd.c: use dynamic allocation Message-Id: Date: Wed, 03 Feb 2021 08:11:02 +0000 commit bbed98e7cedcd5072671c21605330075740382d3 Author: Manuel Bouyer AuthorDate: Sat Jan 30 19:27:10 2021 +0100 Commit: Ian Jackson CommitDate: Mon Feb 1 15:10:00 2021 +0000 xenpmd.c: use dynamic allocation On NetBSD, d_name is larger than 256, so file_name[284] may not be large enough (and gcc emits a format-truncation error). Use asprintf() instead of snprintf() on a static on-stack buffer. Signed-off-by: Manuel Bouyer Reviewed-by: Ian Jackson Reviewed-by: Roger Pau Monné Release-Acked-by: Ian Jackson Plus define GNU_SOURCE for asprintf() Harmless on NetBSD. Signed-off-by: Manuel Bouyer Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/xenpmd/xenpmd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c index 12b82cf43e..8e783181e1 100644 --- a/tools/xenpmd/xenpmd.c +++ b/tools/xenpmd/xenpmd.c @@ -32,6 +32,7 @@ * passed to the guest when appropriate battery ports are read/written to. */ +#define _GNU_SOURCE /* for asprintf() */ #include #include #include @@ -101,7 +102,7 @@ FILE *get_next_battery_file(DIR *battery_dir, { FILE *file = 0; struct dirent *dir_entries; - char file_name[284]; + char *file_name; int ret; do @@ -112,16 +113,16 @@ FILE *get_next_battery_file(DIR *battery_dir, if ( strlen(dir_entries->d_name) < 4 ) continue; if ( battery_info_type == BIF ) - ret = snprintf(file_name, sizeof(file_name), BATTERY_INFO_FILE_PATH, + ret = asprintf(&file_name, BATTERY_INFO_FILE_PATH, dir_entries->d_name); else - ret = snprintf(file_name, sizeof(file_name), BATTERY_STATE_FILE_PATH, + ret = asprintf(&file_name, BATTERY_STATE_FILE_PATH, dir_entries->d_name); /* This should not happen but is needed to pass gcc checks */ if (ret < 0) continue; - file_name[sizeof(file_name) - 1] = '\0'; file = fopen(file_name, "r"); + free(file_name); } while ( !file ); return file; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 03 08:11:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Feb 2021 08:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80844.148149 (Exim 4.92) (envelope-from ) id 1l7DFp-0007P0-FY; Wed, 03 Feb 2021 08:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80844.148149; Wed, 03 Feb 2021 08: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 1l7DFp-0007Or-BK; Wed, 03 Feb 2021 08:11:13 +0000 Received: by outflank-mailman (input) for mailman id 80844; Wed, 03 Feb 2021 08:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DFo-0007Oj-F4 for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DFo-0003Rd-EG for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7DFo-00025u-D9 for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08: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=s6SPOK4rVRbrxFLr55y8+7U32jAB4XHu6cgweQl/eSk=; b=mjHnoKPZnAyb4/jKWjsjEQxybR jZ37STLhCWNmSx5mbG5jfJWeCtvHNvnJe7E3SWOi9S+T2O1rKv7LB/5BB7mhunZ2Azz79TeHN5ueT On5vN1p/mU34Udsdnw84Df/qS6brtFjf8pXxBOMTiJkgJWmY4jShTMYNODQ5PsgmIsEI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xenpmd.c: Remove hard tab Message-Id: Date: Wed, 03 Feb 2021 08:11:12 +0000 commit 419cd07895891c6642f29085aee07be72413f08c Author: Ian Jackson AuthorDate: Mon Feb 1 15:18:36 2021 +0000 Commit: Ian Jackson CommitDate: Mon Feb 1 15:18:36 2021 +0000 xenpmd.c: Remove hard tab bbed98e7cedc "xenpmd.c: use dynamic allocation" had a hard tab. I thought we had fixed that and I thought I had checked. Remove it now. Signed-off-by: Ian Jackson --- tools/xenpmd/xenpmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c index 8e783181e1..15e6169c44 100644 --- a/tools/xenpmd/xenpmd.c +++ b/tools/xenpmd/xenpmd.c @@ -122,7 +122,7 @@ FILE *get_next_battery_file(DIR *battery_dir, if (ret < 0) continue; file = fopen(file_name, "r"); - free(file_name); + free(file_name); } while ( !file ); return file; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 03 08:11:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Feb 2021 08:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80845.148152 (Exim 4.92) (envelope-from ) id 1l7DFz-0007QG-Fg; Wed, 03 Feb 2021 08:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80845.148152; Wed, 03 Feb 2021 08:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DFz-0007Q8-Co; Wed, 03 Feb 2021 08:11:23 +0000 Received: by outflank-mailman (input) for mailman id 80845; Wed, 03 Feb 2021 08:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DFy-0007Q0-I8 for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DFy-0003Rq-HJ for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7DFy-00026T-GO for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08: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=xrIMp3XAV2J1cVGNUHvIWMYZbumJCz1a0jjOgCibw/g=; b=ncCz4As9H0ZtVZldCYoSttOggU hxudITt0pay9viJAZShWDN2mfZ7APsw4XUiIvXaBNGZ+FWldBLgeBUf85eX9vg8D6WjUw7fj5gFuG hgEwPZtkaOwUH7AUuIUzlL3PPbLRXfK+La703RS0FZ4e7gOIgpScRiSzqwkARZwSRhIA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xenstore: fix build on {Net/Free}BSD Message-Id: Date: Wed, 03 Feb 2021 08:11:22 +0000 commit ffbb8aa282de262403275f2395d8540818cf576e Author: Roger Pau Monne AuthorDate: Mon Feb 1 16:53:17 2021 +0100 Commit: Wei Liu CommitDate: Mon Feb 1 18:27:50 2021 +0000 xenstore: fix build on {Net/Free}BSD The endian.h header is in sys/ on NetBSD and FreeBSD. Signed-off-by: Roger Pau Monné Acked-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/xenstore/include/xenstore_state.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h index d2a9307400..1bd443f61a 100644 --- a/tools/xenstore/include/xenstore_state.h +++ b/tools/xenstore/include/xenstore_state.h @@ -21,7 +21,11 @@ #ifndef XENSTORE_STATE_H #define XENSTORE_STATE_H +#if defined(__FreeBSD__) || defined(__NetBSD__) +#include +#else #include +#endif #include #ifndef htobe32 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 03 08:11:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Feb 2021 08:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80846.148156 (Exim 4.92) (envelope-from ) id 1l7DGA-0007RR-Hi; Wed, 03 Feb 2021 08:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80846.148156; Wed, 03 Feb 2021 08: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 1l7DGA-0007RI-EY; Wed, 03 Feb 2021 08:11:34 +0000 Received: by outflank-mailman (input) for mailman id 80846; Wed, 03 Feb 2021 08:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DG8-0007R6-LP for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DG8-0003S0-KY for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7DG8-00027I-JI for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08: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=w2gKDGRQmoyuu3uFjBkqCExtWqWcH4Ns9sZbKp1av9Y=; b=FLO1yl83ZMSUCZixEmwvCGSGwa 8GzmENn/ZdZBY7ClbYYrHyxpShoXWw05sA8vAQPm6TA4j8DviUr1IW9ZvGZfOSWxq9V1YoQlPn7AP aOhEaPpi0rBNmZhN8vZPrBErPuZ7nrioj1BFE/iJHNDaRD7mq+lXgywE7xEah2Ms7j5s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xenstore: Fix all builds Message-Id: Date: Wed, 03 Feb 2021 08:11:32 +0000 commit 3b6c0a9f42525e8e50d5988d8c7fa47e56bc7d1d Author: Andrew Cooper AuthorDate: Tue Feb 2 11:33:26 2021 +0100 Commit: Jan Beulich CommitDate: Tue Feb 2 11:33:26 2021 +0100 xenstore: Fix all builds This diff is easier viewed through `cat -A` diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h$ index 1bd443f61a..f7e4da2b2c 100644$ --- a/tools/xenstore/include/xenstore_state.h$ +++ b/tools/xenstore/include/xenstore_state.h$ @@ -21,7 +21,7 @@$ #ifndef XENSTORE_STATE_H$ #define XENSTORE_STATE_H$ $ -#if defined(__FreeBSD__) ||M-BM- defined(__NetBSD__)$ +#if defined(__FreeBSD__) || defined(__NetBSD__)$ #include $ #else$ #include $ A non-breaking space isn't a valid C preprocessor token. Fixes: ffbb8aa282de ("xenstore: fix build on {Net/Free}BSD") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/xenstore/include/xenstore_state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h index 1bd443f61a..f7e4da2b2c 100644 --- a/tools/xenstore/include/xenstore_state.h +++ b/tools/xenstore/include/xenstore_state.h @@ -21,7 +21,7 @@ #ifndef XENSTORE_STATE_H #define XENSTORE_STATE_H -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) #include #else #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 03 08:11:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Feb 2021 08:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80847.148160 (Exim 4.92) (envelope-from ) id 1l7DGK-0007Su-Je; Wed, 03 Feb 2021 08:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80847.148160; Wed, 03 Feb 2021 08: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 1l7DGK-0007Sk-GB; Wed, 03 Feb 2021 08:11:44 +0000 Received: by outflank-mailman (input) for mailman id 80847; Wed, 03 Feb 2021 08:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DGI-0007SX-Pp for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DGI-0003S8-Na for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7DGI-000284-Mm for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=aW5G6wNl/e0B2pu4J1tfY9z50Diealp+TQn4Du/ThZ4=; b=DDci31tGbhjIFmNfh2gFnEGH0+ U/6g12eio1biXOqDFuguzlxm988yxG6TIW9acoxvTJU0QoPdlEH7e5sBbgyprAOhVKg9TJYqA11ek 2CXSrbsojqxWieGm/xQO0itJ7scDFyt9IxLKm0S3fSAl62Bwd5vjzkKPW5lEVugLnTsk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] memory: fix build with COVERAGE but !HVM Message-Id: Date: Wed, 03 Feb 2021 08:11:42 +0000 commit 119c98972c4e737508df827bbbc8453cc93292c7 Author: Julien Grall AuthorDate: Tue Feb 2 11:35:42 2021 +0100 Commit: Jan Beulich CommitDate: Tue Feb 2 11:35:42 2021 +0100 memory: fix build with COVERAGE but !HVM Xen is heavily relying on the DCE stage to remove unused code so the linker doesn't throw an error because a function is not implemented yet we defined a prototype for it. On some GCC versions (such as 9.4 provided by Debian sid), the compiler DCE stage will not manage to figure that out for xenmem_add_to_physmap_batch(): ld: ld: prelink.o: in function `xenmem_add_to_physmap_batch': /xen/xen/common/memory.c:942: undefined reference to `xenmem_add_to_physmap_one' /xen/xen/common/memory.c:942:(.text+0x22145): relocation truncated to fit: R_X86_64_PLT32 against undefined symbol `xenmem_add_to_physmap_one' prelink-efi.o: in function `xenmem_add_to_physmap_batch': /xen/xen/common/memory.c:942: undefined reference to `xenmem_add_to_physmap_one' make[2]: *** [Makefile:215: /root/xen/xen/xen.efi] Error 1 make[2]: *** Waiting for unfinished jobs.... ld: /xen/xen/.xen-syms.0: hidden symbol `xenmem_add_to_physmap_one' isn't defined ld: final link failed: bad value It is not entirely clear why the compiler DCE is not detecting the unused code. However, cloning the check introduced by the commit below into xenmem_add_to_physmap_batch() does the trick. No functional change intended. Fixes: d4f699a0df6c ("x86/mm: p2m_add_foreign() is HVM-only") Reported-by: Oleksandr Tyshchenko Signed-off-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Wei Liu Release-Acked-by: Ian Jackson --- xen/common/memory.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/xen/common/memory.c b/xen/common/memory.c index 01cab7e493..f23b001fd2 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -904,6 +904,17 @@ static int xenmem_add_to_physmap_batch(struct domain *d, { union add_to_physmap_extra extra = {}; + /* + * In some configurations, (!HVM, COVERAGE), the xenmem_add_to_physmap_one() + * call doesn't succumb to dead-code-elimination. Duplicate the short-circut + * from xatp_permission_check() to try and help the compiler out. + */ + if ( !paging_mode_translate(d) ) + { + ASSERT_UNREACHABLE(); + return -EACCES; + } + if ( unlikely(xatpb->size < extent) ) return -EILSEQ; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 03 08:11:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Feb 2021 08:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80848.148164 (Exim 4.92) (envelope-from ) id 1l7DGU-0007UM-L0; Wed, 03 Feb 2021 08:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80848.148164; Wed, 03 Feb 2021 08:11: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 1l7DGU-0007UE-Hn; Wed, 03 Feb 2021 08:11:54 +0000 Received: by outflank-mailman (input) for mailman id 80848; Wed, 03 Feb 2021 08:11:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DGT-0007U0-0i for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DGS-0003SJ-VM for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7DGS-00028r-Ue for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:11: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=7I3/t6CaF5IIw2sIzuL/8zVIFzbE+n/4p2IR/zIGsQ8=; b=Hl2LUOnqsJLvt1gBvk9lNdcS6s jhojMvLw81sOoQq/mo8OGnTEUXZplqGBZdRVleoVRqQRgn5PX3Kt8/sPwvbBTX9urtis1UWxNdHHM ad3lDsWIrgZcsDhHFM7lvxQnOpgr5opR7k6P6p082mg5KtchJyGyintKbxbdZpNJkmDE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xenstore: Fix all builds Message-Id: Date: Wed, 03 Feb 2021 08:11:52 +0000 commit 42d50392bf49b3d9d2edb6378f903232dc238feb Author: Andrew Cooper AuthorDate: Mon Feb 1 23:30:51 2021 +0000 Commit: Andrew Cooper CommitDate: Tue Feb 2 10:34:10 2021 +0000 xenstore: Fix all builds This diff is easier viewed through `cat -A` diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h$ index 1bd443f61a..f7e4da2b2c 100644$ --- a/tools/xenstore/include/xenstore_state.h$ +++ b/tools/xenstore/include/xenstore_state.h$ @@ -21,7 +21,7 @@$ #ifndef XENSTORE_STATE_H$ #define XENSTORE_STATE_H$ $ -#if defined(__FreeBSD__) ||M-BM- defined(__NetBSD__)$ +#if defined(__FreeBSD__) || defined(__NetBSD__)$ #include $ #else$ #include $ A non-breaking space isn't a valid C preprocessor token. Fixes: ffbb8aa282de ("xenstore: fix build on {Net/Free}BSD") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/xenstore/include/xenstore_state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h index 1bd443f61a..f7e4da2b2c 100644 --- a/tools/xenstore/include/xenstore_state.h +++ b/tools/xenstore/include/xenstore_state.h @@ -21,7 +21,7 @@ #ifndef XENSTORE_STATE_H #define XENSTORE_STATE_H -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) #include #else #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 03 08:12:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Feb 2021 08:12:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80849.148167 (Exim 4.92) (envelope-from ) id 1l7DGe-0007Vu-MQ; Wed, 03 Feb 2021 08:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80849.148167; Wed, 03 Feb 2021 08:12:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DGe-0007Vm-JQ; Wed, 03 Feb 2021 08:12:04 +0000 Received: by outflank-mailman (input) for mailman id 80849; Wed, 03 Feb 2021 08:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DGd-0007VN-3a for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:12:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DGd-0003Ss-2j for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:12:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7DGd-00029f-1E for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:12:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8bQHFaLX5uaabngkF4fV37T9hQLgOo2NwJLLO5F6NIc=; b=EX2rFcMdDuneHdvmul4TtFQW3o N1zSxVlOKBf4yV+lbU8SIorTkExiBxx2Qxv10ez2JAWH0NLOen5LqDynH97b98J1FeQ+IIQBgjh9H mX727eIPrp2nhbNaj3rgXWvtPpwwi85T1h/kvh0PbKIFfzXzWFa6i5gfr58W0Uz9qE5Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging Message-Id: Date: Wed, 03 Feb 2021 08:12:03 +0000 commit 7978d05dbc35373a2e50472f775c9995897fe6c1 Merge: 119c98972c4e737508df827bbbc8453cc93292c7 42d50392bf49b3d9d2edb6378f903232dc238feb Author: Jan Beulich AuthorDate: Tue Feb 2 11:36:28 2021 +0100 Commit: Jan Beulich CommitDate: Tue Feb 2 11:36:28 2021 +0100 Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 03 08:12:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Feb 2021 08:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.80850.148172 (Exim 4.92) (envelope-from ) id 1l7DGo-0007X3-O2; Wed, 03 Feb 2021 08:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80850.148172; Wed, 03 Feb 2021 08:12:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DGo-0007Wv-Kw; Wed, 03 Feb 2021 08:12:14 +0000 Received: by outflank-mailman (input) for mailman id 80850; Wed, 03 Feb 2021 08:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DGn-0007Wo-7H for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7DGn-0003T0-6V for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7DGn-0002AC-4o for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 08:12:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7ULqEiqSUOEz1YY1Jypirp3OAWwhV9QuFx66pXryfxA=; b=uER1/FCUXvw9iCVDHXLaFvJuUC zglcT1zU+pADlYDVmDhPxRLjULcOf9pFbmjSQzdzOu6e3jG9YPT5LgUpyWWPezdav6LffbUUGaX6P Rt1k4LsuM9k15kqWDg0Gn3IH+x/JvPqbJwXQPLtxBVvWIj9N2swzhgbcV1M59hMGXQQM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/build: correctly record dependencies of asm-offsets.s Message-Id: Date: Wed, 03 Feb 2021 08:12:13 +0000 commit 5e7aa904405fa2f268c3af213516bae271de3265 Author: Jan Beulich AuthorDate: Tue Feb 2 11:36:50 2021 +0100 Commit: Jan Beulich CommitDate: Tue Feb 2 11:36:50 2021 +0100 x86/build: correctly record dependencies of asm-offsets.s Going through an intermediate *.new file requires telling the compiler what the real target is, so that the inclusion of the resulting .*.d file will actually be useful. Fixes: 7d2d7a43d014 ("x86/build: limit rebuilding of asm-offsets.h") Reported-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Release-Acked-by: Ian Jackson --- xen/arch/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 7769bb40d7..3a9b7e7b2e 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -241,7 +241,7 @@ 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 -g0 -o $@.new $< + $(CC) $(filter-out -Wa$(comma)% -flto,$(c_flags)) -S -g0 -o $@.new -MQ $@ $< $(call move-if-changed,$@.new,$@) asm-macros.i: CFLAGS-y += -D__ASSEMBLY__ -P -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 03 20:11:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Feb 2021 20:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81053.149044 (Exim 4.92) (envelope-from ) id 1l7OUT-0001JA-Q4; Wed, 03 Feb 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 81053.149044; Wed, 03 Feb 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 1l7OUT-0001J2-Mo; Wed, 03 Feb 2021 20:11:05 +0000 Received: by outflank-mailman (input) for mailman id 81053; Wed, 03 Feb 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 1l7OUS-0001Iw-Sa for xen-changelog@lists.xenproject.org; Wed, 03 Feb 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 1l7OUS-0007gm-NU for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 20:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7OUS-00043h-KZ for xen-changelog@lists.xenproject.org; Wed, 03 Feb 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=x73Tu+Yh0FuzjTVzEbOogRsTz6tej6TAWuxKdr1AyBU=; b=2UQn0AElKqLz3oShGP+yBclLij fbHuOYWljjeytmuDg08QadHRVoFogaX05XHp6pQXt36tLML7tKmuALcyGBeTr5wDTpIgNpYoGqrU6 BJf8yF/xZI+m7g1IilqrvevxABW6uPWYfCb13RwqColTgF7KdKB9g1DIijhQ/cxDhK2E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/foreignmem: Drop useless and/or misleading logging Message-Id: Date: Wed, 03 Feb 2021 20:11:04 +0000 commit 9351e1468d67ee79fbc6411b087c67ac34813891 Author: Andrew Cooper AuthorDate: Wed Feb 3 15:41:55 2021 +0000 Commit: Andrew Cooper CommitDate: Wed Feb 3 19:25:15 2021 +0000 libs/foreignmem: Drop useless and/or misleading logging These log lines are all in response to single system calls, and do not provide any information which the immediate caller can't determine themselves. It is however rude to put junk like this onto stderr, especially as system call failures are not even error conditions in certain circumstances. The FreeBSD logging has stale function names in, and Solaris shouldn't have passed code review to start with. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/libs/foreignmemory/freebsd.c | 7 ++----- tools/libs/foreignmemory/linux.c | 6 +----- tools/libs/foreignmemory/netbsd.c | 2 -- tools/libs/foreignmemory/solaris.c | 2 +- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/tools/libs/foreignmemory/freebsd.c b/tools/libs/foreignmemory/freebsd.c index 9a2796f0b7..04bfa806b0 100644 --- a/tools/libs/foreignmemory/freebsd.c +++ b/tools/libs/foreignmemory/freebsd.c @@ -65,10 +65,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, addr = mmap(addr, num << PAGE_SHIFT, prot, flags | MAP_SHARED, fd, 0); if ( addr == MAP_FAILED ) - { - PERROR("xc_map_foreign_bulk: mmap failed"); return NULL; - } ioctlx.num = num; ioctlx.dom = dom; @@ -80,7 +77,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, if ( rc < 0 ) { int saved_errno = errno; - PERROR("xc_map_foreign_bulk: ioctl failed"); + (void)munmap(addr, num << PAGE_SHIFT); errno = saved_errno; return NULL; @@ -137,7 +134,7 @@ int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem, int saved_errno; if ( errno != ENOSYS ) - PERROR("mmap resource ioctl failed"); + ; else errno = EOPNOTSUPP; diff --git a/tools/libs/foreignmemory/linux.c b/tools/libs/foreignmemory/linux.c index d0eead1196..050b9ed3a5 100644 --- a/tools/libs/foreignmemory/linux.c +++ b/tools/libs/foreignmemory/linux.c @@ -171,10 +171,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, addr = mmap(addr, num << PAGE_SHIFT, prot, flags | MAP_SHARED, fd, 0); if ( addr == MAP_FAILED ) - { - PERROR("mmap failed"); return NULL; - } ioctlx.num = num; ioctlx.dom = dom; @@ -273,7 +270,6 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, { int saved_errno = errno; - PERROR("ioctl failed"); (void)munmap(addr, num << PAGE_SHIFT); errno = saved_errno; return NULL; @@ -330,7 +326,7 @@ int osdep_xenforeignmemory_map_resource( int saved_errno; if ( errno != fmem->unimpl_errno && errno != EOPNOTSUPP ) - PERROR("ioctl failed"); + ; else errno = EOPNOTSUPP; diff --git a/tools/libs/foreignmemory/netbsd.c b/tools/libs/foreignmemory/netbsd.c index 4ae60aafdd..565682e064 100644 --- a/tools/libs/foreignmemory/netbsd.c +++ b/tools/libs/foreignmemory/netbsd.c @@ -147,8 +147,6 @@ int osdep_xenforeignmemory_map_resource( rc = ioctl(fmem->fd, IOCTL_PRIVCMD_MMAP_RESOURCE, &mr); if ( rc ) { - PERROR("ioctl failed"); - if ( fres->addr ) { int saved_errno = errno; diff --git a/tools/libs/foreignmemory/solaris.c b/tools/libs/foreignmemory/solaris.c index ee8aae4fbd..958fb01f6d 100644 --- a/tools/libs/foreignmemory/solaris.c +++ b/tools/libs/foreignmemory/solaris.c @@ -83,7 +83,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, if ( ioctl(fd, IOCTL_PRIVCMD_MMAPBATCH, &ioctlx) < 0 ) { int saved_errno = errno; - PERROR("XXXXXXXX"); + (void)munmap(addr, num*XC_PAGE_SIZE); errno = saved_errno; return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Feb 03 20:11:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Feb 2021 20:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81055.149046 (Exim 4.92) (envelope-from ) id 1l7OUd-0001KQ-RF; Wed, 03 Feb 2021 20:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81055.149046; Wed, 03 Feb 2021 20: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 1l7OUd-0001KI-ON; Wed, 03 Feb 2021 20:11:15 +0000 Received: by outflank-mailman (input) for mailman id 81055; Wed, 03 Feb 2021 20:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7OUc-0001KA-SR for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 20:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7OUc-0007gw-Qb for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 20:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7OUc-00044J-Pe for xen-changelog@lists.xenproject.org; Wed, 03 Feb 2021 20: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=hMH9AKzLahiDOJC+qMiI6RLLD3r+4rBYSsQDguwMINc=; b=m2cQPfb9fsZ+AmKn7V+z/jLSRG KTDgsVwsOVnksxjuIDMasoYoHeeiFIP+cfyhG7WsY59FoZv48VjZK+Sq2MuIHP56/1TL+nyUwl55X FsF+k4p8hnJaCs7xLuJfzMWVBPyHuYys82qRqi13QKiXcjhmFbtOvBMSmVsnkhL+ajeY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/foreignmem: Fix/simplify errno handling for map_resource Message-Id: Date: Wed, 03 Feb 2021 20:11:14 +0000 commit d203dbd69f1a02577dd6fe571d72beb980c548a6 Author: Andrew Cooper AuthorDate: Wed Feb 3 15:43:35 2021 +0000 Commit: Andrew Cooper CommitDate: Wed Feb 3 19:25:35 2021 +0000 libs/foreignmem: Fix/simplify errno handling for map_resource Simplify the FreeBSD and Linux logic, left in this state by the previous change. No functional change. Duplicate the FreeBSD logic for NetBSD, to maintain the uniform ABI for callers that EOPNOTSUPP covers all Xen/Kernel support. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/libs/foreignmemory/freebsd.c | 4 +--- tools/libs/foreignmemory/linux.c | 4 +--- tools/libs/foreignmemory/netbsd.c | 3 +++ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/libs/foreignmemory/freebsd.c b/tools/libs/foreignmemory/freebsd.c index 04bfa806b0..d94ea07862 100644 --- a/tools/libs/foreignmemory/freebsd.c +++ b/tools/libs/foreignmemory/freebsd.c @@ -133,9 +133,7 @@ int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem, { int saved_errno; - if ( errno != ENOSYS ) - ; - else + if ( errno == ENOSYS ) errno = EOPNOTSUPP; if ( fres->addr ) diff --git a/tools/libs/foreignmemory/linux.c b/tools/libs/foreignmemory/linux.c index 050b9ed3a5..c1f35e2db7 100644 --- a/tools/libs/foreignmemory/linux.c +++ b/tools/libs/foreignmemory/linux.c @@ -325,9 +325,7 @@ int osdep_xenforeignmemory_map_resource( { int saved_errno; - if ( errno != fmem->unimpl_errno && errno != EOPNOTSUPP ) - ; - else + if ( errno == fmem->unimpl_errno ) errno = EOPNOTSUPP; if ( fres->addr ) diff --git a/tools/libs/foreignmemory/netbsd.c b/tools/libs/foreignmemory/netbsd.c index 565682e064..c0b1b8f79d 100644 --- a/tools/libs/foreignmemory/netbsd.c +++ b/tools/libs/foreignmemory/netbsd.c @@ -147,6 +147,9 @@ int osdep_xenforeignmemory_map_resource( rc = ioctl(fmem->fd, IOCTL_PRIVCMD_MMAP_RESOURCE, &mr); if ( rc ) { + if ( errno == ENOSYS ) + errno = EOPNOTSUPP; + if ( fres->addr ) { int saved_errno = errno; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 13:11:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 13:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81295.149991 (Exim 4.92) (envelope-from ) id 1l7ePZ-0008Af-ME; Thu, 04 Feb 2021 13:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81295.149991; Thu, 04 Feb 2021 13: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 1l7ePZ-0008AW-Ii; Thu, 04 Feb 2021 13:11:05 +0000 Received: by outflank-mailman (input) for mailman id 81295; Thu, 04 Feb 2021 13:11:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7ePZ-0008AR-4y for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 13:11:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7ePZ-0003C9-0s for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 13:11:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7ePY-0003aj-W1 for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 13: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=qd6mUJwK64okn5yPw/ORRK/zyrz8tYcLjAhDAZS64V4=; b=LoNmVmUEOfBOzFoKOO4F6uq4tp 0Hrb8phIFTzaMxkxGljKAPC680idGB0BCeBQJgAtiQvzW9ENtROgdUPa2RTkQ3w/gm/JbosbbipS+ v/LCJkNWObJFKl4mqn4NjGyx2OCBv+llLh340Y4j2QmcSd+PksKH1G9bre07ag9CBEp0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/string: correct memmove()'s forwarding to memcpy() Message-Id: Date: Thu, 04 Feb 2021 13:11:04 +0000 commit 7b93d92a35dc7c0a6e5f1f79b3c887aa3e66ddc0 Author: Jan Beulich AuthorDate: Thu Feb 4 13:59:56 2021 +0100 Commit: Jan Beulich CommitDate: Thu Feb 4 13:59:56 2021 +0100 x86/string: correct memmove()'s forwarding to memcpy() With memcpy() expanding to the compiler builtin, we may not hand it overlapping source and destination. We strictly mean to forward to our own implementation (a few lines up in the same source file). Fixes: 78825e1c60fa ("x86/string: Clean up x86/string.h") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/string.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/string.c b/xen/arch/x86/string.c index e2f84638c4..bda24b14ac 100644 --- a/xen/arch/x86/string.c +++ b/xen/arch/x86/string.c @@ -43,7 +43,8 @@ void *(memmove)(void *dest, const void *src, size_t n) return dest; if ( dest < src ) - return memcpy(dest, src, n); + /* Depends on Xen's implementation operating forwards. */ + return (memcpy)(dest, src, n); asm volatile ( " std ; " -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 13:11:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 13:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81296.149995 (Exim 4.92) (envelope-from ) id 1l7ePj-0008BO-NL; Thu, 04 Feb 2021 13:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81296.149995; Thu, 04 Feb 2021 13: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 1l7ePj-0008BG-KM; Thu, 04 Feb 2021 13:11:15 +0000 Received: by outflank-mailman (input) for mailman id 81296; Thu, 04 Feb 2021 13:11:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7ePj-0008BB-73 for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 13:11:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7ePj-0003Cd-4G for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 13:11:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7ePj-0003bn-3F for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 13:11:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=svviZbDa9jaRO+PDD/UuWGWM5lYDvhfHI+GuVKYceqc=; b=fS+mCw5u8zzNywiQtfdGAnWRtP qGs0aENGxjNK3GzDVzro6C1IutXdI3kBO+95yCGTxgsWu3S1QmeVEvpDb+x+YGq5NC9xFKIsLOvoI L0YsdZC5eoUb5+VdxkQwj4rcoVfyG8HlFdVr+bfzDT7dj0/IMsx5Ea/Nxm3j5mj/AlU8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] IOREQ: fix waiting for broadcast completion Message-Id: Date: Thu, 04 Feb 2021 13:11:15 +0000 commit da20c93108226cb2eb2ed1a13225337f2318a642 Author: Jan Beulich AuthorDate: Thu Feb 4 14:01:21 2021 +0100 Commit: Jan Beulich CommitDate: Thu Feb 4 14:01:21 2021 +0100 IOREQ: fix waiting for broadcast completion Checking just a single server is not enough - all of them must have signaled that they're done processing the request. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/common/ioreq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/ioreq.c b/xen/common/ioreq.c index 90ed2e0302..5b603c0520 100644 --- a/xen/common/ioreq.c +++ b/xen/common/ioreq.c @@ -213,9 +213,9 @@ bool vcpu_ioreq_handle_completion(struct vcpu *v) return false; } - sv = get_pending_vcpu(v, &s); - if ( sv && !wait_for_io(sv, get_ioreq(s, v)) ) - return false; + while ( (sv = get_pending_vcpu(v, &s)) != NULL ) + if ( !wait_for_io(sv, get_ioreq(s, v)) ) + return false; vio->req.state = ioreq_needs_completion(&vio->req) ? STATE_IORESP_READY : STATE_IOREQ_NONE; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 13:11:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 13:11:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81297.149999 (Exim 4.92) (envelope-from ) id 1l7ePt-0008D1-P8; Thu, 04 Feb 2021 13:11:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81297.149999; Thu, 04 Feb 2021 13: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 1l7ePt-0008Ct-M2; Thu, 04 Feb 2021 13:11:25 +0000 Received: by outflank-mailman (input) for mailman id 81297; Thu, 04 Feb 2021 13:11:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7ePt-0008Cj-7r for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 13:11:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7ePt-0003Cs-7B for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 13:11:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7ePt-0003cV-6N for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 13: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=fc6dvqPkOSC4yFPemeSthCzaAsUiRl1ogH+zWDRJt4A=; b=gfeufdanzHz+yK7kos2E4Cabrp +eW/zfeEjKFqmTharOMVL0cV+zXm9tUPmw1+yMBcXU15v944V3OiFanw0IiQSqNi1sHLk0SlKJP4y LATgg1cziS99rywuuE6iKSOksCEflZvT6n2wWSULmWlkZesN5T4yYZwlRp0Ox4Xs/c8A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/efi: enable MS ABI attribute on clang Message-Id: Date: Thu, 04 Feb 2021 13:11:25 +0000 commit 92f5ffa58d188c9f9a9f1bcdccb6d6348d9df612 Author: Roger Pau Monné AuthorDate: Thu Feb 4 14:02:32 2021 +0100 Commit: Jan Beulich CommitDate: Thu Feb 4 14:02:32 2021 +0100 x86/efi: enable MS ABI attribute on clang Or else the EFI service calls will use the wrong calling convention. The __ms_abi__ attribute is available on all supported versions of clang. Add a specific Clang check because the GCC version reported by Clang is below the required 4.4 to use the __ms_abi__ attribute. Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- xen/include/asm-x86/x86_64/efibind.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-x86/x86_64/efibind.h b/xen/include/asm-x86/x86_64/efibind.h index b013db175d..ddcfae07ec 100644 --- a/xen/include/asm-x86/x86_64/efibind.h +++ b/xen/include/asm-x86/x86_64/efibind.h @@ -172,7 +172,7 @@ typedef uint64_t UINTN; #ifndef EFIAPI // Forces EFI calling conventions reguardless of compiler options #ifdef _MSC_EXTENSIONS #define EFIAPI __cdecl // Force C calling convention for Microsoft C compiler - #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) + #elif __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) #define EFIAPI __attribute__((__ms_abi__)) // Force Microsoft ABI #else #define EFIAPI // Substitute expresion to force C calling convention -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 14:22:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 14:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81327.150108 (Exim 4.92) (envelope-from ) id 1l7fWI-0007s4-6v; Thu, 04 Feb 2021 14:22:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81327.150108; Thu, 04 Feb 2021 14: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 1l7fWI-0007rw-3q; Thu, 04 Feb 2021 14:22:06 +0000 Received: by outflank-mailman (input) for mailman id 81327; Thu, 04 Feb 2021 14:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7fWG-0007rp-Lc for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7fWG-0004R7-Kn for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7fWG-00026z-J1 for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14: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=Y+2YUYpw5ezH2KlPvJGeU5WynolwVaq7QKtISFJ/zuM=; b=yL4Je9M34sxAAptPjzL4NdAMLT zMma/4hn5gemaVPw3xHulcHcZjdcZVc1jJeDtpsUsLtaH6NjQIZT/sn9QehJ5BOzio9bWEytd6xQo xXW7Ilj/+dsC1R92UEUSmjNjkLyIwU/Ijq+dUgK0QmFxHHbFfEpA4PRpAnzFJDmtNeg8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: Fix quota calculation for mkdir EEXIST Message-Id: Date: Thu, 04 Feb 2021 14:22:04 +0000 commit c8b96708252a436da44005307f7c195d699bd7c5 Author: Edwin Török AuthorDate: Fri Jan 15 19:11:32 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 4 14:17:44 2021 +0000 tools/oxenstored: Fix quota calculation for mkdir EEXIST We increment the domain's quota on mkdir even when the node already exists. This results in a quota inconsistency after live update, where reconstructing the tree from scratch results in a different quota. Not a security issue because the domain uses up quota faster, so it will only get a Quota error sooner than it should. Found by the structured fuzzer. Signed-off-by: Edwin Török Acked-by: Christian Lindig Release-Acked-by: Ian Jackson --- tools/ocaml/xenstored/store.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ocaml/xenstored/store.ml b/tools/ocaml/xenstored/store.ml index 1bd0c81f6f..20e67b1427 100644 --- a/tools/ocaml/xenstored/store.ml +++ b/tools/ocaml/xenstored/store.ml @@ -419,6 +419,7 @@ let mkdir store perm path = (* It's upt to the mkdir logic to decide what to do with existing path *) if not (existing || (Perms.Connection.is_dom0 perm)) then Quota.check store.quota owner 0; store.root <- path_mkdir store perm path; + if not existing then Quota.add_entry store.quota owner let rm store perm path = -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 14:22:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 14:22:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81328.150111 (Exim 4.92) (envelope-from ) id 1l7fWS-0007t4-8G; Thu, 04 Feb 2021 14:22:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81328.150111; Thu, 04 Feb 2021 14: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 1l7fWS-0007sy-5P; Thu, 04 Feb 2021 14:22:16 +0000 Received: by outflank-mailman (input) for mailman id 81328; Thu, 04 Feb 2021 14:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7fWQ-0007sp-R5 for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7fWQ-0004RD-QE for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7fWQ-000285-Mv for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14: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=9MqqCcVKOHc3c8PylUO/z2SIpzl2hMPTjGbzV+/1TLM=; b=WKqp5a3YhYqzp5Ovc+k1DVvPMs luzuMCO5BUGxjToAh9nMxMLQQzDGTJ1Qqcju18xpvbsn0+8ecYP2G04lSwUHCOHOHA9hDNior0aaF 4qEnDCfDZJGXmxtRoYtdpu3ObaDNgH14XJom2NGSsxrgdiNaLkTrQ4thSwB2TAlhFrpo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: Reject invalid watch paths early Message-Id: Date: Thu, 04 Feb 2021 14:22:14 +0000 commit dc8caf214fb882546b0e93317b9828247a7c9da8 Author: Edwin Török AuthorDate: Fri Jan 15 19:28:37 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 4 14:17:44 2021 +0000 tools/oxenstored: Reject invalid watch paths early Watches on invalid paths were accepted, but they would never trigger. The client also got no notification that its watch is bad and would never trigger. Found again by the structured fuzzer, due to an error on live update reload: the invalid watch paths would get rejected during live update and the list of watches would be different pre/post live update. The testcase is watch on `//`, which is an invalid path. Signed-off-by: Edwin Török Acked-by: Christian Lindig Release-Acked-by: Ian Jackson --- tools/ocaml/xenstored/connection.ml | 5 ++--- tools/ocaml/xenstored/connections.ml | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index d09a0fa405..65f99ea6f2 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -158,18 +158,17 @@ let get_children_watches con path = let is_dom0 con = Perms.Connection.is_dom0 (get_perm con) -let add_watch con path token = +let add_watch con (path, apath) token = if !Quota.activate && !Define.maxwatch > 0 && not (is_dom0 con) && con.nb_watches > !Define.maxwatch then raise Quota.Limit_reached; - let apath = get_watch_path con path in let l = get_watches con apath in if List.exists (fun w -> w.token = token) l then raise Define.Already_exist; let watch = watch_create ~con ~token ~path in Hashtbl.replace con.watches apath (watch :: l); con.nb_watches <- con.nb_watches + 1; - apath, watch + watch let del_watch con path token = let apath = get_watch_path con path in diff --git a/tools/ocaml/xenstored/connections.ml b/tools/ocaml/xenstored/connections.ml index 8a66eeec3a..3c7429fe7f 100644 --- a/tools/ocaml/xenstored/connections.ml +++ b/tools/ocaml/xenstored/connections.ml @@ -114,8 +114,10 @@ let key_of_path path = "" :: Store.Path.to_string_list path let add_watch cons con path token = - let apath, watch = Connection.add_watch con path token in + let apath = Connection.get_watch_path con path in + (* fail on invalid paths early by calling key_of_str before adding watch *) let key = key_of_str apath in + let watch = Connection.add_watch con (path, apath) token in let watches = if Trie.mem cons.watches key then Trie.find cons.watches key -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 14:22:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 14:22:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81329.150116 (Exim 4.92) (envelope-from ) id 1l7fWc-0007uj-A6; Thu, 04 Feb 2021 14:22:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81329.150116; Thu, 04 Feb 2021 14: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 1l7fWc-0007uU-6q; Thu, 04 Feb 2021 14:22:26 +0000 Received: by outflank-mailman (input) for mailman id 81329; Thu, 04 Feb 2021 14:22:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7fWa-0007uI-UE for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14:22:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7fWa-0004Rb-TS for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7fWa-000299-SG for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14: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=zBub+ADsOTs2jGypua3ecJCVHiQlBpp6ffmaSn/2/44=; b=CbObM4emKAzPJ8srig+kHmHY44 Z3vxoP9y0by+0KEyfNCLVWXXZq+JS5urTlWKUsaFy5yoJHjUjBMeqZL0rRgaVHjPf8xdvXC7LSJn+ mLwBFNsz8foYpdklAhgynipjH7FoDSDN1S1qk4BUpBP6fOzhgqW7f1UpunA+MwXsaYD0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/oxenstored: mkdir conflicts were sometimes missed Message-Id: Date: Thu, 04 Feb 2021 14:22:24 +0000 commit 45dee7d92b493bb531e7e77a6f9c0180ab152f87 Author: Edwin Török AuthorDate: Fri Jan 15 19:38:58 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 4 14:17:44 2021 +0000 tools/oxenstored: mkdir conflicts were sometimes missed Due to how set_write_lowpath was used here it didn't detect create/delete conflicts. When we create an entry we must mark our parent as modified (this is what creating a new node via write does). Otherwise we can have 2 transactions one creating, and another deleting a node both succeeding depending on timing. Or one transaction reading an entry, concluding it doesn't exist, do some other work based on that information and successfully commit even if another transaction creates the node via mkdir meanwhile. Signed-off-by: Edwin Török Acked-by: Christian Lindig Release-Acked-by: Ian Jackson --- tools/ocaml/xenstored/transaction.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/xenstored/transaction.ml b/tools/ocaml/xenstored/transaction.ml index 25bc8c3b4a..17b1bdf2ea 100644 --- a/tools/ocaml/xenstored/transaction.ml +++ b/tools/ocaml/xenstored/transaction.ml @@ -165,7 +165,7 @@ let write t perm path value = let mkdir ?(with_watch=true) t perm path = Store.mkdir t.store perm path; - set_write_lowpath t path; + set_write_lowpath t (Store.Path.get_parent path); if with_watch then add_wop t Xenbus.Xb.Op.Mkdir path -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 14:44:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 14:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81333.150132 (Exim 4.92) (envelope-from ) id 1l7fra-0001g0-4p; Thu, 04 Feb 2021 14:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81333.150132; Thu, 04 Feb 2021 14: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 1l7fra-0001fr-1l; Thu, 04 Feb 2021 14:44:06 +0000 Received: by outflank-mailman (input) for mailman id 81333; Thu, 04 Feb 2021 14:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7frY-0001fm-QJ for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7frY-0004nc-MU for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7frY-0004cM-KF for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14: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=PfOBFVklvO3Nzq8uT9lqvN9TOmHyz9tUA+/LgEvJB4E=; b=XeqxkY7BVUB19KTpxlwVNbhHo0 glw+kq8UbQbfGdWiS3sX/OKxqB0qlDGKg7cMnpsBzk72Tl+TQb1A5ZTIz1VNJaYtVZUDCaAS5QmHS ClW37Y3UabgvSJqxehDAhpCSCcWBin8/Mvqa2UoUlyQVO88eofNORHhzesHbnFW4HpGg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.12] x86/msr: fix handling of MSR_IA32_PERF_{STATUS/CTL} (again) Message-Id: Date: Thu, 04 Feb 2021 14:44:04 +0000 commit f1f322610718c40680ac09e66f6c82e69c78ba3a Author: Jan Beulich AuthorDate: Thu Feb 4 15:39:45 2021 +0100 Commit: Jan Beulich CommitDate: Thu Feb 4 15:39:45 2021 +0100 x86/msr: fix handling of MSR_IA32_PERF_{STATUS/CTL} (again) X86_VENDOR_* aren't bit masks in the older trees. Reported-by: James Dingwall Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/msr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 927ed625df..aefe0cbb4b 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -226,7 +226,8 @@ int guest_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) */ case MSR_IA32_PERF_STATUS: case MSR_IA32_PERF_CTL: - if ( !(cp->x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_CENTAUR)) ) + if ( cp->x86_vendor != X86_VENDOR_INTEL && + cp->x86_vendor != X86_VENDOR_CENTAUR ) goto gp_fault; *val = 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 14:44:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 14:44:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81334.150136 (Exim 4.92) (envelope-from ) id 1l7frl-0001gm-6F; Thu, 04 Feb 2021 14:44:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81334.150136; Thu, 04 Feb 2021 14: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 1l7frl-0001ge-3J; Thu, 04 Feb 2021 14:44:17 +0000 Received: by outflank-mailman (input) for mailman id 81334; Thu, 04 Feb 2021 14:44:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7frj-0001gW-8q for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14:44:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7frj-0004ni-7a for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14:44:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7frj-0004e0-6b for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 14: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=CS0yy+usRFdGXV11hV3f3shth9lt/hl17CBAxPy6BjY=; b=xlRWIawSTtIhKVhP/+r3GMERqY WILQc7T08W5TU/p/sW6LAgEeLWLnU8vQLy4ZT8sRu34+rGCuKELD3QliyMbIgECEJXoxmGX0boDcW 6pug7oe0nPjD6HTYzLWORM5Sd5vTdlGwU1Hok/1j4qivmlrKD6CBMd9hA1pOyIBgUWPA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.11] x86/msr: fix handling of MSR_IA32_PERF_{STATUS/CTL} (again) Message-Id: Date: Thu, 04 Feb 2021 14:44:15 +0000 commit f9090d990e201a5ca045976b8ddaab9fa6ee69dd Author: Jan Beulich AuthorDate: Thu Feb 4 15:41:12 2021 +0100 Commit: Jan Beulich CommitDate: Thu Feb 4 15:41:12 2021 +0100 x86/msr: fix handling of MSR_IA32_PERF_{STATUS/CTL} (again) X86_VENDOR_* aren't bit masks in the older trees. Reported-by: James Dingwall Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/msr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 99c848ff41..1afb80427c 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -232,7 +232,8 @@ int guest_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) */ case MSR_IA32_PERF_STATUS: case MSR_IA32_PERF_CTL: - if ( !(cp->x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_CENTAUR)) ) + if ( cp->x86_vendor != X86_VENDOR_INTEL && + cp->x86_vendor != X86_VENDOR_CENTAUR ) goto gp_fault; *val = 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.11 From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 21:33:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 21:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81440.150564 (Exim 4.92) (envelope-from ) id 1l7mFP-0005Va-4E; Thu, 04 Feb 2021 21:33:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81440.150564; Thu, 04 Feb 2021 21: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 1l7mFP-0005VS-1C; Thu, 04 Feb 2021 21:33:07 +0000 Received: by outflank-mailman (input) for mailman id 81440; Thu, 04 Feb 2021 21:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7mFN-0005VN-Lb for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 21:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7mFN-00043z-Eq for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 21:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7mFN-0000o2-BF for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 21: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=eoaDVi/zA0ujRnkUX7N5T7lQU3bfw0jNdEv+7ici7hk=; b=wibDF2EuTNx5ERZ+eyCi7Ty2Rk UxLUVD0CUVWMKc7tT+KfPyEwGn648DFV8s00ST//+d+cu9kZkFGBxyYde2pkJ2Fgq/t67bZHKxAMX j0gMYbNonsViaQZfHac5HYdeiKw2y9dAQ1jGu2yQanM08/0etuWh/i1UkRa2hLtw0m+Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/devicemodel: Fix ABI breakage from xendevicemodel_set_irq_level() Message-Id: Date: Thu, 04 Feb 2021 21:33:05 +0000 commit e8af54084586f4e165eee0b49175a63e3c541c64 Author: Andrew Cooper AuthorDate: Thu Feb 4 15:50:16 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 4 21:26:41 2021 +0000 libs/devicemodel: Fix ABI breakage from xendevicemodel_set_irq_level() It is not permitted to edit the VERS clause for a version in a release of Xen. Revert xendevicemodel_set_irq_level()'s inclusion in .so.1.2 and bump the the library minor version to .so.1.4 instead. Fixes: 5d752df85f ("xen/dm: Introduce xendevicemodel_set_irq_level DM op") Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/libs/devicemodel/Makefile | 2 +- tools/libs/devicemodel/libxendevicemodel.map | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile index 500de7adc5..3e50ff6d90 100644 --- a/tools/libs/devicemodel/Makefile +++ b/tools/libs/devicemodel/Makefile @@ -2,7 +2,7 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 -MINOR = 3 +MINOR = 4 SRCS-y += core.c SRCS-$(CONFIG_Linux) += common.c diff --git a/tools/libs/devicemodel/libxendevicemodel.map b/tools/libs/devicemodel/libxendevicemodel.map index a0c30125de..733549327b 100644 --- a/tools/libs/devicemodel/libxendevicemodel.map +++ b/tools/libs/devicemodel/libxendevicemodel.map @@ -32,10 +32,14 @@ VERS_1.2 { global: xendevicemodel_relocate_memory; xendevicemodel_pin_memory_cacheattr; - xendevicemodel_set_irq_level; } VERS_1.1; VERS_1.3 { global: xendevicemodel_modified_memory_bulk; } VERS_1.2; + +VERS_1.4 { + global: + xendevicemodel_set_irq_level; +} VERS_1.3; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 21:33:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 21:33:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81441.150567 (Exim 4.92) (envelope-from ) id 1l7mFZ-0005Wc-6w; Thu, 04 Feb 2021 21:33:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81441.150567; Thu, 04 Feb 2021 21: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 1l7mFZ-0005WU-40; Thu, 04 Feb 2021 21:33:17 +0000 Received: by outflank-mailman (input) for mailman id 81441; Thu, 04 Feb 2021 21:33:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7mFX-0005WN-J2 for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 21:33:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7mFX-000442-IE for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 21:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7mFX-0000ou-H9 for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 21: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=Kk7e9LIWBZ3lBJaWu7a21aVbjAN6TtiF6jUbJoDPlog=; b=TDNk90pcYi0BcI1ewDjR7rhc5C uehcVROAN3VUhRFgi02aACSFbY+V5txYOMLx32RAoyPYd0IOHL+YZQ5b2P7wx8R06bZV8lpuluOHe 5UkX3yzxF8H8d1sXhOB7PY29VMPVswASTxg93e4OiixCyRjqZ5lHa2VZjVJu+QQAySNA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/hotplug: Add a qemu-ifup script on NetBSD Message-Id: Date: Thu, 04 Feb 2021 21:33:15 +0000 commit 4cc948020a58588d02413d92976ddd5233dd7cae Author: Manuel Bouyer AuthorDate: Wed Feb 3 17:54:18 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Feb 4 21:26:41 2021 +0000 tools/hotplug: Add a qemu-ifup script on NetBSD On NetBSD, qemu-xen will use a qemu-ifup script to setup the tap interfaces (as qemu-xen-traditional used to). Copy the script from qemu-xen-traditional, and install it on NetBSD. While there document parameters and environnement variables. Signed-off-by: Manuel Bouyer Acked-by: Ian Jackson --- tools/hotplug/NetBSD/Makefile | 1 + tools/hotplug/NetBSD/qemu-ifup | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index 114b223207..f909ffa367 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -7,6 +7,7 @@ XEN_SCRIPTS += locking.sh XEN_SCRIPTS += block XEN_SCRIPTS += vif-bridge XEN_SCRIPTS += vif-ip +XEN_SCRIPTS += qemu-ifup XEN_SCRIPT_DATA = XEN_RCD_PROG = rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/xendriverdomain diff --git a/tools/hotplug/NetBSD/qemu-ifup b/tools/hotplug/NetBSD/qemu-ifup new file mode 100644 index 0000000000..4305419f44 --- /dev/null +++ b/tools/hotplug/NetBSD/qemu-ifup @@ -0,0 +1,9 @@ +#!/bin/sh + +#called by qemu when a HVM domU is started. +# first parameter is tap interface, second is the bridge name +# environement variable $XEN_DOMAIN_ID contains the domU's ID, +# which can be used to retrieve extra parameters from the xenstore. + +ifconfig $1 up +exec /sbin/brconfig $2 add $1 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 21:33:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 21:33:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81443.150584 (Exim 4.92) (envelope-from ) id 1l7mFj-0005ah-H2; Thu, 04 Feb 2021 21:33:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81443.150584; Thu, 04 Feb 2021 21: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 1l7mFj-0005aZ-Dq; Thu, 04 Feb 2021 21:33:27 +0000 Received: by outflank-mailman (input) for mailman id 81443; Thu, 04 Feb 2021 21:33:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7mFh-0005a1-N4 for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 21:33:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7mFh-000463-LW for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 21:33:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7mFh-0000po-KW for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 21: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=Z5wPTvx0EOnJYhAUxUD9wJSCE6D86WjDZnnavDNmySw=; b=eFruoIAfF4lP8fCOGUsalZrUEQ G5Bf77BRy+EDOQkKcTdkzh5j4Ht/6fVmfGLg8QZxI5Zj0rXSaYau/BlOz7IZmdbWW3isiYLgPm/x8 8JUj4SNFvAiInwQznbFVlWFXLXp+/FxZZWWJY+DQ6AcITAIqvsh0YN8sWBez1zISSxEY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstored: close socket connections on error Message-Id: Date: Thu, 04 Feb 2021 21:33:25 +0000 commit cd09c4929e9b70d77747ec187ea94731c8a06ab2 Author: Manuel Bouyer AuthorDate: Wed Feb 3 17:54:19 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Feb 4 21:26:41 2021 +0000 tools/xenstored: close socket connections on error On error, don't keep socket connection in ignored state but close them. When the remote end of a socket is closed, xenstored will flag it as an error and switch the connection to ignored. But on some OSes (e.g. NetBSD), poll(2) will return only POLLIN in this case, so sockets in ignored state will stay open forever in xenstored (and it will loop with CPU 100% busy). Fixes: d2fa370d3ef9 ("tools/xenstore: Preserve bad client until they are destroyed") Signed-off-by: Manuel Bouyer Reviewed-by: Juergen Gross Release-Acked-by: Ian Jackson --- tools/xenstore/xenstored_core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 1ab6f162cb..0fea598352 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1440,6 +1440,9 @@ static void ignore_connection(struct connection *conn) talloc_free(conn->in); conn->in = NULL; + /* if this is a socket connection, drop it now */ + if (conn->fd >= 0) + talloc_free(conn); } static const char *sockmsg_string(enum xsd_sockmsg_type type) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 21:33:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 21:33:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81444.150588 (Exim 4.92) (envelope-from ) id 1l7mFt-0005e7-IY; Thu, 04 Feb 2021 21:33:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81444.150588; Thu, 04 Feb 2021 21: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 1l7mFt-0005dz-FS; Thu, 04 Feb 2021 21:33:37 +0000 Received: by outflank-mailman (input) for mailman id 81444; Thu, 04 Feb 2021 21:33:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7mFr-0005da-Pc for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 21:33:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7mFr-00046A-Op for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 21:33:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7mFr-0000qY-Nd for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 21: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=6ax40Xm+HpBOJcV4Cu0jLPGxiq3d5sIl/QGL+DjWopM=; b=wXatfdE4LAQgMkkzqskCiA0gpY h0SnhJLiCSPL8a7i3bz7a00jGsdJeD6lbCEUhOEiD+CeZ5fvvfS1oPgbqmmxE0n+ozMI2Qygie5gp 9dfO0aSkjx2ul/+v5PuEcUb0aqMRWD8EEeuurfG1Sh+tHda+NQFbMrWe8/tHcyiE0GtE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs/man: Document qemu-ifup on NetBSD Message-Id: Date: Thu, 04 Feb 2021 21:33:35 +0000 commit def12125357ed2efd6d581d9033afcc9d66daa8a Author: Manuel Bouyer AuthorDate: Wed Feb 3 17:54:20 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Feb 4 21:26:41 2021 +0000 docs/man: Document qemu-ifup on NetBSD Document that on NetBSD, the tap interface will be configured by the qemu-ifup script. Signed-off-by: Manuel Bouyer Release-Acked-by: Ian Jackson --- docs/man/xl-network-configuration.5.pod | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/man/xl-network-configuration.5.pod b/docs/man/xl-network-configuration.5.pod index af058d4d3c..8e5fd909fa 100644 --- a/docs/man/xl-network-configuration.5.pod +++ b/docs/man/xl-network-configuration.5.pod @@ -172,6 +172,9 @@ add it to the relevant bridge). Defaults to C but can be set to any script. Some example scripts are installed in C. +Note on NetBSD HVM guests will ignore the script option for tap +(emulated) interfaces and always use +C to configure the interface in bridged mode. =head2 ip -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Feb 04 22:11:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Feb 2021 22:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81455.150620 (Exim 4.92) (envelope-from ) id 1l7mq9-0001dM-Sm; Thu, 04 Feb 2021 22:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81455.150620; Thu, 04 Feb 2021 22: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 1l7mq9-0001dE-Pf; Thu, 04 Feb 2021 22:11:05 +0000 Received: by outflank-mailman (input) for mailman id 81455; Thu, 04 Feb 2021 22:11:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7mq9-0001d9-4O for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 22:11:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7mq9-0004i5-29 for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 22:11:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7mq9-0003zU-0m for xen-changelog@lists.xenproject.org; Thu, 04 Feb 2021 22: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=Mie9bHSEbyAEeayr9tHYjut38KITNEq6bQyBz5A5mUY=; b=Qx64bsLAN3PPCPOhvW9BQ8HN5n V+L+MvUvpqL4d9p9ef25nOp9DYxqrtYNMQ3EyQPtFZDl5dlfRDFjrlYyKIb0v6IzBJXTAGpoJPPtu 3CKyFQ6LsjUvSs6gp/BPMHU5q7h83fGGjmBvN6IYN26ELh9uECE3dRAbV99HFwnI+VqA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests: Introduce a test for acquire_resource Message-Id: Date: Thu, 04 Feb 2021 22:11:05 +0000 commit ff522e2e9163b27fe4d80ba55c18408f9b1f1cb7 Author: Andrew Cooper AuthorDate: Thu Jul 23 17:26:16 2020 +0100 Commit: Andrew Cooper CommitDate: Thu Feb 4 22:03:33 2021 +0000 tools/tests: Introduce a test for acquire_resource For now, simply try to map 40 frames of grant table. This catches most of the basic errors with resource sizes found and fixed through the 4.15 dev window. Signed-off-by: Andrew Cooper Tested-by: Oleksandr Tyshchenko Release-Acked-by: Ian Jackson --- tools/tests/Makefile | 1 + tools/tests/resource/.gitignore | 1 + tools/tests/resource/Makefile | 40 ++++++++++ tools/tests/resource/test-resource.c | 151 +++++++++++++++++++++++++++++++++++ 4 files changed, 193 insertions(+) diff --git a/tools/tests/Makefile b/tools/tests/Makefile index fc9b715951..8746aabe6b 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -2,6 +2,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := +SUBDIRS-y += resource SUBDIRS-$(CONFIG_X86) += cpu-policy SUBDIRS-$(CONFIG_X86) += mce-test ifneq ($(clang),y) diff --git a/tools/tests/resource/.gitignore b/tools/tests/resource/.gitignore new file mode 100644 index 0000000000..4872e97d4b --- /dev/null +++ b/tools/tests/resource/.gitignore @@ -0,0 +1 @@ +test-resource diff --git a/tools/tests/resource/Makefile b/tools/tests/resource/Makefile new file mode 100644 index 0000000000..4bef482966 --- /dev/null +++ b/tools/tests/resource/Makefile @@ -0,0 +1,40 @@ +XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +TARGET := test-resource + +.PHONY: all +all: $(TARGET) + +.PHONY: run +run: $(TARGET) + ./$(TARGET) + +.PHONY: clean +clean: + $(RM) -f -- *.o $(TARGET) $(DEPS_RM) + +.PHONY: distclean +distclean: clean + $(RM) -f -- *~ + +.PHONY: install +install: all + +.PHONY: uninstall +uninstall: + +CFLAGS += -Werror +CFLAGS += $(CFLAGS_xeninclude) +CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_libxenforeginmemory) +CFLAGS += $(APPEND_CFLAGS) + +LDFLAGS += $(LDLIBS_libxenctrl) +LDFLAGS += $(LDLIBS_libxenforeignmemory) +LDFLAGS += $(APPEND_LDFLAGS) + +test-resource: test-resource.o + $(CC) -o $@ $< $(LDFLAGS) + +-include $(DEPS_INCLUDE) diff --git a/tools/tests/resource/test-resource.c b/tools/tests/resource/test-resource.c new file mode 100644 index 0000000000..a409a82f44 --- /dev/null +++ b/tools/tests/resource/test-resource.c @@ -0,0 +1,151 @@ +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +static unsigned int nr_failures; +#define fail(fmt, ...) \ +({ \ + nr_failures++; \ + (void)printf(fmt, ##__VA_ARGS__); \ +}) + +static xc_interface *xch; +static xenforeignmemory_handle *fh; + +static void test_gnttab(uint32_t domid, unsigned int nr_frames) +{ + xenforeignmemory_resource_handle *res; + void *addr = NULL; + size_t size; + int rc; + + printf(" Test grant table\n"); + + /* Obtain the grant table resource size. */ + rc = xenforeignmemory_resource_size( + fh, domid, XENMEM_resource_grant_table, + XENMEM_resource_grant_table_id_shared, &size); + + /* + * A failure of this call indicates missing kernel support for size + * ioctl(), or missing Xen acquire_resource support. + */ + if ( rc ) + return fail(" Fail: Get size: %d - %s\n", errno, strerror(errno)); + + /* + * Getting 32 frames back instead of nr_frames indicates Xen is missing + * the bugfix to make size requests actually return real data. + */ + if ( (size >> XC_PAGE_SHIFT) != nr_frames ) + return fail(" Fail: Get size: expected %u frames, got %zu\n", + nr_frames, size >> XC_PAGE_SHIFT); + + /* Map the entire grant table. */ + res = xenforeignmemory_map_resource( + fh, domid, XENMEM_resource_grant_table, + XENMEM_resource_grant_table_id_shared, 0, size >> XC_PAGE_SHIFT, + &addr, PROT_READ | PROT_WRITE, 0); + + /* + * Failure here with E2BIG indicates Xen is missing the bugfix to map + * resources larger than 32 frames. + */ + if ( !res ) + return fail(" Fail: Map %d - %s\n", errno, strerror(errno)); + + rc = xenforeignmemory_unmap_resource(fh, res); + if ( rc ) + return fail(" Fail: Unmap %d - %s\n", errno, strerror(errno)); +} + +static void test_domain_configurations(void) +{ + static struct test { + const char *name; + struct xen_domctl_createdomain create; + } tests[] = { +#if defined(__x86_64__) || defined(__i386__) + { + .name = "x86 PV", + .create = { + .max_vcpus = 2, + .max_grant_frames = 40, + }, + }, + { + .name = "x86 PVH", + .create = { + .flags = XEN_DOMCTL_CDF_hvm, + .max_vcpus = 2, + .max_grant_frames = 40, + .arch = { + .emulation_flags = XEN_X86_EMU_LAPIC, + }, + }, + }, +#elif defined(__aarch64__) || defined(__arm__) + { + .name = "ARM", + .create = { + .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, + .max_vcpus = 2, + .max_grant_frames = 40, + }, + }, +#endif + }; + + for ( unsigned int i = 0; i < ARRAY_SIZE(tests); ++i ) + { + struct test *t = &tests[i]; + uint32_t domid = 0; + int rc; + + printf("Test %s\n", t->name); + + rc = xc_domain_create(xch, &domid, &t->create); + if ( rc ) + { + if ( errno == EINVAL || errno == EOPNOTSUPP ) + printf(" Skip: %d - %s\n", errno, strerror(errno)); + else + fail(" Domain create failure: %d - %s\n", + errno, strerror(errno)); + continue; + } + + printf(" Created d%u\n", domid); + + test_gnttab(domid, t->create.max_grant_frames); + + rc = xc_domain_destroy(xch, domid); + if ( rc ) + fail(" Failed to destroy domain: %d - %s\n", + errno, strerror(errno)); + } +} + +int main(int argc, char **argv) +{ + printf("XENMEM_acquire_resource tests\n"); + + xch = xc_interface_open(NULL, NULL, 0); + fh = xenforeignmemory_open(NULL, 0); + + if ( !xch ) + err(1, "xc_interface_open"); + if ( !fh ) + err(1, "xenforeignmemory_open"); + + test_domain_configurations(); + + return !!nr_failures; +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 07:55:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 07:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81531.150777 (Exim 4.92) (envelope-from ) id 1l7vxK-0006zM-CW; Fri, 05 Feb 2021 07:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81531.150777; Fri, 05 Feb 2021 07: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 1l7vxK-0006zE-9h; Fri, 05 Feb 2021 07:55:06 +0000 Received: by outflank-mailman (input) for mailman id 81531; Fri, 05 Feb 2021 07:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7vxI-0006z9-NO for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 07:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7vxI-0000aj-KV for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 07:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7vxI-000274-Ho for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 07: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=H8s4mCoZUeLTMSXdUTjhNFadnGBFNhGqlOQj5PMVi+w=; b=NIJdyMbxk52VEnrNCSPRsR0Y5n dpFhpTBcCw+G1LcjPIFcEGtCOvaZgqOduRcxlJj4RNjuKBkVqsSQH/O+9gai5QbR04uzmh5immwuR 1yg2qkSBbXRBuVWe0VBcDPzC3z776XfQGqXvu98VVWvnv/e65B6L0gXGqhhRf9Poagms=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.12] x86/msr: fix handling of MSR_IA32_PERF_{STATUS/CTL} (again, part 2) Message-Id: Date: Fri, 05 Feb 2021 07:55:04 +0000 commit 8d26cdd3b66ab86d560dacd763d76ff3da95723e Author: Jan Beulich AuthorDate: Fri Feb 5 08:52:54 2021 +0100 Commit: Jan Beulich CommitDate: Fri Feb 5 08:52:54 2021 +0100 x86/msr: fix handling of MSR_IA32_PERF_{STATUS/CTL} (again, part 2) X86_VENDOR_* aren't bit masks in the older trees. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/msr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index aefe0cbb4b..f53a186f6c 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -441,7 +441,8 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) * a cpufreq controller dom0 which has full access. */ case MSR_IA32_PERF_CTL: - if ( !(cp->x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_CENTAUR)) ) + if ( cp->x86_vendor != X86_VENDOR_INTEL && + cp->x86_vendor != X86_VENDOR_CENTAUR ) goto gp_fault; if ( likely(!is_cpufreq_controller(d)) || wrmsr_safe(msr, val) == 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 07:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 07:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81532.150781 (Exim 4.92) (envelope-from ) id 1l7vxU-000705-EN; Fri, 05 Feb 2021 07:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81532.150781; Fri, 05 Feb 2021 07: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 1l7vxU-0006zv-BD; Fri, 05 Feb 2021 07:55:16 +0000 Received: by outflank-mailman (input) for mailman id 81532; Fri, 05 Feb 2021 07:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7vxT-0006zo-7C for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 07:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7vxT-0000aq-5T for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 07:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7vxT-00027y-40 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 07: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=rjPM7W9JMFTPYKCiLjENYxEUCuFVhQr2UVG7CgwuFRE=; b=TCr+G8XPiVD255JCSblv6h1Grv xsQhhJjdnNnFXvxncp2LC4DR+v9Z6Ut/WARb4DFYxlsfQYUUs65GiKmseXTofyOCCUF9ufY+Y+67q hcegpBkiISTa3kFK/wVYpedPypmw7YiWwwD2D5des0OVWT0XAOB7ZGhryQi/d88N32Ec=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.11] x86/msr: fix handling of MSR_IA32_PERF_{STATUS/CTL} (again, part 2) Message-Id: Date: Fri, 05 Feb 2021 07:55:15 +0000 commit 1c7d984645f9ade9b47e862b5880734ad498fea8 Author: Jan Beulich AuthorDate: Fri Feb 5 08:54:03 2021 +0100 Commit: Jan Beulich CommitDate: Fri Feb 5 08:54:03 2021 +0100 x86/msr: fix handling of MSR_IA32_PERF_{STATUS/CTL} (again, part 2) X86_VENDOR_* aren't bit masks in the older trees. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/msr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 1afb80427c..c028fbdcf4 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -393,7 +393,8 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) * a cpufreq controller dom0 which has full access. */ case MSR_IA32_PERF_CTL: - if ( !(cp->x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_CENTAUR)) ) + if ( cp->x86_vendor != X86_VENDOR_INTEL && + cp->x86_vendor != X86_VENDOR_CENTAUR ) goto gp_fault; if ( likely(!is_cpufreq_controller(d)) || wrmsr_safe(msr, val) == 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.11 From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 08:44:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 08:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81545.150796 (Exim 4.92) (envelope-from ) id 1l7wih-0004M2-76; Fri, 05 Feb 2021 08:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81545.150796; Fri, 05 Feb 2021 08: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 1l7wih-0004Lx-4F; Fri, 05 Feb 2021 08:44:03 +0000 Received: by outflank-mailman (input) for mailman id 81545; Fri, 05 Feb 2021 08:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7wif-0004L7-U3 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 08:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7wif-0001ub-RH for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 08:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7wif-0005OM-QF for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 08: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=QQjjqCWF9Ppob6R8sSO3eLScvHqPHmdpTcHK0Nq+DGY=; b=v66ahRjxzMsnSuPi132CAZdiVA ZiJ/Izp1uE3BTkHvQoLMU/Y06IGLQ1TWGIYXD5Gd7zQy2OY4arGt/uC3OVZu8dPw3RCMlsb+YO0na bxFj55KtRji0e6ww2R0GKVicef1M8ksFeqLjS8816bk/nX0fBMWF9hOBVRShs3M+OUKk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/foreignmem: Drop useless and/or misleading logging Message-Id: Date: Fri, 05 Feb 2021 08:44:01 +0000 commit 9351e1468d67ee79fbc6411b087c67ac34813891 Author: Andrew Cooper AuthorDate: Wed Feb 3 15:41:55 2021 +0000 Commit: Andrew Cooper CommitDate: Wed Feb 3 19:25:15 2021 +0000 libs/foreignmem: Drop useless and/or misleading logging These log lines are all in response to single system calls, and do not provide any information which the immediate caller can't determine themselves. It is however rude to put junk like this onto stderr, especially as system call failures are not even error conditions in certain circumstances. The FreeBSD logging has stale function names in, and Solaris shouldn't have passed code review to start with. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/libs/foreignmemory/freebsd.c | 7 ++----- tools/libs/foreignmemory/linux.c | 6 +----- tools/libs/foreignmemory/netbsd.c | 2 -- tools/libs/foreignmemory/solaris.c | 2 +- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/tools/libs/foreignmemory/freebsd.c b/tools/libs/foreignmemory/freebsd.c index 9a2796f0b7..04bfa806b0 100644 --- a/tools/libs/foreignmemory/freebsd.c +++ b/tools/libs/foreignmemory/freebsd.c @@ -65,10 +65,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, addr = mmap(addr, num << PAGE_SHIFT, prot, flags | MAP_SHARED, fd, 0); if ( addr == MAP_FAILED ) - { - PERROR("xc_map_foreign_bulk: mmap failed"); return NULL; - } ioctlx.num = num; ioctlx.dom = dom; @@ -80,7 +77,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, if ( rc < 0 ) { int saved_errno = errno; - PERROR("xc_map_foreign_bulk: ioctl failed"); + (void)munmap(addr, num << PAGE_SHIFT); errno = saved_errno; return NULL; @@ -137,7 +134,7 @@ int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem, int saved_errno; if ( errno != ENOSYS ) - PERROR("mmap resource ioctl failed"); + ; else errno = EOPNOTSUPP; diff --git a/tools/libs/foreignmemory/linux.c b/tools/libs/foreignmemory/linux.c index d0eead1196..050b9ed3a5 100644 --- a/tools/libs/foreignmemory/linux.c +++ b/tools/libs/foreignmemory/linux.c @@ -171,10 +171,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, addr = mmap(addr, num << PAGE_SHIFT, prot, flags | MAP_SHARED, fd, 0); if ( addr == MAP_FAILED ) - { - PERROR("mmap failed"); return NULL; - } ioctlx.num = num; ioctlx.dom = dom; @@ -273,7 +270,6 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, { int saved_errno = errno; - PERROR("ioctl failed"); (void)munmap(addr, num << PAGE_SHIFT); errno = saved_errno; return NULL; @@ -330,7 +326,7 @@ int osdep_xenforeignmemory_map_resource( int saved_errno; if ( errno != fmem->unimpl_errno && errno != EOPNOTSUPP ) - PERROR("ioctl failed"); + ; else errno = EOPNOTSUPP; diff --git a/tools/libs/foreignmemory/netbsd.c b/tools/libs/foreignmemory/netbsd.c index 4ae60aafdd..565682e064 100644 --- a/tools/libs/foreignmemory/netbsd.c +++ b/tools/libs/foreignmemory/netbsd.c @@ -147,8 +147,6 @@ int osdep_xenforeignmemory_map_resource( rc = ioctl(fmem->fd, IOCTL_PRIVCMD_MMAP_RESOURCE, &mr); if ( rc ) { - PERROR("ioctl failed"); - if ( fres->addr ) { int saved_errno = errno; diff --git a/tools/libs/foreignmemory/solaris.c b/tools/libs/foreignmemory/solaris.c index ee8aae4fbd..958fb01f6d 100644 --- a/tools/libs/foreignmemory/solaris.c +++ b/tools/libs/foreignmemory/solaris.c @@ -83,7 +83,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, if ( ioctl(fd, IOCTL_PRIVCMD_MMAPBATCH, &ioctlx) < 0 ) { int saved_errno = errno; - PERROR("XXXXXXXX"); + (void)munmap(addr, num*XC_PAGE_SIZE); errno = saved_errno; return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 08:44:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 08:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81548.150816 (Exim 4.92) (envelope-from ) id 1l7wir-0004QJ-J3; Fri, 05 Feb 2021 08:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81548.150816; Fri, 05 Feb 2021 08: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 1l7wir-0004QD-G5; Fri, 05 Feb 2021 08:44:13 +0000 Received: by outflank-mailman (input) for mailman id 81548; Fri, 05 Feb 2021 08:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7wip-0004Po-WF for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 08:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7wip-0001uk-V2 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 08:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l7wip-0005PJ-TN for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 08:44:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=C0Qxl9cjOJCN8YAAkXMLgkN7MNeqzUu3nzxqb/59S+g=; b=Hm1OAHzXPMm++XOjEH+a0ujJEn 5YNFEUODT0jO/9lTNbG9I2UjmpYU/3GNWxvD1xbM6ynVWpcJgCvl6LuqitWQIBGQRBKYvcmERqcVR jLpwJmkxd0MSMo5c58du9klwZbw1MjNtBpvNQ4U7X571xq7Q0uVuWzjz8tGhMPHchnl8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/foreignmem: Fix/simplify errno handling for map_resource Message-Id: Date: Fri, 05 Feb 2021 08:44:11 +0000 commit d203dbd69f1a02577dd6fe571d72beb980c548a6 Author: Andrew Cooper AuthorDate: Wed Feb 3 15:43:35 2021 +0000 Commit: Andrew Cooper CommitDate: Wed Feb 3 19:25:35 2021 +0000 libs/foreignmem: Fix/simplify errno handling for map_resource Simplify the FreeBSD and Linux logic, left in this state by the previous change. No functional change. Duplicate the FreeBSD logic for NetBSD, to maintain the uniform ABI for callers that EOPNOTSUPP covers all Xen/Kernel support. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/libs/foreignmemory/freebsd.c | 4 +--- tools/libs/foreignmemory/linux.c | 4 +--- tools/libs/foreignmemory/netbsd.c | 3 +++ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/libs/foreignmemory/freebsd.c b/tools/libs/foreignmemory/freebsd.c index 04bfa806b0..d94ea07862 100644 --- a/tools/libs/foreignmemory/freebsd.c +++ b/tools/libs/foreignmemory/freebsd.c @@ -133,9 +133,7 @@ int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem, { int saved_errno; - if ( errno != ENOSYS ) - ; - else + if ( errno == ENOSYS ) errno = EOPNOTSUPP; if ( fres->addr ) diff --git a/tools/libs/foreignmemory/linux.c b/tools/libs/foreignmemory/linux.c index 050b9ed3a5..c1f35e2db7 100644 --- a/tools/libs/foreignmemory/linux.c +++ b/tools/libs/foreignmemory/linux.c @@ -325,9 +325,7 @@ int osdep_xenforeignmemory_map_resource( { int saved_errno; - if ( errno != fmem->unimpl_errno && errno != EOPNOTSUPP ) - ; - else + if ( errno == fmem->unimpl_errno ) errno = EOPNOTSUPP; if ( fres->addr ) diff --git a/tools/libs/foreignmemory/netbsd.c b/tools/libs/foreignmemory/netbsd.c index 565682e064..c0b1b8f79d 100644 --- a/tools/libs/foreignmemory/netbsd.c +++ b/tools/libs/foreignmemory/netbsd.c @@ -147,6 +147,9 @@ int osdep_xenforeignmemory_map_resource( rc = ioctl(fmem->fd, IOCTL_PRIVCMD_MMAP_RESOURCE, &mr); if ( rc ) { + if ( errno == ENOSYS ) + errno = EOPNOTSUPP; + if ( fres->addr ) { int saved_errno = errno; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 12:55:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 12:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81693.151041 (Exim 4.92) (envelope-from ) id 1l80dd-0006m0-PU; Fri, 05 Feb 2021 12:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81693.151041; Fri, 05 Feb 2021 12:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l80dd-0006ls-Mc; Fri, 05 Feb 2021 12:55:05 +0000 Received: by outflank-mailman (input) for mailman id 81693; Fri, 05 Feb 2021 12:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l80dc-0006ln-Hn for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 12:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l80dc-00069k-EK for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 12:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l80dc-0007Z2-BM for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 12:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Gadyt5urkc2Tv0EVTyuVgqOlNLpbzWWa0OWPR3jurg0=; b=nt6L3f0HhwNgNzW/+LoFQZ2vEE FkaCuH5DrHSNn1m10beQTb4jAMKje9zIEp4/hoTP6N0Y94KOZ1AQZ+yCmMknvXZ2K0HtWpqBqjL5a wThIb9Dqy1Lmva/t6+vjhXBZ7VS0abrXWe+3kk0zm4jI9GBzcsQ/F82EL1UdZ0RjjFwk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests: fix resource test build on FreeBSD Message-Id: Date: Fri, 05 Feb 2021 12:55:04 +0000 commit d7acc47c8201611fda98ce5bd465626478ca4759 Author: Roger Pau Monne AuthorDate: Fri Feb 5 13:19:38 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Feb 5 12:52:19 2021 +0000 tools/tests: fix resource test build on FreeBSD error.h is not a standard header, and none of the functions declared there are actually used by the code. This fixes the build on FreeBSD that doesn't have error.h Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- tools/tests/resource/test-resource.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/tests/resource/test-resource.c b/tools/tests/resource/test-resource.c index a409a82f44..1caaa60e62 100644 --- a/tools/tests/resource/test-resource.c +++ b/tools/tests/resource/test-resource.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 13:11:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 13:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81712.151070 (Exim 4.92) (envelope-from ) id 1l80t8-0000ZK-FY; Fri, 05 Feb 2021 13:11:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81712.151070; Fri, 05 Feb 2021 13: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 1l80t8-0000ZC-CZ; Fri, 05 Feb 2021 13:11:06 +0000 Received: by outflank-mailman (input) for mailman id 81712; Fri, 05 Feb 2021 13:11:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l80t7-0000Z7-45 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 13:11:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l80t6-0006TT-Vu for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 13:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l80t6-0000Nx-UD for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 13: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=tlo4v3Qkk3nsITwjFpTpLtwbaaY21AY+YXJLDDtQm4Q=; b=tnuwSRbxzim01Ek/QxoBSQa6Q0 tvr53ff17dEYjF+vflUrFv6Uzp+8ebHese5dolVdi/5XMz6pcgDu7t90A6hqPbGzq5haE/QwDXXi6 tFNY6XvUArW8QULGDCkBocYlRepoDDvPCcYEjHuY+CMc2uf/iX7uPvj+kVu5aTLsGaRI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/EFI: work around GNU ld 2.36 issue Message-Id: Date: Fri, 05 Feb 2021 13:11:04 +0000 commit f4318db940c39cc656128fcf72df3e79d2e55bc1 Author: Jan Beulich AuthorDate: Fri Feb 5 14:09:42 2021 +0100 Commit: Jan Beulich CommitDate: Fri Feb 5 14:09:42 2021 +0100 x86/EFI: work around GNU ld 2.36 issue Our linker capability check fails with the recent binutils release's ld: .../check.o:(.debug_aranges+0x6): relocation truncated to fit: R_X86_64_32 against `.debug_info' .../check.o:(.debug_info+0x6): relocation truncated to fit: R_X86_64_32 against `.debug_abbrev' .../check.o:(.debug_info+0xc): relocation truncated to fit: R_X86_64_32 against `.debug_str'+76 .../check.o:(.debug_info+0x11): relocation truncated to fit: R_X86_64_32 against `.debug_str'+d .../check.o:(.debug_info+0x15): relocation truncated to fit: R_X86_64_32 against `.debug_str'+2b .../check.o:(.debug_info+0x29): relocation truncated to fit: R_X86_64_32 against `.debug_line' .../check.o:(.debug_info+0x30): relocation truncated to fit: R_X86_64_32 against `.debug_str'+19 .../check.o:(.debug_info+0x37): relocation truncated to fit: R_X86_64_32 against `.debug_str'+71 .../check.o:(.debug_info+0x3e): relocation truncated to fit: R_X86_64_32 against `.debug_str' .../check.o:(.debug_info+0x45): relocation truncated to fit: R_X86_64_32 against `.debug_str'+5e .../check.o:(.debug_info+0x4c): additional relocation overflows omitted from the output Tell the linker to strip debug info as a workaround. Debug info has been getting stripped already anyway when linking the actual xen.efi. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 3a9b7e7b2e..dff597f30c 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -123,7 +123,7 @@ ifneq ($(efi-y),) # Check if the compiler supports the MS ABI. export XEN_BUILD_EFI := $(shell $(CC) $(XEN_CFLAGS) -c efi/check.c -o efi/check.o 2>/dev/null && echo y) # Check if the linker supports PE. -XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y)) +XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) -mi386pep --subsystem=10 -S -o efi/check.efi efi/check.o 2>/dev/null && echo y)) CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 19:11:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 19:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81895.151446 (Exim 4.92) (envelope-from ) id 1l86VW-0007Gh-HW; Fri, 05 Feb 2021 19:11:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81895.151446; Fri, 05 Feb 2021 19:11:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86VW-0007GY-EG; Fri, 05 Feb 2021 19:11:06 +0000 Received: by outflank-mailman (input) for mailman id 81895; Fri, 05 Feb 2021 19:11:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86VV-0007GT-GE for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:11:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86VV-0004dM-D8 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:11:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l86VV-00067E-BB for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19: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=0Dvs/JZOvgKXZLpgT8u1PEaB1JFc40vOrXOYr24z35o=; b=xW9Tv1XTBVMlLr+Wiyrchle8sj 5Gqo214tcoq5ZlNbDHebJ4vPcRvXmUt7g74sJXErzWQ4bI7X1ybS+F9B7qOtvRZ9rZFSQcQEEJabq YaXvKS9ldYEcbkoWTYt+MwQrUvpvAXtng0GdT3uHsEErT+9fsgVP1coPiypLzHcJZmEc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/memory: Fix mapping grant tables with XENMEM_acquire_resource Message-Id: Date: Fri, 05 Feb 2021 19:11:05 +0000 commit 34cc2e5f8dba6906da82fe8d76e839f9ab20f153 Author: Andrew Cooper AuthorDate: Mon Jul 27 17:24:11 2020 +0100 Commit: Andrew Cooper CommitDate: Fri Feb 5 17:37:27 2021 +0000 xen/memory: Fix mapping grant tables with XENMEM_acquire_resource A guest's default number of grant frames is 64, and XENMEM_acquire_resource will reject an attempt to map more than 32 frames. This limit is caused by the size of mfn_list[] on the stack. Fix mapping of arbitrary size requests by looping over batches of 32 in acquire_resource(), and using hypercall continuations when necessary. To start with, break _acquire_resource() out of acquire_resource() to cope with type-specific dispatching, and update the return semantics to indicate the number of mfns returned. Update gnttab_acquire_resource() and x86's arch_acquire_resource() to match these new semantics. Have do_memory_op() pass start_extent into acquire_resource() so it can pick up where it left off after a continuation, and loop over batches of 32 until all the work is done, or a continuation needs to occur. compat_memory_op() is a bit more complicated, because it also has to marshal frame_list in the XLAT buffer. Have it account for continuation information itself and hide details from the upper layer, so it can marshal the buffer in chunks if necessary. With these fixes in place, it is now possible to map the whole grant table for a guest. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Release-Acked-by: Ian Jackson --- xen/common/compat/memory.c | 114 +++++++++++++++++++++++++++++++++-------- xen/common/grant_table.c | 3 ++ xen/common/memory.c | 124 +++++++++++++++++++++++++++++++++------------ 3 files changed, 187 insertions(+), 54 deletions(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 834c5e19d1..c43fa97cf1 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -402,23 +402,10 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) case XENMEM_acquire_resource: { xen_pfn_t *xen_frame_list = NULL; - unsigned int max_nr_frames; if ( copy_from_guest(&cmp.mar, compat, 1) ) return -EFAULT; - /* - * The number of frames handled is currently limited to a - * small number by the underlying implementation, so the - * scratch space should be sufficient for bouncing the - * frame addresses. - */ - max_nr_frames = (COMPAT_ARG_XLAT_SIZE - sizeof(*nat.mar)) / - sizeof(*xen_frame_list); - - if ( cmp.mar.nr_frames > max_nr_frames ) - return -E2BIG; - /* Marshal the frame list in the remainder of the xlat space. */ if ( !compat_handle_is_null(cmp.mar.frame_list) ) xen_frame_list = (xen_pfn_t *)(nat.mar + 1); @@ -432,6 +419,28 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) if ( xen_frame_list && cmp.mar.nr_frames ) { + unsigned int xlat_max_frames = + (COMPAT_ARG_XLAT_SIZE - sizeof(*nat.mar)) / + sizeof(*xen_frame_list); + + if ( start_extent >= cmp.mar.nr_frames ) + return -EINVAL; + + /* + * Adjust nat to account for work done on previous + * continuations, leaving cmp pristine. Hide the continaution + * from the native code to prevent double accounting. + */ + nat.mar->nr_frames -= start_extent; + nat.mar->frame += start_extent; + cmd &= MEMOP_CMD_MASK; + + /* + * If there are two many frames to fit within the xlat buffer, + * we'll need to loop to marshal them all. + */ + nat.mar->nr_frames = min(nat.mar->nr_frames, xlat_max_frames); + /* * frame_list is an input for translated guests, and an output * for untranslated guests. Only copy in for translated guests. @@ -444,14 +453,14 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) cmp.mar.nr_frames) || __copy_from_compat_offset( compat_frame_list, cmp.mar.frame_list, - 0, cmp.mar.nr_frames) ) + start_extent, nat.mar->nr_frames) ) return -EFAULT; /* * Iterate backwards over compat_frame_list[] expanding * compat_pfn_t to xen_pfn_t in place. */ - for ( int x = cmp.mar.nr_frames - 1; x >= 0; --x ) + for ( int x = nat.mar->nr_frames - 1; x >= 0; --x ) xen_frame_list[x] = compat_frame_list[x]; } } @@ -600,9 +609,11 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) case XENMEM_acquire_resource: { DEFINE_XEN_GUEST_HANDLE(compat_mem_acquire_resource_t); + unsigned int done; if ( compat_handle_is_null(cmp.mar.frame_list) ) { + ASSERT(split == 0 && rc == 0); if ( __copy_field_to_guest( guest_handle_cast(compat, compat_mem_acquire_resource_t), @@ -611,6 +622,21 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) break; } + if ( split < 0 ) + { + /* Continuation occurred. */ + ASSERT(rc != XENMEM_acquire_resource); + done = cmd >> MEMOP_EXTENT_SHIFT; + } + else + { + /* No continuation. */ + ASSERT(rc == 0); + done = nat.mar->nr_frames; + } + + ASSERT(done <= nat.mar->nr_frames); + /* * frame_list is an input for translated guests, and an output for * untranslated guests. Only copy out for untranslated guests. @@ -626,21 +652,67 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) */ BUILD_BUG_ON(sizeof(compat_pfn_t) > sizeof(xen_pfn_t)); - for ( i = 0; i < cmp.mar.nr_frames; i++ ) + rc = 0; + for ( i = 0; i < done; i++ ) { compat_pfn_t frame = xen_frame_list[i]; if ( frame != xen_frame_list[i] ) - return -ERANGE; + { + rc = -ERANGE; + break; + } compat_frame_list[i] = frame; } - if ( __copy_to_compat_offset(cmp.mar.frame_list, 0, - compat_frame_list, - cmp.mar.nr_frames) ) - return -EFAULT; + if ( !rc && __copy_to_compat_offset( + cmp.mar.frame_list, start_extent, + compat_frame_list, done) ) + rc = -EFAULT; + + if ( rc ) + { + if ( split < 0 ) + { + gdprintk(XENLOG_ERR, + "Cannot cancel continuation: %ld\n", rc); + domain_crash(current->domain); + } + return rc; + } + } + + start_extent += done; + + /* Completely done. */ + if ( start_extent == cmp.mar.nr_frames ) + break; + + /* + * Done a "full" batch, but we were limited by space in the xlat + * area. Go around the loop again without necesserily returning + * to guest context. + */ + if ( done == nat.mar->nr_frames ) + { + split = 1; + break; } + + /* Explicit continuation request from a higher level. */ + if ( done < nat.mar->nr_frames ) + return hypercall_create_continuation( + __HYPERVISOR_memory_op, "ih", + op | (start_extent << MEMOP_EXTENT_SHIFT), compat); + + /* + * Well... Somethings gone wrong with the two levels of chunking. + * My condolences to whomever next has to debug this mess. + */ + ASSERT_UNREACHABLE(); + domain_crash(current->domain); + split = 0; break; } diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 280b7969b6..b95403695f 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -4053,6 +4053,9 @@ int gnttab_acquire_resource( for ( i = 0; i < nr_frames; ++i ) mfn_list[i] = virt_to_mfn(vaddrs[frame + i]); + /* Success. Passed nr_frames back to the caller. */ + rc = nr_frames; + out: grant_write_unlock(gt); diff --git a/xen/common/memory.c b/xen/common/memory.c index f23b001fd2..7b012ce291 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -1129,23 +1129,41 @@ static int acquire_ioreq_server(struct domain *d, mfn_list[i] = mfn_x(mfn); } - return 0; + /* Success. Passed nr_frames back to the caller. */ + return nr_frames; #else return -EOPNOTSUPP; #endif } +/* + * Returns -errno on error, or positive in the range [1, nr_frames] on + * success. Returning less than nr_frames contitutes a request for a + * continuation. Callers can depend on frame + nr_frames not overflowing. + */ +static int _acquire_resource( + struct domain *d, unsigned int type, unsigned int id, unsigned int frame, + unsigned int nr_frames, xen_pfn_t mfn_list[]) +{ + switch ( type ) + { + case XENMEM_resource_grant_table: + return gnttab_acquire_resource(d, id, frame, nr_frames, mfn_list); + + case XENMEM_resource_ioreq_server: + return acquire_ioreq_server(d, id, frame, nr_frames, mfn_list); + + default: + return -EOPNOTSUPP; + } +} + static int acquire_resource( - XEN_GUEST_HANDLE_PARAM(xen_mem_acquire_resource_t) arg) + XEN_GUEST_HANDLE_PARAM(xen_mem_acquire_resource_t) arg, + unsigned long start_extent) { struct domain *d, *currd = current->domain; xen_mem_acquire_resource_t xmar; - /* - * The mfn_list and gfn_list (below) arrays are ok on stack for the - * moment since they are small, but if they need to grow in future - * use-cases then per-CPU arrays or heap allocations may be required. - */ - xen_pfn_t mfn_list[32]; unsigned int max_frames; int rc; @@ -1158,9 +1176,6 @@ static int acquire_resource( if ( xmar.pad != 0 ) return -EINVAL; - if ( xmar.nr_frames > ARRAY_SIZE(mfn_list) ) - return -E2BIG; - /* * The ABI is rather unfortunate. nr_frames (and therefore the total size * of the resource) is 32bit, while frame (the offset within the resource @@ -1190,7 +1205,7 @@ static int acquire_resource( if ( guest_handle_is_null(xmar.frame_list) ) { - if ( xmar.nr_frames ) + if ( xmar.nr_frames || start_extent ) goto out; xmar.nr_frames = max_frames; @@ -1198,30 +1213,47 @@ static int acquire_resource( goto out; } - do { - switch ( xmar.type ) - { - case XENMEM_resource_grant_table: - rc = gnttab_acquire_resource(d, xmar.id, xmar.frame, xmar.nr_frames, - mfn_list); - break; + /* + * Limiting nr_frames at (UINT_MAX >> MEMOP_EXTENT_SHIFT) isn't ideal. If + * it ever becomes a practical problem, we can switch to mutating + * xmar.{frame,nr_frames,frame_list} in guest memory. + */ + rc = -EINVAL; + if ( start_extent >= xmar.nr_frames || + xmar.nr_frames > (UINT_MAX >> MEMOP_EXTENT_SHIFT) ) + goto out; - case XENMEM_resource_ioreq_server: - rc = acquire_ioreq_server(d, xmar.id, xmar.frame, xmar.nr_frames, - mfn_list); - break; + /* Adjust for work done on previous continuations. */ + xmar.nr_frames -= start_extent; + xmar.frame += start_extent; + guest_handle_add_offset(xmar.frame_list, start_extent); - default: - rc = -EOPNOTSUPP; - break; - } + do { + /* + * Arbitrary size. Not too much stack space, and a reasonable stride + * for continuation checks. + */ + xen_pfn_t mfn_list[32]; + unsigned int todo = MIN(ARRAY_SIZE(mfn_list), xmar.nr_frames), done; - if ( rc ) + rc = _acquire_resource(d, xmar.type, xmar.id, xmar.frame, + todo, mfn_list); + if ( rc < 0 ) + goto out; + + done = rc; + rc = 0; + if ( done == 0 || done > todo ) + { + ASSERT_UNREACHABLE(); + rc = -EINVAL; goto out; + } + /* Adjust guest frame_list appropriately. */ if ( !paging_mode_translate(currd) ) { - if ( copy_to_guest(xmar.frame_list, mfn_list, xmar.nr_frames) ) + if ( copy_to_guest(xmar.frame_list, mfn_list, done) ) rc = -EFAULT; } else @@ -1229,10 +1261,10 @@ static int acquire_resource( xen_pfn_t gfn_list[ARRAY_SIZE(mfn_list)]; unsigned int i; - if ( copy_from_guest(gfn_list, xmar.frame_list, xmar.nr_frames) ) + if ( copy_from_guest(gfn_list, xmar.frame_list, done) ) rc = -EFAULT; - for ( i = 0; !rc && i < xmar.nr_frames; i++ ) + for ( i = 0; !rc && i < done; i++ ) { rc = set_foreign_p2m_entry(currd, d, gfn_list[i], _mfn(mfn_list[i])); @@ -1241,7 +1273,32 @@ static int acquire_resource( rc = -EIO; } } - } while ( 0 ); + + if ( rc ) + goto out; + + xmar.nr_frames -= done; + xmar.frame += done; + guest_handle_add_offset(xmar.frame_list, done); + start_extent += done; + + /* + * Explicit continuation request from _acquire_resource(), or we've + * still got more work to do. + */ + if ( done < todo || + (xmar.nr_frames && hypercall_preempt_check()) ) + { + rc = hypercall_create_continuation( + __HYPERVISOR_memory_op, "lh", + XENMEM_acquire_resource | (start_extent << MEMOP_EXTENT_SHIFT), + arg); + goto out; + } + + } while ( xmar.nr_frames ); + + rc = 0; out: rcu_unlock_domain(d); @@ -1708,7 +1765,8 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENMEM_acquire_resource: rc = acquire_resource( - guest_handle_cast(arg, xen_mem_acquire_resource_t)); + guest_handle_cast(arg, xen_mem_acquire_resource_t), + start_extent); break; default: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 19:11:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 19:11:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81896.151449 (Exim 4.92) (envelope-from ) id 1l86Vg-0007HY-JH; Fri, 05 Feb 2021 19:11:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81896.151449; Fri, 05 Feb 2021 19: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 1l86Vg-0007HP-Ft; Fri, 05 Feb 2021 19:11:16 +0000 Received: by outflank-mailman (input) for mailman id 81896; Fri, 05 Feb 2021 19:11:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86Vf-0007HG-Ju for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:11:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86Vf-0004dZ-Hw for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:11:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l86Vf-00068E-Fi for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19: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=MIRpzo3TeqTvo9maqRkxExu6beDDGXxTPre3U1TJXe0=; b=j2O4k/a1a4fvfOsvngy+cKk4aY t6DNxI/EPCLyMXRuwIrmA+SFIvN1b+ad7M3UZFb4MAr7Koacr5IZ+duwvwitOWIx2yTwHAT9l3WYQ mOhB1wiVVPeHOeEKnEUhjN0NQ2KF1kr2IuHDDqZrLTeL8gYTqW/pj7C/yUVfTlhe0eHs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/domain: Add vmtrace_size domain creation parameter Message-Id: Date: Fri, 05 Feb 2021 19:11:15 +0000 commit 217dd79ee29286b85074d22cc75ee064206fb2af Author: Michał Leszczyński AuthorDate: Fri Jul 3 01:16:10 2020 +0200 Commit: Andrew Cooper CommitDate: Fri Feb 5 17:37:27 2021 +0000 xen/domain: Add vmtrace_size domain creation parameter To use vmtrace, buffers of a suitable size need allocating, and different tasks will want different sizes. Add a domain creation parameter, and audit it appropriately in the {arch_,}sanitise_domain_config() functions. For now, the x86 specific auditing is tuned to Processor Trace running in Single Output mode, which requires a single contiguous range of memory. The size is given an arbitrary limit of 64M which is expected to be enough for anticipated usecases, but not large enough to get into long-running-hypercall problems. Signed-off-by: Michał Leszczyński Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Acked-by: Jan Beulich Release-Acked-by: Ian Jackson --- xen/arch/x86/domain.c | 23 ++++++++++++++ xen/common/domain.c | 77 +++++++++++++++++++++++++++++++++++++++++++++ xen/include/public/domctl.h | 3 ++ xen/include/xen/sched.h | 6 ++++ 4 files changed, 109 insertions(+) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index b9ba04633e..6c7ee25f3b 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -660,6 +660,29 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } + if ( config->vmtrace_size ) + { + unsigned int size = config->vmtrace_size; + + ASSERT(vmtrace_available); /* Checked by common code. */ + + /* + * For now, vmtrace is restricted to HVM guests, and using a + * power-of-2 buffer between 4k and 64M in size. + */ + if ( !hvm ) + { + dprintk(XENLOG_INFO, "vmtrace not supported for PV\n"); + return -EINVAL; + } + + if ( size < PAGE_SIZE || size > MB(64) || (size & (size - 1)) ) + { + dprintk(XENLOG_INFO, "Unsupported vmtrace size: %#x\n", size); + return -EINVAL; + } + } + return 0; } diff --git a/xen/common/domain.c b/xen/common/domain.c index d1e94d88cf..d85984638a 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -132,6 +132,69 @@ static void vcpu_info_reset(struct vcpu *v) v->vcpu_info_mfn = INVALID_MFN; } +static void vmtrace_free_buffer(struct vcpu *v) +{ + const struct domain *d = v->domain; + struct page_info *pg = v->vmtrace.pg; + unsigned int i; + + if ( !pg ) + return; + + v->vmtrace.pg = NULL; + + for ( i = 0; i < (d->vmtrace_size >> PAGE_SHIFT); i++ ) + { + put_page_alloc_ref(&pg[i]); + put_page_and_type(&pg[i]); + } +} + +static int vmtrace_alloc_buffer(struct vcpu *v) +{ + struct domain *d = v->domain; + struct page_info *pg; + unsigned int i; + + if ( !d->vmtrace_size ) + return 0; + + pg = alloc_domheap_pages(d, get_order_from_bytes(d->vmtrace_size), + MEMF_no_refcount); + if ( !pg ) + return -ENOMEM; + + for ( i = 0; i < (d->vmtrace_size >> PAGE_SHIFT); i++ ) + if ( unlikely(!get_page_and_type(&pg[i], d, PGT_writable_page)) ) + /* + * The domain can't possibly know about this page yet, so failure + * here is a clear indication of something fishy going on. + */ + goto refcnt_err; + + /* + * We must only let vmtrace_free_buffer() take any action in the success + * case when we've taken all the refs it intends to drop. + */ + v->vmtrace.pg = pg; + return 0; + + refcnt_err: + /* + * We can theoretically reach this point if someone has taken 2^43 refs on + * the frames in the time the above loop takes to execute, or someone has + * made a blind decrease reservation hypercall and managed to pick the + * right mfn. Free the memory we safely can, and leak the rest. + */ + while ( i-- ) + { + put_page_alloc_ref(&pg[i]); + put_page_and_type(&pg[i]); + } + + return -ENODATA; +} + /* * 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. @@ -140,6 +203,8 @@ static void vcpu_info_reset(struct vcpu *v) */ static int vcpu_teardown(struct vcpu *v) { + vmtrace_free_buffer(v); + return 0; } @@ -201,6 +266,9 @@ struct vcpu *vcpu_create(struct domain *d, unsigned int vcpu_id) if ( sched_init_vcpu(v) != 0 ) goto fail_wq; + if ( vmtrace_alloc_buffer(v) != 0 ) + goto fail_wq; + if ( arch_vcpu_create(v) != 0 ) goto fail_sched; @@ -449,6 +517,12 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config) } } + if ( config->vmtrace_size && !vmtrace_available ) + { + dprintk(XENLOG_INFO, "vmtrace requested but not available\n"); + return -EINVAL; + } + return arch_sanitise_domain_config(config); } @@ -474,7 +548,10 @@ struct domain *domain_create(domid_t domid, ASSERT(is_system_domain(d) ? config == NULL : config != NULL); if ( config ) + { d->options = config->flags; + d->vmtrace_size = config->vmtrace_size; + } /* Sort out our idea of is_control_domain(). */ d->is_privileged = is_priv; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 666aeb71bf..88a5b1ef5d 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -95,6 +95,9 @@ struct xen_domctl_createdomain { int32_t max_grant_frames; int32_t max_maptrack_frames; + /* Per-vCPU buffer size in bytes. 0 to disable. */ + uint32_t vmtrace_size; + struct xen_arch_domainconfig arch; }; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 06dba1a397..bc78a09a53 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -272,6 +272,10 @@ struct vcpu /* vPCI per-vCPU area, used to store data for long running operations. */ struct vpci_vcpu vpci; + struct { + struct page_info *pg; /* One contiguous allocation of d->vmtrace_size */ + } vmtrace; + struct arch_vcpu arch; #ifdef CONFIG_IOREQ_SERVER @@ -547,6 +551,8 @@ struct domain unsigned int guest_request_sync : 1; } monitor; + unsigned int vmtrace_size; /* Buffer size in bytes, or 0 to disable. */ + #ifdef CONFIG_ARGO /* Argo interdomain communication support */ struct argo_domain *argo; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 19:11:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 19:11:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81897.151454 (Exim 4.92) (envelope-from ) id 1l86Vr-0007JH-M0; Fri, 05 Feb 2021 19:11:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81897.151454; Fri, 05 Feb 2021 19: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 1l86Vr-0007J9-Iz; Fri, 05 Feb 2021 19:11:27 +0000 Received: by outflank-mailman (input) for mailman id 81897; Fri, 05 Feb 2021 19:11:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86Vp-0007Iw-Nm for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:11:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86Vp-0004do-My for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:11:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l86Vp-00069L-L0 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19: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=e6MPBtR+9zGYNzwTzO4fOL0ZKpumEVE3y5pFnplVprs=; b=Yv4sem2w0NZORTKJ1dSUfm472P 4Rp9erzEG8I34fzSy7gUUiO1sen6YiI3x5wyh+4CPZB0QkKnWvC2tpmpF+mjRmCOndU1dqDDtua/U Ndl9UMEPDnbFm3lnXUVpgV1cnZ7uNvuig1gp7pyVxIb85hBl3+xWtJSPG9kff0O8qcDU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/[lib]xl: Add vmtrace_buf_size parameter Message-Id: Date: Fri, 05 Feb 2021 19:11:25 +0000 commit 45ba9a7d7688a6a08200e37a8caa2bc99bb4d267 Author: Michał Leszczyński AuthorDate: Fri Jun 19 00:31:24 2020 +0200 Commit: Andrew Cooper CommitDate: Fri Feb 5 17:37:27 2021 +0000 tools/[lib]xl: Add vmtrace_buf_size parameter Allow to specify the size of per-vCPU trace buffer upon domain creation. This is zero by default (meaning: not enabled). Signed-off-by: Michał Leszczyński Signed-off-by: Andrew Cooper Acked-by: Ian Jackson Release-Acked-by: Ian Jackson --- docs/man/xl.cfg.5.pod.in | 9 +++++++++ tools/golang/xenlight/helpers.gen.go | 2 ++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 7 +++++++ tools/libs/light/libxl_create.c | 1 + tools/libs/light/libxl_types.idl | 4 ++++ tools/xl/xl_parse.c | 4 ++++ 7 files changed, 28 insertions(+) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 7cdb8595d3..040374dcd6 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -681,6 +681,15 @@ Windows). If this option is not specified then it will default to B. +=item B + +Specifies the size of vmtrace buffer that would be allocated for each +vCPU belonging to this domain. Disabled (i.e. B) by +default. + +B: Acceptable values are platform specific. For Intel Processor +Trace, this value must be a power of 2 between 4k and 16M. + =back =head2 Devices diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index 63e2876463..4c60d27a9c 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1114,6 +1114,7 @@ return fmt.Errorf("invalid union key '%v'", x.Type)} x.ArchArm.GicVersion = GicVersion(xc.arch_arm.gic_version) x.ArchArm.Vuart = VuartType(xc.arch_arm.vuart) x.Altp2M = Altp2MMode(xc.altp2m) +x.VmtraceBufKb = int(xc.vmtrace_buf_kb) return nil} @@ -1589,6 +1590,7 @@ return fmt.Errorf("invalid union key '%v'", x.Type)} xc.arch_arm.gic_version = C.libxl_gic_version(x.ArchArm.GicVersion) xc.arch_arm.vuart = C.libxl_vuart_type(x.ArchArm.Vuart) xc.altp2m = C.libxl_altp2m_mode(x.Altp2M) +xc.vmtrace_buf_kb = C.int(x.VmtraceBufKb) return nil } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 5851c38057..cb13002fdb 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -514,6 +514,7 @@ GicVersion GicVersion Vuart VuartType } Altp2M Altp2MMode +VmtraceBufKb int } type domainBuildInfoTypeUnion interface { diff --git a/tools/include/libxl.h b/tools/include/libxl.h index f48d0c5e8a..a7b673e89d 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -488,6 +488,13 @@ */ #define LIBXL_HAVE_PHYSINFO_CAP_VMTRACE 1 +/* + * LIBXL_HAVE_VMTRACE_BUF_KB indicates that libxl_domain_create_info has a + * vmtrace_buf_kb parameter, which allows to enable pre-allocation of + * processor tracing buffers of given size. + */ +#define LIBXL_HAVE_VMTRACE_BUF_KB 1 + /* * libxl ABI compatibility * diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 9848d65f36..46f68da697 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -607,6 +607,7 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, .max_evtchn_port = b_info->event_channels, .max_grant_frames = b_info->max_grant_frames, .max_maptrack_frames = b_info->max_maptrack_frames, + .vmtrace_size = ROUNDUP(b_info->vmtrace_buf_kb << 10, XC_PAGE_SHIFT), }; if (info->type != LIBXL_DOMAIN_TYPE_PV) { diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index dacb7df6b7..5b85a7419f 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -648,6 +648,10 @@ libxl_domain_build_info = Struct("domain_build_info",[ # supported by x86 HVM and ARM support is planned. ("altp2m", libxl_altp2m_mode), + # Size of preallocated vmtrace trace buffers (in KBYTES). + # Use zero value to disable this feature. + ("vmtrace_buf_kb", integer), + ], dir=DIR_IN, copy_deprecated_fn="libxl__domain_build_info_copy_deprecated", ) diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 867e4d068a..1893cfc086 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1863,6 +1863,10 @@ void parse_config_data(const char *config_source, } } + if (!xlu_cfg_get_long(config, "vmtrace_buf_kb", &l, 1) && l) { + b_info->vmtrace_buf_kb = l; + } + if (!xlu_cfg_get_list(config, "ioports", &ioports, &num_ioports, 0)) { b_info->num_ioports = num_ioports; b_info->ioports = calloc(num_ioports, sizeof(*b_info->ioports)); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 19:11:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 19:11:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81899.151458 (Exim 4.92) (envelope-from ) id 1l86W1-0007Kd-NR; Fri, 05 Feb 2021 19:11:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81899.151458; Fri, 05 Feb 2021 19: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 1l86W1-0007KV-Kb; Fri, 05 Feb 2021 19:11:37 +0000 Received: by outflank-mailman (input) for mailman id 81899; Fri, 05 Feb 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 1l86Vz-0007KN-RB for xen-changelog@lists.xenproject.org; Fri, 05 Feb 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 1l86Vz-0004eF-QX for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:11:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l86Vz-0006AZ-P9 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19: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=a+9hdsGkkAJJ3GQE6Sci4PclxymDFfhj13XEMEDTIL4=; b=cyEMKlobt89AJFuBGATtI5rHTC 2LiEL1Xe58lJ/4PPGDxv5+Bs/+qEJXoPUvirY5T1bVK6cukDz5hfhRHfXeQwmIJVBlLkRgK5FON6o nLoKYbYghRn/uGKFL8QrkKXyFD7P7JscipRlnjujRGDHGNwkcA7rd7h0ZZ00bPWxIO5c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/memory: Add a vmtrace_buf resource type Message-Id: Date: Fri, 05 Feb 2021 19:11:35 +0000 commit b72eab263592a3d76aa826675e5d62606d83cecd Author: Michał Leszczyński AuthorDate: Mon Jun 29 00:05:51 2020 +0200 Commit: Andrew Cooper CommitDate: Fri Feb 5 17:37:27 2021 +0000 xen/memory: Add a vmtrace_buf resource type Allow to map processor trace buffer using acquire_resource(). Signed-off-by: Michał Leszczyński Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Ian Jackson --- xen/common/memory.c | 29 +++++++++++++++++++++++++++++ xen/include/public/memory.h | 1 + 2 files changed, 30 insertions(+) diff --git a/xen/common/memory.c b/xen/common/memory.c index 7b012ce291..76b9f58478 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -1096,6 +1096,9 @@ static unsigned int resource_max_frames(const struct domain *d, case XENMEM_resource_ioreq_server: return ioreq_server_max_frames(d); + case XENMEM_resource_vmtrace_buf: + return d->vmtrace_size >> PAGE_SHIFT; + default: return -EOPNOTSUPP; } @@ -1136,6 +1139,29 @@ static int acquire_ioreq_server(struct domain *d, #endif } +static int acquire_vmtrace_buf( + struct domain *d, unsigned int id, unsigned int frame, + unsigned int nr_frames, xen_pfn_t mfn_list[]) +{ + const struct vcpu *v = domain_vcpu(d, id); + unsigned int i; + mfn_t mfn; + + if ( !v ) + return -ENOENT; + + if ( !v->vmtrace.pg || + (frame + nr_frames) > (d->vmtrace_size >> PAGE_SHIFT) ) + return -EINVAL; + + mfn = page_to_mfn(v->vmtrace.pg); + + for ( i = 0; i < nr_frames; i++ ) + mfn_list[i] = mfn_x(mfn) + frame + i; + + return nr_frames; +} + /* * Returns -errno on error, or positive in the range [1, nr_frames] on * success. Returning less than nr_frames contitutes a request for a @@ -1153,6 +1179,9 @@ static int _acquire_resource( case XENMEM_resource_ioreq_server: return acquire_ioreq_server(d, id, frame, nr_frames, mfn_list); + case XENMEM_resource_vmtrace_buf: + return acquire_vmtrace_buf(d, id, frame, nr_frames, mfn_list); + default: return -EOPNOTSUPP; } diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index 020c79d757..50e73eef98 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -625,6 +625,7 @@ struct xen_mem_acquire_resource { #define XENMEM_resource_ioreq_server 0 #define XENMEM_resource_grant_table 1 +#define XENMEM_resource_vmtrace_buf 2 /* * IN - a type-specific resource identifier, which must be zero -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 19:11:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 19:11:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81900.151463 (Exim 4.92) (envelope-from ) id 1l86WB-0007MO-PM; Fri, 05 Feb 2021 19:11:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81900.151463; Fri, 05 Feb 2021 19: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 1l86WB-0007MG-M6; Fri, 05 Feb 2021 19:11:47 +0000 Received: by outflank-mailman (input) for mailman id 81900; Fri, 05 Feb 2021 19:11:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86W9-0007M3-W2 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 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 1l86W9-0004eO-VA for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:11:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l86W9-0006BU-T0 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 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=ppHbFLT/ggPrw5/vAdv/xsvmOKyd3Om03NIQ58y/7og=; b=q+/1TUmS2t2Z4X9gUetrr3AShT wOIoODg2HdWaavqZ/3XidD1nOgv5kcyy4wAW0W9QpumY/g33H3YbzTYqIVKThLRBT5VHh+JS7Hzat E+n2AlOIiKeoCPMFTkcSoEZSjO7Xl4FMw9VaXhliW08fVLapWTw67aZ8rWdj+FjpLlmQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vmx: Add Intel Processor Trace support Message-Id: Date: Fri, 05 Feb 2021 19:11:45 +0000 commit 71cb03f03ce309e8cc1dacd18aa383ccea6af231 Author: Michał Leszczyński AuthorDate: Tue Jun 16 15:20:18 2020 +0200 Commit: Andrew Cooper CommitDate: Fri Feb 5 17:37:27 2021 +0000 x86/vmx: Add Intel Processor Trace support Add CPUID/MSR enumeration details for Processor Trace. For now, we will only support its use inside VMX operation. Fill in the vmtrace_available boolean to activate the newly introduced common infrastructure for allocating trace buffers. For now, Processor Trace is going to be operated in Single Output mode behind the guests back. Add the MSRs to struct vcpu_msrs, and set up the buffer limit in vmx_init_ipt() as it is fixed for the lifetime of the domain. Context switch the most of the MSRs in and out of vCPU context, but the main control register needs to reside in the MSR load/save lists. Explicitly pull the msrs pointer out into a local variable, because the optimiser cannot keep it live across the memory clobbers in the MSR accesses. Signed-off-by: Michał Leszczyński Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Ian Jackson --- tools/libs/light/libxl_cpuid.c | 1 + tools/misc/xen-cpuid.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 19 +++++++++++++--- xen/arch/x86/hvm/vmx/vmx.c | 34 ++++++++++++++++++++++++++++- xen/include/asm-x86/cpufeature.h | 1 + xen/include/asm-x86/hvm/vmx/vmcs.h | 4 ++++ xen/include/asm-x86/msr.h | 32 +++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 1 + 8 files changed, 89 insertions(+), 5 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index 259612834e..289c59c742 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -188,6 +188,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"avx512-ifma", 0x00000007, 0, CPUID_REG_EBX, 21, 1}, {"clflushopt", 0x00000007, 0, CPUID_REG_EBX, 23, 1}, {"clwb", 0x00000007, 0, CPUID_REG_EBX, 24, 1}, + {"proc-trace", 0x00000007, 0, CPUID_REG_EBX, 25, 1}, {"avx512pf", 0x00000007, 0, CPUID_REG_EBX, 26, 1}, {"avx512er", 0x00000007, 0, CPUID_REG_EBX, 27, 1}, {"avx512cd", 0x00000007, 0, CPUID_REG_EBX, 28, 1}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index c81aa93055..2d04162d8d 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -106,7 +106,7 @@ static const char *const str_7b0[32] = [18] = "rdseed", [19] = "adx", [20] = "smap", [21] = "avx512-ifma", [22] = "pcommit", [23] = "clflushopt", - [24] = "clwb", [25] = "pt", + [24] = "clwb", [25] = "proc-trace", [26] = "avx512pf", [27] = "avx512er", [28] = "avx512cd", [29] = "sha", [30] = "avx512bw", [31] = "avx512vl", diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 164535f8f0..f9f9bc18cd 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -243,7 +243,7 @@ static bool_t cap_check(const char *name, u32 expected, u32 saw) return saw != expected; } -static int vmx_init_vmcs_config(void) +static int vmx_init_vmcs_config(bool bsp) { u32 vmx_basic_msr_low, vmx_basic_msr_high, min, opt; u32 _vmx_pin_based_exec_control; @@ -291,6 +291,20 @@ static int vmx_init_vmcs_config(void) _vmx_cpu_based_exec_control &= ~(CPU_BASED_CR8_LOAD_EXITING | CPU_BASED_CR8_STORE_EXITING); + rdmsrl(MSR_IA32_VMX_MISC, _vmx_misc_cap); + + /* Check whether IPT is supported in VMX operation. */ + if ( bsp ) + vmtrace_available = cpu_has_proc_trace && + (_vmx_misc_cap & VMX_MISC_PROC_TRACE); + else if ( vmtrace_available && + !(_vmx_misc_cap & VMX_MISC_PROC_TRACE) ) + { + printk("VMX: IPT capabilities differ between CPU%u and BSP\n", + smp_processor_id()); + return -EINVAL; + } + if ( _vmx_cpu_based_exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS ) { min = 0; @@ -305,7 +319,6 @@ static int vmx_init_vmcs_config(void) SECONDARY_EXEC_ENABLE_VIRT_EXCEPTIONS | SECONDARY_EXEC_XSAVES | SECONDARY_EXEC_TSC_SCALING); - rdmsrl(MSR_IA32_VMX_MISC, _vmx_misc_cap); if ( _vmx_misc_cap & VMX_MISC_VMWRITE_ALL ) opt |= SECONDARY_EXEC_ENABLE_VMCS_SHADOWING; if ( opt_vpid_enabled ) @@ -715,7 +728,7 @@ static int _vmx_cpu_up(bool bsp) wrmsr(MSR_IA32_FEATURE_CONTROL, eax, 0); } - if ( (rc = vmx_init_vmcs_config()) != 0 ) + if ( (rc = vmx_init_vmcs_config(bsp)) != 0 ) return rc; INIT_LIST_HEAD(&this_cpu(active_vmcs_list)); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2d4475ee3d..12b961113e 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -428,6 +428,20 @@ static void vmx_domain_relinquish_resources(struct domain *d) vmx_free_vlapic_mapping(d); } +static void vmx_init_ipt(struct vcpu *v) +{ + unsigned int size = v->domain->vmtrace_size; + + if ( !size ) + return; + + /* Checked by domain creation logic. */ + ASSERT(v->vmtrace.pg); + ASSERT(size >= PAGE_SIZE && (size & (size - 1)) == 0); + + v->arch.msrs->rtit.output_limit = size - 1; +} + static int vmx_vcpu_initialise(struct vcpu *v) { int rc; @@ -470,6 +484,7 @@ static int vmx_vcpu_initialise(struct vcpu *v) } vmx_install_vlapic_mapping(v); + vmx_init_ipt(v); return 0; } @@ -508,22 +523,39 @@ static void vmx_restore_host_msrs(void) static void vmx_save_guest_msrs(struct vcpu *v) { + struct vcpu_msrs *msrs = v->arch.msrs; + /* * We cannot cache SHADOW_GS_BASE while the VCPU runs, as it can * be updated at any time via SWAPGS, which we cannot trap. */ v->arch.hvm.vmx.shadow_gs = read_gs_shadow(); + + if ( v->arch.hvm.vmx.ipt_active ) + { + rdmsrl(MSR_RTIT_OUTPUT_MASK, msrs->rtit.output_mask); + rdmsrl(MSR_RTIT_STATUS, msrs->rtit.status); + } } static void vmx_restore_guest_msrs(struct vcpu *v) { + const struct vcpu_msrs *msrs = v->arch.msrs; + write_gs_shadow(v->arch.hvm.vmx.shadow_gs); wrmsrl(MSR_STAR, v->arch.hvm.vmx.star); wrmsrl(MSR_LSTAR, v->arch.hvm.vmx.lstar); wrmsrl(MSR_SYSCALL_MASK, v->arch.hvm.vmx.sfmask); if ( cpu_has_msr_tsc_aux ) - wrmsr_tsc_aux(v->arch.msrs->tsc_aux); + wrmsr_tsc_aux(msrs->tsc_aux); + + if ( v->arch.hvm.vmx.ipt_active ) + { + wrmsrl(MSR_RTIT_OUTPUT_BASE, page_to_maddr(v->vmtrace.pg)); + wrmsrl(MSR_RTIT_OUTPUT_MASK, msrs->rtit.output_mask); + wrmsrl(MSR_RTIT_STATUS, msrs->rtit.status); + } } void vmx_update_cpu_exec_control(struct vcpu *v) diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index f62e526a96..33b2257888 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -105,6 +105,7 @@ #define cpu_has_clwb boot_cpu_has(X86_FEATURE_CLWB) #define cpu_has_avx512er boot_cpu_has(X86_FEATURE_AVX512ER) #define cpu_has_avx512cd boot_cpu_has(X86_FEATURE_AVX512CD) +#define cpu_has_proc_trace boot_cpu_has(X86_FEATURE_PROC_TRACE) #define cpu_has_sha boot_cpu_has(X86_FEATURE_SHA) #define cpu_has_avx512bw boot_cpu_has(X86_FEATURE_AVX512BW) #define cpu_has_avx512vl boot_cpu_has(X86_FEATURE_AVX512VL) diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 906810592f..8073af323b 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -156,6 +156,9 @@ struct vmx_vcpu { /* Do we need to tolerate a spurious EPT_MISCONFIG VM exit? */ bool_t ept_spurious_misconfig; + /* Processor Trace configured and enabled for the vcpu. */ + bool ipt_active; + /* Is the guest in real mode? */ uint8_t vmx_realmode; /* Are we emulating rather than VMENTERing? */ @@ -283,6 +286,7 @@ extern u32 vmx_secondary_exec_control; #define VMX_VPID_INVVPID_SINGLE_CONTEXT_RETAINING_GLOBAL 0x80000000000ULL extern u64 vmx_ept_vpid_cap; +#define VMX_MISC_PROC_TRACE 0x00004000 #define VMX_MISC_CR3_TARGET 0x01ff0000 #define VMX_MISC_VMWRITE_ALL 0x20000000 diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h index 16f95e7344..1d3eca9063 100644 --- a/xen/include/asm-x86/msr.h +++ b/xen/include/asm-x86/msr.h @@ -306,6 +306,38 @@ struct vcpu_msrs }; } misc_features_enables; + /* + * 0x00000560 ... 57x - MSR_RTIT_* + * + * "Real Time Instruction Trace", now called Processor Trace. + * + * These MSRs are not exposed to guests. They are controlled by Xen + * behind the scenes, when vmtrace is enabled for the domain. + * + * MSR_RTIT_OUTPUT_BASE not stored here. It is fixed per vcpu, and + * derived from v->vmtrace.buf. + */ + struct { + /* + * Placed in the MSR load/save lists. Only modified by hypercall in + * the common case. + */ + uint64_t ctl; + + /* + * Updated by hardware in non-root mode. Synchronised here on vcpu + * context switch. + */ + uint64_t status; + union { + uint64_t output_mask; + struct { + uint32_t output_limit; + uint32_t output_offset; + }; + }; + } rtit; + /* 0x00000da0 - MSR_IA32_XSS */ struct { uint64_t raw; diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 6f7efaad6d..a501479820 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -217,6 +217,7 @@ XEN_CPUFEATURE(SMAP, 5*32+20) /*S Supervisor Mode Access Prevention */ XEN_CPUFEATURE(AVX512_IFMA, 5*32+21) /*A AVX-512 Integer Fused Multiply Add */ XEN_CPUFEATURE(CLFLUSHOPT, 5*32+23) /*A CLFLUSHOPT instruction */ XEN_CPUFEATURE(CLWB, 5*32+24) /*A CLWB instruction */ +XEN_CPUFEATURE(PROC_TRACE, 5*32+25) /* Processor Trace */ XEN_CPUFEATURE(AVX512PF, 5*32+26) /*A AVX-512 Prefetch Instructions */ XEN_CPUFEATURE(AVX512ER, 5*32+27) /*A AVX-512 Exponent & Reciprocal Instrs */ XEN_CPUFEATURE(AVX512CD, 5*32+28) /*A AVX-512 Conflict Detection Instrs */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 19:11:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 19:11:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81901.151466 (Exim 4.92) (envelope-from ) id 1l86WL-0007Nc-R5; Fri, 05 Feb 2021 19:11:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81901.151466; Fri, 05 Feb 2021 19: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 1l86WL-0007NU-Ng; Fri, 05 Feb 2021 19:11:57 +0000 Received: by outflank-mailman (input) for mailman id 81901; Fri, 05 Feb 2021 19:11:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86WK-0007NI-3H for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:11:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86WK-0004eW-26 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:11:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l86WK-0006CS-1R for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19: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=E7m+V9o4goMyKSK7j+/XUl9m0ve+W25qLoAqRWyFuQA=; b=P2EPkqjKOeGu7EHzxjcZ28EB44 RrDXHYXtjutuymhCU4luenvduKcIgei9/1ocJFG/9ahB2lcRCLvzNE6qlCqFsK3G6GCA9neaR52dZ J9ErHnZElFvErPWWcMiVUA+20fLSlYsh/wXx/p2pa0NiUCaZqx2Y0eSUsr7gnZp4NZYM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/domctl: Add XEN_DOMCTL_vmtrace_op Message-Id: Date: Fri, 05 Feb 2021 19:11:56 +0000 commit 1cee4bd97c88633c4a39f56f6722be0727c9ea8f Author: Michał Leszczyński AuthorDate: Sun Jun 28 23:48:09 2020 +0200 Commit: Andrew Cooper CommitDate: Fri Feb 5 17:37:28 2021 +0000 xen/domctl: Add XEN_DOMCTL_vmtrace_op Implement an interface to configure and control tracing operations. Reuse the existing SETDEBUGGING flask vector rather than inventing a new one. Userspace using this interface is going to need platform specific knowledge anyway to interpret the contents of the trace buffer. While some operations (e.g. enable/disable) can reasonably be generic, others cannot. Provide an explicitly-platform specific pair of get/set operations to reduce API churn as new options get added/enabled. For the VMX specific Processor Trace implementation, tolerate reading and modifying a safe subset of bits in CTL, STATUS and OUTPUT_MASK. This permits userspace to control the content which gets logged, but prevents modification of details such as the position/size of the output buffer. Signed-off-by: Michał Leszczyński Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Release-Acked-by: Ian Jackson --- xen/arch/x86/domctl.c | 55 +++++++++++++++++ xen/arch/x86/hvm/vmx/vmx.c | 135 ++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/hvm/hvm.h | 63 ++++++++++++++++++++ xen/include/public/domctl.h | 35 +++++++++++ xen/xsm/flask/hooks.c | 1 + 5 files changed, 289 insertions(+) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index b28cfe9817..b464465230 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -155,6 +155,55 @@ void arch_get_domain_info(const struct domain *d, info->arch_config.emulation_flags = d->arch.emulation_flags; } +static int do_vmtrace_op(struct domain *d, struct xen_domctl_vmtrace_op *op, + XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) +{ + struct vcpu *v; + int rc; + + if ( !d->vmtrace_size || d == current->domain /* No vcpu_pause() */ ) + return -EINVAL; + + ASSERT(is_hvm_domain(d)); /* Restricted by domain creation logic. */ + + v = domain_vcpu(d, op->vcpu); + if ( !v ) + return -ENOENT; + + vcpu_pause(v); + switch ( op->cmd ) + { + case XEN_DOMCTL_vmtrace_enable: + case XEN_DOMCTL_vmtrace_disable: + case XEN_DOMCTL_vmtrace_reset_and_enable: + rc = hvm_vmtrace_control( + v, op->cmd != XEN_DOMCTL_vmtrace_disable, + op->cmd == XEN_DOMCTL_vmtrace_reset_and_enable); + break; + + case XEN_DOMCTL_vmtrace_output_position: + rc = hvm_vmtrace_output_position(v, &op->value); + if ( rc >= 0 ) + rc = 0; + break; + + case XEN_DOMCTL_vmtrace_get_option: + rc = hvm_vmtrace_get_option(v, op->key, &op->value); + break; + + case XEN_DOMCTL_vmtrace_set_option: + rc = hvm_vmtrace_set_option(v, op->key, op->value); + break; + + default: + rc = -EOPNOTSUPP; + break; + } + vcpu_unpause(v); + + return rc; +} + #define MAX_IOPORTS 0x10000 long arch_do_domctl( @@ -1320,6 +1369,12 @@ long arch_do_domctl( domain_unpause(d); break; + case XEN_DOMCTL_vmtrace_op: + ret = do_vmtrace_op(d, &domctl->u.vmtrace_op, u_domctl); + if ( !ret ) + copyback = true; + break; + default: ret = iommu_do_domctl(domctl, d, u_domctl); break; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 12b961113e..beb5692b8b 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2261,6 +2261,137 @@ static bool vmx_get_pending_event(struct vcpu *v, struct x86_event *info) return true; } +/* + * We only let vmtrace agents see and modify a subset of bits in MSR_RTIT_CTL. + * These all pertain to data-emitted into the trace buffer(s). Must not + * include controls pertaining to the structure/position of the trace + * buffer(s). + */ +#define RTIT_CTL_MASK \ + (RTIT_CTL_TRACE_EN | RTIT_CTL_OS | RTIT_CTL_USR | RTIT_CTL_TSC_EN | \ + RTIT_CTL_DIS_RETC | RTIT_CTL_BRANCH_EN) + +/* + * Status bits restricted to the first-gen subset (i.e. no further CPUID + * requirements.) + */ +#define RTIT_STATUS_MASK \ + (RTIT_STATUS_FILTER_EN | RTIT_STATUS_CONTEXT_EN | RTIT_STATUS_TRIGGER_EN | \ + RTIT_STATUS_ERROR | RTIT_STATUS_STOPPED) + +static int vmtrace_get_option(struct vcpu *v, uint64_t key, uint64_t *output) +{ + const struct vcpu_msrs *msrs = v->arch.msrs; + + switch ( key ) + { + case MSR_RTIT_CTL: + *output = msrs->rtit.ctl & RTIT_CTL_MASK; + break; + + case MSR_RTIT_STATUS: + *output = msrs->rtit.status & RTIT_STATUS_MASK; + break; + + default: + *output = 0; + return -EINVAL; + } + return 0; +} + +static int vmtrace_set_option(struct vcpu *v, uint64_t key, uint64_t value) +{ + struct vcpu_msrs *msrs = v->arch.msrs; + bool new_en, old_en = msrs->rtit.ctl & RTIT_CTL_TRACE_EN; + + switch ( key ) + { + case MSR_RTIT_CTL: + if ( value & ~RTIT_CTL_MASK ) + return -EINVAL; + + msrs->rtit.ctl &= ~RTIT_CTL_MASK; + msrs->rtit.ctl |= (value & RTIT_CTL_MASK); + break; + + case MSR_RTIT_STATUS: + if ( value & ~RTIT_STATUS_MASK ) + return -EINVAL; + + msrs->rtit.status &= ~RTIT_STATUS_MASK; + msrs->rtit.status |= (value & RTIT_STATUS_MASK); + break; + + default: + return -EINVAL; + } + + new_en = msrs->rtit.ctl & RTIT_CTL_TRACE_EN; + + /* ctl.trace_en changed => update MSR load/save lists appropriately. */ + if ( !old_en && new_en ) + { + if ( vmx_add_guest_msr(v, MSR_RTIT_CTL, msrs->rtit.ctl) || + vmx_add_host_load_msr(v, MSR_RTIT_CTL, 0) ) + { + /* + * The only failure cases here are failing the + * singleton-per-domain memory allocation, or exceeding the space + * in the allocation. We could unwind in principle, but there is + * nothing userspace can usefully do to continue using this VM. + */ + domain_crash(v->domain); + return -ENXIO; + } + } + else if ( old_en && !new_en ) + { + vmx_del_msr(v, MSR_RTIT_CTL, VMX_MSR_GUEST); + vmx_del_msr(v, MSR_RTIT_CTL, VMX_MSR_HOST); + } + + return 0; +} + +static int vmtrace_control(struct vcpu *v, bool enable, bool reset) +{ + struct vcpu_msrs *msrs = v->arch.msrs; + uint64_t new_ctl; + int rc; + + /* + * Absolutely nothing good will come of Xen's and userspace's idea of + * whether ipt is enabled getting out of sync. + */ + if ( v->arch.hvm.vmx.ipt_active == enable ) + return -EINVAL; + + if ( reset ) + { + msrs->rtit.status = 0; + msrs->rtit.output_offset = 0; + } + + new_ctl = msrs->rtit.ctl & ~RTIT_CTL_TRACE_EN; + if ( enable ) + new_ctl |= RTIT_CTL_TRACE_EN; + + rc = vmtrace_set_option(v, MSR_RTIT_CTL, new_ctl); + if ( rc ) + return rc; + + v->arch.hvm.vmx.ipt_active = enable; + + return 0; +} + +static int vmtrace_output_position(struct vcpu *v, uint64_t *pos) +{ + *pos = v->arch.msrs->rtit.output_offset; + return v->arch.hvm.vmx.ipt_active; +} + static struct hvm_function_table __initdata vmx_function_table = { .name = "VMX", .cpu_up_prepare = vmx_cpu_up_prepare, @@ -2316,6 +2447,10 @@ static struct hvm_function_table __initdata vmx_function_table = { .altp2m_vcpu_update_vmfunc_ve = vmx_vcpu_update_vmfunc_ve, .altp2m_vcpu_emulate_ve = vmx_vcpu_emulate_ve, .altp2m_vcpu_emulate_vmfunc = vmx_vcpu_emulate_vmfunc, + .vmtrace_control = vmtrace_control, + .vmtrace_output_position = vmtrace_output_position, + .vmtrace_set_option = vmtrace_set_option, + .vmtrace_get_option = vmtrace_get_option, .tsc_scaling = { .max_ratio = VMX_TSC_MULTIPLIER_MAX, }, diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 334bd573b9..960ec03917 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -214,6 +214,12 @@ struct hvm_function_table { bool_t (*altp2m_vcpu_emulate_ve)(struct vcpu *v); int (*altp2m_vcpu_emulate_vmfunc)(const struct cpu_user_regs *regs); + /* vmtrace */ + int (*vmtrace_control)(struct vcpu *v, bool enable, bool reset); + int (*vmtrace_output_position)(struct vcpu *v, uint64_t *pos); + int (*vmtrace_set_option)(struct vcpu *v, uint64_t key, uint64_t value); + int (*vmtrace_get_option)(struct vcpu *v, uint64_t key, uint64_t *value); + /* * Parameters and callbacks for hardware-assisted TSC scaling, * which are valid only when the hardware feature is available. @@ -655,6 +661,41 @@ static inline bool altp2m_vcpu_emulate_ve(struct vcpu *v) return false; } +static inline int hvm_vmtrace_control(struct vcpu *v, bool enable, bool reset) +{ + if ( hvm_funcs.vmtrace_control ) + return hvm_funcs.vmtrace_control(v, enable, reset); + + return -EOPNOTSUPP; +} + +/* Returns -errno, or a boolean of whether tracing is currently active. */ +static inline int hvm_vmtrace_output_position(struct vcpu *v, uint64_t *pos) +{ + if ( hvm_funcs.vmtrace_output_position ) + return hvm_funcs.vmtrace_output_position(v, pos); + + return -EOPNOTSUPP; +} + +static inline int hvm_vmtrace_set_option( + struct vcpu *v, uint64_t key, uint64_t value) +{ + if ( hvm_funcs.vmtrace_set_option ) + return hvm_funcs.vmtrace_set_option(v, key, value); + + return -EOPNOTSUPP; +} + +static inline int hvm_vmtrace_get_option( + struct vcpu *v, uint64_t key, uint64_t *value) +{ + if ( hvm_funcs.vmtrace_get_option ) + return hvm_funcs.vmtrace_get_option(v, key, value); + + return -EOPNOTSUPP; +} + /* * This must be defined as a macro instead of an inline function, * because it uses 'struct vcpu' and 'struct domain' which have @@ -751,6 +792,28 @@ static inline bool hvm_has_set_descriptor_access_exiting(void) return false; } +static inline int hvm_vmtrace_control(struct vcpu *v, bool enable, bool reset) +{ + return -EOPNOTSUPP; +} + +static inline int hvm_vmtrace_output_position(struct vcpu *v, uint64_t *pos) +{ + return -EOPNOTSUPP; +} + +static inline int hvm_vmtrace_set_option( + struct vcpu *v, uint64_t key, uint64_t value) +{ + return -EOPNOTSUPP; +} + +static inline int hvm_vmtrace_get_option( + struct vcpu *v, uint64_t key, uint64_t *value) +{ + return -EOPNOTSUPP; +} + #define is_viridian_domain(d) ((void)(d), false) #define is_viridian_vcpu(v) ((void)(v), false) #define has_viridian_time_ref_count(d) ((void)(d), false) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 88a5b1ef5d..4dbf107785 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1135,6 +1135,39 @@ struct xen_domctl_vuart_op { */ }; +/* XEN_DOMCTL_vmtrace_op: Perform VM tracing operations. */ +struct xen_domctl_vmtrace_op { + uint32_t cmd; /* IN */ + uint32_t vcpu; /* IN */ + uint64_aligned_t key; /* IN - @cmd specific data. */ + uint64_aligned_t value; /* IN/OUT - @cmd specific data. */ + + /* + * General enable/disable of tracing. + * + * XEN_DOMCTL_vmtrace_reset_and_enable is provided as optimisation for + * common usecases, which want to reset status and position information + * when turning tracing back on. + */ +#define XEN_DOMCTL_vmtrace_enable 1 +#define XEN_DOMCTL_vmtrace_disable 2 +#define XEN_DOMCTL_vmtrace_reset_and_enable 3 + + /* Obtain the current output position within the buffer. Fills @value. */ +#define XEN_DOMCTL_vmtrace_output_position 4 + + /* + * Get/Set platform specific configuration. + * + * For Intel Processor Trace, @key/@value are interpreted as MSR + * reads/writes to MSR_RTIT_*, filtered to a safe subset. + */ +#define XEN_DOMCTL_vmtrace_get_option 5 +#define XEN_DOMCTL_vmtrace_set_option 6 +}; +typedef struct xen_domctl_vmtrace_op xen_domctl_vmtrace_op_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_vmtrace_op_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -1219,6 +1252,7 @@ struct xen_domctl { #define XEN_DOMCTL_vuart_op 81 #define XEN_DOMCTL_get_cpu_policy 82 #define XEN_DOMCTL_set_cpu_policy 83 +#define XEN_DOMCTL_vmtrace_op 84 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1279,6 +1313,7 @@ struct xen_domctl { struct xen_domctl_monitor_op monitor_op; struct xen_domctl_psr_alloc psr_alloc; struct xen_domctl_vuart_op vuart_op; + struct xen_domctl_vmtrace_op vmtrace_op; uint8_t pad[128]; } u; }; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 11784d7425..3b7313b949 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -703,6 +703,7 @@ static int flask_domctl(struct domain *d, int cmd) return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__VM_EVENT); case XEN_DOMCTL_debug_op: + case XEN_DOMCTL_vmtrace_op: case XEN_DOMCTL_gdbsx_guestmemio: case XEN_DOMCTL_gdbsx_pausevcpu: case XEN_DOMCTL_gdbsx_unpausevcpu: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 19:12:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 19:12:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81902.151470 (Exim 4.92) (envelope-from ) id 1l86WV-0007P3-US; Fri, 05 Feb 2021 19:12:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81902.151470; Fri, 05 Feb 2021 19: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 1l86WV-0007Ov-RS; Fri, 05 Feb 2021 19:12:07 +0000 Received: by outflank-mailman (input) for mailman id 81902; Fri, 05 Feb 2021 19:12:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86WU-0007Oj-6Z for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86WU-0004er-5T for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l86WU-0006DP-4S for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19: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=harFxYL96XUXyov6dFA56FEYHC/nz3eT3qA+2ocwaus=; b=CeNnlVJjmHrnjW064bQwm6SSDQ /SkX0KBG3cgpAyS8flVgcOEH0cGS2lrxirhUjxrmxVJB0iqzGP7h14X/tTcKu6t4SYQssR4Ges3mC Ijpqv9XGVfhxrNT3Y3TT2Vn/SBeCG8kFppLXSxe9ATm405P2IuxBrqnZutUqYsrordQs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxc: Add xc_vmtrace_* functions Message-Id: Date: Fri, 05 Feb 2021 19:12:06 +0000 commit 53aaa792fdebcf131983d45ee8e3d09bd0740c71 Author: Michał Leszczyński AuthorDate: Tue Jun 16 15:33:25 2020 +0200 Commit: Andrew Cooper CommitDate: Fri Feb 5 17:37:28 2021 +0000 tools/libxc: Add xc_vmtrace_* functions Add functions in libxc that use the new XEN_DOMCTL_vmtrace interface. Signed-off-by: Michał Leszczyński Signed-off-by: Andrew Cooper Acked-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/include/xenctrl.h | 73 ++++++++++++++++++++++++ tools/libs/ctrl/Makefile | 1 + tools/libs/ctrl/xc_vmtrace.c | 128 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 202 insertions(+) diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index 3796425e1e..0efcdae8b4 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -1583,6 +1583,79 @@ int xc_tbuf_set_cpu_mask(xc_interface *xch, xc_cpumap_t mask); int xc_tbuf_set_evt_mask(xc_interface *xch, uint32_t mask); +/** + * Enable vmtrace for given vCPU. + * + * @parm xch a handle to an open hypervisor interface + * @parm domid domain identifier + * @parm vcpu vcpu identifier + * @return 0 on success, -1 on failure + */ +int xc_vmtrace_enable(xc_interface *xch, uint32_t domid, uint32_t vcpu); + +/** + * Enable vmtrace for given vCPU. + * + * @parm xch a handle to an open hypervisor interface + * @parm domid domain identifier + * @parm vcpu vcpu identifier + * @return 0 on success, -1 on failure + */ +int xc_vmtrace_disable(xc_interface *xch, uint32_t domid, uint32_t vcpu); + +/** + * Enable vmtrace for a given vCPU, along with resetting status/offset + * details. + * + * @parm xch a handle to an open hypervisor interface + * @parm domid domain identifier + * @parm vcpu vcpu identifier + * @return 0 on success, -1 on failure + */ +int xc_vmtrace_reset_and_enable(xc_interface *xch, uint32_t domid, + uint32_t vcpu); + +/** + * Get current output position inside the trace buffer. + * + * Repeated calls will return different values if tracing is enabled. It is + * platform specific what happens when the buffer fills completely. + * + * @parm xch a handle to an open hypervisor interface + * @parm domid domain identifier + * @parm vcpu vcpu identifier + * @parm pos current output position in bytes + * @return 0 on success, -1 on failure + */ +int xc_vmtrace_output_position(xc_interface *xch, uint32_t domid, + uint32_t vcpu, uint64_t *pos); + +/** + * Get platform specific vmtrace options. + * + * @parm xch a handle to an open hypervisor interface + * @parm domid domain identifier + * @parm vcpu vcpu identifier + * @parm key platform-specific input + * @parm value platform-specific output + * @return 0 on success, -1 on failure + */ +int xc_vmtrace_get_option(xc_interface *xch, uint32_t domid, + uint32_t vcpu, uint64_t key, uint64_t *value); + +/** + * Set platform specific vntvmtrace options. + * + * @parm xch a handle to an open hypervisor interface + * @parm domid domain identifier + * @parm vcpu vcpu identifier + * @parm key platform-specific input + * @parm value platform-specific input + * @return 0 on success, -1 on failure + */ +int xc_vmtrace_set_option(xc_interface *xch, uint32_t domid, + uint32_t vcpu, uint64_t key, uint64_t value); + int xc_domctl(xc_interface *xch, struct xen_domctl *domctl); int xc_sysctl(xc_interface *xch, struct xen_sysctl *sysctl); diff --git a/tools/libs/ctrl/Makefile b/tools/libs/ctrl/Makefile index 6106e36c49..ce9ecae710 100644 --- a/tools/libs/ctrl/Makefile +++ b/tools/libs/ctrl/Makefile @@ -22,6 +22,7 @@ SRCS-y += xc_pm.c SRCS-y += xc_cpu_hotplug.c SRCS-y += xc_resume.c SRCS-y += xc_vm_event.c +SRCS-y += xc_vmtrace.c SRCS-y += xc_monitor.c SRCS-y += xc_mem_paging.c SRCS-y += xc_mem_access.c diff --git a/tools/libs/ctrl/xc_vmtrace.c b/tools/libs/ctrl/xc_vmtrace.c new file mode 100644 index 0000000000..602502367f --- /dev/null +++ b/tools/libs/ctrl/xc_vmtrace.c @@ -0,0 +1,128 @@ +/****************************************************************************** + * xc_vmtrace.c + * + * API for manipulating hardware tracing features + * + * Copyright (c) 2020, Michal Leszczynski + * + * Copyright 2020 CERT Polska. All rights reserved. + * Use is subject to license terms. + * + * 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 "xc_private.h" + +int xc_vmtrace_enable( + xc_interface *xch, uint32_t domid, uint32_t vcpu) +{ + struct xen_domctl domctl = { + .cmd = XEN_DOMCTL_vmtrace_op, + .domain = domid, + .u.vmtrace_op = { + .cmd = XEN_DOMCTL_vmtrace_enable, + .vcpu = vcpu, + }, + }; + + return do_domctl(xch, &domctl); +} + +int xc_vmtrace_disable( + xc_interface *xch, uint32_t domid, uint32_t vcpu) +{ + struct xen_domctl domctl = { + .cmd = XEN_DOMCTL_vmtrace_op, + .domain = domid, + .u.vmtrace_op = { + .cmd = XEN_DOMCTL_vmtrace_disable, + .vcpu = vcpu, + }, + }; + + return do_domctl(xch, &domctl); +} + +int xc_vmtrace_reset_and_enable( + xc_interface *xch, uint32_t domid, uint32_t vcpu) +{ + struct xen_domctl domctl = { + .cmd = XEN_DOMCTL_vmtrace_op, + .domain = domid, + .u.vmtrace_op = { + .cmd = XEN_DOMCTL_vmtrace_reset_and_enable, + .vcpu = vcpu, + }, + }; + + return do_domctl(xch, &domctl); +} + +int xc_vmtrace_output_position( + xc_interface *xch, uint32_t domid, uint32_t vcpu, uint64_t *pos) +{ + struct xen_domctl domctl = { + .cmd = XEN_DOMCTL_vmtrace_op, + .domain = domid, + .u.vmtrace_op = { + .cmd = XEN_DOMCTL_vmtrace_output_position, + .vcpu = vcpu, + }, + }; + int rc = do_domctl(xch, &domctl); + + if ( !rc ) + *pos = domctl.u.vmtrace_op.value; + + return rc; +} + +int xc_vmtrace_get_option( + xc_interface *xch, uint32_t domid, uint32_t vcpu, + uint64_t key, uint64_t *value) +{ + struct xen_domctl domctl = { + .cmd = XEN_DOMCTL_vmtrace_op, + .domain = domid, + .u.vmtrace_op = { + .cmd = XEN_DOMCTL_vmtrace_get_option, + .vcpu = vcpu, + .key = key, + }, + }; + int rc = do_domctl(xch, &domctl); + + if ( !rc ) + *value = domctl.u.vmtrace_op.value; + + return rc; +} + +int xc_vmtrace_set_option( + xc_interface *xch, uint32_t domid, uint32_t vcpu, + uint64_t key, uint64_t value) +{ + struct xen_domctl domctl = { + .cmd = XEN_DOMCTL_vmtrace_op, + .domain = domid, + .u.vmtrace_op = { + .cmd = XEN_DOMCTL_vmtrace_set_option, + .vcpu = vcpu, + .key = key, + .value = value, + }, + }; + + return do_domctl(xch, &domctl); +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 19:12:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 19:12:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81903.151473 (Exim 4.92) (envelope-from ) id 1l86Wf-0007QI-Vv; Fri, 05 Feb 2021 19:12:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81903.151473; Fri, 05 Feb 2021 19: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 1l86Wf-0007QA-T5; Fri, 05 Feb 2021 19:12:17 +0000 Received: by outflank-mailman (input) for mailman id 81903; Fri, 05 Feb 2021 19:12:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86We-0007Q1-91 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86We-0004ez-8J for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l86We-0006ET-7Z for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19: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=DYJPb8EtlknsewUqGBs689H2UVvk2LOhhOWsIrFtCyA=; b=j/xbcoUsdy0Qfk04SYMZldKOIP pXuJsoZaku32JY9MaVBLREsP2NTgvVpVwNZiyC6g6fXHY2kMRfHo+Fs6UZH97z7fL/4m9jJjiPapM H9WLJeZwBcOEFgizrEJ4PqJVRCyEFPT25fAaQ7m8SmfN6rsN1oeFXZwgX6+sKDZOnrIs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/misc: Add xen-vmtrace tool Message-Id: Date: Fri, 05 Feb 2021 19:12:16 +0000 commit 88dd8389dd2c9442729e9d96a4febaf38cd822e3 Author: Michał Leszczyński AuthorDate: Tue Jun 16 15:35:07 2020 +0200 Commit: Andrew Cooper CommitDate: Fri Feb 5 17:37:28 2021 +0000 tools/misc: Add xen-vmtrace tool Add an demonstration tool that uses xc_vmtrace_* calls in order to manage external IPT monitoring for DomU. Signed-off-by: Michał Leszczyński Signed-off-by: Andrew Cooper Acked-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/misc/.gitignore | 1 + tools/misc/Makefile | 7 ++ tools/misc/xen-vmtrace.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 174 insertions(+) diff --git a/tools/misc/.gitignore b/tools/misc/.gitignore index b2c3b21f57..ce6f937d0c 100644 --- a/tools/misc/.gitignore +++ b/tools/misc/.gitignore @@ -1,3 +1,4 @@ xen-access xen-memshare xen-ucode +xen-vmtrace diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 912c5d4f0e..2b683819d4 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -50,6 +50,10 @@ TARGETS_COPY += xenpvnetboot # Everything which needs to be built TARGETS_BUILD := $(filter-out $(TARGETS_COPY),$(TARGETS_ALL)) +# ... including build-only targets +TARGETS_BUILD-$(CONFIG_X86) += xen-vmtrace +TARGETS_BUILD += $(TARGETS_BUILD-y) + .PHONY: all build all build: $(TARGETS_BUILD) @@ -90,6 +94,9 @@ xen-hvmcrash: xen-hvmcrash.o xen-memshare: xen-memshare.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) +xen-vmtrace: xen-vmtrace.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenforeignmemory) $(APPEND_LDFLAGS) + xenperf: xenperf.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) diff --git a/tools/misc/xen-vmtrace.c b/tools/misc/xen-vmtrace.c new file mode 100644 index 0000000000..7572e880c5 --- /dev/null +++ b/tools/misc/xen-vmtrace.c @@ -0,0 +1,166 @@ +/****************************************************************************** + * tools/vmtrace.c + * + * Demonstrative tool for collecting Intel Processor Trace data from Xen. + * Could be used to externally monitor a given vCPU in given DomU. + * + * Copyright (C) 2020 by CERT Polska - NASK PIB + * + * Authors: Michał Leszczyński, michal.leszczynski@cert.pl + * Date: June, 2020 + * + * 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 + +#define MSR_RTIT_CTL 0x00000570 +#define RTIT_CTL_OS (1 << 2) +#define RTIT_CTL_USR (1 << 3) +#define RTIT_CTL_BRANCH_EN (1 << 13) + +static xc_interface *xch; +static xenforeignmemory_handle *fh; +static uint32_t domid, vcpu; +static size_t size; +static char *buf; + +static sig_atomic_t interrupted; +static void int_handler(int signum) +{ + interrupted = 1; +} + +static int get_more_data(void) +{ + static uint64_t last_pos; + uint64_t pos; + + if ( xc_vmtrace_output_position(xch, domid, vcpu, &pos) ) + { + perror("xc_vmtrace_output_position()"); + return -1; + } + + if ( pos > last_pos ) + fwrite(buf + last_pos, pos - last_pos, 1, stdout); + else if ( pos < last_pos ) + { + /* buffer wrapped */ + fwrite(buf + last_pos, size - last_pos, 1, stdout); + fwrite(buf, pos, 1, stdout); + } + + last_pos = pos; + return 0; +} + +int main(int argc, char **argv) +{ + int rc, exit = 1; + xenforeignmemory_resource_handle *fres = NULL; + + if ( signal(SIGINT, int_handler) == SIG_ERR ) + err(1, "Failed to register signal handler\n"); + + if ( argc != 3 ) + { + fprintf(stderr, "Usage: %s \n", argv[0]); + fprintf(stderr, "It's recommended to redirect thisprogram's output to file\n"); + fprintf(stderr, "or to pipe it's output to xxd or other program.\n"); + return 1; + } + + domid = atoi(argv[1]); + vcpu = atoi(argv[2]); + + xch = xc_interface_open(NULL, NULL, 0); + fh = xenforeignmemory_open(NULL, 0); + + if ( !xch ) + err(1, "xc_interface_open()"); + if ( !fh ) + err(1, "xenforeignmemory_open()"); + + rc = xenforeignmemory_resource_size( + fh, domid, XENMEM_resource_vmtrace_buf, vcpu, &size); + if ( rc ) + err(1, "xenforeignmemory_resource_size()"); + + fres = xenforeignmemory_map_resource( + fh, domid, XENMEM_resource_vmtrace_buf, vcpu, + 0, size >> XC_PAGE_SHIFT, (void **)&buf, PROT_READ, 0); + if ( !fres ) + err(1, "xenforeignmemory_map_resource()"); + + if ( xc_vmtrace_set_option( + xch, domid, vcpu, MSR_RTIT_CTL, + RTIT_CTL_BRANCH_EN | RTIT_CTL_USR | RTIT_CTL_OS) ) + { + perror("xc_vmtrace_set_option()"); + goto out; + } + + if ( xc_vmtrace_enable(xch, domid, vcpu) ) + { + perror("xc_vmtrace_enable()"); + goto out; + } + + while ( !interrupted ) + { + xc_dominfo_t dominfo; + + if ( get_more_data() ) + goto out; + + usleep(1000 * 100); + + if ( xc_domain_getinfo(xch, domid, 1, &dominfo) != 1 || + dominfo.domid != domid || dominfo.shutdown ) + { + if ( get_more_data() ) + goto out; + break; + } + } + + exit = 0; + + out: + if ( xc_vmtrace_disable(xch, domid, vcpu) ) + perror("xc_vmtrace_disable()"); + + if ( fres && xenforeignmemory_unmap_resource(fh, fres) ) + perror("xenforeignmemory_unmap_resource()"); + + return exit; +} + +/* + * 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 Fri Feb 05 19:12:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 19:12:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81904.151478 (Exim 4.92) (envelope-from ) id 1l86Wq-0007Rj-1P; Fri, 05 Feb 2021 19:12:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81904.151478; Fri, 05 Feb 2021 19:12: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 1l86Wp-0007Rb-Ui; Fri, 05 Feb 2021 19:12:27 +0000 Received: by outflank-mailman (input) for mailman id 81904; Fri, 05 Feb 2021 19:12:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86Wo-0007RO-CG for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86Wo-0004f8-BW for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l86Wo-0006FF-Aj for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12: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=F/JgnTYax2xy8T1Sxj5AG9ON/52YJZ/7ykO8xUX/hho=; b=5aUIOKn41+CAhezNRNWH5E+T3r k+zbRPJT1jrekrqciWkCU7PS8g0MwTsXzwgUyVPkSDIKHoTQr7H14b5FLwz73MjfKnxbWVufP/j0x b02ag8/FPAphfAo8AlylIuB7btNKPFHI8FxsG6G64Zu32lfSvQRH9eyvefY8hdu6q/5k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/vmtrace: support for VM forks Message-Id: Date: Fri, 05 Feb 2021 19:12:26 +0000 commit 9744611991a042e9aea348c5721b80cc2101c7e5 Author: Tamas K Lengyel AuthorDate: Fri Sep 11 20:14:00 2020 +0200 Commit: Andrew Cooper CommitDate: Fri Feb 5 17:37:28 2021 +0000 xen/vmtrace: support for VM forks Implement vmtrace_reset_pt function. Properly set IPT state for VM forks. Signed-off-by: Tamas K Lengyel Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Ian Jackson --- xen/arch/x86/hvm/vmx/vmx.c | 11 +++++++++++ xen/arch/x86/mm/mem_sharing.c | 3 +++ xen/include/asm-x86/hvm/hvm.h | 9 +++++++++ 3 files changed, 23 insertions(+) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index beb5692b8b..faba95d057 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2392,6 +2392,16 @@ static int vmtrace_output_position(struct vcpu *v, uint64_t *pos) return v->arch.hvm.vmx.ipt_active; } +static int vmtrace_reset(struct vcpu *v) +{ + if ( !v->arch.hvm.vmx.ipt_active ) + return -EINVAL; + + v->arch.msrs->rtit.output_offset = 0; + v->arch.msrs->rtit.status = 0; + return 0; +} + static struct hvm_function_table __initdata vmx_function_table = { .name = "VMX", .cpu_up_prepare = vmx_cpu_up_prepare, @@ -2451,6 +2461,7 @@ static struct hvm_function_table __initdata vmx_function_table = { .vmtrace_output_position = vmtrace_output_position, .vmtrace_set_option = vmtrace_set_option, .vmtrace_get_option = vmtrace_get_option, + .vmtrace_reset = vmtrace_reset, .tsc_scaling = { .max_ratio = VMX_TSC_MULTIPLIER_MAX, }, diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index adaeab4612..00ada05c10 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1632,6 +1632,8 @@ static int copy_vcpu_settings(struct domain *cd, const struct domain *d) copy_domain_page(new_vcpu_info_mfn, vcpu_info_mfn); } + hvm_vmtrace_reset(cd_vcpu); + /* * TODO: to support VMs with PV interfaces copy additional * settings here, such as PV timers. @@ -1782,6 +1784,7 @@ static int fork(struct domain *cd, struct domain *d) cd->max_pages = d->max_pages; *cd->arch.cpuid = *d->arch.cpuid; *cd->arch.msr = *d->arch.msr; + cd->vmtrace_size = d->vmtrace_size; cd->parent = d; } diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 960ec03917..150746de66 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -219,6 +219,7 @@ struct hvm_function_table { int (*vmtrace_output_position)(struct vcpu *v, uint64_t *pos); int (*vmtrace_set_option)(struct vcpu *v, uint64_t key, uint64_t value); int (*vmtrace_get_option)(struct vcpu *v, uint64_t key, uint64_t *value); + int (*vmtrace_reset)(struct vcpu *v); /* * Parameters and callbacks for hardware-assisted TSC scaling, @@ -696,6 +697,14 @@ static inline int hvm_vmtrace_get_option( return -EOPNOTSUPP; } +static inline int hvm_vmtrace_reset(struct vcpu *v) +{ + if ( hvm_funcs.vmtrace_reset ) + return hvm_funcs.vmtrace_reset(v); + + return -EOPNOTSUPP; +} + /* * This must be defined as a macro instead of an inline function, * because it uses 'struct vcpu' and 'struct domain' which have -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Feb 05 19:12:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 19:12:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81906.151494 (Exim 4.92) (envelope-from ) id 1l86Wz-0007Ux-Bv; Fri, 05 Feb 2021 19:12:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81906.151494; Fri, 05 Feb 2021 19:12: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 1l86Wz-0007Up-8W; Fri, 05 Feb 2021 19:12:37 +0000 Received: by outflank-mailman (input) for mailman id 81906; Fri, 05 Feb 2021 19:12:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86Wy-0007UT-G6 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86Wy-0004fV-FK for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l86Wy-0006G1-Dg for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12: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=+ilYkssF+HIoFZYuRr7iUl8zN8YLIZQGdbIf0b07N1c=; b=wMeP5vwNwRgu25WGCCQuYJIv92 lXH8OJmtTekfguGVh5r6QXXoik+QL8c3CoZtuGve7CCHARvTaY94GRPMjlmJWlERs7HqD44AsJ9Ny LulYK26yr+oN7pskUXxobP2v7LCG9fgB8rYwleoLH+KNHeXfEaBmMAku9oIUNJHL+u0U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vm_event: Carry the vmtrace buffer position in vm_event Message-Id: Date: Fri, 05 Feb 2021 19:12:36 +0000 commit c5866ab93167a73a8d4d85b844edf4aa364a1aaa Author: Tamas K Lengyel AuthorDate: Mon Jan 18 12:46:37 2021 -0500 Commit: Andrew Cooper CommitDate: Fri Feb 5 17:37:28 2021 +0000 x86/vm_event: Carry the vmtrace buffer position in vm_event Add vmtrace_pos field to x86 regs in vm_event. Initialized to ~0 if vmtrace is not in use. Signed-off-by: Tamas K Lengyel Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Ian Jackson --- xen/arch/x86/vm_event.c | 3 +++ xen/include/public/vm_event.h | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/xen/arch/x86/vm_event.c b/xen/arch/x86/vm_event.c index 848d69c1b0..36272e9316 100644 --- a/xen/arch/x86/vm_event.c +++ b/xen/arch/x86/vm_event.c @@ -251,6 +251,9 @@ void vm_event_fill_regs(vm_event_request_t *req) req->data.regs.x86.shadow_gs = ctxt.shadow_gs; req->data.regs.x86.dr6 = ctxt.dr6; + + if ( hvm_vmtrace_output_position(curr, &req->data.regs.x86.vmtrace_pos) != 1 ) + req->data.regs.x86.vmtrace_pos = ~0; #endif } diff --git a/xen/include/public/vm_event.h b/xen/include/public/vm_event.h index 141ea024a3..147dc3ea73 100644 --- a/xen/include/public/vm_event.h +++ b/xen/include/public/vm_event.h @@ -223,6 +223,13 @@ struct vm_event_regs_x86 { */ uint64_t npt_base; + /* + * Current position in the vmtrace buffer, or ~0 if vmtrace is not active. + * + * For Intel Processor Trace, it is the upper half of MSR_RTIT_OUTPUT_MASK. + */ + uint64_t vmtrace_pos; + 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 Fri Feb 05 19:12:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Feb 2021 19:12:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.81907.151498 (Exim 4.92) (envelope-from ) id 1l86X9-0007YD-D1; Fri, 05 Feb 2021 19:12:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 81907.151498; Fri, 05 Feb 2021 19:12: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 1l86X9-0007Y5-A3; Fri, 05 Feb 2021 19:12:47 +0000 Received: by outflank-mailman (input) for mailman id 81907; Fri, 05 Feb 2021 19:12:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86X8-0007Xu-J3 for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l86X8-0004fc-IK for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l86X8-0006Gs-HS for xen-changelog@lists.xenproject.org; Fri, 05 Feb 2021 19:12: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=Ef6kAGqybG+PgmD2WhekKMtNRDlpA6XjoXWeW7uCeeg=; b=X+uFAEHhN5yaO63vtnBK+D+jD/ cIQMW52eLMC4Ds1463dwWGRc99L64DJ1o1YfFv81Sj5hQjpUWRYLl/0UeEjriubyj9UiWDtZRF9OX gfjR2Lc2loB9Lwm2ovspiSDa/rtdXiZMvvhVxeTu9TwdjYhNjajzAyOUnbU4dlZVz9sA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vm_event: add response flag to reset vmtrace buffer Message-Id: Date: Fri, 05 Feb 2021 19:12:46 +0000 commit ca82d3fecc93745ee17850a609ac7772bd7c8bf7 Author: Tamas K Lengyel AuthorDate: Sat Jan 30 08:36:37 2021 -0500 Commit: Andrew Cooper CommitDate: Fri Feb 5 17:37:28 2021 +0000 x86/vm_event: add response flag to reset vmtrace buffer Allow resetting the vmtrace buffer in response to a vm_event. This can be used to optimize a use-case where detecting a looped vmtrace buffer is important. Signed-off-by: Tamas K Lengyel Acked-by: Andrew Cooper Release-Acked-by: Ian Jackson --- xen/arch/x86/vm_event.c | 7 +++++++ xen/common/vm_event.c | 3 +++ xen/include/asm-arm/vm_event.h | 6 ++++++ xen/include/asm-x86/vm_event.h | 2 ++ xen/include/public/vm_event.h | 4 ++++ 5 files changed, 22 insertions(+) diff --git a/xen/arch/x86/vm_event.c b/xen/arch/x86/vm_event.c index 36272e9316..8f73a73e2e 100644 --- a/xen/arch/x86/vm_event.c +++ b/xen/arch/x86/vm_event.c @@ -300,6 +300,13 @@ void vm_event_emulate_check(struct vcpu *v, vm_event_response_t *rsp) }; } +void vm_event_reset_vmtrace(struct vcpu *v) +{ +#ifdef CONFIG_HVM + hvm_vmtrace_reset(v); +#endif +} + /* * Local variables: * mode: C diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 127f2d58f1..44d542f23e 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -424,6 +424,9 @@ static int vm_event_resume(struct domain *d, struct vm_event_domain *ved) if ( rsp.flags & VM_EVENT_FLAG_GET_NEXT_INTERRUPT ) vm_event_monitor_next_interrupt(v); + if ( rsp.flags & VM_EVENT_FLAG_RESET_VMTRACE ) + vm_event_reset_vmtrace(v); + if ( rsp.flags & VM_EVENT_FLAG_VCPU_PAUSED ) vm_event_vcpu_unpause(v); } diff --git a/xen/include/asm-arm/vm_event.h b/xen/include/asm-arm/vm_event.h index 14d1d341cc..abe7db1970 100644 --- a/xen/include/asm-arm/vm_event.h +++ b/xen/include/asm-arm/vm_event.h @@ -58,4 +58,10 @@ void vm_event_sync_event(struct vcpu *v, bool value) /* Not supported on ARM. */ } +static inline +void vm_event_reset_vmtrace(struct vcpu *v) +{ + /* Not supported on ARM. */ +} + #endif /* __ASM_ARM_VM_EVENT_H__ */ diff --git a/xen/include/asm-x86/vm_event.h b/xen/include/asm-x86/vm_event.h index 785e741fba..0756124075 100644 --- a/xen/include/asm-x86/vm_event.h +++ b/xen/include/asm-x86/vm_event.h @@ -54,4 +54,6 @@ void vm_event_emulate_check(struct vcpu *v, vm_event_response_t *rsp); void vm_event_sync_event(struct vcpu *v, bool value); +void vm_event_reset_vmtrace(struct vcpu *v); + #endif /* __ASM_X86_VM_EVENT_H__ */ diff --git a/xen/include/public/vm_event.h b/xen/include/public/vm_event.h index 147dc3ea73..36135ba4f1 100644 --- a/xen/include/public/vm_event.h +++ b/xen/include/public/vm_event.h @@ -123,6 +123,10 @@ * Set if the event comes from a nested VM and thus npt_base is valid. */ #define VM_EVENT_FLAG_NESTED_P2M (1 << 12) +/* + * Reset the vmtrace buffer (if vmtrace is enabled) + */ +#define VM_EVENT_FLAG_RESET_VMTRACE (1 << 13) /* * Reasons for the vm event request -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Feb 06 11:11:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Feb 2021 11:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82142.151891 (Exim 4.92) (envelope-from ) id 1l8LUV-0000r8-AW; Sat, 06 Feb 2021 11:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82142.151891; Sat, 06 Feb 2021 11:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LUV-0000r1-7W; Sat, 06 Feb 2021 11:11:03 +0000 Received: by outflank-mailman (input) for mailman id 82142; Sat, 06 Feb 2021 11:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LUU-0000qw-HG for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LUU-00073f-GV for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l8LUU-000196-El for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=O5OtVYSPh9r5bIBBwkDZvwP4z9uFGfHhi58QXAq+9Fk=; b=h4YMUV5b1DGp7aQG5AQ52sGrNc 66zBluv7Pg92zoreWBr8VlwiFZqQmeJNR3NEF0Sp9Trpz0yC9jTh78mSAH77SVoV8Xbh93wJSeKTb UhmxJ/Z3ZQyWv3EqZcADtRWvBqwV6ZXZdrXZAAU63IJBSUn/bgPit4+lPxsf+uNqnDhA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/string: correct memmove()'s forwarding to memcpy() Message-Id: Date: Sat, 06 Feb 2021 11:11:02 +0000 commit 7b93d92a35dc7c0a6e5f1f79b3c887aa3e66ddc0 Author: Jan Beulich AuthorDate: Thu Feb 4 13:59:56 2021 +0100 Commit: Jan Beulich CommitDate: Thu Feb 4 13:59:56 2021 +0100 x86/string: correct memmove()'s forwarding to memcpy() With memcpy() expanding to the compiler builtin, we may not hand it overlapping source and destination. We strictly mean to forward to our own implementation (a few lines up in the same source file). Fixes: 78825e1c60fa ("x86/string: Clean up x86/string.h") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/string.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/string.c b/xen/arch/x86/string.c index e2f84638c4..bda24b14ac 100644 --- a/xen/arch/x86/string.c +++ b/xen/arch/x86/string.c @@ -43,7 +43,8 @@ void *(memmove)(void *dest, const void *src, size_t n) return dest; if ( dest < src ) - return memcpy(dest, src, n); + /* Depends on Xen's implementation operating forwards. */ + return (memcpy)(dest, src, n); asm volatile ( " std ; " -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 06 11:11:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Feb 2021 11:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82143.151895 (Exim 4.92) (envelope-from ) id 1l8LUf-0000sa-Ce; Sat, 06 Feb 2021 11:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82143.151895; Sat, 06 Feb 2021 11: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 1l8LUf-0000sQ-9G; Sat, 06 Feb 2021 11:11:13 +0000 Received: by outflank-mailman (input) for mailman id 82143; Sat, 06 Feb 2021 11:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LUe-0000sG-LI for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LUe-00073r-KT for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l8LUe-00019x-Ig for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11: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=lE4R1fxK7sDIrvABD8e/U3kEGQ/CerCA5h7S7ZLpVYE=; b=clKcfdYQMvmHjzozRXvi1lQARx xhNazSAtRJBAfPpjZv6Tv+NKJjoxAAwiL/B2iGSwdC6fNRySmAA3mWzeuFid2Ly5dtN2c336+Fx+X SUFsV3Avpg2qgREYlAwlTv2v1gMdJs6Y5IeoIR5sJvOHSf46/avNiTwAcoO26oRMzE8s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] IOREQ: fix waiting for broadcast completion Message-Id: Date: Sat, 06 Feb 2021 11:11:12 +0000 commit da20c93108226cb2eb2ed1a13225337f2318a642 Author: Jan Beulich AuthorDate: Thu Feb 4 14:01:21 2021 +0100 Commit: Jan Beulich CommitDate: Thu Feb 4 14:01:21 2021 +0100 IOREQ: fix waiting for broadcast completion Checking just a single server is not enough - all of them must have signaled that they're done processing the request. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/common/ioreq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/ioreq.c b/xen/common/ioreq.c index 90ed2e0302..5b603c0520 100644 --- a/xen/common/ioreq.c +++ b/xen/common/ioreq.c @@ -213,9 +213,9 @@ bool vcpu_ioreq_handle_completion(struct vcpu *v) return false; } - sv = get_pending_vcpu(v, &s); - if ( sv && !wait_for_io(sv, get_ioreq(s, v)) ) - return false; + while ( (sv = get_pending_vcpu(v, &s)) != NULL ) + if ( !wait_for_io(sv, get_ioreq(s, v)) ) + return false; vio->req.state = ioreq_needs_completion(&vio->req) ? STATE_IORESP_READY : STATE_IOREQ_NONE; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 06 11:11:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Feb 2021 11:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82145.151899 (Exim 4.92) (envelope-from ) id 1l8LUp-0000uC-EC; Sat, 06 Feb 2021 11:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82145.151899; Sat, 06 Feb 2021 11:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LUp-0000u3-B2; Sat, 06 Feb 2021 11:11:23 +0000 Received: by outflank-mailman (input) for mailman id 82145; Sat, 06 Feb 2021 11:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LUo-0000tx-ON for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LUo-000744-NV for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l8LUo-0001Ao-Mb for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11: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=Q/1Ndky1mZWCHKLCmws6vIbcXZyxtqkgCWWrZjJRCd0=; b=MWeDQdJGf0cyHibvUlzhmAPntu l+Nc19Uj8FvwypX1PuxRV0JrYZgW6mMI+e+GHVpM0SdyHjtxaIlRLiyVEouTyPQlre58Fb0Xj4bMG APuXcDEDp5M9+UZA1ja5rzBRgf711QWI6802HVswLSzZhsLjgkXqRbfLUQWKFvpY9UMs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/efi: enable MS ABI attribute on clang Message-Id: Date: Sat, 06 Feb 2021 11:11:22 +0000 commit 92f5ffa58d188c9f9a9f1bcdccb6d6348d9df612 Author: Roger Pau Monné AuthorDate: Thu Feb 4 14:02:32 2021 +0100 Commit: Jan Beulich CommitDate: Thu Feb 4 14:02:32 2021 +0100 x86/efi: enable MS ABI attribute on clang Or else the EFI service calls will use the wrong calling convention. The __ms_abi__ attribute is available on all supported versions of clang. Add a specific Clang check because the GCC version reported by Clang is below the required 4.4 to use the __ms_abi__ attribute. Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- xen/include/asm-x86/x86_64/efibind.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-x86/x86_64/efibind.h b/xen/include/asm-x86/x86_64/efibind.h index b013db175d..ddcfae07ec 100644 --- a/xen/include/asm-x86/x86_64/efibind.h +++ b/xen/include/asm-x86/x86_64/efibind.h @@ -172,7 +172,7 @@ typedef uint64_t UINTN; #ifndef EFIAPI // Forces EFI calling conventions reguardless of compiler options #ifdef _MSC_EXTENSIONS #define EFIAPI __cdecl // Force C calling convention for Microsoft C compiler - #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) + #elif __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) #define EFIAPI __attribute__((__ms_abi__)) // Force Microsoft ABI #else #define EFIAPI // Substitute expresion to force C calling convention -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 06 11:11:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Feb 2021 11:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82146.151902 (Exim 4.92) (envelope-from ) id 1l8LV0-0000vf-Fk; Sat, 06 Feb 2021 11:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82146.151902; Sat, 06 Feb 2021 11: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 1l8LV0-0000vZ-Cq; Sat, 06 Feb 2021 11:11:34 +0000 Received: by outflank-mailman (input) for mailman id 82146; Sat, 06 Feb 2021 11:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LUy-0000vL-To for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LUy-00074F-QM for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l8LUy-0001Bb-PX for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11: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=c/akaxTaSWDJD2l4V5NcaY/3lZNi/Dopjeh3mMFmbvQ=; b=XFrod6ktV/0W82HOdyWGkrpBnX Weg2hm2rYHeooAFrg3Fzi+rz5Ld+47Cyg73kvkhGZXT/hjCIDar1G0ybl/bmMDpEWlXKd/nBN1giR fSURhCof8nXgZ2uACeyj0BgbR25ZAYIv6WFIMR/i6vexSKZQVQBdf+1Z58f9iZ/818Fg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/oxenstored: Fix quota calculation for mkdir EEXIST Message-Id: Date: Sat, 06 Feb 2021 11:11:32 +0000 commit c8b96708252a436da44005307f7c195d699bd7c5 Author: Edwin Török AuthorDate: Fri Jan 15 19:11:32 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 4 14:17:44 2021 +0000 tools/oxenstored: Fix quota calculation for mkdir EEXIST We increment the domain's quota on mkdir even when the node already exists. This results in a quota inconsistency after live update, where reconstructing the tree from scratch results in a different quota. Not a security issue because the domain uses up quota faster, so it will only get a Quota error sooner than it should. Found by the structured fuzzer. Signed-off-by: Edwin Török Acked-by: Christian Lindig Release-Acked-by: Ian Jackson --- tools/ocaml/xenstored/store.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ocaml/xenstored/store.ml b/tools/ocaml/xenstored/store.ml index 1bd0c81f6f..20e67b1427 100644 --- a/tools/ocaml/xenstored/store.ml +++ b/tools/ocaml/xenstored/store.ml @@ -419,6 +419,7 @@ let mkdir store perm path = (* It's upt to the mkdir logic to decide what to do with existing path *) if not (existing || (Perms.Connection.is_dom0 perm)) then Quota.check store.quota owner 0; store.root <- path_mkdir store perm path; + if not existing then Quota.add_entry store.quota owner let rm store perm path = -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 06 11:11:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Feb 2021 11:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82147.151906 (Exim 4.92) (envelope-from ) id 1l8LVA-0000x0-He; Sat, 06 Feb 2021 11:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82147.151906; Sat, 06 Feb 2021 11: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 1l8LVA-0000ws-EZ; Sat, 06 Feb 2021 11:11:44 +0000 Received: by outflank-mailman (input) for mailman id 82147; Sat, 06 Feb 2021 11:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LV8-0000wf-Tq for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LV8-00074Q-T8 for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l8LV8-0001CR-SR for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=O+bPPj/raPNsrlldf6prEchixoAi1ar2c9XJn1IpqF4=; b=BBXQs01zjqwuAw7Hn9FhLcSqAg XuN6ssME/c8LXJBxVW2ZEnUEtJd7jR02GBPrrELUxL/XtORTIH/iUOGlsnQEtS5YRy3PQO6SxXZit npO+PfiCidD0HZGo9YKDAz0hZynE2fDUIYiMdvSh5Ngsi5YFytZXod46ucglh3R72bWk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/oxenstored: Reject invalid watch paths early Message-Id: Date: Sat, 06 Feb 2021 11:11:42 +0000 commit dc8caf214fb882546b0e93317b9828247a7c9da8 Author: Edwin Török AuthorDate: Fri Jan 15 19:28:37 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 4 14:17:44 2021 +0000 tools/oxenstored: Reject invalid watch paths early Watches on invalid paths were accepted, but they would never trigger. The client also got no notification that its watch is bad and would never trigger. Found again by the structured fuzzer, due to an error on live update reload: the invalid watch paths would get rejected during live update and the list of watches would be different pre/post live update. The testcase is watch on `//`, which is an invalid path. Signed-off-by: Edwin Török Acked-by: Christian Lindig Release-Acked-by: Ian Jackson --- tools/ocaml/xenstored/connection.ml | 5 ++--- tools/ocaml/xenstored/connections.ml | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index d09a0fa405..65f99ea6f2 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -158,18 +158,17 @@ let get_children_watches con path = let is_dom0 con = Perms.Connection.is_dom0 (get_perm con) -let add_watch con path token = +let add_watch con (path, apath) token = if !Quota.activate && !Define.maxwatch > 0 && not (is_dom0 con) && con.nb_watches > !Define.maxwatch then raise Quota.Limit_reached; - let apath = get_watch_path con path in let l = get_watches con apath in if List.exists (fun w -> w.token = token) l then raise Define.Already_exist; let watch = watch_create ~con ~token ~path in Hashtbl.replace con.watches apath (watch :: l); con.nb_watches <- con.nb_watches + 1; - apath, watch + watch let del_watch con path token = let apath = get_watch_path con path in diff --git a/tools/ocaml/xenstored/connections.ml b/tools/ocaml/xenstored/connections.ml index 8a66eeec3a..3c7429fe7f 100644 --- a/tools/ocaml/xenstored/connections.ml +++ b/tools/ocaml/xenstored/connections.ml @@ -114,8 +114,10 @@ let key_of_path path = "" :: Store.Path.to_string_list path let add_watch cons con path token = - let apath, watch = Connection.add_watch con path token in + let apath = Connection.get_watch_path con path in + (* fail on invalid paths early by calling key_of_str before adding watch *) let key = key_of_str apath in + let watch = Connection.add_watch con (path, apath) token in let watches = if Trie.mem cons.watches key then Trie.find cons.watches key -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 06 11:11:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Feb 2021 11:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82148.151911 (Exim 4.92) (envelope-from ) id 1l8LVK-0000yF-JJ; Sat, 06 Feb 2021 11:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82148.151911; Sat, 06 Feb 2021 11:11: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 1l8LVK-0000y6-G6; Sat, 06 Feb 2021 11:11:54 +0000 Received: by outflank-mailman (input) for mailman id 82148; Sat, 06 Feb 2021 11:11:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVJ-0000xu-0R for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVI-00074y-Vs for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l8LVI-0001DK-VB for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:11: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=c1pbVZfMUG+Nx5h5hF7Bsn99jl6JweSc8wThoA4Hp70=; b=4m6VTLEcV0D0KEWPDGZnyhU6qn WUcCniKJg644ttG3e/BdXeft2qEHhGmbUUA2yY+LhhyQIQYflllxrsdjH9oGyc+0U9n8z3G+mgghJ ZIaCC+5FvR6WI5izbgscmDoZRGODLjzuFGGCGrD/eBK9HeXU9zCdrjoPuhtPSMjZcK0Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/oxenstored: mkdir conflicts were sometimes missed Message-Id: Date: Sat, 06 Feb 2021 11:11:52 +0000 commit 45dee7d92b493bb531e7e77a6f9c0180ab152f87 Author: Edwin Török AuthorDate: Fri Jan 15 19:38:58 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 4 14:17:44 2021 +0000 tools/oxenstored: mkdir conflicts were sometimes missed Due to how set_write_lowpath was used here it didn't detect create/delete conflicts. When we create an entry we must mark our parent as modified (this is what creating a new node via write does). Otherwise we can have 2 transactions one creating, and another deleting a node both succeeding depending on timing. Or one transaction reading an entry, concluding it doesn't exist, do some other work based on that information and successfully commit even if another transaction creates the node via mkdir meanwhile. Signed-off-by: Edwin Török Acked-by: Christian Lindig Release-Acked-by: Ian Jackson --- tools/ocaml/xenstored/transaction.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/xenstored/transaction.ml b/tools/ocaml/xenstored/transaction.ml index 25bc8c3b4a..17b1bdf2ea 100644 --- a/tools/ocaml/xenstored/transaction.ml +++ b/tools/ocaml/xenstored/transaction.ml @@ -165,7 +165,7 @@ let write t perm path value = let mkdir ?(with_watch=true) t perm path = Store.mkdir t.store perm path; - set_write_lowpath t path; + set_write_lowpath t (Store.Path.get_parent path); if with_watch then add_wop t Xenbus.Xb.Op.Mkdir path -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 06 11:12:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Feb 2021 11:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82151.151915 (Exim 4.92) (envelope-from ) id 1l8LVU-000102-LT; Sat, 06 Feb 2021 11:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82151.151915; Sat, 06 Feb 2021 11:12:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVU-0000zs-Hs; Sat, 06 Feb 2021 11:12:04 +0000 Received: by outflank-mailman (input) for mailman id 82151; Sat, 06 Feb 2021 11:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVT-0000zk-3D for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVT-00075H-2R for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l8LVT-0001EK-1j for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z2DbqmkZWQFLm2NiTdJxUDnOXV7g3H8PbDc4hEoPO88=; b=AAfHXcmTCFiCnY5pkCZ+PSHjXi UZGDUrZeG4sbvl/K8YpRLhGRTxCBxwVBjEbGP/Qt1u0uqshMfO8ylhaPAwlKewJ0n08h2S9CZSfmy yNxhY2/GLJJ+jwyutPUHPQ8LcZQ9EuXAyvAldRi+gmPnJTH3ByTsWPxt9UsB4qyEMdxk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/devicemodel: Fix ABI breakage from xendevicemodel_set_irq_level() Message-Id: Date: Sat, 06 Feb 2021 11:12:03 +0000 commit e8af54084586f4e165eee0b49175a63e3c541c64 Author: Andrew Cooper AuthorDate: Thu Feb 4 15:50:16 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 4 21:26:41 2021 +0000 libs/devicemodel: Fix ABI breakage from xendevicemodel_set_irq_level() It is not permitted to edit the VERS clause for a version in a release of Xen. Revert xendevicemodel_set_irq_level()'s inclusion in .so.1.2 and bump the the library minor version to .so.1.4 instead. Fixes: 5d752df85f ("xen/dm: Introduce xendevicemodel_set_irq_level DM op") Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/libs/devicemodel/Makefile | 2 +- tools/libs/devicemodel/libxendevicemodel.map | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile index 500de7adc5..3e50ff6d90 100644 --- a/tools/libs/devicemodel/Makefile +++ b/tools/libs/devicemodel/Makefile @@ -2,7 +2,7 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 -MINOR = 3 +MINOR = 4 SRCS-y += core.c SRCS-$(CONFIG_Linux) += common.c diff --git a/tools/libs/devicemodel/libxendevicemodel.map b/tools/libs/devicemodel/libxendevicemodel.map index a0c30125de..733549327b 100644 --- a/tools/libs/devicemodel/libxendevicemodel.map +++ b/tools/libs/devicemodel/libxendevicemodel.map @@ -32,10 +32,14 @@ VERS_1.2 { global: xendevicemodel_relocate_memory; xendevicemodel_pin_memory_cacheattr; - xendevicemodel_set_irq_level; } VERS_1.1; VERS_1.3 { global: xendevicemodel_modified_memory_bulk; } VERS_1.2; + +VERS_1.4 { + global: + xendevicemodel_set_irq_level; +} VERS_1.3; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 06 11:12:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Feb 2021 11:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82152.151918 (Exim 4.92) (envelope-from ) id 1l8LVe-00011M-NN; Sat, 06 Feb 2021 11:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82152.151918; Sat, 06 Feb 2021 11:12:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVe-00011E-Ji; Sat, 06 Feb 2021 11:12:14 +0000 Received: by outflank-mailman (input) for mailman id 82152; Sat, 06 Feb 2021 11:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVd-000113-6o for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVd-00075P-5w for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l8LVd-0001F9-4f for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=A3mFOVTkol/9aUsd9xklazee6x9Ky/XBx+evbDklgDY=; b=uBk5cm8REQAT11wV/cNr+5qEia 1X4kwYJLGzPxly0XcE0nyV7kB/7R/q0/STY9NFcHFMxNYtZuEXLzqi4CeirDnHmhnIkCgNy6m9wk+ nWyNwjenbgw4Fud3QgCdPpfgzCMEfLwat/2OepYVjGs0JcYMfQQpHq8ht/wuge1LMaio=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/hotplug: Add a qemu-ifup script on NetBSD Message-Id: Date: Sat, 06 Feb 2021 11:12:13 +0000 commit 4cc948020a58588d02413d92976ddd5233dd7cae Author: Manuel Bouyer AuthorDate: Wed Feb 3 17:54:18 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Feb 4 21:26:41 2021 +0000 tools/hotplug: Add a qemu-ifup script on NetBSD On NetBSD, qemu-xen will use a qemu-ifup script to setup the tap interfaces (as qemu-xen-traditional used to). Copy the script from qemu-xen-traditional, and install it on NetBSD. While there document parameters and environnement variables. Signed-off-by: Manuel Bouyer Acked-by: Ian Jackson --- tools/hotplug/NetBSD/Makefile | 1 + tools/hotplug/NetBSD/qemu-ifup | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index 114b223207..f909ffa367 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -7,6 +7,7 @@ XEN_SCRIPTS += locking.sh XEN_SCRIPTS += block XEN_SCRIPTS += vif-bridge XEN_SCRIPTS += vif-ip +XEN_SCRIPTS += qemu-ifup XEN_SCRIPT_DATA = XEN_RCD_PROG = rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/xendriverdomain diff --git a/tools/hotplug/NetBSD/qemu-ifup b/tools/hotplug/NetBSD/qemu-ifup new file mode 100644 index 0000000000..4305419f44 --- /dev/null +++ b/tools/hotplug/NetBSD/qemu-ifup @@ -0,0 +1,9 @@ +#!/bin/sh + +#called by qemu when a HVM domU is started. +# first parameter is tap interface, second is the bridge name +# environement variable $XEN_DOMAIN_ID contains the domU's ID, +# which can be used to retrieve extra parameters from the xenstore. + +ifconfig $1 up +exec /sbin/brconfig $2 add $1 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 06 11:12:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Feb 2021 11:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82153.151923 (Exim 4.92) (envelope-from ) id 1l8LVo-00012n-Qm; Sat, 06 Feb 2021 11:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82153.151923; Sat, 06 Feb 2021 11:12:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVo-00012f-NA; Sat, 06 Feb 2021 11:12:24 +0000 Received: by outflank-mailman (input) for mailman id 82153; Sat, 06 Feb 2021 11:12:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVn-00012U-A2 for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVn-00075W-9M for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l8LVn-0001Fx-86 for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=d+3p3gaSAtTEnmagMqv2ioDwxkq2nJA6yDk0jiFw3Os=; b=XqeO5Gj02Et93i3yJvQd/inT9W nnlT3BkiKsl6KQRAWIbwGRmXZCm4GlwTvkzms0W9Qip1UjRV7OM0eTdWdvIAvL/FJBrkr8nBJ14gO BVMFstgVlIyfbD1jjitc4m4AWqm9OEcbzQcSAkvJ7tHjoTS7kqgK6Vk3GIDs2hJZjFw0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: close socket connections on error Message-Id: Date: Sat, 06 Feb 2021 11:12:23 +0000 commit cd09c4929e9b70d77747ec187ea94731c8a06ab2 Author: Manuel Bouyer AuthorDate: Wed Feb 3 17:54:19 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Feb 4 21:26:41 2021 +0000 tools/xenstored: close socket connections on error On error, don't keep socket connection in ignored state but close them. When the remote end of a socket is closed, xenstored will flag it as an error and switch the connection to ignored. But on some OSes (e.g. NetBSD), poll(2) will return only POLLIN in this case, so sockets in ignored state will stay open forever in xenstored (and it will loop with CPU 100% busy). Fixes: d2fa370d3ef9 ("tools/xenstore: Preserve bad client until they are destroyed") Signed-off-by: Manuel Bouyer Reviewed-by: Juergen Gross Release-Acked-by: Ian Jackson --- tools/xenstore/xenstored_core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 1ab6f162cb..0fea598352 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1440,6 +1440,9 @@ static void ignore_connection(struct connection *conn) talloc_free(conn->in); conn->in = NULL; + /* if this is a socket connection, drop it now */ + if (conn->fd >= 0) + talloc_free(conn); } static const char *sockmsg_string(enum xsd_sockmsg_type type) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 06 11:12:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Feb 2021 11:12:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82154.151927 (Exim 4.92) (envelope-from ) id 1l8LVy-000149-Se; Sat, 06 Feb 2021 11:12:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82154.151927; Sat, 06 Feb 2021 11:12: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 1l8LVy-000140-Ou; Sat, 06 Feb 2021 11:12:34 +0000 Received: by outflank-mailman (input) for mailman id 82154; Sat, 06 Feb 2021 11:12:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVx-00013q-D4 for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LVx-00075e-CK for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l8LVx-0001Gl-Bb for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HaEUzrjxukNF045zJ0uBjC7YhnO7UxOfG+kZyff5HF4=; b=ibEGpcyGEfKJHdEBHNEgiY8byd jDKoEijkVy9VfyRnmLNDhDhwlNVTaVRHszdTIRYbz4aw/gixdmYKGZZ75onCbWGtOCR4uhM1AYHjg VUv9qBqoGu6+hcjB4mzoLJNKapDkhLRI8rE66ebkwDfOWolp7j0eRpZCwtHzm4amUL40=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/man: Document qemu-ifup on NetBSD Message-Id: Date: Sat, 06 Feb 2021 11:12:33 +0000 commit def12125357ed2efd6d581d9033afcc9d66daa8a Author: Manuel Bouyer AuthorDate: Wed Feb 3 17:54:20 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Feb 4 21:26:41 2021 +0000 docs/man: Document qemu-ifup on NetBSD Document that on NetBSD, the tap interface will be configured by the qemu-ifup script. Signed-off-by: Manuel Bouyer Release-Acked-by: Ian Jackson --- docs/man/xl-network-configuration.5.pod | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/man/xl-network-configuration.5.pod b/docs/man/xl-network-configuration.5.pod index af058d4d3c..8e5fd909fa 100644 --- a/docs/man/xl-network-configuration.5.pod +++ b/docs/man/xl-network-configuration.5.pod @@ -172,6 +172,9 @@ add it to the relevant bridge). Defaults to C but can be set to any script. Some example scripts are installed in C. +Note on NetBSD HVM guests will ignore the script option for tap +(emulated) interfaces and always use +C to configure the interface in bridged mode. =head2 ip -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 06 11:12:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Feb 2021 11:12:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82155.151933 (Exim 4.92) (envelope-from ) id 1l8LW8-00015Q-V4; Sat, 06 Feb 2021 11:12:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82155.151933; Sat, 06 Feb 2021 11:12: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 1l8LW8-00015L-Qh; Sat, 06 Feb 2021 11:12:44 +0000 Received: by outflank-mailman (input) for mailman id 82155; Sat, 06 Feb 2021 11:12:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LW7-000159-Gq for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l8LW7-00075o-F1 for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l8LW7-0001HZ-EO for xen-changelog@lists.xenproject.org; Sat, 06 Feb 2021 11:12:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OMTsr0zUciMBm6LVOdfuUm8bUmB+gkkd+JVIzAuU7kw=; b=o/4xQOjpLXcIEYD5TCddTiQ4B+ veVu2OP5mU9aJ/mMub/fy6h40gD+J9aAV6fMeBZlgVMGa2KKvdGZwF7dWG5dOMlQgwPpSkTnEODpq 5W4N7E26mLkqW3re+It2CwGGcugeuozgabPfjUK0qPFqJfGcqDZlA2IBl6NtDJmaQAx0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/tests: Introduce a test for acquire_resource Message-Id: Date: Sat, 06 Feb 2021 11:12:43 +0000 commit ff522e2e9163b27fe4d80ba55c18408f9b1f1cb7 Author: Andrew Cooper AuthorDate: Thu Jul 23 17:26:16 2020 +0100 Commit: Andrew Cooper CommitDate: Thu Feb 4 22:03:33 2021 +0000 tools/tests: Introduce a test for acquire_resource For now, simply try to map 40 frames of grant table. This catches most of the basic errors with resource sizes found and fixed through the 4.15 dev window. Signed-off-by: Andrew Cooper Tested-by: Oleksandr Tyshchenko Release-Acked-by: Ian Jackson --- tools/tests/Makefile | 1 + tools/tests/resource/.gitignore | 1 + tools/tests/resource/Makefile | 40 ++++++++++ tools/tests/resource/test-resource.c | 151 +++++++++++++++++++++++++++++++++++ 4 files changed, 193 insertions(+) diff --git a/tools/tests/Makefile b/tools/tests/Makefile index fc9b715951..8746aabe6b 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -2,6 +2,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := +SUBDIRS-y += resource SUBDIRS-$(CONFIG_X86) += cpu-policy SUBDIRS-$(CONFIG_X86) += mce-test ifneq ($(clang),y) diff --git a/tools/tests/resource/.gitignore b/tools/tests/resource/.gitignore new file mode 100644 index 0000000000..4872e97d4b --- /dev/null +++ b/tools/tests/resource/.gitignore @@ -0,0 +1 @@ +test-resource diff --git a/tools/tests/resource/Makefile b/tools/tests/resource/Makefile new file mode 100644 index 0000000000..4bef482966 --- /dev/null +++ b/tools/tests/resource/Makefile @@ -0,0 +1,40 @@ +XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +TARGET := test-resource + +.PHONY: all +all: $(TARGET) + +.PHONY: run +run: $(TARGET) + ./$(TARGET) + +.PHONY: clean +clean: + $(RM) -f -- *.o $(TARGET) $(DEPS_RM) + +.PHONY: distclean +distclean: clean + $(RM) -f -- *~ + +.PHONY: install +install: all + +.PHONY: uninstall +uninstall: + +CFLAGS += -Werror +CFLAGS += $(CFLAGS_xeninclude) +CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_libxenforeginmemory) +CFLAGS += $(APPEND_CFLAGS) + +LDFLAGS += $(LDLIBS_libxenctrl) +LDFLAGS += $(LDLIBS_libxenforeignmemory) +LDFLAGS += $(APPEND_LDFLAGS) + +test-resource: test-resource.o + $(CC) -o $@ $< $(LDFLAGS) + +-include $(DEPS_INCLUDE) diff --git a/tools/tests/resource/test-resource.c b/tools/tests/resource/test-resource.c new file mode 100644 index 0000000000..a409a82f44 --- /dev/null +++ b/tools/tests/resource/test-resource.c @@ -0,0 +1,151 @@ +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +static unsigned int nr_failures; +#define fail(fmt, ...) \ +({ \ + nr_failures++; \ + (void)printf(fmt, ##__VA_ARGS__); \ +}) + +static xc_interface *xch; +static xenforeignmemory_handle *fh; + +static void test_gnttab(uint32_t domid, unsigned int nr_frames) +{ + xenforeignmemory_resource_handle *res; + void *addr = NULL; + size_t size; + int rc; + + printf(" Test grant table\n"); + + /* Obtain the grant table resource size. */ + rc = xenforeignmemory_resource_size( + fh, domid, XENMEM_resource_grant_table, + XENMEM_resource_grant_table_id_shared, &size); + + /* + * A failure of this call indicates missing kernel support for size + * ioctl(), or missing Xen acquire_resource support. + */ + if ( rc ) + return fail(" Fail: Get size: %d - %s\n", errno, strerror(errno)); + + /* + * Getting 32 frames back instead of nr_frames indicates Xen is missing + * the bugfix to make size requests actually return real data. + */ + if ( (size >> XC_PAGE_SHIFT) != nr_frames ) + return fail(" Fail: Get size: expected %u frames, got %zu\n", + nr_frames, size >> XC_PAGE_SHIFT); + + /* Map the entire grant table. */ + res = xenforeignmemory_map_resource( + fh, domid, XENMEM_resource_grant_table, + XENMEM_resource_grant_table_id_shared, 0, size >> XC_PAGE_SHIFT, + &addr, PROT_READ | PROT_WRITE, 0); + + /* + * Failure here with E2BIG indicates Xen is missing the bugfix to map + * resources larger than 32 frames. + */ + if ( !res ) + return fail(" Fail: Map %d - %s\n", errno, strerror(errno)); + + rc = xenforeignmemory_unmap_resource(fh, res); + if ( rc ) + return fail(" Fail: Unmap %d - %s\n", errno, strerror(errno)); +} + +static void test_domain_configurations(void) +{ + static struct test { + const char *name; + struct xen_domctl_createdomain create; + } tests[] = { +#if defined(__x86_64__) || defined(__i386__) + { + .name = "x86 PV", + .create = { + .max_vcpus = 2, + .max_grant_frames = 40, + }, + }, + { + .name = "x86 PVH", + .create = { + .flags = XEN_DOMCTL_CDF_hvm, + .max_vcpus = 2, + .max_grant_frames = 40, + .arch = { + .emulation_flags = XEN_X86_EMU_LAPIC, + }, + }, + }, +#elif defined(__aarch64__) || defined(__arm__) + { + .name = "ARM", + .create = { + .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, + .max_vcpus = 2, + .max_grant_frames = 40, + }, + }, +#endif + }; + + for ( unsigned int i = 0; i < ARRAY_SIZE(tests); ++i ) + { + struct test *t = &tests[i]; + uint32_t domid = 0; + int rc; + + printf("Test %s\n", t->name); + + rc = xc_domain_create(xch, &domid, &t->create); + if ( rc ) + { + if ( errno == EINVAL || errno == EOPNOTSUPP ) + printf(" Skip: %d - %s\n", errno, strerror(errno)); + else + fail(" Domain create failure: %d - %s\n", + errno, strerror(errno)); + continue; + } + + printf(" Created d%u\n", domid); + + test_gnttab(domid, t->create.max_grant_frames); + + rc = xc_domain_destroy(xch, domid); + if ( rc ) + fail(" Failed to destroy domain: %d - %s\n", + errno, strerror(errno)); + } +} + +int main(int argc, char **argv) +{ + printf("XENMEM_acquire_resource tests\n"); + + xch = xc_interface_open(NULL, NULL, 0); + fh = xenforeignmemory_open(NULL, 0); + + if ( !xch ) + err(1, "xc_interface_open"); + if ( !fh ) + err(1, "xenforeignmemory_open"); + + test_domain_configurations(); + + return !!nr_failures; +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Feb 08 12:33:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Feb 2021 12:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82837.153180 (Exim 4.92) (envelope-from ) id 1l95j1-0005qM-2A; Mon, 08 Feb 2021 12:33:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82837.153180; Mon, 08 Feb 2021 12: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 1l95j0-0005qE-Vb; Mon, 08 Feb 2021 12:33:06 +0000 Received: by outflank-mailman (input) for mailman id 82837; Mon, 08 Feb 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 1l95iz-0005q6-He for xen-changelog@lists.xenproject.org; Mon, 08 Feb 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 1l95iz-0003Uv-Fu for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 12:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l95iz-00051T-ES for xen-changelog@lists.xenproject.org; Mon, 08 Feb 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=tARa5+sK3RRE9bd4f1IPqh/qzCyyeNgJYPj3hCUZ5Pg=; b=Kn2AL9eIBOtnL0Pi0tKWCkRFL7 +2HR4A7xcAuv+07IyKhN/OSs+/599uFZU9v0bATHp2Yh1TrHXuMbuKtLj4hl+S89B7fGdHVQ+4uau FxCTC0TtWXh893mldmQlNYSghz0d28T8h5SEawiHCW3//j/NC5xPj7M6VPrytQcqLUwU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxl: pass libxl__domain_build_state to libxl__arch_domain_create Message-Id: Date: Mon, 08 Feb 2021 12:33:05 +0000 commit 804fe751375b1f40eb3142121bf2b70fa2a83972 Author: Igor Druzhinin AuthorDate: Wed Feb 3 20:07:03 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Feb 8 12:26:44 2021 +0000 tools/libxl: pass libxl__domain_build_state to libxl__arch_domain_create No functional change. Signed-off-by: Igor Druzhinin Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/libs/light/libxl_arch.h | 6 ++++-- tools/libs/light/libxl_arm.c | 4 +++- tools/libs/light/libxl_dom.c | 2 +- tools/libs/light/libxl_x86.c | 6 ++++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/libs/light/libxl_arch.h b/tools/libs/light/libxl_arch.h index 6a91775b9e..c305d704b1 100644 --- a/tools/libs/light/libxl_arch.h +++ b/tools/libs/light/libxl_arch.h @@ -30,8 +30,10 @@ int libxl__arch_domain_save_config(libxl__gc *gc, /* arch specific internal domain creation function */ _hidden -int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, - uint32_t domid); +int libxl__arch_domain_create(libxl__gc *gc, + libxl_domain_config *d_config, + libxl__domain_build_state *state, + uint32_t domid); /* setup arch specific hardware description, i.e. DTB on ARM */ _hidden diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 66e8a065fe..8c4eda3caf 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -126,7 +126,9 @@ int libxl__arch_domain_save_config(libxl__gc *gc, return 0; } -int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, +int libxl__arch_domain_create(libxl__gc *gc, + libxl_domain_config *d_config, + ibxl__domain_build_state *state, uint32_t domid) { return 0; diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index 19168572fd..842a51c86c 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -378,7 +378,7 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, state->store_port = xc_evtchn_alloc_unbound(ctx->xch, domid, state->store_domid); state->console_port = xc_evtchn_alloc_unbound(ctx->xch, domid, state->console_domid); - rc = libxl__arch_domain_create(gc, d_config, domid); + rc = libxl__arch_domain_create(gc, d_config, state, domid); /* Construct a CPUID policy, but only for brand new domains. Domains * being migrated-in/restored have CPUID handled during the diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index 91a9fc72ed..91169d1045 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -453,8 +453,10 @@ static int hvm_set_conf_params(libxl__gc *gc, uint32_t domid, return ret; } -int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, - uint32_t domid) +int libxl__arch_domain_create(libxl__gc *gc, + libxl_domain_config *d_config, + libxl__domain_build_state *state, + uint32_t domid) { const libxl_domain_build_info *info = &d_config->b_info; int ret = 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Feb 08 12:33:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Feb 2021 12:33:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82838.153184 (Exim 4.92) (envelope-from ) id 1l95jB-0005ss-3b; Mon, 08 Feb 2021 12:33:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82838.153184; Mon, 08 Feb 2021 12: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 1l95jB-0005sk-0m; Mon, 08 Feb 2021 12:33:17 +0000 Received: by outflank-mailman (input) for mailman id 82838; Mon, 08 Feb 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 1l95j9-0005sa-Ku for xen-changelog@lists.xenproject.org; Mon, 08 Feb 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 1l95j9-0003V7-Jg for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 12:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l95j9-00052t-I1 for xen-changelog@lists.xenproject.org; Mon, 08 Feb 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=KpYdlVWVigaueQLUZeEdSdEeYItm4+W700iwNRBoeQw=; b=WOkX5WqEJ7oKYOthAW+RcKEILB 7IzE0cvfe7zk1WZgZ10P4gZoZprGw1udfKMaG4P5QHnxo6ffdX8pWK8q3GVbLqzXThGuHc4K+AanJ wHMFdMvzk58cKYLNXRHDacFajxGBwX2HcE8k89KOwhdPcHHpCIM6Bs6PpNCegURJAXiI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxl: only set viridian flags on new domains Message-Id: Date: Mon, 08 Feb 2021 12:33:15 +0000 commit 25ee478662d378ec2b24f517fb6d8d4829b885ff Author: Igor Druzhinin AuthorDate: Wed Feb 3 20:07:04 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Feb 8 12:26:44 2021 +0000 tools/libxl: only set viridian flags on new domains Domains migrating or restoring should have viridian HVM param key in the migration stream already and setting that twice results in Xen returing -EEXIST on the second attempt later (during migration stream parsing) in case the values don't match. That causes migration/restore operation to fail at destination side. That issue is now resurfaced by the latest commits (983524671 and 7e5cffcd1e) extending default viridian feature set making the values from the previous migration streams and those set at domain construction different. Suggested-by: Andrew Cooper Signed-off-by: Igor Druzhinin Reviewed-by: Andrew Cooper Release-Acked-by: Ian Jackson --- tools/libs/light/libxl_x86.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index 91169d1045..58187ed760 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -468,7 +468,10 @@ int libxl__arch_domain_create(libxl__gc *gc, (ret = hvm_set_conf_params(gc, domid, info)) != 0) goto out; - if (info->type == LIBXL_DOMAIN_TYPE_HVM && + /* Viridian flags are already a part of the migration stream so set + * them here only for brand new domains. */ + if (!state->restore && + info->type == LIBXL_DOMAIN_TYPE_HVM && (ret = hvm_set_viridian_features(gc, domid, info)) != 0) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Feb 08 14:44:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Feb 2021 14:44:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82901.153324 (Exim 4.92) (envelope-from ) id 1l97lm-00026g-VR; Mon, 08 Feb 2021 14:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82901.153324; Mon, 08 Feb 2021 14: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 1l97lm-00026Y-S7; Mon, 08 Feb 2021 14:44:06 +0000 Received: by outflank-mailman (input) for mailman id 82901; Mon, 08 Feb 2021 14:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l97ll-00026T-BO for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 14:44:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l97ll-0005hX-6y for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 14:44:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l97ll-0007pj-44 for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 14: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=+RK+gKZu1+rmuqCj9H0uhBZxU1D8KKBk7m+9Hx9zlOo=; b=ji1+FPPT6tjk5oZIAwt5DCk98D hf8wEPcWWt1kM9yI/Et2lRWIrPjUuGQ2kcbsJ7cbjsISjmAQ+CceAJKpJXR+IbrahvYY0isPqGxsy PjMU3UVuM/hW0U4V3cYqrLrsgou7hPzDqo0RjOvLoJuFH+bbWJyj3kIFVfSgA0f4myxw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxl: Fix ARM build Message-Id: Date: Mon, 08 Feb 2021 14:44:05 +0000 commit c973c38c2722b44396e94b64655a909330c631e7 Author: Andrew Cooper AuthorDate: Mon Feb 8 14:36:32 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Feb 8 14:36:32 2021 +0000 tools/libxl: Fix ARM build Fixes: 804fe751375 ("tools/libxl: pass libxl__domain_build_state to libxl__arch_domain_create") Signed-off-by: Andrew Cooper --- tools/libs/light/libxl_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 8c4eda3caf..5e2a209a8b 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -128,7 +128,7 @@ int libxl__arch_domain_save_config(libxl__gc *gc, int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, - ibxl__domain_build_state *state, + libxl__domain_build_state *state, uint32_t domid) { return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Feb 08 16:33:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Feb 2021 16:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82964.153522 (Exim 4.92) (envelope-from ) id 1l99TG-0005lE-Ml; Mon, 08 Feb 2021 16:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82964.153522; Mon, 08 Feb 2021 16: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 1l99TG-0005l6-K1; Mon, 08 Feb 2021 16:33:06 +0000 Received: by outflank-mailman (input) for mailman id 82964; Mon, 08 Feb 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 1l99TF-0005l1-L0 for xen-changelog@lists.xenproject.org; Mon, 08 Feb 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 1l99TF-000866-HS for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 16:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l99TF-0000Jj-Gm for xen-changelog@lists.xenproject.org; Mon, 08 Feb 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=CaA9AhAqPVvM8qoTkrZM1xR3g8PDZn6tJVRRfC9PaEA=; b=1iNAEI+12ySwwaNATbw8Q6p8VO RminRoc+uHd6WHnTCsWly9neRKw0g46rF4Sg2RVn92MZoTyl2El9ZvG7ZdW8J+TyYZdPWTDABy2kL +Nel64FZQxyCe+BdSpf7LiHBHemNWZqROkeyOO0GIyVmWMLKwxq7xgDhM80ow6lKW0A0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs: remove stale create example from xl.1 Message-Id: Date: Mon, 08 Feb 2021 16:33:05 +0000 commit 8563c9e3a7bdf8c928a8e675e6b2c9c9254bd440 Author: Olaf Hering AuthorDate: Mon Jan 11 18:41:48 2021 +0100 Commit: Ian Jackson CommitDate: Mon Feb 8 15:43:31 2021 +0000 docs: remove stale create example from xl.1 Maybe xm create had a feature to create a domU based on a configuration file. xl create requires the '-f' option to refer to a file. There is no code to look into XEN_CONFIG_DIR, so remove the example. Signed-off-by: Olaf Hering Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- docs/man/xl.1.pod.in | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in index f4779d8fd6..0354d3beba 100644 --- a/docs/man/xl.1.pod.in +++ b/docs/man/xl.1.pod.in @@ -171,13 +171,6 @@ B =over 4 -=item I - - xl create DebianLenny - -This creates a domain with the file /etc/xen/DebianLenny, and returns as -soon as it is run. - =item I xl create hvm.cfg 'cpus="0-3"; pci=["01:05.1","01:05.2"]' -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Feb 08 16:33:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Feb 2021 16:33:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82965.153527 (Exim 4.92) (envelope-from ) id 1l99TQ-0005m3-Ob; Mon, 08 Feb 2021 16:33:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82965.153527; Mon, 08 Feb 2021 16: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 1l99TQ-0005lv-Le; Mon, 08 Feb 2021 16:33:16 +0000 Received: by outflank-mailman (input) for mailman id 82965; Mon, 08 Feb 2021 16:33:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l99TP-0005lq-Np for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 16:33:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l99TP-00086J-LN for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 16:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l99TP-0000KW-Je for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 16: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=y9/3Jotl5Qb2qR74XwjeQWFHrkb/yVAUfYTbhFjLx98=; b=tQfJwtOGuDY32zz6T26gPAQJmX t6OGOQVGvpIfQ7GAXdTq9FFZfL3yJbU76IQJ4HCiKFzfLwAB16Jc/yEBI9CDyDlPi/nf9tx2dzQJG 2bV5VQKc1ZW0mInyB1m1akhmB1ZAUxmM4rJ+K/s0nDSJtrxVQ/BweaO9w6vaFNiWR5L8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs: substitute XEN_CONFIG_DIR in xl.conf.5 Message-Id: Date: Mon, 08 Feb 2021 16:33:15 +0000 commit 52280d9492ee486be735859ef496220534c71905 Author: Olaf Hering AuthorDate: Mon Jan 11 18:41:49 2021 +0100 Commit: Ian Jackson CommitDate: Mon Feb 8 15:45:28 2021 +0000 docs: substitute XEN_CONFIG_DIR in xl.conf.5 xl(1) opens xl.conf in XEN_CONFIG_DIR. Substitute this variable also in the man page. Signed-off-by: Olaf Hering Reviewed-by: Anthony PERARD Release-Acked-by: Ian Jackson --- docs/man/xl.1.pod.in | 2 +- docs/man/xl.conf.5.pod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in index 0354d3beba..e206039d99 100644 --- a/docs/man/xl.1.pod.in +++ b/docs/man/xl.1.pod.in @@ -50,7 +50,7 @@ setup the bridge. If you specify the amount of memory dom0 has, passing B to Xen, it is highly recommended to disable B. Edit -B and set it to 0. +B<@XEN_CONFIG_DIR@/xl.conf> and set it to 0. =item run xl as B diff --git a/docs/man/xl.conf.5.pod b/docs/man/xl.conf.5.pod index 41ee428744..dfea9d64ba 100644 --- a/docs/man/xl.conf.5.pod +++ b/docs/man/xl.conf.5.pod @@ -1,6 +1,6 @@ =head1 NAME -/etc/xen/xl.conf - XL Global/Host Configuration +@XEN_CONFIG_DIR@/xl.conf - XL Global/Host Configuration =head1 DESCRIPTION -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Feb 08 16:33:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Feb 2021 16:33:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82966.153532 (Exim 4.92) (envelope-from ) id 1l99Ta-0005nA-Qf; Mon, 08 Feb 2021 16:33:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82966.153532; Mon, 08 Feb 2021 16: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 1l99Ta-0005n2-NB; Mon, 08 Feb 2021 16:33:26 +0000 Received: by outflank-mailman (input) for mailman id 82966; Mon, 08 Feb 2021 16:33:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l99TZ-0005mv-PF for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 16:33:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l99TZ-00086T-OU for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 16:33:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l99TZ-0000L6-NY for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 16: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=6gyRxgpNtj93ynTc+zn4YsPUxJ7AWYll636o0tFU0m8=; b=R/vUvBI/3h0cto3I81ARAzskiA WLDNySC63YGW+D/5X4X/Iltle07KRcGyNZ96z/AFfKgPGXVyrXjzECTr1sMiMavgdkd+O3AkQraFo Un5ndoPijoufdxaPuU1AJOqwOhMPHUGHdCG1Pcn0QsZLsC0XjPtScaZVHBUFjKQ029Z4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Update .gitignore for some docs files Message-Id: Date: Mon, 08 Feb 2021 16:33:25 +0000 commit 12e459742544fa0ef3260ec1cda7ea6fe2cd53bd Author: Olaf Hering AuthorDate: Mon Feb 8 16:07:32 2021 +0000 Commit: Ian Jackson CommitDate: Mon Feb 8 16:08:10 2021 +0000 Update .gitignore for some docs files [ split out of a larger commit -iwj ] Signed-off-by: Olaf Hering Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 9e0488e0cd..1c2fa1530b 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,10 @@ dist/* docs/tmp.* docs/html/ docs/man/xl.cfg.5.pod +docs/man/xl-disk-configuration.5.pod +docs/man/xl-network-configuration.5.pod docs/man/xl.1.pod +docs/man/xl.conf.5.pod docs/man1/ docs/man5/ docs/man7/ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Feb 08 16:33:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Feb 2021 16:33:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.82967.153535 (Exim 4.92) (envelope-from ) id 1l99Tk-0005oK-SB; Mon, 08 Feb 2021 16:33:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 82967.153535; Mon, 08 Feb 2021 16: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 1l99Tk-0005oD-Ox; Mon, 08 Feb 2021 16:33:36 +0000 Received: by outflank-mailman (input) for mailman id 82967; Mon, 08 Feb 2021 16:33:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l99Tj-0005o4-V3 for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 16:33:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l99Tj-00086d-TF for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 16:33:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1l99Tj-0000Lo-Qm for xen-changelog@lists.xenproject.org; Mon, 08 Feb 2021 16: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=7P5X0MzHf8dsfjKcTGYhNQhceOM2GadD+yYwFOmhzMA=; b=1xPb+6jfTLQMK9udY2QQm7Tfu2 E9BSxsz7DQR5jesi20/yczotEAJSeHcPuxdckEqki/GYrosQ5qz1of2BhUDN8y6vGDuuMV/yIIztF R8IXxoIqOHsFdixnkCTQkDSK3rVQpfuB//giRH59H0lNrVdKFU5HQSjVhBq8T/3JDEQQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Use XEN_SCRIPT_DIR to refer to /etc/xen/scripts Message-Id: Date: Mon, 08 Feb 2021 16:33:35 +0000 commit 53c8785b63a777902563394a93428030cbecf943 Author: Olaf Hering AuthorDate: Mon Jan 11 18:41:51 2021 +0100 Commit: Ian Jackson CommitDate: Mon Feb 8 16:22:00 2021 +0000 Use XEN_SCRIPT_DIR to refer to /etc/xen/scripts Replace all hardcoded paths to use XEN_SCRIPT_DIR to expand the actual location. [ .gitignore change split out -iwj ] [ dropped erroneous hunk for docs/misc/block-scripts.txt iwj ] Signed-off-by: Olaf Hering Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- docs/configure.ac | 3 + docs/man/xl-disk-configuration.5.pod | 529 ----------------------------- docs/man/xl-disk-configuration.5.pod.in | 529 +++++++++++++++++++++++++++++ docs/man/xl-network-configuration.5.pod | 260 -------------- docs/man/xl-network-configuration.5.pod.in | 260 ++++++++++++++ docs/man/xl.1.pod.in | 2 +- docs/man/xl.conf.5.pod | 229 ------------- docs/man/xl.conf.5.pod.in | 229 +++++++++++++ tools/xl/xl_cmdtable.c | 2 +- 9 files changed, 1023 insertions(+), 1020 deletions(-) diff --git a/docs/configure.ac b/docs/configure.ac index cb5a6eaa4c..c2e5edd3b3 100644 --- a/docs/configure.ac +++ b/docs/configure.ac @@ -9,6 +9,9 @@ AC_CONFIG_FILES([ ../config/Docs.mk man/xl.cfg.5.pod man/xl.1.pod +man/xl-disk-configuration.5.pod +man/xl-network-configuration.5.pod +man/xl.conf.5.pod ]) AC_CONFIG_AUX_DIR([../]) diff --git a/docs/man/xl-disk-configuration.5.pod b/docs/man/xl-disk-configuration.5.pod deleted file mode 100644 index 46feedb95e..0000000000 --- a/docs/man/xl-disk-configuration.5.pod +++ /dev/null @@ -1,529 +0,0 @@ -=head1 NAME - -xl-disk-configuration - XL Disk Configuration Syntax - -=head1 SYNTAX - -This document specifies the xl config file format disk configuration -option. It has the following form: - - disk = [ 'DISKSPEC', 'DISKSPEC', ... ] - -where each C is in this form: - - [=|,]*, - [, [, [, []]]], - [=|,]* - [target=] - -For example, these strings are equivalent: - - /dev/vg/guest-volume,,hda - /dev/vg/guest-volume,raw,hda,rw - format=raw, vdev=hda, access=rw, target=/dev/vg/guest-volume - raw:/dev/vg/guest-volume,hda,w (deprecated, see below) - -As are these: - - /root/image.iso,,hdc,cdrom - /root/image.iso,,hdc,,cdrom - /root/image.iso,raw,hdc,devtype=cdrom - format=raw, vdev=hdc, access=ro, devtype=cdrom, target=/root/image.iso - raw:/root/image.iso,hdc:cdrom,ro (deprecated, see below) - -These might be specified in the domain config file like this: - - disk = [ '/dev/vg/guest-volume,,hda', '/root/image.iso,,hdc,cdrom' ] - - -More formally, the string is a series of comma-separated keyword/value -pairs, flags and positional parameters. Parameters which are not bare -keywords and which do not contain "=" symbols are assigned to the -so-far-unspecified positional parameters, in the order below. The -positional parameters may also be specified explicitly by name. - -Each parameter may be specified at most once, either as a positional -parameter or a named parameter. Default values apply if the parameter -is not specified, or if it is specified with an empty value (whether -positionally or explicitly). - -Whitespace may appear before each parameter and will be ignored. - -=head1 Positional Parameters - -=over 4 - -=item B - -=over 4 - -=item Description - -Block device or image file path. When this is used as a path, F -will be prepended if the path doesn't start with a '/'. - -=item Supported values - -N/A - -=item Deprecated values - -N/A - -=item Default value - -None. While a path is provided in most cases there is an exception: -for a cdrom device, lack of this attribute would imply an empty cdrom -drive. - -=item Special syntax - -When this parameter is specified by name, ie with the C -syntax in the configuration file, it consumes the whole rest of the -C including trailing whitespaces. Therefore in that case -it must come last. This is permissible even if an empty value for -the target was already specified as a positional parameter. This -is the only way to specify a target string containing metacharacters -such as commas and (in some cases) colons, which would otherwise be -misinterpreted. - -Future parameter and flag names will start with an ascii letter and -contain only ascii alphanumerics, hyphens and underscores, and will -not be legal as vdevs. Targets which might match that syntax -should not be specified as positional parameters. - -=back - -=item B - -=over 4 - -=item Description - -Specifies the format of image file. - -=item Supported values - -raw, qcow, qcow2, vhd, qed - -=item Deprecated values - -None - -=item Default value - -raw - -=back - -=item B - -=over 4 - -=item Description - -Virtual device as seen by the guest (also referred to as guest drive -designation in some specifications). See L. - -=item Supported values - -hd[x], xvd[x], sd[x] etc. Please refer to the above specification for -further details. - -=item Deprecated values - -None - -=item Default Value - -None, this parameter is mandatory. - -=back - -=item B - -=over 4 - -=item Description - -Specified access control information. Whether or not the block device is -provided to the guest in read-only or read-write mode depends on this -attribute. - -=item Supported values - -C, C (specifies read-only) - -C, C (specifies read/write) - -=item Deprecated values - -None - -=item Default value - -C unless devtype=cdrom, in which case C - -=back - -=back - -=head1 Other Parameters And Flags - -=over 4 - -=item B=I - -=over 4 - -=item Description - -Qualifies virtual device type. - -=item Supported values - -cdrom - -=item Deprecated values - -None - -=item Mandatory - -No - -=back - -=item B - -Convenience alias for "devtype=cdrom". - - -=item B=I - -=over 4 - -=item Description - -Designates a backend domain for the device - -=item Supported values - -Valid domain names - -=item Mandatory - -No - -=back - -Specifies the backend domain which this device should attach to. This -defaults to domain 0. Specifying another domain requires setting up a -driver domain which is outside the scope of this document. - - -=item B=I - -=over 4 - -=item Description - -Specifies the backend implementation to use - -=item Supported values - -phy, qdisk - -=item Mandatory - -No - -=item Default value - -Automatically determine which backend to use. - -=back - -This does not affect the guest's view of the device. It controls -which software implementation of the Xen backend driver is used. - -Not all backend drivers support all combinations of other options. -For example, "phy" does not support formats other than "raw". -Normally this option should not be specified, in which case libxl will -automatically determine the most suitable backend. - - -=item B