From xen-changelog-bounces@lists.xen.org Sat Mar 01 08:44:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 08:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJfWi-0002y6-6F; Sat, 01 Mar 2014 08:44:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJfWg-0002y1-Rp for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 08:44:07 +0000 Received: from [85.158.139.211:3217] by server-9.bemta-5.messagelabs.com id DF/33-11237-5DD91135; Sat, 01 Mar 2014 08:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1393663443!7068899!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31260 invoked from network); 1 Mar 2014 08:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 08:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJfWd-000205-EI for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 08:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJfWc-0001cJ-QQ for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 08:44:02 +0000 Date: Sat, 01 Mar 2014 08:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: Fix libxl_postfork_child_noexec deadlock etc. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5be1e95318147855713709094e6847e3104ae910 Author: Ian Jackson AuthorDate: Mon Feb 24 12:57:53 2014 +0000 Commit: Ian Jackson CommitDate: Mon Feb 24 16:28:17 2014 +0000 libxl: Fix libxl_postfork_child_noexec deadlock etc. libxl_postfork_child_noexec would nestedly reaquire the non-recursive "no_forking" mutex: atfork_lock uses it, as does sigchld_user_remove. The result on Linux is that the process always deadlocks before returning from this function. This is used by xl's console child. So, the ultimate effect is that xl with pygrub does not manage to connect to the pygrub console. This behaviour was reported by Michael Young in Xen 4.4.0 RC5. Also, the use of sigchld_user_remove in libxl_postfork_child_noexec is not correct with SIGCHLD sharing. libxl_postfork_child_noexec is documented to suffice if called only on one ctx. So deregistering the ctx it's called on is not sufficient. Instead, we need a new approach which discards the whole sigchld_user list and unconditionally removes our SIGCHLD handler if we had one. Prompted by this, clarify the semantics of libxl_postfork_child_noexec. Specifically, expand on the meaning of "quickly" by explaining what operations are not permitted; and document the fact that the function doesn't reclaim the resources in the ctxs. And add a comment in libxl_postfork_child_noexec explaining the internal concurrency situation. This is an important bugfix. IMO the bug is a blocker for Xen 4.4. Signed-off-by: Ian Jackson Reported-by: M A Young CC: Ian Campbell CC: George Dunlap Acked-by: Ian Campbell Release-acked-by: George Dunlap --- tools/libxl/libxl_event.h | 16 ++++++++++++++++ tools/libxl/libxl_fork.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index ca43cb9..b5db83c 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -601,6 +601,22 @@ void libxl_childproc_sigchld_occurred(libxl_ctx *ctx) * this all previously existing libxl_ctx's are invalidated and * must not be used - or even freed. It is harmless to call this * postfork function and then exec anyway. + * + * Until libxl_postfork_child_noexec has returned: + * - No other libxl calls may be made. + * - If any libxl ctx was configured handle the process's SIGCHLD, + * the child may not create further (grand)child processes, nor + * manipulate SIGCHLD. + * + * libxl_postfork_child_noexec may not reclaim all the resources + * associated with the libxl ctx. This includes but is not limited + * to: ordinary memory; files on disk and in /var/run; file + * descriptors; memory mapped into the process from domains being + * managed (grant maps); Xen event channels. Use of libxl in + * processes which fork long-lived children is not recommended for + * this reason. libxl_postfork_child_noexec is provided so that + * an application can make further libxl calls in a child which + * is going to exec or exit soon. */ void libxl_postfork_child_noexec(libxl_ctx *ctx); diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 1d0017b..8421296 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -60,6 +60,9 @@ static void sigchld_removehandler_core(void); /* idempotent */ static void sigchld_user_remove(libxl_ctx *ctx); /* idempotent */ static void sigchld_sethandler_raw(void (*handler)(int), struct sigaction *old); +static void defer_sigchld(void); +static void release_sigchld(void); + static void atfork_lock(void) { int r = pthread_mutex_lock(&no_forking); @@ -117,6 +120,19 @@ libxl__carefd *libxl__carefd_opened(libxl_ctx *ctx, int fd) void libxl_postfork_child_noexec(libxl_ctx *ctx) { + /* + * Anything running without the no_forking lock (atfork_lock) + * might be interrupted by fork. But libxl functions other than + * this one are then forbidden to the child. + * + * Conversely, this function might interrupt any other libxl + * operation (even though that other operation has the libxl ctx + * lock). We don't take the lock ourselves, since we are running + * in the child and if the lock is held the thread that took it no + * longer exists. To prevent us being interrupted by another call + * to ourselves (whether in another thread or by virtue of another + * fork) we take the atfork lock ourselves. + */ libxl__carefd *cf, *cf_tmp; int r; @@ -134,7 +150,33 @@ void libxl_postfork_child_noexec(libxl_ctx *ctx) } LIBXL_LIST_INIT(&carefds); - sigchld_user_remove(ctx); + if (sigchld_installed) { + /* We are in theory not at risk of concurrent execution of the + * SIGCHLD handler, because the application should call + * libxl_postfork_child_noexec before the child forks again. + * (If the SIGCHLD was in flight in the parent at the time of + * the fork, the thread it was delivered on exists only in the + * parent so is not our concern.) + * + * But in case the application violated this rule (and did so + * while multithreaded in the child), we use our deferral + * machinery. The result is that the SIGCHLD may then be lost + * (i.e. signaled to the now-defunct libxl ctx(s)). But at + * least we won't execute undefined behaviour (by examining + * the list in the signal handler concurrently with clearing + * it here), and since we won't actually reap the new children + * things will in fact go OK if the application doesn't try to + * use SIGCHLD, but instead just waits for the child(ren). */ + defer_sigchld(); + + LIBXL_LIST_INIT(&sigchld_users); + /* After this the ->sigchld_user_registered entries in the + * now-obsolete contexts may be lies. But that's OK because + * no-one will look at them. */ + + release_sigchld(); + sigchld_removehandler_core(); + } atfork_unlock(); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 08:44:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 08:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJfWi-0002y6-6F; Sat, 01 Mar 2014 08:44:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJfWg-0002y1-Rp for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 08:44:07 +0000 Received: from [85.158.139.211:3217] by server-9.bemta-5.messagelabs.com id DF/33-11237-5DD91135; Sat, 01 Mar 2014 08:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1393663443!7068899!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31260 invoked from network); 1 Mar 2014 08:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 08:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJfWd-000205-EI for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 08:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJfWc-0001cJ-QQ for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 08:44:02 +0000 Date: Sat, 01 Mar 2014 08:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: Fix libxl_postfork_child_noexec deadlock etc. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5be1e95318147855713709094e6847e3104ae910 Author: Ian Jackson AuthorDate: Mon Feb 24 12:57:53 2014 +0000 Commit: Ian Jackson CommitDate: Mon Feb 24 16:28:17 2014 +0000 libxl: Fix libxl_postfork_child_noexec deadlock etc. libxl_postfork_child_noexec would nestedly reaquire the non-recursive "no_forking" mutex: atfork_lock uses it, as does sigchld_user_remove. The result on Linux is that the process always deadlocks before returning from this function. This is used by xl's console child. So, the ultimate effect is that xl with pygrub does not manage to connect to the pygrub console. This behaviour was reported by Michael Young in Xen 4.4.0 RC5. Also, the use of sigchld_user_remove in libxl_postfork_child_noexec is not correct with SIGCHLD sharing. libxl_postfork_child_noexec is documented to suffice if called only on one ctx. So deregistering the ctx it's called on is not sufficient. Instead, we need a new approach which discards the whole sigchld_user list and unconditionally removes our SIGCHLD handler if we had one. Prompted by this, clarify the semantics of libxl_postfork_child_noexec. Specifically, expand on the meaning of "quickly" by explaining what operations are not permitted; and document the fact that the function doesn't reclaim the resources in the ctxs. And add a comment in libxl_postfork_child_noexec explaining the internal concurrency situation. This is an important bugfix. IMO the bug is a blocker for Xen 4.4. Signed-off-by: Ian Jackson Reported-by: M A Young CC: Ian Campbell CC: George Dunlap Acked-by: Ian Campbell Release-acked-by: George Dunlap --- tools/libxl/libxl_event.h | 16 ++++++++++++++++ tools/libxl/libxl_fork.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index ca43cb9..b5db83c 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -601,6 +601,22 @@ void libxl_childproc_sigchld_occurred(libxl_ctx *ctx) * this all previously existing libxl_ctx's are invalidated and * must not be used - or even freed. It is harmless to call this * postfork function and then exec anyway. + * + * Until libxl_postfork_child_noexec has returned: + * - No other libxl calls may be made. + * - If any libxl ctx was configured handle the process's SIGCHLD, + * the child may not create further (grand)child processes, nor + * manipulate SIGCHLD. + * + * libxl_postfork_child_noexec may not reclaim all the resources + * associated with the libxl ctx. This includes but is not limited + * to: ordinary memory; files on disk and in /var/run; file + * descriptors; memory mapped into the process from domains being + * managed (grant maps); Xen event channels. Use of libxl in + * processes which fork long-lived children is not recommended for + * this reason. libxl_postfork_child_noexec is provided so that + * an application can make further libxl calls in a child which + * is going to exec or exit soon. */ void libxl_postfork_child_noexec(libxl_ctx *ctx); diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 1d0017b..8421296 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -60,6 +60,9 @@ static void sigchld_removehandler_core(void); /* idempotent */ static void sigchld_user_remove(libxl_ctx *ctx); /* idempotent */ static void sigchld_sethandler_raw(void (*handler)(int), struct sigaction *old); +static void defer_sigchld(void); +static void release_sigchld(void); + static void atfork_lock(void) { int r = pthread_mutex_lock(&no_forking); @@ -117,6 +120,19 @@ libxl__carefd *libxl__carefd_opened(libxl_ctx *ctx, int fd) void libxl_postfork_child_noexec(libxl_ctx *ctx) { + /* + * Anything running without the no_forking lock (atfork_lock) + * might be interrupted by fork. But libxl functions other than + * this one are then forbidden to the child. + * + * Conversely, this function might interrupt any other libxl + * operation (even though that other operation has the libxl ctx + * lock). We don't take the lock ourselves, since we are running + * in the child and if the lock is held the thread that took it no + * longer exists. To prevent us being interrupted by another call + * to ourselves (whether in another thread or by virtue of another + * fork) we take the atfork lock ourselves. + */ libxl__carefd *cf, *cf_tmp; int r; @@ -134,7 +150,33 @@ void libxl_postfork_child_noexec(libxl_ctx *ctx) } LIBXL_LIST_INIT(&carefds); - sigchld_user_remove(ctx); + if (sigchld_installed) { + /* We are in theory not at risk of concurrent execution of the + * SIGCHLD handler, because the application should call + * libxl_postfork_child_noexec before the child forks again. + * (If the SIGCHLD was in flight in the parent at the time of + * the fork, the thread it was delivered on exists only in the + * parent so is not our concern.) + * + * But in case the application violated this rule (and did so + * while multithreaded in the child), we use our deferral + * machinery. The result is that the SIGCHLD may then be lost + * (i.e. signaled to the now-defunct libxl ctx(s)). But at + * least we won't execute undefined behaviour (by examining + * the list in the signal handler concurrently with clearing + * it here), and since we won't actually reap the new children + * things will in fact go OK if the application doesn't try to + * use SIGCHLD, but instead just waits for the child(ren). */ + defer_sigchld(); + + LIBXL_LIST_INIT(&sigchld_users); + /* After this the ->sigchld_user_registered entries in the + * now-obsolete contexts may be lies. But that's OK because + * no-one will look at them. */ + + release_sigchld(); + sigchld_removehandler_core(); + } atfork_unlock(); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:00:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:00:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJst8-0006fB-Iq; Sat, 01 Mar 2014 23:00:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJst6-0006f1-Pl for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:09 +0000 Received: from [85.158.137.68:27357] by server-11.bemta-3.messagelabs.com id 5A/EA-04255-77662135; Sat, 01 Mar 2014 23:00:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1393714805!4999160!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16415 invoked from network); 1 Mar 2014 23:00:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:00:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJst2-0001xL-SU for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJst2-0000Nb-OB for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:04 +0000 Date: Sat, 01 Mar 2014 23:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MCE: Fix race condition in mctelem_reserve X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60ea3a3ac3d2bcd8e85b250fdbfc46b3b9dc7085 Author: Frediano Ziglio AuthorDate: Mon Feb 24 12:07:41 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:07:41 2014 +0100 x86/MCE: Fix race condition in mctelem_reserve These lines (in mctelem_reserve) newhead = oldhead->mcte_next; if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { are racy. After you read the newhead pointer it can happen that another flow (thread or recursive invocation) change all the list but set head with same value. So oldhead is the same as *freelp but you are setting a new head that could point to whatever element (even already used). This patch use instead a bit array and atomic bit operations. Signed-off-by: Frediano Ziglio Reviewed-by: Liu Jinsong --- xen/arch/x86/cpu/mcheck/mctelem.c | 81 ++++++++++++++----------------------- 1 files changed, 30 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index 895ce1a..ed8e8d2 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -37,24 +37,19 @@ struct mctelem_ent { void *mcte_data; /* corresponding data payload */ }; -#define MCTE_F_HOME_URGENT 0x0001U /* free to urgent freelist */ -#define MCTE_F_HOME_NONURGENT 0x0002U /* free to nonurgent freelist */ -#define MCTE_F_CLASS_URGENT 0x0004U /* in use - urgent errors */ -#define MCTE_F_CLASS_NONURGENT 0x0008U /* in use - nonurgent errors */ +#define MCTE_F_CLASS_URGENT 0x0001U /* in use - urgent errors */ +#define MCTE_F_CLASS_NONURGENT 0x0002U /* in use - nonurgent errors */ #define MCTE_F_STATE_FREE 0x0010U /* on a freelist */ #define MCTE_F_STATE_UNCOMMITTED 0x0020U /* reserved; on no list */ #define MCTE_F_STATE_COMMITTED 0x0040U /* on a committed list */ #define MCTE_F_STATE_PROCESSING 0x0080U /* on a processing list */ -#define MCTE_F_MASK_HOME (MCTE_F_HOME_URGENT | MCTE_F_HOME_NONURGENT) #define MCTE_F_MASK_CLASS (MCTE_F_CLASS_URGENT | MCTE_F_CLASS_NONURGENT) #define MCTE_F_MASK_STATE (MCTE_F_STATE_FREE | \ MCTE_F_STATE_UNCOMMITTED | \ MCTE_F_STATE_COMMITTED | \ MCTE_F_STATE_PROCESSING) -#define MCTE_HOME(tep) ((tep)->mcte_flags & MCTE_F_MASK_HOME) - #define MCTE_CLASS(tep) ((tep)->mcte_flags & MCTE_F_MASK_CLASS) #define MCTE_SET_CLASS(tep, new) do { \ (tep)->mcte_flags &= ~MCTE_F_MASK_CLASS; \ @@ -69,6 +64,8 @@ struct mctelem_ent { #define MC_URGENT_NENT 10 #define MC_NONURGENT_NENT 20 +#define MC_NENT (MC_URGENT_NENT + MC_NONURGENT_NENT) + #define MC_NCLASSES (MC_NONURGENT + 1) #define COOKIE2MCTE(c) ((struct mctelem_ent *)(c)) @@ -77,11 +74,9 @@ struct mctelem_ent { static struct mc_telem_ctl { /* Linked lists that thread the array members together. * - * The free lists are singly-linked via mcte_next, and we allocate - * from them by atomically unlinking an element from the head. - * Consumed entries are returned to the head of the free list. - * When an entry is reserved off the free list it is not linked - * on any list until it is committed or dismissed. + * The free lists is a bit array where bit 1 means free. + * This as element number is quite small and is easy to + * atomically allocate that way. * * The committed list grows at the head and we do not maintain a * tail pointer; insertions are performed atomically. The head @@ -101,7 +96,7 @@ static struct mc_telem_ctl { * we can lock it for updates. The head of the processing list * always has the oldest telemetry, and we append (as above) * at the tail of the processing list. */ - struct mctelem_ent *mctc_free[MC_NCLASSES]; + DECLARE_BITMAP(mctc_free, MC_NENT); struct mctelem_ent *mctc_committed[MC_NCLASSES]; struct mctelem_ent *mctc_processing_head[MC_NCLASSES]; struct mctelem_ent *mctc_processing_tail[MC_NCLASSES]; @@ -207,14 +202,14 @@ int mctelem_has_deferred(unsigned int cpu) */ static void mctelem_free(struct mctelem_ent *tep) { - mctelem_class_t target = MCTE_HOME(tep) == MCTE_F_HOME_URGENT ? - MC_URGENT : MC_NONURGENT; - BUG_ON(tep->mcte_refcnt != 0); BUG_ON(MCTE_STATE(tep) != MCTE_F_STATE_FREE); tep->mcte_prev = NULL; - mctelem_xchg_head(&mctctl.mctc_free[target], &tep->mcte_next, tep); + tep->mcte_next = NULL; + + /* set free in array */ + set_bit(tep - mctctl.mctc_elems, mctctl.mctc_free); } /* Increment the reference count of an entry that is not linked on to @@ -274,34 +269,25 @@ void mctelem_init(int reqdatasz) } if ((mctctl.mctc_elems = xmalloc_array(struct mctelem_ent, - MC_URGENT_NENT + MC_NONURGENT_NENT)) == NULL || - (datarr = xmalloc_bytes((MC_URGENT_NENT + MC_NONURGENT_NENT) * - datasz)) == NULL) { + MC_NENT)) == NULL || + (datarr = xmalloc_bytes(MC_NENT * datasz)) == NULL) { if (mctctl.mctc_elems) xfree(mctctl.mctc_elems); printk("Allocations for MCA telemetry failed\n"); return; } - for (i = 0; i < MC_URGENT_NENT + MC_NONURGENT_NENT; i++) { - struct mctelem_ent *tep, **tepp; + for (i = 0; i < MC_NENT; i++) { + struct mctelem_ent *tep; tep = mctctl.mctc_elems + i; tep->mcte_flags = MCTE_F_STATE_FREE; tep->mcte_refcnt = 0; tep->mcte_data = datarr + i * datasz; - if (i < MC_URGENT_NENT) { - tepp = &mctctl.mctc_free[MC_URGENT]; - tep->mcte_flags |= MCTE_F_HOME_URGENT; - } else { - tepp = &mctctl.mctc_free[MC_NONURGENT]; - tep->mcte_flags |= MCTE_F_HOME_NONURGENT; - } - - tep->mcte_next = *tepp; + __set_bit(i, mctctl.mctc_free); + tep->mcte_next = NULL; tep->mcte_prev = NULL; - *tepp = tep; } } @@ -310,32 +296,25 @@ static int mctelem_drop_count; /* Reserve a telemetry entry, or return NULL if none available. * If we return an entry then the caller must subsequently call exactly one of - * mctelem_unreserve or mctelem_commit for that entry. + * mctelem_dismiss or mctelem_commit for that entry. */ mctelem_cookie_t mctelem_reserve(mctelem_class_t which) { - struct mctelem_ent **freelp; - struct mctelem_ent *oldhead, *newhead; - mctelem_class_t target = (which == MC_URGENT) ? - MC_URGENT : MC_NONURGENT; + unsigned bit; + unsigned start_bit = (which == MC_URGENT) ? 0 : MC_URGENT_NENT; - freelp = &mctctl.mctc_free[target]; for (;;) { - if ((oldhead = *freelp) == NULL) { - if (which == MC_URGENT && target == MC_URGENT) { - /* raid the non-urgent freelist */ - target = MC_NONURGENT; - freelp = &mctctl.mctc_free[target]; - continue; - } else { - mctelem_drop_count++; - return (NULL); - } + bit = find_next_bit(mctctl.mctc_free, MC_NENT, start_bit); + + if (bit >= MC_NENT) { + mctelem_drop_count++; + return (NULL); } - newhead = oldhead->mcte_next; - if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { - struct mctelem_ent *tep = oldhead; + /* try to allocate, atomically clear free bit */ + if (test_and_clear_bit(bit, mctctl.mctc_free)) { + /* return element we got */ + struct mctelem_ent *tep = mctctl.mctc_elems + bit; mctelem_hold(tep); MCTE_TRANSITION_STATE(tep, FREE, UNCOMMITTED); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:00:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:00:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJst8-0006fB-Iq; Sat, 01 Mar 2014 23:00:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJst6-0006f1-Pl for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:09 +0000 Received: from [85.158.137.68:27357] by server-11.bemta-3.messagelabs.com id 5A/EA-04255-77662135; Sat, 01 Mar 2014 23:00:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1393714805!4999160!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16415 invoked from network); 1 Mar 2014 23:00:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:00:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJst2-0001xL-SU for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJst2-0000Nb-OB for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:04 +0000 Date: Sat, 01 Mar 2014 23:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MCE: Fix race condition in mctelem_reserve X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60ea3a3ac3d2bcd8e85b250fdbfc46b3b9dc7085 Author: Frediano Ziglio AuthorDate: Mon Feb 24 12:07:41 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:07:41 2014 +0100 x86/MCE: Fix race condition in mctelem_reserve These lines (in mctelem_reserve) newhead = oldhead->mcte_next; if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { are racy. After you read the newhead pointer it can happen that another flow (thread or recursive invocation) change all the list but set head with same value. So oldhead is the same as *freelp but you are setting a new head that could point to whatever element (even already used). This patch use instead a bit array and atomic bit operations. Signed-off-by: Frediano Ziglio Reviewed-by: Liu Jinsong --- xen/arch/x86/cpu/mcheck/mctelem.c | 81 ++++++++++++++----------------------- 1 files changed, 30 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index 895ce1a..ed8e8d2 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -37,24 +37,19 @@ struct mctelem_ent { void *mcte_data; /* corresponding data payload */ }; -#define MCTE_F_HOME_URGENT 0x0001U /* free to urgent freelist */ -#define MCTE_F_HOME_NONURGENT 0x0002U /* free to nonurgent freelist */ -#define MCTE_F_CLASS_URGENT 0x0004U /* in use - urgent errors */ -#define MCTE_F_CLASS_NONURGENT 0x0008U /* in use - nonurgent errors */ +#define MCTE_F_CLASS_URGENT 0x0001U /* in use - urgent errors */ +#define MCTE_F_CLASS_NONURGENT 0x0002U /* in use - nonurgent errors */ #define MCTE_F_STATE_FREE 0x0010U /* on a freelist */ #define MCTE_F_STATE_UNCOMMITTED 0x0020U /* reserved; on no list */ #define MCTE_F_STATE_COMMITTED 0x0040U /* on a committed list */ #define MCTE_F_STATE_PROCESSING 0x0080U /* on a processing list */ -#define MCTE_F_MASK_HOME (MCTE_F_HOME_URGENT | MCTE_F_HOME_NONURGENT) #define MCTE_F_MASK_CLASS (MCTE_F_CLASS_URGENT | MCTE_F_CLASS_NONURGENT) #define MCTE_F_MASK_STATE (MCTE_F_STATE_FREE | \ MCTE_F_STATE_UNCOMMITTED | \ MCTE_F_STATE_COMMITTED | \ MCTE_F_STATE_PROCESSING) -#define MCTE_HOME(tep) ((tep)->mcte_flags & MCTE_F_MASK_HOME) - #define MCTE_CLASS(tep) ((tep)->mcte_flags & MCTE_F_MASK_CLASS) #define MCTE_SET_CLASS(tep, new) do { \ (tep)->mcte_flags &= ~MCTE_F_MASK_CLASS; \ @@ -69,6 +64,8 @@ struct mctelem_ent { #define MC_URGENT_NENT 10 #define MC_NONURGENT_NENT 20 +#define MC_NENT (MC_URGENT_NENT + MC_NONURGENT_NENT) + #define MC_NCLASSES (MC_NONURGENT + 1) #define COOKIE2MCTE(c) ((struct mctelem_ent *)(c)) @@ -77,11 +74,9 @@ struct mctelem_ent { static struct mc_telem_ctl { /* Linked lists that thread the array members together. * - * The free lists are singly-linked via mcte_next, and we allocate - * from them by atomically unlinking an element from the head. - * Consumed entries are returned to the head of the free list. - * When an entry is reserved off the free list it is not linked - * on any list until it is committed or dismissed. + * The free lists is a bit array where bit 1 means free. + * This as element number is quite small and is easy to + * atomically allocate that way. * * The committed list grows at the head and we do not maintain a * tail pointer; insertions are performed atomically. The head @@ -101,7 +96,7 @@ static struct mc_telem_ctl { * we can lock it for updates. The head of the processing list * always has the oldest telemetry, and we append (as above) * at the tail of the processing list. */ - struct mctelem_ent *mctc_free[MC_NCLASSES]; + DECLARE_BITMAP(mctc_free, MC_NENT); struct mctelem_ent *mctc_committed[MC_NCLASSES]; struct mctelem_ent *mctc_processing_head[MC_NCLASSES]; struct mctelem_ent *mctc_processing_tail[MC_NCLASSES]; @@ -207,14 +202,14 @@ int mctelem_has_deferred(unsigned int cpu) */ static void mctelem_free(struct mctelem_ent *tep) { - mctelem_class_t target = MCTE_HOME(tep) == MCTE_F_HOME_URGENT ? - MC_URGENT : MC_NONURGENT; - BUG_ON(tep->mcte_refcnt != 0); BUG_ON(MCTE_STATE(tep) != MCTE_F_STATE_FREE); tep->mcte_prev = NULL; - mctelem_xchg_head(&mctctl.mctc_free[target], &tep->mcte_next, tep); + tep->mcte_next = NULL; + + /* set free in array */ + set_bit(tep - mctctl.mctc_elems, mctctl.mctc_free); } /* Increment the reference count of an entry that is not linked on to @@ -274,34 +269,25 @@ void mctelem_init(int reqdatasz) } if ((mctctl.mctc_elems = xmalloc_array(struct mctelem_ent, - MC_URGENT_NENT + MC_NONURGENT_NENT)) == NULL || - (datarr = xmalloc_bytes((MC_URGENT_NENT + MC_NONURGENT_NENT) * - datasz)) == NULL) { + MC_NENT)) == NULL || + (datarr = xmalloc_bytes(MC_NENT * datasz)) == NULL) { if (mctctl.mctc_elems) xfree(mctctl.mctc_elems); printk("Allocations for MCA telemetry failed\n"); return; } - for (i = 0; i < MC_URGENT_NENT + MC_NONURGENT_NENT; i++) { - struct mctelem_ent *tep, **tepp; + for (i = 0; i < MC_NENT; i++) { + struct mctelem_ent *tep; tep = mctctl.mctc_elems + i; tep->mcte_flags = MCTE_F_STATE_FREE; tep->mcte_refcnt = 0; tep->mcte_data = datarr + i * datasz; - if (i < MC_URGENT_NENT) { - tepp = &mctctl.mctc_free[MC_URGENT]; - tep->mcte_flags |= MCTE_F_HOME_URGENT; - } else { - tepp = &mctctl.mctc_free[MC_NONURGENT]; - tep->mcte_flags |= MCTE_F_HOME_NONURGENT; - } - - tep->mcte_next = *tepp; + __set_bit(i, mctctl.mctc_free); + tep->mcte_next = NULL; tep->mcte_prev = NULL; - *tepp = tep; } } @@ -310,32 +296,25 @@ static int mctelem_drop_count; /* Reserve a telemetry entry, or return NULL if none available. * If we return an entry then the caller must subsequently call exactly one of - * mctelem_unreserve or mctelem_commit for that entry. + * mctelem_dismiss or mctelem_commit for that entry. */ mctelem_cookie_t mctelem_reserve(mctelem_class_t which) { - struct mctelem_ent **freelp; - struct mctelem_ent *oldhead, *newhead; - mctelem_class_t target = (which == MC_URGENT) ? - MC_URGENT : MC_NONURGENT; + unsigned bit; + unsigned start_bit = (which == MC_URGENT) ? 0 : MC_URGENT_NENT; - freelp = &mctctl.mctc_free[target]; for (;;) { - if ((oldhead = *freelp) == NULL) { - if (which == MC_URGENT && target == MC_URGENT) { - /* raid the non-urgent freelist */ - target = MC_NONURGENT; - freelp = &mctctl.mctc_free[target]; - continue; - } else { - mctelem_drop_count++; - return (NULL); - } + bit = find_next_bit(mctctl.mctc_free, MC_NENT, start_bit); + + if (bit >= MC_NENT) { + mctelem_drop_count++; + return (NULL); } - newhead = oldhead->mcte_next; - if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { - struct mctelem_ent *tep = oldhead; + /* try to allocate, atomically clear free bit */ + if (test_and_clear_bit(bit, mctctl.mctc_free)) { + /* return element we got */ + struct mctelem_ent *tep = mctctl.mctc_elems + bit; mctelem_hold(tep); MCTE_TRANSITION_STATE(tep, FREE, UNCOMMITTED); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:00:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:00:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstH-0006g4-P7; Sat, 01 Mar 2014 23:00:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstF-0006fl-VJ for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:18 +0000 Received: from [193.109.254.147:57949] by server-6.bemta-14.messagelabs.com id 2C/40-03396-18662135; Sat, 01 Mar 2014 23:00:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1393714815!7764354!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6220 invoked from network); 1 Mar 2014 23:00:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:00:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstD-0001xO-2k for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJstD-0000O8-0X for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:15 +0000 Date: Sat, 01 Mar 2014 23:00:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vmce: Allow vmce_amd_* functions to handle AMD thresolding MSRs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 199a0878195f3a271394d126c66e8030c461ebd3 Author: Aravind Gopalakrishnan AuthorDate: Mon Feb 24 12:09:14 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:09:14 2014 +0100 vmce: Allow vmce_amd_* functions to handle AMD thresolding MSRs vmce_amd_[rd|wr]msr functions can handle accesses to AMD thresholding registers. But due to this statement here: switch ( msr & (MSR_IA32_MC0_CTL | 3) ) we are wrongly masking off top two bits which meant the register accesses never made it to vmce_amd_* functions. Corrected this problem by modifying the mask in this patch to allow AMD thresholding registers to fall to 'default' case which in turn allows vmce_amd_* functions to handle access to the registers. While at it, remove some clutter in the vmce_amd* functions. Retained current policy of returning zero for reads and ignoring writes. Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Jan Beulich Reviewed-by: Liu Jinsong --- xen/arch/x86/cpu/mcheck/amd_f10.c | 41 +++++------------------------------- xen/arch/x86/cpu/mcheck/vmce.c | 4 +- 2 files changed, 8 insertions(+), 37 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/amd_f10.c b/xen/arch/x86/cpu/mcheck/amd_f10.c index 61319dc..03797ab 100644 --- a/xen/arch/x86/cpu/mcheck/amd_f10.c +++ b/xen/arch/x86/cpu/mcheck/amd_f10.c @@ -105,43 +105,14 @@ enum mcheck_type amd_f10_mcheck_init(struct cpuinfo_x86 *c) /* amd specific MCA MSR */ int vmce_amd_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) { - switch (msr) { - case MSR_F10_MC4_MISC1: /* DRAM error type */ - v->arch.vmce.bank[1].mci_misc = val; - mce_printk(MCE_VERBOSE, "MCE: wr msr %#"PRIx64"\n", val); - break; - case MSR_F10_MC4_MISC2: /* Link error type */ - case MSR_F10_MC4_MISC3: /* L3 cache error type */ - /* ignore write: we do not emulate link and l3 cache errors - * to the guest. - */ - mce_printk(MCE_VERBOSE, "MCE: wr msr %#"PRIx64"\n", val); - break; - default: - return 0; - } - - return 1; + /* Do nothing as we don't emulate this MC bank currently */ + mce_printk(MCE_VERBOSE, "MCE: wr msr %#"PRIx64"\n", val); + return 1; } int vmce_amd_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) { - switch (msr) { - case MSR_F10_MC4_MISC1: /* DRAM error type */ - *val = v->arch.vmce.bank[1].mci_misc; - mce_printk(MCE_VERBOSE, "MCE: rd msr %#"PRIx64"\n", *val); - break; - case MSR_F10_MC4_MISC2: /* Link error type */ - case MSR_F10_MC4_MISC3: /* L3 cache error type */ - /* we do not emulate link and l3 cache - * errors to the guest. - */ - *val = 0; - mce_printk(MCE_VERBOSE, "MCE: rd msr %#"PRIx64"\n", *val); - break; - default: - return 0; - } - - return 1; + /* Assign '0' as we don't emulate this MC bank currently */ + *val = 0; + return 1; } diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index f6c35db..be9bb5e 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -107,7 +107,7 @@ static int bank_mce_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) *val = 0; - switch ( msr & (MSR_IA32_MC0_CTL | 3) ) + switch ( msr & (-MSR_IA32_MC0_CTL | 3) ) { case MSR_IA32_MC0_CTL: /* stick all 1's to MCi_CTL */ @@ -210,7 +210,7 @@ static int bank_mce_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) int ret = 1; unsigned int bank = (msr - MSR_IA32_MC0_CTL) / 4; - switch ( msr & (MSR_IA32_MC0_CTL | 3) ) + switch ( msr & (-MSR_IA32_MC0_CTL | 3) ) { case MSR_IA32_MC0_CTL: /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:00:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:00:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstH-0006g4-P7; Sat, 01 Mar 2014 23:00:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstF-0006fl-VJ for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:18 +0000 Received: from [193.109.254.147:57949] by server-6.bemta-14.messagelabs.com id 2C/40-03396-18662135; Sat, 01 Mar 2014 23:00:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1393714815!7764354!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6220 invoked from network); 1 Mar 2014 23:00:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:00:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstD-0001xO-2k for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJstD-0000O8-0X for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:15 +0000 Date: Sat, 01 Mar 2014 23:00:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vmce: Allow vmce_amd_* functions to handle AMD thresolding MSRs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 199a0878195f3a271394d126c66e8030c461ebd3 Author: Aravind Gopalakrishnan AuthorDate: Mon Feb 24 12:09:14 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:09:14 2014 +0100 vmce: Allow vmce_amd_* functions to handle AMD thresolding MSRs vmce_amd_[rd|wr]msr functions can handle accesses to AMD thresholding registers. But due to this statement here: switch ( msr & (MSR_IA32_MC0_CTL | 3) ) we are wrongly masking off top two bits which meant the register accesses never made it to vmce_amd_* functions. Corrected this problem by modifying the mask in this patch to allow AMD thresholding registers to fall to 'default' case which in turn allows vmce_amd_* functions to handle access to the registers. While at it, remove some clutter in the vmce_amd* functions. Retained current policy of returning zero for reads and ignoring writes. Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Jan Beulich Reviewed-by: Liu Jinsong --- xen/arch/x86/cpu/mcheck/amd_f10.c | 41 +++++------------------------------- xen/arch/x86/cpu/mcheck/vmce.c | 4 +- 2 files changed, 8 insertions(+), 37 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/amd_f10.c b/xen/arch/x86/cpu/mcheck/amd_f10.c index 61319dc..03797ab 100644 --- a/xen/arch/x86/cpu/mcheck/amd_f10.c +++ b/xen/arch/x86/cpu/mcheck/amd_f10.c @@ -105,43 +105,14 @@ enum mcheck_type amd_f10_mcheck_init(struct cpuinfo_x86 *c) /* amd specific MCA MSR */ int vmce_amd_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) { - switch (msr) { - case MSR_F10_MC4_MISC1: /* DRAM error type */ - v->arch.vmce.bank[1].mci_misc = val; - mce_printk(MCE_VERBOSE, "MCE: wr msr %#"PRIx64"\n", val); - break; - case MSR_F10_MC4_MISC2: /* Link error type */ - case MSR_F10_MC4_MISC3: /* L3 cache error type */ - /* ignore write: we do not emulate link and l3 cache errors - * to the guest. - */ - mce_printk(MCE_VERBOSE, "MCE: wr msr %#"PRIx64"\n", val); - break; - default: - return 0; - } - - return 1; + /* Do nothing as we don't emulate this MC bank currently */ + mce_printk(MCE_VERBOSE, "MCE: wr msr %#"PRIx64"\n", val); + return 1; } int vmce_amd_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) { - switch (msr) { - case MSR_F10_MC4_MISC1: /* DRAM error type */ - *val = v->arch.vmce.bank[1].mci_misc; - mce_printk(MCE_VERBOSE, "MCE: rd msr %#"PRIx64"\n", *val); - break; - case MSR_F10_MC4_MISC2: /* Link error type */ - case MSR_F10_MC4_MISC3: /* L3 cache error type */ - /* we do not emulate link and l3 cache - * errors to the guest. - */ - *val = 0; - mce_printk(MCE_VERBOSE, "MCE: rd msr %#"PRIx64"\n", *val); - break; - default: - return 0; - } - - return 1; + /* Assign '0' as we don't emulate this MC bank currently */ + *val = 0; + return 1; } diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index f6c35db..be9bb5e 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -107,7 +107,7 @@ static int bank_mce_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) *val = 0; - switch ( msr & (MSR_IA32_MC0_CTL | 3) ) + switch ( msr & (-MSR_IA32_MC0_CTL | 3) ) { case MSR_IA32_MC0_CTL: /* stick all 1's to MCi_CTL */ @@ -210,7 +210,7 @@ static int bank_mce_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) int ret = 1; unsigned int bank = (msr - MSR_IA32_MC0_CTL) / 4; - switch ( msr & (MSR_IA32_MC0_CTL | 3) ) + switch ( msr & (-MSR_IA32_MC0_CTL | 3) ) { case MSR_IA32_MC0_CTL: /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:00:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstR-0006hI-1D; Sat, 01 Mar 2014 23:00:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstP-0006h5-R9 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:28 +0000 Received: from [193.109.254.147:9859] by server-5.bemta-14.messagelabs.com id D8/AB-16688-B8662135; Sat, 01 Mar 2014 23:00:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1393714825!7731031!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15643 invoked from network); 1 Mar 2014 23:00:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:00:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstN-0001xR-A2 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJstN-0000OX-7n for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:25 +0000 Date: Sat, 01 Mar 2014 23:00:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Nested VMX: update nested paging mode on vmexit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd1864f48d8914fb8eeb6841cd08c2c09b368909 Author: Yang Zhang AuthorDate: Mon Feb 24 12:09:52 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:09:52 2014 +0100 Nested VMX: update nested paging mode on vmexit Since SVM and VMX use different mechanism to emulate the virtual-vmentry and virtual-vmexit, it's hard to update the nested paging mode correctly in common code. So we need to update the nested paging mode in their respective code path. SVM already updates the nested paging mode on vmexit. This patch adds the same logic in VMX side. Previous discussion is here: http://lists.xen.org/archives/html/xen-devel/2013-12/msg01759.html Signed-off-by: Yang Zhang Reviewed-by: Christoph Egger --- xen/arch/x86/hvm/vmx/vmx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f6409d6..baf3040 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2541,6 +2541,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vcpu_nestedhvm(v).nv_vmswitch_in_progress = 0; if ( nestedhvm_vcpu_in_guestmode(v) ) { + paging_update_nestedmode(v); if ( nvmx_n2_vmexit_handler(regs, exit_reason) ) goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:00:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstR-0006hI-1D; Sat, 01 Mar 2014 23:00:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstP-0006h5-R9 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:28 +0000 Received: from [193.109.254.147:9859] by server-5.bemta-14.messagelabs.com id D8/AB-16688-B8662135; Sat, 01 Mar 2014 23:00:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1393714825!7731031!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15643 invoked from network); 1 Mar 2014 23:00:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:00:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstN-0001xR-A2 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJstN-0000OX-7n for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:25 +0000 Date: Sat, 01 Mar 2014 23:00:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Nested VMX: update nested paging mode on vmexit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd1864f48d8914fb8eeb6841cd08c2c09b368909 Author: Yang Zhang AuthorDate: Mon Feb 24 12:09:52 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:09:52 2014 +0100 Nested VMX: update nested paging mode on vmexit Since SVM and VMX use different mechanism to emulate the virtual-vmentry and virtual-vmexit, it's hard to update the nested paging mode correctly in common code. So we need to update the nested paging mode in their respective code path. SVM already updates the nested paging mode on vmexit. This patch adds the same logic in VMX side. Previous discussion is here: http://lists.xen.org/archives/html/xen-devel/2013-12/msg01759.html Signed-off-by: Yang Zhang Reviewed-by: Christoph Egger --- xen/arch/x86/hvm/vmx/vmx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f6409d6..baf3040 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2541,6 +2541,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vcpu_nestedhvm(v).nv_vmswitch_in_progress = 0; if ( nestedhvm_vcpu_in_guestmode(v) ) { + paging_update_nestedmode(v); if ( nvmx_n2_vmexit_handler(regs, exit_reason) ) goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:00:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:00:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstc-0006j1-4I; Sat, 01 Mar 2014 23:00:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsta-0006ic-4p for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:38 +0000 Received: from [193.109.254.147:16170] by server-10.bemta-14.messagelabs.com id 00/8E-10711-59662135; Sat, 01 Mar 2014 23:00:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1393714835!7748526!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10701 invoked from network); 1 Mar 2014 23:00:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:00:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstX-0001xd-J2 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJstX-0000Pi-GQ for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:35 +0000 Date: Sat, 01 Mar 2014 23:00:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI: don't risk division by zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d160d913e03b581bdddde73535c18ac670cf0a9 Author: Jan Beulich AuthorDate: Mon Feb 24 12:11:01 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:11:01 2014 +0100 x86/MSI: don't risk division by zero The check in question is redundant with the one in the immediately following if(), where dividing by zero gets carefully avoided. Spotted-by: Boris Ostrovsky Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky --- xen/arch/x86/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 1aaceeb..61d6dd0 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -636,7 +636,7 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) return 0; base = pos + PCI_SRIOV_BAR; vf -= PCI_BDF(bus, slot, func) + offset; - if ( vf < 0 || (vf && vf % stride) ) + if ( vf < 0 ) return 0; if ( stride ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:00:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:00:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstc-0006j1-4I; Sat, 01 Mar 2014 23:00:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsta-0006ic-4p for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:38 +0000 Received: from [193.109.254.147:16170] by server-10.bemta-14.messagelabs.com id 00/8E-10711-59662135; Sat, 01 Mar 2014 23:00:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1393714835!7748526!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10701 invoked from network); 1 Mar 2014 23:00:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:00:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstX-0001xd-J2 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJstX-0000Pi-GQ for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:35 +0000 Date: Sat, 01 Mar 2014 23:00:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI: don't risk division by zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d160d913e03b581bdddde73535c18ac670cf0a9 Author: Jan Beulich AuthorDate: Mon Feb 24 12:11:01 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:11:01 2014 +0100 x86/MSI: don't risk division by zero The check in question is redundant with the one in the immediately following if(), where dividing by zero gets carefully avoided. Spotted-by: Boris Ostrovsky Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky --- xen/arch/x86/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 1aaceeb..61d6dd0 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -636,7 +636,7 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) return 0; base = pos + PCI_SRIOV_BAR; vf -= PCI_BDF(bus, slot, func) + offset; - if ( vf < 0 || (vf && vf % stride) ) + if ( vf < 0 ) return 0; if ( stride ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:01:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:01:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstm-0006ki-7O; Sat, 01 Mar 2014 23:00:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstk-0006kS-Ha for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:48 +0000 Received: from [85.158.143.35:37767] by server-2.bemta-4.messagelabs.com id FA/78-04779-F9662135; Sat, 01 Mar 2014 23:00:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1393714846!9291938!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16659 invoked from network); 1 Mar 2014 23:00:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:00:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsth-0001xm-Oz for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsth-0000Q4-NB for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:45 +0000 Date: Sat, 01 Mar 2014 23:00:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: expose RDSEED, ADX, and PREFETCHW to dom0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9625f4ef05031773a52ebe3ca84db64af68956d6 Author: Xudong Hao AuthorDate: Mon Feb 24 12:11:53 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:11:53 2014 +0100 x86: expose RDSEED, ADX, and PREFETCHW to dom0 This patch explicitly exposes Intel new features to dom0, including RDSEED and ADX. As for PREFETCHW, it doesn't need explicit exposing. Signed-off-by: Xudong Hao Signed-off-by: Liu Jinsong Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 2 ++ xen/include/asm-x86/cpufeature.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0bd43b9..c736dd1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -829,6 +829,8 @@ void pv_cpuid(struct cpu_user_regs *regs) cpufeat_mask(X86_FEATURE_BMI2) | cpufeat_mask(X86_FEATURE_ERMS) | cpufeat_mask(X86_FEATURE_RTM) | + cpufeat_mask(X86_FEATURE_RDSEED) | + cpufeat_mask(X86_FEATURE_ADX) | cpufeat_mask(X86_FEATURE_FSGSBASE)); else b = 0; diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 1cfaf94..87d5f66 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -148,6 +148,8 @@ #define X86_FEATURE_INVPCID (7*32+10) /* Invalidate Process Context ID */ #define X86_FEATURE_RTM (7*32+11) /* Restricted Transactional Memory */ #define X86_FEATURE_NO_FPU_SEL (7*32+13) /* FPU CS/DS stored as zero */ +#define X86_FEATURE_RDSEED (7*32+18) /* RDSEED instruction */ +#define X86_FEATURE_ADX (7*32+19) /* ADCX, ADOX instructions */ #define X86_FEATURE_SMAP (7*32+20) /* Supervisor Mode Access Prevention */ #define cpu_has(c, bit) test_bit(bit, (c)->x86_capability) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:01:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:01:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstm-0006ki-7O; Sat, 01 Mar 2014 23:00:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstk-0006kS-Ha for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:48 +0000 Received: from [85.158.143.35:37767] by server-2.bemta-4.messagelabs.com id FA/78-04779-F9662135; Sat, 01 Mar 2014 23:00:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1393714846!9291938!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16659 invoked from network); 1 Mar 2014 23:00:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:00:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsth-0001xm-Oz for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsth-0000Q4-NB for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:45 +0000 Date: Sat, 01 Mar 2014 23:00:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: expose RDSEED, ADX, and PREFETCHW to dom0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9625f4ef05031773a52ebe3ca84db64af68956d6 Author: Xudong Hao AuthorDate: Mon Feb 24 12:11:53 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:11:53 2014 +0100 x86: expose RDSEED, ADX, and PREFETCHW to dom0 This patch explicitly exposes Intel new features to dom0, including RDSEED and ADX. As for PREFETCHW, it doesn't need explicit exposing. Signed-off-by: Xudong Hao Signed-off-by: Liu Jinsong Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 2 ++ xen/include/asm-x86/cpufeature.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0bd43b9..c736dd1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -829,6 +829,8 @@ void pv_cpuid(struct cpu_user_regs *regs) cpufeat_mask(X86_FEATURE_BMI2) | cpufeat_mask(X86_FEATURE_ERMS) | cpufeat_mask(X86_FEATURE_RTM) | + cpufeat_mask(X86_FEATURE_RDSEED) | + cpufeat_mask(X86_FEATURE_ADX) | cpufeat_mask(X86_FEATURE_FSGSBASE)); else b = 0; diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 1cfaf94..87d5f66 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -148,6 +148,8 @@ #define X86_FEATURE_INVPCID (7*32+10) /* Invalidate Process Context ID */ #define X86_FEATURE_RTM (7*32+11) /* Restricted Transactional Memory */ #define X86_FEATURE_NO_FPU_SEL (7*32+13) /* FPU CS/DS stored as zero */ +#define X86_FEATURE_RDSEED (7*32+18) /* RDSEED instruction */ +#define X86_FEATURE_ADX (7*32+19) /* ADCX, ADOX instructions */ #define X86_FEATURE_SMAP (7*32+20) /* Supervisor Mode Access Prevention */ #define cpu_has(c, bit) test_bit(bit, (c)->x86_capability) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:01:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:01:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstz-0006mT-Ad; Sat, 01 Mar 2014 23:01:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstw-0006lq-1G for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:00 +0000 Received: from [85.158.143.35:46066] by server-3.bemta-4.messagelabs.com id 97/EA-11539-BA662135; Sat, 01 Mar 2014 23:00:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1393714856!9279032!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2054 invoked from network); 1 Mar 2014 23:00:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:00:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsts-0001xp-2c for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJstr-0000QU-SU for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:55 +0000 Date: Sat, 01 Mar 2014 23:00:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vtd: don't export iommu_domain_teardown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 24e0a36d63a6bac1e2777b7265c8add3f7895e58 Author: Julien Grall AuthorDate: Mon Feb 24 12:21:54 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:28:49 2014 +0100 vtd: don't export iommu_domain_teardown iommu_domain_teardown is only used internally in xen/drivers/passthrough/vtd/iommu.c Signed-off-by: Julien Grall Acked-by: Ian Cambell Acked-by: Jan Beulich --- xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/include/xen/iommu.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 5f10034..a8d33fc 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1701,7 +1701,7 @@ static int reassign_device_ownership( return ret; } -void iommu_domain_teardown(struct domain *d) +static void iommu_domain_teardown(struct domain *d) { struct hvm_iommu *hd = domain_hvm_iommu(d); diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 8bb0a1d..ae7e75d 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -69,7 +69,6 @@ int iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, int iommu_unmap_page(struct domain *d, unsigned long gfn); void iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte, int order, int present); void iommu_set_pgd(struct domain *d); -void iommu_domain_teardown(struct domain *d); void pt_pci_init(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:01:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:01:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstz-0006mT-Ad; Sat, 01 Mar 2014 23:01:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJstw-0006lq-1G for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:00 +0000 Received: from [85.158.143.35:46066] by server-3.bemta-4.messagelabs.com id 97/EA-11539-BA662135; Sat, 01 Mar 2014 23:00:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1393714856!9279032!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2054 invoked from network); 1 Mar 2014 23:00:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:00:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsts-0001xp-2c for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJstr-0000QU-SU for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:00:55 +0000 Date: Sat, 01 Mar 2014 23:00:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vtd: don't export iommu_domain_teardown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 24e0a36d63a6bac1e2777b7265c8add3f7895e58 Author: Julien Grall AuthorDate: Mon Feb 24 12:21:54 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:28:49 2014 +0100 vtd: don't export iommu_domain_teardown iommu_domain_teardown is only used internally in xen/drivers/passthrough/vtd/iommu.c Signed-off-by: Julien Grall Acked-by: Ian Cambell Acked-by: Jan Beulich --- xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/include/xen/iommu.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 5f10034..a8d33fc 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1701,7 +1701,7 @@ static int reassign_device_ownership( return ret; } -void iommu_domain_teardown(struct domain *d) +static void iommu_domain_teardown(struct domain *d) { struct hvm_iommu *hd = domain_hvm_iommu(d); diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 8bb0a1d..ae7e75d 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -69,7 +69,6 @@ int iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, int iommu_unmap_page(struct domain *d, unsigned long gfn); void iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte, int order, int present); void iommu_set_pgd(struct domain *d); -void iommu_domain_teardown(struct domain *d); void pt_pci_init(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:01:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:01:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsu6-0006nq-Gr; Sat, 01 Mar 2014 23:01:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsu5-0006nd-2c for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:09 +0000 Received: from [193.109.254.147:17258] by server-13.bemta-14.messagelabs.com id AC/5A-01226-4B662135; Sat, 01 Mar 2014 23:01:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1393714866!7731098!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.7 required=7.0 tests=BIZ_TLD X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19599 invoked from network); 1 Mar 2014 23:01:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:01:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsu2-0001yO-If for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsu2-0000RG-E1 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:06 +0000 Date: Sat, 01 Mar 2014 23:01:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: comments cleanup on libxl_dm.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 21eaf5b06a41c787e1441523f7b22e57565bb292 Author: Fabio Fantoni AuthorDate: Sat Feb 22 11:35:54 2014 +0100 Commit: Ian Jackson CommitDate: Mon Feb 24 11:26:37 2014 +0000 libxl: comments cleanup on libxl_dm.c Removed some unuseful comments lines. Signed-off-by: Fabio Fantoni Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index f6f7bbd..5c06dfa 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -412,7 +412,6 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, /* * Remove default devices created by qemu. Qemu will create only devices * defined by xen, since the devices not defined by xen are not usable. - * Remove deleting of empty floppy no more needed with nodefault. */ flexarray_append(dm_args, "-nodefaults"); @@ -470,10 +469,6 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ } - /*if (info->type == LIBXL_DOMAIN_TYPE_PV && !b_info->nographic) { - flexarray_vappend(dm_args, "-vga", "xenfb", NULL); - } never was possible?*/ - if (keymap) { flexarray_vappend(dm_args, "-k", keymap, NULL); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:01:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:01:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsu6-0006nq-Gr; Sat, 01 Mar 2014 23:01:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsu5-0006nd-2c for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:09 +0000 Received: from [193.109.254.147:17258] by server-13.bemta-14.messagelabs.com id AC/5A-01226-4B662135; Sat, 01 Mar 2014 23:01:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1393714866!7731098!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.7 required=7.0 tests=BIZ_TLD X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19599 invoked from network); 1 Mar 2014 23:01:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:01:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsu2-0001yO-If for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsu2-0000RG-E1 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:06 +0000 Date: Sat, 01 Mar 2014 23:01:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: comments cleanup on libxl_dm.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 21eaf5b06a41c787e1441523f7b22e57565bb292 Author: Fabio Fantoni AuthorDate: Sat Feb 22 11:35:54 2014 +0100 Commit: Ian Jackson CommitDate: Mon Feb 24 11:26:37 2014 +0000 libxl: comments cleanup on libxl_dm.c Removed some unuseful comments lines. Signed-off-by: Fabio Fantoni Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index f6f7bbd..5c06dfa 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -412,7 +412,6 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, /* * Remove default devices created by qemu. Qemu will create only devices * defined by xen, since the devices not defined by xen are not usable. - * Remove deleting of empty floppy no more needed with nodefault. */ flexarray_append(dm_args, "-nodefaults"); @@ -470,10 +469,6 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ } - /*if (info->type == LIBXL_DOMAIN_TYPE_PV && !b_info->nographic) { - flexarray_vappend(dm_args, "-vga", "xenfb", NULL); - } never was possible?*/ - if (keymap) { flexarray_vappend(dm_args, "-k", keymap, NULL); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsua-0006tT-5y; Sat, 01 Mar 2014 23:01:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuZ-0006tG-JV for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:39 +0000 Received: from [193.109.254.147:24110] by server-6.bemta-14.messagelabs.com id 8A/C0-03396-2D662135; Sat, 01 Mar 2014 23:01:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1393714897!7728151!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1733 invoked from network); 1 Mar 2014 23:01:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:01:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuX-0001yd-41 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsuX-0000T4-2W for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:37 +0000 Date: Sat, 01 Mar 2014 23:01:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] iommu: don't need to map dom0 page when the PT is shared X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9b51591c330672765d866a5ed4ed8e40c75bb1cf Author: Julien Grall AuthorDate: Mon Feb 24 12:33:00 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:33:00 2014 +0100 iommu: don't need to map dom0 page when the PT is shared Currently iommu_init_dom0 is browsing the page list and call map_page callback on each page. On both AMD and VTD drivers, the function will directly return if the page table is shared with the processor. So Xen can safely avoid to run through the page list. Signed-off-by: Julien Grall Acked-by: Ian Campbell Acked-by: Jan Beulich --- xen/drivers/passthrough/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 19b0e23..c70165a 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -153,7 +153,7 @@ void __init iommu_dom0_init(struct domain *d) register_keyhandler('o', &iommu_p2m_table); d->need_iommu = !!iommu_dom0_strict; - if ( need_iommu(d) ) + if ( need_iommu(d) && !iommu_use_hap_pt(d) ) { struct page_info *page; unsigned int i = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsua-0006tT-5y; Sat, 01 Mar 2014 23:01:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuZ-0006tG-JV for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:39 +0000 Received: from [193.109.254.147:24110] by server-6.bemta-14.messagelabs.com id 8A/C0-03396-2D662135; Sat, 01 Mar 2014 23:01:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1393714897!7728151!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1733 invoked from network); 1 Mar 2014 23:01:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:01:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuX-0001yd-41 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsuX-0000T4-2W for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:37 +0000 Date: Sat, 01 Mar 2014 23:01:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] iommu: don't need to map dom0 page when the PT is shared X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9b51591c330672765d866a5ed4ed8e40c75bb1cf Author: Julien Grall AuthorDate: Mon Feb 24 12:33:00 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:33:00 2014 +0100 iommu: don't need to map dom0 page when the PT is shared Currently iommu_init_dom0 is browsing the page list and call map_page callback on each page. On both AMD and VTD drivers, the function will directly return if the page table is shared with the processor. So Xen can safely avoid to run through the page list. Signed-off-by: Julien Grall Acked-by: Ian Campbell Acked-by: Jan Beulich --- xen/drivers/passthrough/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 19b0e23..c70165a 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -153,7 +153,7 @@ void __init iommu_dom0_init(struct domain *d) register_keyhandler('o', &iommu_p2m_table); d->need_iommu = !!iommu_dom0_strict; - if ( need_iommu(d) ) + if ( need_iommu(d) && !iommu_use_hap_pt(d) ) { struct page_info *page; unsigned int i = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuv-0006x9-Bv; Sat, 01 Mar 2014 23:02:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuu-0006we-1H for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:00 +0000 Received: from [193.109.254.147:3269] by server-12.bemta-14.messagelabs.com id 7C/F5-17220-7E662135; Sat, 01 Mar 2014 23:01:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1393714917!3938481!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3311 invoked from network); 1 Mar 2014 23:01:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:01:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsur-0001yj-E1 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsur-0000Tw-CS for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:57 +0000 Date: Sat, 01 Mar 2014 23:01:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm/rtc: don't run the vpt timer when !REG_B.PIE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c15a82f034c9c2213a18b6320834f3906d00ba9 Author: Tim Deegan AuthorDate: Tue Feb 25 09:26:45 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:26:45 2014 +0100 x86/hvm/rtc: don't run the vpt timer when !REG_B.PIE If the guest has not asked for interrupts, don't run the vpt timer to generate them. This is a prerequisite for a patch to simplify how the vpt interacts with the RTC, and also gets rid of a timer series in Xen in a case where it's unlikely to be needed. Instead, calculate the correct value for REG_C.PF whenever REG_C is read or PIE is enabled. This allow a guest to poll for the PF bit while not asking for actual timer interrupts. Such a guest would no longer get the benefit of the vpt's timer modes. Signed-off-by: Tim Deegan Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/rtc.c | 53 +++++++++++++++++++++++++++++++--------- xen/include/asm-x86/hvm/vpt.h | 3 +- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index cdedefe..1a731f7 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -94,7 +94,7 @@ bool_t rtc_periodic_interrupt(void *opaque) { /* VM is ignoring its RTC; no point in running the timer */ destroy_periodic_time(&s->pt); - s->pt_code = 0; + s->period = 0; } if ( !(s->hw.cmos_data[RTC_REG_C] & RTC_IRQF) ) ret = 0; @@ -103,6 +103,24 @@ bool_t rtc_periodic_interrupt(void *opaque) return ret; } +/* Check whether the REG_C.PF bit should have been set by a tick since + * the last time we looked. This is used to track ticks when REG_B.PIE + * is clear; when PIE is set, PF ticks are handled by the VPT callbacks. */ +static void check_for_pf_ticks(RTCState *s) +{ + s_time_t now; + + if ( s->period == 0 || (s->hw.cmos_data[RTC_REG_B] & RTC_PIE) ) + return; + + now = NOW(); + if ( (now - s->start_time) / s->period + != (s->check_ticks_since - s->start_time) / s->period ) + s->hw.cmos_data[RTC_REG_C] |= RTC_PF; + + s->check_ticks_since = now; +} + /* Enable/configure/disable the periodic timer based on the RTC_PIE and * RTC_RATE_SELECT settings */ static void rtc_timer_update(RTCState *s) @@ -125,24 +143,29 @@ static void rtc_timer_update(RTCState *s) case RTC_REF_CLCK_4MHZ: if ( period_code != 0 ) { - if ( period_code != s->pt_code ) + period = 1 << (period_code - 1); /* period in 32 Khz cycles */ + period = DIV_ROUND(period * 1000000000ULL, 32768); /* in ns */ + if ( period != s->period ) { - s->pt_code = period_code; - period = 1 << (period_code - 1); /* period in 32 Khz cycles */ - period = DIV_ROUND(period * 1000000000ULL, 32768); /* in ns */ + s_time_t now = NOW(); + + s->period = period; if ( v->domain->arch.hvm_domain.params[HVM_PARAM_VPT_ALIGN] ) delta = 0; else - delta = period - ((NOW() - s->start_time) % period); - create_periodic_time(v, &s->pt, delta, period, - RTC_IRQ, NULL, s); + delta = period - ((now - s->start_time) % period); + if ( s->hw.cmos_data[RTC_REG_B] & RTC_PIE ) + create_periodic_time(v, &s->pt, delta, period, + RTC_IRQ, NULL, s); + else + s->check_ticks_since = now; } break; } /* fall through */ default: destroy_periodic_time(&s->pt); - s->pt_code = 0; + s->period = 0; break; } } @@ -484,14 +507,19 @@ static int rtc_ioport_write(void *opaque, uint32_t addr, uint32_t data) if ( orig & RTC_SET ) rtc_set_time(s); } + check_for_pf_ticks(s); s->hw.cmos_data[RTC_REG_B] = data; /* * If the interrupt is already set when the interrupt becomes * enabled, raise an interrupt immediately. */ rtc_update_irq(s); - if ( (data & RTC_PIE) && !(orig & RTC_PIE) ) + if ( (data ^ orig) & RTC_PIE ) + { + destroy_periodic_time(&s->pt); + s->period = 0; rtc_timer_update(s); + } if ( (data ^ orig) & RTC_SET ) check_update_timer(s); if ( (data ^ orig) & (RTC_24H | RTC_DM_BINARY | RTC_SET) ) @@ -645,6 +673,7 @@ static uint32_t rtc_ioport_read(RTCState *s, uint32_t addr) ret |= RTC_UIP; break; case RTC_REG_C: + check_for_pf_ticks(s); ret = s->hw.cmos_data[s->hw.cmos_index]; s->hw.cmos_data[RTC_REG_C] = 0x00; if ( (ret & RTC_IRQF) && !rtc_mode_is(s, no_ack) ) @@ -652,7 +681,7 @@ static uint32_t rtc_ioport_read(RTCState *s, uint32_t addr) rtc_update_irq(s); check_update_timer(s); alarm_timer_update(s); - rtc_timer_update(s); + s->pt_dead_ticks = 0; break; default: ret = s->hw.cmos_data[s->hw.cmos_index]; @@ -748,7 +777,7 @@ void rtc_reset(struct domain *d) RTCState *s = domain_vrtc(d); destroy_periodic_time(&s->pt); - s->pt_code = 0; + s->period = 0; s->pt.source = PTSRC_isa; } diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h index 87c3a66..9f48635 100644 --- a/xen/include/asm-x86/hvm/vpt.h +++ b/xen/include/asm-x86/hvm/vpt.h @@ -113,7 +113,8 @@ typedef struct RTCState { /* periodic timer */ struct periodic_time pt; s_time_t start_time; - int pt_code; + s_time_t check_ticks_since; + int period; uint8_t pt_dead_ticks; uint32_t use_timer; spinlock_t lock; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuH-0006pq-Jv; Sat, 01 Mar 2014 23:01:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuF-0006pF-TE for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:20 +0000 Received: from [85.158.139.211:4755] by server-16.bemta-5.messagelabs.com id 89/4D-05060-EB662135; Sat, 01 Mar 2014 23:01:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1393714876!7121845!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6038 invoked from network); 1 Mar 2014 23:01:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:01:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuC-0001yU-Ou for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsuC-0000Re-MM for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:16 +0000 Date: Sat, 01 Mar 2014 23:01:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0566814a400f436056faac286d2804edb5791c0 Merge: 24e0a36d63a6bac1e2777b7265c8add3f7895e58 21eaf5b06a41c787e1441523f7b22e57565bb292 Author: Jan Beulich AuthorDate: Mon Feb 24 12:31:28 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:31:28 2014 +0100 Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging tools/libxl/libxl_dm.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsul-0006vQ-8u; Sat, 01 Mar 2014 23:01:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuk-0006v6-Bv for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:50 +0000 Received: from [85.158.139.211:5819] by server-9.bemta-5.messagelabs.com id 90/39-11237-DD662135; Sat, 01 Mar 2014 23:01:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1393714907!2572943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32421 invoked from network); 1 Mar 2014 23:01:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:01:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuh-0001yg-8i for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsuh-0000Ta-7Y for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:47 +0000 Date: Sat, 01 Mar 2014 23:01:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix libxl_postfork_child_noexec deadlock etc. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6ac84ca0db28b99073d4364815e0f71600c5780 Author: Ian Jackson AuthorDate: Mon Feb 24 12:57:53 2014 +0000 Commit: Ian Jackson CommitDate: Mon Feb 24 16:30:23 2014 +0000 libxl: Fix libxl_postfork_child_noexec deadlock etc. libxl_postfork_child_noexec would nestedly reaquire the non-recursive "no_forking" mutex: atfork_lock uses it, as does sigchld_user_remove. The result on Linux is that the process always deadlocks before returning from this function. This is used by xl's console child. So, the ultimate effect is that xl with pygrub does not manage to connect to the pygrub console. This behaviour was reported by Michael Young in Xen 4.4.0 RC5. Also, the use of sigchld_user_remove in libxl_postfork_child_noexec is not correct with SIGCHLD sharing. libxl_postfork_child_noexec is documented to suffice if called only on one ctx. So deregistering the ctx it's called on is not sufficient. Instead, we need a new approach which discards the whole sigchld_user list and unconditionally removes our SIGCHLD handler if we had one. Prompted by this, clarify the semantics of libxl_postfork_child_noexec. Specifically, expand on the meaning of "quickly" by explaining what operations are not permitted; and document the fact that the function doesn't reclaim the resources in the ctxs. And add a comment in libxl_postfork_child_noexec explaining the internal concurrency situation. This is an important bugfix. IMO the bug is a blocker for Xen 4.4. Signed-off-by: Ian Jackson Reported-by: M A Young CC: Ian Campbell CC: George Dunlap Acked-by: Ian Campbell Release-acked-by: George Dunlap (cherry picked from commit 5be1e95318147855713709094e6847e3104ae910) --- tools/libxl/libxl_event.h | 16 ++++++++++++++++ tools/libxl/libxl_fork.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index ca43cb9..b5db83c 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -601,6 +601,22 @@ void libxl_childproc_sigchld_occurred(libxl_ctx *ctx) * this all previously existing libxl_ctx's are invalidated and * must not be used - or even freed. It is harmless to call this * postfork function and then exec anyway. + * + * Until libxl_postfork_child_noexec has returned: + * - No other libxl calls may be made. + * - If any libxl ctx was configured handle the process's SIGCHLD, + * the child may not create further (grand)child processes, nor + * manipulate SIGCHLD. + * + * libxl_postfork_child_noexec may not reclaim all the resources + * associated with the libxl ctx. This includes but is not limited + * to: ordinary memory; files on disk and in /var/run; file + * descriptors; memory mapped into the process from domains being + * managed (grant maps); Xen event channels. Use of libxl in + * processes which fork long-lived children is not recommended for + * this reason. libxl_postfork_child_noexec is provided so that + * an application can make further libxl calls in a child which + * is going to exec or exit soon. */ void libxl_postfork_child_noexec(libxl_ctx *ctx); diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 1d0017b..8421296 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -60,6 +60,9 @@ static void sigchld_removehandler_core(void); /* idempotent */ static void sigchld_user_remove(libxl_ctx *ctx); /* idempotent */ static void sigchld_sethandler_raw(void (*handler)(int), struct sigaction *old); +static void defer_sigchld(void); +static void release_sigchld(void); + static void atfork_lock(void) { int r = pthread_mutex_lock(&no_forking); @@ -117,6 +120,19 @@ libxl__carefd *libxl__carefd_opened(libxl_ctx *ctx, int fd) void libxl_postfork_child_noexec(libxl_ctx *ctx) { + /* + * Anything running without the no_forking lock (atfork_lock) + * might be interrupted by fork. But libxl functions other than + * this one are then forbidden to the child. + * + * Conversely, this function might interrupt any other libxl + * operation (even though that other operation has the libxl ctx + * lock). We don't take the lock ourselves, since we are running + * in the child and if the lock is held the thread that took it no + * longer exists. To prevent us being interrupted by another call + * to ourselves (whether in another thread or by virtue of another + * fork) we take the atfork lock ourselves. + */ libxl__carefd *cf, *cf_tmp; int r; @@ -134,7 +150,33 @@ void libxl_postfork_child_noexec(libxl_ctx *ctx) } LIBXL_LIST_INIT(&carefds); - sigchld_user_remove(ctx); + if (sigchld_installed) { + /* We are in theory not at risk of concurrent execution of the + * SIGCHLD handler, because the application should call + * libxl_postfork_child_noexec before the child forks again. + * (If the SIGCHLD was in flight in the parent at the time of + * the fork, the thread it was delivered on exists only in the + * parent so is not our concern.) + * + * But in case the application violated this rule (and did so + * while multithreaded in the child), we use our deferral + * machinery. The result is that the SIGCHLD may then be lost + * (i.e. signaled to the now-defunct libxl ctx(s)). But at + * least we won't execute undefined behaviour (by examining + * the list in the signal handler concurrently with clearing + * it here), and since we won't actually reap the new children + * things will in fact go OK if the application doesn't try to + * use SIGCHLD, but instead just waits for the child(ren). */ + defer_sigchld(); + + LIBXL_LIST_INIT(&sigchld_users); + /* After this the ->sigchld_user_registered entries in the + * now-obsolete contexts may be lies. But that's OK because + * no-one will look at them. */ + + release_sigchld(); + sigchld_removehandler_core(); + } atfork_unlock(); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuv-0006x9-Bv; Sat, 01 Mar 2014 23:02:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuu-0006we-1H for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:00 +0000 Received: from [193.109.254.147:3269] by server-12.bemta-14.messagelabs.com id 7C/F5-17220-7E662135; Sat, 01 Mar 2014 23:01:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1393714917!3938481!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3311 invoked from network); 1 Mar 2014 23:01:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:01:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsur-0001yj-E1 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsur-0000Tw-CS for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:57 +0000 Date: Sat, 01 Mar 2014 23:01:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm/rtc: don't run the vpt timer when !REG_B.PIE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c15a82f034c9c2213a18b6320834f3906d00ba9 Author: Tim Deegan AuthorDate: Tue Feb 25 09:26:45 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:26:45 2014 +0100 x86/hvm/rtc: don't run the vpt timer when !REG_B.PIE If the guest has not asked for interrupts, don't run the vpt timer to generate them. This is a prerequisite for a patch to simplify how the vpt interacts with the RTC, and also gets rid of a timer series in Xen in a case where it's unlikely to be needed. Instead, calculate the correct value for REG_C.PF whenever REG_C is read or PIE is enabled. This allow a guest to poll for the PF bit while not asking for actual timer interrupts. Such a guest would no longer get the benefit of the vpt's timer modes. Signed-off-by: Tim Deegan Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/rtc.c | 53 +++++++++++++++++++++++++++++++--------- xen/include/asm-x86/hvm/vpt.h | 3 +- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index cdedefe..1a731f7 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -94,7 +94,7 @@ bool_t rtc_periodic_interrupt(void *opaque) { /* VM is ignoring its RTC; no point in running the timer */ destroy_periodic_time(&s->pt); - s->pt_code = 0; + s->period = 0; } if ( !(s->hw.cmos_data[RTC_REG_C] & RTC_IRQF) ) ret = 0; @@ -103,6 +103,24 @@ bool_t rtc_periodic_interrupt(void *opaque) return ret; } +/* Check whether the REG_C.PF bit should have been set by a tick since + * the last time we looked. This is used to track ticks when REG_B.PIE + * is clear; when PIE is set, PF ticks are handled by the VPT callbacks. */ +static void check_for_pf_ticks(RTCState *s) +{ + s_time_t now; + + if ( s->period == 0 || (s->hw.cmos_data[RTC_REG_B] & RTC_PIE) ) + return; + + now = NOW(); + if ( (now - s->start_time) / s->period + != (s->check_ticks_since - s->start_time) / s->period ) + s->hw.cmos_data[RTC_REG_C] |= RTC_PF; + + s->check_ticks_since = now; +} + /* Enable/configure/disable the periodic timer based on the RTC_PIE and * RTC_RATE_SELECT settings */ static void rtc_timer_update(RTCState *s) @@ -125,24 +143,29 @@ static void rtc_timer_update(RTCState *s) case RTC_REF_CLCK_4MHZ: if ( period_code != 0 ) { - if ( period_code != s->pt_code ) + period = 1 << (period_code - 1); /* period in 32 Khz cycles */ + period = DIV_ROUND(period * 1000000000ULL, 32768); /* in ns */ + if ( period != s->period ) { - s->pt_code = period_code; - period = 1 << (period_code - 1); /* period in 32 Khz cycles */ - period = DIV_ROUND(period * 1000000000ULL, 32768); /* in ns */ + s_time_t now = NOW(); + + s->period = period; if ( v->domain->arch.hvm_domain.params[HVM_PARAM_VPT_ALIGN] ) delta = 0; else - delta = period - ((NOW() - s->start_time) % period); - create_periodic_time(v, &s->pt, delta, period, - RTC_IRQ, NULL, s); + delta = period - ((now - s->start_time) % period); + if ( s->hw.cmos_data[RTC_REG_B] & RTC_PIE ) + create_periodic_time(v, &s->pt, delta, period, + RTC_IRQ, NULL, s); + else + s->check_ticks_since = now; } break; } /* fall through */ default: destroy_periodic_time(&s->pt); - s->pt_code = 0; + s->period = 0; break; } } @@ -484,14 +507,19 @@ static int rtc_ioport_write(void *opaque, uint32_t addr, uint32_t data) if ( orig & RTC_SET ) rtc_set_time(s); } + check_for_pf_ticks(s); s->hw.cmos_data[RTC_REG_B] = data; /* * If the interrupt is already set when the interrupt becomes * enabled, raise an interrupt immediately. */ rtc_update_irq(s); - if ( (data & RTC_PIE) && !(orig & RTC_PIE) ) + if ( (data ^ orig) & RTC_PIE ) + { + destroy_periodic_time(&s->pt); + s->period = 0; rtc_timer_update(s); + } if ( (data ^ orig) & RTC_SET ) check_update_timer(s); if ( (data ^ orig) & (RTC_24H | RTC_DM_BINARY | RTC_SET) ) @@ -645,6 +673,7 @@ static uint32_t rtc_ioport_read(RTCState *s, uint32_t addr) ret |= RTC_UIP; break; case RTC_REG_C: + check_for_pf_ticks(s); ret = s->hw.cmos_data[s->hw.cmos_index]; s->hw.cmos_data[RTC_REG_C] = 0x00; if ( (ret & RTC_IRQF) && !rtc_mode_is(s, no_ack) ) @@ -652,7 +681,7 @@ static uint32_t rtc_ioport_read(RTCState *s, uint32_t addr) rtc_update_irq(s); check_update_timer(s); alarm_timer_update(s); - rtc_timer_update(s); + s->pt_dead_ticks = 0; break; default: ret = s->hw.cmos_data[s->hw.cmos_index]; @@ -748,7 +777,7 @@ void rtc_reset(struct domain *d) RTCState *s = domain_vrtc(d); destroy_periodic_time(&s->pt); - s->pt_code = 0; + s->period = 0; s->pt.source = PTSRC_isa; } diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h index 87c3a66..9f48635 100644 --- a/xen/include/asm-x86/hvm/vpt.h +++ b/xen/include/asm-x86/hvm/vpt.h @@ -113,7 +113,8 @@ typedef struct RTCState { /* periodic timer */ struct periodic_time pt; s_time_t start_time; - int pt_code; + s_time_t check_ticks_since; + int period; uint8_t pt_dead_ticks; uint32_t use_timer; spinlock_t lock; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuH-0006pq-Jv; Sat, 01 Mar 2014 23:01:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuF-0006pF-TE for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:20 +0000 Received: from [85.158.139.211:4755] by server-16.bemta-5.messagelabs.com id 89/4D-05060-EB662135; Sat, 01 Mar 2014 23:01:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1393714876!7121845!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6038 invoked from network); 1 Mar 2014 23:01:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:01:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuC-0001yU-Ou for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsuC-0000Re-MM for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:16 +0000 Date: Sat, 01 Mar 2014 23:01:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0566814a400f436056faac286d2804edb5791c0 Merge: 24e0a36d63a6bac1e2777b7265c8add3f7895e58 21eaf5b06a41c787e1441523f7b22e57565bb292 Author: Jan Beulich AuthorDate: Mon Feb 24 12:31:28 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:31:28 2014 +0100 Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging tools/libxl/libxl_dm.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuR-0006rd-3A; Sat, 01 Mar 2014 23:01:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuP-0006rP-Hs for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:29 +0000 Received: from [193.109.254.147:23843] by server-9.bemta-14.messagelabs.com id 10/BE-24895-8C662135; Sat, 01 Mar 2014 23:01:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1393714887!7748605!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12900 invoked from network); 1 Mar 2014 23:01:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:01:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuM-0001ya-Ue for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsuM-0000S4-Sy for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:26 +0000 Date: Sat, 01 Mar 2014 23:01:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vtd: don't export iommu_set_pgd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2608662379d50e69b3bba4e6827fc910db9f64f8 Author: Julien Grall AuthorDate: Mon Feb 24 12:32:00 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:32:00 2014 +0100 vtd: don't export iommu_set_pgd iommu_set_pgd is only used internally in xen/drivers/passthrough/vtd/iommu.c Signed-off-by: Julien Grall Acked-by: Xiantoa Zhang Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/include/xen/iommu.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index a8d33fc..d5ce5b7 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1826,7 +1826,7 @@ static int vtd_ept_page_compatible(struct iommu *iommu) /* * set VT-d page table directory to EPT table if allowed */ -void iommu_set_pgd(struct domain *d) +static void iommu_set_pgd(struct domain *d) { struct hvm_iommu *hd = domain_hvm_iommu(d); mfn_t pgd_mfn; diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index ae7e75d..4f534ed 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -68,7 +68,6 @@ int iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, unsigned int flags); int iommu_unmap_page(struct domain *d, unsigned long gfn); void iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte, int order, int present); -void iommu_set_pgd(struct domain *d); void pt_pci_init(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsul-0006vQ-8u; Sat, 01 Mar 2014 23:01:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuk-0006v6-Bv for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:50 +0000 Received: from [85.158.139.211:5819] by server-9.bemta-5.messagelabs.com id 90/39-11237-DD662135; Sat, 01 Mar 2014 23:01:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1393714907!2572943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32421 invoked from network); 1 Mar 2014 23:01:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:01:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuh-0001yg-8i for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsuh-0000Ta-7Y for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:47 +0000 Date: Sat, 01 Mar 2014 23:01:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix libxl_postfork_child_noexec deadlock etc. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6ac84ca0db28b99073d4364815e0f71600c5780 Author: Ian Jackson AuthorDate: Mon Feb 24 12:57:53 2014 +0000 Commit: Ian Jackson CommitDate: Mon Feb 24 16:30:23 2014 +0000 libxl: Fix libxl_postfork_child_noexec deadlock etc. libxl_postfork_child_noexec would nestedly reaquire the non-recursive "no_forking" mutex: atfork_lock uses it, as does sigchld_user_remove. The result on Linux is that the process always deadlocks before returning from this function. This is used by xl's console child. So, the ultimate effect is that xl with pygrub does not manage to connect to the pygrub console. This behaviour was reported by Michael Young in Xen 4.4.0 RC5. Also, the use of sigchld_user_remove in libxl_postfork_child_noexec is not correct with SIGCHLD sharing. libxl_postfork_child_noexec is documented to suffice if called only on one ctx. So deregistering the ctx it's called on is not sufficient. Instead, we need a new approach which discards the whole sigchld_user list and unconditionally removes our SIGCHLD handler if we had one. Prompted by this, clarify the semantics of libxl_postfork_child_noexec. Specifically, expand on the meaning of "quickly" by explaining what operations are not permitted; and document the fact that the function doesn't reclaim the resources in the ctxs. And add a comment in libxl_postfork_child_noexec explaining the internal concurrency situation. This is an important bugfix. IMO the bug is a blocker for Xen 4.4. Signed-off-by: Ian Jackson Reported-by: M A Young CC: Ian Campbell CC: George Dunlap Acked-by: Ian Campbell Release-acked-by: George Dunlap (cherry picked from commit 5be1e95318147855713709094e6847e3104ae910) --- tools/libxl/libxl_event.h | 16 ++++++++++++++++ tools/libxl/libxl_fork.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index ca43cb9..b5db83c 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -601,6 +601,22 @@ void libxl_childproc_sigchld_occurred(libxl_ctx *ctx) * this all previously existing libxl_ctx's are invalidated and * must not be used - or even freed. It is harmless to call this * postfork function and then exec anyway. + * + * Until libxl_postfork_child_noexec has returned: + * - No other libxl calls may be made. + * - If any libxl ctx was configured handle the process's SIGCHLD, + * the child may not create further (grand)child processes, nor + * manipulate SIGCHLD. + * + * libxl_postfork_child_noexec may not reclaim all the resources + * associated with the libxl ctx. This includes but is not limited + * to: ordinary memory; files on disk and in /var/run; file + * descriptors; memory mapped into the process from domains being + * managed (grant maps); Xen event channels. Use of libxl in + * processes which fork long-lived children is not recommended for + * this reason. libxl_postfork_child_noexec is provided so that + * an application can make further libxl calls in a child which + * is going to exec or exit soon. */ void libxl_postfork_child_noexec(libxl_ctx *ctx); diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 1d0017b..8421296 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -60,6 +60,9 @@ static void sigchld_removehandler_core(void); /* idempotent */ static void sigchld_user_remove(libxl_ctx *ctx); /* idempotent */ static void sigchld_sethandler_raw(void (*handler)(int), struct sigaction *old); +static void defer_sigchld(void); +static void release_sigchld(void); + static void atfork_lock(void) { int r = pthread_mutex_lock(&no_forking); @@ -117,6 +120,19 @@ libxl__carefd *libxl__carefd_opened(libxl_ctx *ctx, int fd) void libxl_postfork_child_noexec(libxl_ctx *ctx) { + /* + * Anything running without the no_forking lock (atfork_lock) + * might be interrupted by fork. But libxl functions other than + * this one are then forbidden to the child. + * + * Conversely, this function might interrupt any other libxl + * operation (even though that other operation has the libxl ctx + * lock). We don't take the lock ourselves, since we are running + * in the child and if the lock is held the thread that took it no + * longer exists. To prevent us being interrupted by another call + * to ourselves (whether in another thread or by virtue of another + * fork) we take the atfork lock ourselves. + */ libxl__carefd *cf, *cf_tmp; int r; @@ -134,7 +150,33 @@ void libxl_postfork_child_noexec(libxl_ctx *ctx) } LIBXL_LIST_INIT(&carefds); - sigchld_user_remove(ctx); + if (sigchld_installed) { + /* We are in theory not at risk of concurrent execution of the + * SIGCHLD handler, because the application should call + * libxl_postfork_child_noexec before the child forks again. + * (If the SIGCHLD was in flight in the parent at the time of + * the fork, the thread it was delivered on exists only in the + * parent so is not our concern.) + * + * But in case the application violated this rule (and did so + * while multithreaded in the child), we use our deferral + * machinery. The result is that the SIGCHLD may then be lost + * (i.e. signaled to the now-defunct libxl ctx(s)). But at + * least we won't execute undefined behaviour (by examining + * the list in the signal handler concurrently with clearing + * it here), and since we won't actually reap the new children + * things will in fact go OK if the application doesn't try to + * use SIGCHLD, but instead just waits for the child(ren). */ + defer_sigchld(); + + LIBXL_LIST_INIT(&sigchld_users); + /* After this the ->sigchld_user_registered entries in the + * now-obsolete contexts may be lies. But that's OK because + * no-one will look at them. */ + + release_sigchld(); + sigchld_removehandler_core(); + } atfork_unlock(); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuR-0006rd-3A; Sat, 01 Mar 2014 23:01:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuP-0006rP-Hs for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:29 +0000 Received: from [193.109.254.147:23843] by server-9.bemta-14.messagelabs.com id 10/BE-24895-8C662135; Sat, 01 Mar 2014 23:01:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1393714887!7748605!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12900 invoked from network); 1 Mar 2014 23:01:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:01:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsuM-0001ya-Ue for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsuM-0000S4-Sy for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:01:26 +0000 Date: Sat, 01 Mar 2014 23:01:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vtd: don't export iommu_set_pgd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2608662379d50e69b3bba4e6827fc910db9f64f8 Author: Julien Grall AuthorDate: Mon Feb 24 12:32:00 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 24 12:32:00 2014 +0100 vtd: don't export iommu_set_pgd iommu_set_pgd is only used internally in xen/drivers/passthrough/vtd/iommu.c Signed-off-by: Julien Grall Acked-by: Xiantoa Zhang Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/include/xen/iommu.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index a8d33fc..d5ce5b7 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1826,7 +1826,7 @@ static int vtd_ept_page_compatible(struct iommu *iommu) /* * set VT-d page table directory to EPT table if allowed */ -void iommu_set_pgd(struct domain *d) +static void iommu_set_pgd(struct domain *d) { struct hvm_iommu *hd = domain_hvm_iommu(d); mfn_t pgd_mfn; diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index ae7e75d..4f534ed 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -68,7 +68,6 @@ int iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, unsigned int flags); int iommu_unmap_page(struct domain *d, unsigned long gfn); void iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte, int order, int present); -void iommu_set_pgd(struct domain *d); void pt_pci_init(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsv5-00070w-Gg; Sat, 01 Mar 2014 23:02:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsv4-00070Q-FH for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:10 +0000 Received: from [85.158.143.35:49271] by server-2.bemta-4.messagelabs.com id 2F/F8-04779-1F662135; Sat, 01 Mar 2014 23:02:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1393714927!9292086!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20985 invoked from network); 1 Mar 2014 23:02:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:02:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsv1-0001zU-JI for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsv1-0000US-I5 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:07 +0000 Date: Sat, 01 Mar 2014 23:02:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm/rtc: inject RTC periodic interupts from the vpt code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c7e35c6ec705d777c0a11124ec28876f1468f2c5 Author: Tim Deegan AuthorDate: Tue Feb 25 09:29:26 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:29:26 2014 +0100 x86/hvm/rtc: inject RTC periodic interupts from the vpt code Let the vpt code drive the RTC's timer interrupts directly, as it does for other periodic time sources, and fix up the register state in a vpt callback when the interrupt is injected. This fixes a hang seen on Windows 2003 in no-missed-ticks mode, where when a tick was pending, the early callback from the VPT code would always set REG_C.PF on every VMENTER; meanwhile the guest was in its interrupt handler reading REG_C in a loop and waiting to see it clear. One drawback is that a guest that attempts to suppress RTC periodic interrupts by failing to read REG_C will receive up to 10 spurious interrupts, even in 'strict' mode. However: - since all previous RTC models have had this property (including the current one, since 'no-ack' mode is hard-coded on) we're pretty sure that all guests can handle this; and - we're already playing some other interesting games with this interrupt in the vpt code. One other corner case: a guest that enables the PF timer interrupt, masks the interupt in the APIC and then polls REG_C looking for PF will not see PF getting set. The more likely case of enabling the timers and masking the interrupt with REG_B.PIE is already handled correctly. Signed-off-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/rtc.c | 25 +++++++++++-------------- xen/arch/x86/hvm/vpt.c | 40 ---------------------------------------- xen/include/asm-x86/hvm/vpt.h | 1 - 3 files changed, 11 insertions(+), 55 deletions(-) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 1a731f7..d641d95 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -78,29 +78,26 @@ static void rtc_update_irq(RTCState *s) hvm_isa_irq_assert(vrtc_domain(s), RTC_IRQ); } -bool_t rtc_periodic_interrupt(void *opaque) +/* Called by the VPT code after it's injected a PF interrupt for us. + * Fix up the register state to reflect what happened. */ +static void rtc_pf_callback(struct vcpu *v, void *opaque) { RTCState *s = opaque; - bool_t ret; spin_lock(&s->lock); - ret = rtc_mode_is(s, no_ack) || !(s->hw.cmos_data[RTC_REG_C] & RTC_IRQF); - if ( rtc_mode_is(s, no_ack) || !(s->hw.cmos_data[RTC_REG_C] & RTC_PF) ) - { - s->hw.cmos_data[RTC_REG_C] |= RTC_PF; - rtc_update_irq(s); - } - else if ( ++(s->pt_dead_ticks) >= 10 ) + + if ( !rtc_mode_is(s, no_ack) + && (s->hw.cmos_data[RTC_REG_C] & RTC_IRQF) + && ++(s->pt_dead_ticks) >= 10 ) { /* VM is ignoring its RTC; no point in running the timer */ destroy_periodic_time(&s->pt); s->period = 0; } - if ( !(s->hw.cmos_data[RTC_REG_C] & RTC_IRQF) ) - ret = 0; - spin_unlock(&s->lock); - return ret; + s->hw.cmos_data[RTC_REG_C] |= RTC_PF|RTC_IRQF; + + spin_unlock(&s->lock); } /* Check whether the REG_C.PF bit should have been set by a tick since @@ -156,7 +153,7 @@ static void rtc_timer_update(RTCState *s) delta = period - ((now - s->start_time) % period); if ( s->hw.cmos_data[RTC_REG_B] & RTC_PIE ) create_periodic_time(v, &s->pt, delta, period, - RTC_IRQ, NULL, s); + RTC_IRQ, rtc_pf_callback, s); else s->check_ticks_since = now; } diff --git a/xen/arch/x86/hvm/vpt.c b/xen/arch/x86/hvm/vpt.c index 1961bda..f7af688 100644 --- a/xen/arch/x86/hvm/vpt.c +++ b/xen/arch/x86/hvm/vpt.c @@ -231,12 +231,9 @@ int pt_update_irq(struct vcpu *v) struct periodic_time *pt, *temp, *earliest_pt; uint64_t max_lag; int irq, is_lapic; - void *pt_priv; - rescan: spin_lock(&v->arch.hvm_vcpu.tm_lock); - rescan_locked: earliest_pt = NULL; max_lag = -1ULL; list_for_each_entry_safe ( pt, temp, head, list ) @@ -270,48 +267,11 @@ int pt_update_irq(struct vcpu *v) earliest_pt->irq_issued = 1; irq = earliest_pt->irq; is_lapic = (earliest_pt->source == PTSRC_lapic); - pt_priv = earliest_pt->priv; spin_unlock(&v->arch.hvm_vcpu.tm_lock); if ( is_lapic ) vlapic_set_irq(vcpu_vlapic(v), irq, 0); - else if ( irq == RTC_IRQ && pt_priv ) - { - if ( !rtc_periodic_interrupt(pt_priv) ) - irq = -1; - - pt_lock(earliest_pt); - - if ( irq < 0 && earliest_pt->pending_intr_nr ) - { - /* - * RTC periodic timer runs without the corresponding interrupt - * being enabled - need to mimic enough of pt_intr_post() to keep - * things going. - */ - earliest_pt->pending_intr_nr = 0; - earliest_pt->irq_issued = 0; - set_timer(&earliest_pt->timer, earliest_pt->scheduled); - } - else if ( irq >= 0 && pt_irq_masked(earliest_pt) ) - { - if ( earliest_pt->on_list ) - { - /* suspend timer emulation */ - list_del(&earliest_pt->list); - earliest_pt->on_list = 0; - } - irq = -1; - } - - /* Avoid dropping the lock if we can. */ - if ( irq < 0 && v == earliest_pt->vcpu ) - goto rescan_locked; - pt_unlock(earliest_pt); - if ( irq < 0 ) - goto rescan; - } else { hvm_isa_irq_deassert(v->domain, irq); diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h index 9f48635..7d62653 100644 --- a/xen/include/asm-x86/hvm/vpt.h +++ b/xen/include/asm-x86/hvm/vpt.h @@ -184,7 +184,6 @@ void rtc_migrate_timers(struct vcpu *v); void rtc_deinit(struct domain *d); void rtc_reset(struct domain *d); void rtc_update_clock(struct domain *d); -bool_t rtc_periodic_interrupt(void *); void pmtimer_init(struct vcpu *v); void pmtimer_deinit(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsv5-00070w-Gg; Sat, 01 Mar 2014 23:02:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsv4-00070Q-FH for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:10 +0000 Received: from [85.158.143.35:49271] by server-2.bemta-4.messagelabs.com id 2F/F8-04779-1F662135; Sat, 01 Mar 2014 23:02:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1393714927!9292086!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20985 invoked from network); 1 Mar 2014 23:02:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:02:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsv1-0001zU-JI for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsv1-0000US-I5 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:07 +0000 Date: Sat, 01 Mar 2014 23:02:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm/rtc: inject RTC periodic interupts from the vpt code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c7e35c6ec705d777c0a11124ec28876f1468f2c5 Author: Tim Deegan AuthorDate: Tue Feb 25 09:29:26 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:29:26 2014 +0100 x86/hvm/rtc: inject RTC periodic interupts from the vpt code Let the vpt code drive the RTC's timer interrupts directly, as it does for other periodic time sources, and fix up the register state in a vpt callback when the interrupt is injected. This fixes a hang seen on Windows 2003 in no-missed-ticks mode, where when a tick was pending, the early callback from the VPT code would always set REG_C.PF on every VMENTER; meanwhile the guest was in its interrupt handler reading REG_C in a loop and waiting to see it clear. One drawback is that a guest that attempts to suppress RTC periodic interrupts by failing to read REG_C will receive up to 10 spurious interrupts, even in 'strict' mode. However: - since all previous RTC models have had this property (including the current one, since 'no-ack' mode is hard-coded on) we're pretty sure that all guests can handle this; and - we're already playing some other interesting games with this interrupt in the vpt code. One other corner case: a guest that enables the PF timer interrupt, masks the interupt in the APIC and then polls REG_C looking for PF will not see PF getting set. The more likely case of enabling the timers and masking the interrupt with REG_B.PIE is already handled correctly. Signed-off-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/rtc.c | 25 +++++++++++-------------- xen/arch/x86/hvm/vpt.c | 40 ---------------------------------------- xen/include/asm-x86/hvm/vpt.h | 1 - 3 files changed, 11 insertions(+), 55 deletions(-) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 1a731f7..d641d95 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -78,29 +78,26 @@ static void rtc_update_irq(RTCState *s) hvm_isa_irq_assert(vrtc_domain(s), RTC_IRQ); } -bool_t rtc_periodic_interrupt(void *opaque) +/* Called by the VPT code after it's injected a PF interrupt for us. + * Fix up the register state to reflect what happened. */ +static void rtc_pf_callback(struct vcpu *v, void *opaque) { RTCState *s = opaque; - bool_t ret; spin_lock(&s->lock); - ret = rtc_mode_is(s, no_ack) || !(s->hw.cmos_data[RTC_REG_C] & RTC_IRQF); - if ( rtc_mode_is(s, no_ack) || !(s->hw.cmos_data[RTC_REG_C] & RTC_PF) ) - { - s->hw.cmos_data[RTC_REG_C] |= RTC_PF; - rtc_update_irq(s); - } - else if ( ++(s->pt_dead_ticks) >= 10 ) + + if ( !rtc_mode_is(s, no_ack) + && (s->hw.cmos_data[RTC_REG_C] & RTC_IRQF) + && ++(s->pt_dead_ticks) >= 10 ) { /* VM is ignoring its RTC; no point in running the timer */ destroy_periodic_time(&s->pt); s->period = 0; } - if ( !(s->hw.cmos_data[RTC_REG_C] & RTC_IRQF) ) - ret = 0; - spin_unlock(&s->lock); - return ret; + s->hw.cmos_data[RTC_REG_C] |= RTC_PF|RTC_IRQF; + + spin_unlock(&s->lock); } /* Check whether the REG_C.PF bit should have been set by a tick since @@ -156,7 +153,7 @@ static void rtc_timer_update(RTCState *s) delta = period - ((now - s->start_time) % period); if ( s->hw.cmos_data[RTC_REG_B] & RTC_PIE ) create_periodic_time(v, &s->pt, delta, period, - RTC_IRQ, NULL, s); + RTC_IRQ, rtc_pf_callback, s); else s->check_ticks_since = now; } diff --git a/xen/arch/x86/hvm/vpt.c b/xen/arch/x86/hvm/vpt.c index 1961bda..f7af688 100644 --- a/xen/arch/x86/hvm/vpt.c +++ b/xen/arch/x86/hvm/vpt.c @@ -231,12 +231,9 @@ int pt_update_irq(struct vcpu *v) struct periodic_time *pt, *temp, *earliest_pt; uint64_t max_lag; int irq, is_lapic; - void *pt_priv; - rescan: spin_lock(&v->arch.hvm_vcpu.tm_lock); - rescan_locked: earliest_pt = NULL; max_lag = -1ULL; list_for_each_entry_safe ( pt, temp, head, list ) @@ -270,48 +267,11 @@ int pt_update_irq(struct vcpu *v) earliest_pt->irq_issued = 1; irq = earliest_pt->irq; is_lapic = (earliest_pt->source == PTSRC_lapic); - pt_priv = earliest_pt->priv; spin_unlock(&v->arch.hvm_vcpu.tm_lock); if ( is_lapic ) vlapic_set_irq(vcpu_vlapic(v), irq, 0); - else if ( irq == RTC_IRQ && pt_priv ) - { - if ( !rtc_periodic_interrupt(pt_priv) ) - irq = -1; - - pt_lock(earliest_pt); - - if ( irq < 0 && earliest_pt->pending_intr_nr ) - { - /* - * RTC periodic timer runs without the corresponding interrupt - * being enabled - need to mimic enough of pt_intr_post() to keep - * things going. - */ - earliest_pt->pending_intr_nr = 0; - earliest_pt->irq_issued = 0; - set_timer(&earliest_pt->timer, earliest_pt->scheduled); - } - else if ( irq >= 0 && pt_irq_masked(earliest_pt) ) - { - if ( earliest_pt->on_list ) - { - /* suspend timer emulation */ - list_del(&earliest_pt->list); - earliest_pt->on_list = 0; - } - irq = -1; - } - - /* Avoid dropping the lock if we can. */ - if ( irq < 0 && v == earliest_pt->vcpu ) - goto rescan_locked; - pt_unlock(earliest_pt); - if ( irq < 0 ) - goto rescan; - } else { hvm_isa_irq_deassert(v->domain, irq); diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h index 9f48635..7d62653 100644 --- a/xen/include/asm-x86/hvm/vpt.h +++ b/xen/include/asm-x86/hvm/vpt.h @@ -184,7 +184,6 @@ void rtc_migrate_timers(struct vcpu *v); void rtc_deinit(struct domain *d); void rtc_reset(struct domain *d); void rtc_update_clock(struct domain *d); -bool_t rtc_periodic_interrupt(void *); void pmtimer_init(struct vcpu *v); void pmtimer_deinit(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvH-00073l-Jj; Sat, 01 Mar 2014 23:02:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvF-00073Q-UO for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:22 +0000 Received: from [85.158.139.211:65027] by server-6.bemta-5.messagelabs.com id 7E/32-14342-DF662135; Sat, 01 Mar 2014 23:02:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1393714938!7061214!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6632 invoked from network); 1 Mar 2014 23:02:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:02:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvB-0001za-OQ for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsvB-0000Uq-Mz for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:17 +0000 Date: Sat, 01 Mar 2014 23:02:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm/rtc: always deassert the IRQ line when clearing REG_C.IRQF X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d27a537727ca933bfef8ba01bc65847dc97cee1 Author: Tim Deegan AuthorDate: Tue Feb 25 09:30:21 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:30:21 2014 +0100 x86/hvm/rtc: always deassert the IRQ line when clearing REG_C.IRQF Even in no-ack mode, there's no reason to leave the line asserted after an explicit ack of the interrupt. Furthermore, rtc_update_irq() is an unconditional noop having just cleared REG_C. Signed-off-by: Tim Deegan Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/rtc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index d641d95..639b4c5 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -673,9 +673,8 @@ static uint32_t rtc_ioport_read(RTCState *s, uint32_t addr) check_for_pf_ticks(s); ret = s->hw.cmos_data[s->hw.cmos_index]; s->hw.cmos_data[RTC_REG_C] = 0x00; - if ( (ret & RTC_IRQF) && !rtc_mode_is(s, no_ack) ) + if ( ret & RTC_IRQF ) hvm_isa_irq_deassert(d, RTC_IRQ); - rtc_update_irq(s); check_update_timer(s); alarm_timer_update(s); s->pt_dead_ticks = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvH-00073l-Jj; Sat, 01 Mar 2014 23:02:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvF-00073Q-UO for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:22 +0000 Received: from [85.158.139.211:65027] by server-6.bemta-5.messagelabs.com id 7E/32-14342-DF662135; Sat, 01 Mar 2014 23:02:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1393714938!7061214!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6632 invoked from network); 1 Mar 2014 23:02:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:02:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvB-0001za-OQ for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsvB-0000Uq-Mz for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:17 +0000 Date: Sat, 01 Mar 2014 23:02:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm/rtc: always deassert the IRQ line when clearing REG_C.IRQF X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d27a537727ca933bfef8ba01bc65847dc97cee1 Author: Tim Deegan AuthorDate: Tue Feb 25 09:30:21 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:30:21 2014 +0100 x86/hvm/rtc: always deassert the IRQ line when clearing REG_C.IRQF Even in no-ack mode, there's no reason to leave the line asserted after an explicit ack of the interrupt. Furthermore, rtc_update_irq() is an unconditional noop having just cleared REG_C. Signed-off-by: Tim Deegan Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/rtc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index d641d95..639b4c5 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -673,9 +673,8 @@ static uint32_t rtc_ioport_read(RTCState *s, uint32_t addr) check_for_pf_ticks(s); ret = s->hw.cmos_data[s->hw.cmos_index]; s->hw.cmos_data[RTC_REG_C] = 0x00; - if ( (ret & RTC_IRQF) && !rtc_mode_is(s, no_ack) ) + if ( ret & RTC_IRQF ) hvm_isa_irq_deassert(d, RTC_IRQ); - rtc_update_irq(s); check_update_timer(s); alarm_timer_update(s); s->pt_dead_ticks = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvP-00075a-Mi; Sat, 01 Mar 2014 23:02:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvO-00075A-9G for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:30 +0000 Received: from [193.109.254.147:7935] by server-1.bemta-14.messagelabs.com id 81/85-29588-50762135; Sat, 01 Mar 2014 23:02:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1393714948!7722897!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3675 invoked from network); 1 Mar 2014 23:02:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:02:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvL-0001zg-UA for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsvL-0000VC-SB for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:27 +0000 Date: Sat, 01 Mar 2014 23:02:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mce: Reduce boot-time logspam X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a5ab9c9fa29cda7e1b18dbcaa69a5dbded96de32 Author: Andrew Cooper AuthorDate: Tue Feb 25 09:30:59 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:30:59 2014 +0100 x86/mce: Reduce boot-time logspam When booting with "no-mce", the user does not need to be told that "MCE support [was] disabled by bootparam" for each cpu. Furthermore, a file:line reference is unnecessary. Signed-off-by: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mce.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index b375ef7..af6f0be 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -729,8 +729,10 @@ void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp) { enum mcheck_type inited = mcheck_none; - if (mce_disabled == 1) { - dprintk(XENLOG_INFO, "MCE support disabled by bootparam\n"); + if ( mce_disabled ) + { + if ( bsp ) + printk(XENLOG_INFO "MCE support disabled by bootparam\n"); return; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvP-00075a-Mi; Sat, 01 Mar 2014 23:02:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvO-00075A-9G for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:30 +0000 Received: from [193.109.254.147:7935] by server-1.bemta-14.messagelabs.com id 81/85-29588-50762135; Sat, 01 Mar 2014 23:02:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1393714948!7722897!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3675 invoked from network); 1 Mar 2014 23:02:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:02:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvL-0001zg-UA for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsvL-0000VC-SB for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:27 +0000 Date: Sat, 01 Mar 2014 23:02:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mce: Reduce boot-time logspam X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a5ab9c9fa29cda7e1b18dbcaa69a5dbded96de32 Author: Andrew Cooper AuthorDate: Tue Feb 25 09:30:59 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:30:59 2014 +0100 x86/mce: Reduce boot-time logspam When booting with "no-mce", the user does not need to be told that "MCE support [was] disabled by bootparam" for each cpu. Furthermore, a file:line reference is unnecessary. Signed-off-by: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mce.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index b375ef7..af6f0be 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -729,8 +729,10 @@ void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp) { enum mcheck_type inited = mcheck_none; - if (mce_disabled == 1) { - dprintk(XENLOG_INFO, "MCE support disabled by bootparam\n"); + if ( mce_disabled ) + { + if ( bsp ) + printk(XENLOG_INFO "MCE support disabled by bootparam\n"); return; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsva-00077b-PY; Sat, 01 Mar 2014 23:02:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvZ-00077F-Bv for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:41 +0000 Received: from [85.158.139.211:7224] by server-8.bemta-5.messagelabs.com id 61/B1-05298-01762135; Sat, 01 Mar 2014 23:02:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1393714958!7083224!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29112 invoked from network); 1 Mar 2014 23:02:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:02:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvW-0001zm-2u for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsvW-0000WL-1T for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:38 +0000 Date: Sat, 01 Mar 2014 23:02:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: Fix xsm_map_gfmn_foreign prototype when XSM is enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e7a797a8bf115e5b79f8fb5676379c3ac5c30255 Author: Julien Grall AuthorDate: Tue Feb 25 09:31:29 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:31:29 2014 +0100 xsm: Fix xsm_map_gfmn_foreign prototype when XSM is enabled Signed-off-by: Julien Grall Acked-by: Daniel De Graaf --- xen/include/xsm/xsm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 1939453..5d35455 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -621,7 +621,7 @@ static inline int xsm_ioport_mapping (xsm_default_t def, struct domain *d, uint3 #endif /* CONFIG_X86 */ #ifdef CONFIG_ARM -static inline int xsm_map_gmfn_foreign (struct domain *d, struct domain *t) +static inline int xsm_map_gmfn_foreign (xsm_default_t def, struct domain *d, struct domain *t) { return xsm_ops->map_gmfn_foreign(d, t); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsva-00077b-PY; Sat, 01 Mar 2014 23:02:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvZ-00077F-Bv for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:41 +0000 Received: from [85.158.139.211:7224] by server-8.bemta-5.messagelabs.com id 61/B1-05298-01762135; Sat, 01 Mar 2014 23:02:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1393714958!7083224!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29112 invoked from network); 1 Mar 2014 23:02:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:02:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvW-0001zm-2u for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsvW-0000WL-1T for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:38 +0000 Date: Sat, 01 Mar 2014 23:02:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: Fix xsm_map_gfmn_foreign prototype when XSM is enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e7a797a8bf115e5b79f8fb5676379c3ac5c30255 Author: Julien Grall AuthorDate: Tue Feb 25 09:31:29 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:31:29 2014 +0100 xsm: Fix xsm_map_gfmn_foreign prototype when XSM is enabled Signed-off-by: Julien Grall Acked-by: Daniel De Graaf --- xen/include/xsm/xsm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 1939453..5d35455 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -621,7 +621,7 @@ static inline int xsm_ioport_mapping (xsm_default_t def, struct domain *d, uint3 #endif /* CONFIG_X86 */ #ifdef CONFIG_ARM -static inline int xsm_map_gmfn_foreign (struct domain *d, struct domain *t) +static inline int xsm_map_gmfn_foreign (xsm_default_t def, struct domain *d, struct domain *t) { return xsm_ops->map_gmfn_foreign(d, t); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvk-00079I-SL; Sat, 01 Mar 2014 23:02:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvi-00078y-Qo for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:51 +0000 Received: from [193.109.254.147:32143] by server-11.bemta-14.messagelabs.com id 5E/94-24604-A1762135; Sat, 01 Mar 2014 23:02:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1393714968!3938559!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7537 invoked from network); 1 Mar 2014 23:02:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:02:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvg-0001zs-77 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsvg-0000Wh-6E for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:48 +0000 Date: Sat, 01 Mar 2014 23:02:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsave: enable support for new ISA extensions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8121c54ec8cc6a92ae2d7219e7a7fede6dfd137 Author: Jan Beulich AuthorDate: Tue Feb 25 09:34:04 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:34:04 2014 +0100 x86/xsave: enable support for new ISA extensions Intel has released a new version of Intel Architecture Instruction Set Extensions Programming Reference, adding new features like AVX-512, MPX, etc. Refer to http://download-software.intel.com/sites/default/files/319433-015.pdf This patch adds support for these new instruction set extensions without enabling this support for guest use, yet. It also adjusts XCR0 validation, at once fixing the definition of XSTATE_ALL (which is not supposed to include bit 63). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/xstate.c | 47 +++++++++++++++++++++++++++++------------ xen/include/asm-x86/xstate.h | 13 ++++++++--- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 9e74929..7d9b92b 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -253,7 +253,7 @@ void xstate_free_save_area(struct vcpu *v) /* Collect the information of processor's extended state */ void xstate_init(bool_t bsp) { - u32 eax, ebx, ecx, edx, min_size; + u32 eax, ebx, ecx, edx; u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) @@ -269,12 +269,6 @@ void xstate_init(bool_t bsp) BUG_ON((eax & XSTATE_YMM) && !(eax & XSTATE_SSE)); feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; - /* FP/SSE, XSAVE.HEADER, YMM */ - min_size = XSTATE_AREA_MIN_SIZE; - if ( eax & XSTATE_YMM ) - min_size += XSTATE_YMM_SIZE; - BUG_ON(ecx < min_size); - /* * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ @@ -327,14 +321,38 @@ unsigned int xstate_ctxt_size(u64 xcr0) return ebx; } +static bool_t valid_xcr0(u64 xcr0) +{ + /* FP must be unconditionally set. */ + if ( !(xcr0 & XSTATE_FP) ) + return 0; + + /* YMM depends on SSE. */ + if ( (xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE) ) + return 0; + + if ( xcr0 & (XSTATE_OPMASK | XSTATE_ZMM | XSTATE_HI_ZMM) ) + { + /* OPMASK, ZMM, and HI_ZMM require YMM. */ + if ( !(xcr0 & XSTATE_YMM) ) + return 0; + + /* OPMASK, ZMM, and HI_ZMM must be the same. */ + if ( ~xcr0 & (XSTATE_OPMASK | XSTATE_ZMM | XSTATE_HI_ZMM) ) + return 0; + } + + /* BNDREGS and BNDCSR must be the same. */ + return !(xcr0 & XSTATE_BNDREGS) == !(xcr0 & XSTATE_BNDCSR); +} + int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) { if ( (xcr0_accum & ~xfeat_mask) || (xstate_bv & ~xcr0_accum) || (xcr0 & ~xcr0_accum) || - !(xcr0 & XSTATE_FP) || - ((xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE)) || - ((xcr0_accum & XSTATE_YMM) && !(xcr0_accum & XSTATE_SSE)) ) + !valid_xcr0(xcr0) || + !valid_xcr0(xcr0_accum) ) return -EINVAL; if ( xcr0_accum & ~xfeature_mask ) @@ -351,10 +369,7 @@ int handle_xsetbv(u32 index, u64 new_bv) if ( index != XCR_XFEATURE_ENABLED_MASK ) return -EOPNOTSUPP; - if ( (new_bv & ~xfeature_mask) || !(new_bv & XSTATE_FP) ) - return -EINVAL; - - if ( (new_bv & XSTATE_YMM) && !(new_bv & XSTATE_SSE) ) + if ( (new_bv & ~xfeature_mask) || !valid_xcr0(new_bv) ) return -EINVAL; if ( !set_xcr0(new_bv) ) @@ -364,6 +379,10 @@ int handle_xsetbv(u32 index, u64 new_bv) curr->arch.xcr0 = new_bv; curr->arch.xcr0_accum |= new_bv; + /* LWP sets nonlazy_xstate_used independently. */ + if ( new_bv & (XSTATE_NONLAZY & ~XSTATE_LWP) ) + curr->arch.nonlazy_xstate_used = 1; + mask &= curr->fpu_dirtied ? ~XSTATE_FP_SSE : XSTATE_NONLAZY; if ( mask ) { diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index 5617963..de5711e 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -20,18 +20,23 @@ #define XCR_XFEATURE_ENABLED_MASK 0x00000000 /* index of XCR0 */ #define XSTATE_YMM_SIZE 256 -#define XSTATE_YMM_OFFSET XSAVE_AREA_MIN_SIZE #define XSTATE_AREA_MIN_SIZE (512 + 64) /* FP/SSE + XSAVE.HEADER */ #define XSTATE_FP (1ULL << 0) #define XSTATE_SSE (1ULL << 1) #define XSTATE_YMM (1ULL << 2) +#define XSTATE_BNDREGS (1ULL << 3) +#define XSTATE_BNDCSR (1ULL << 4) +#define XSTATE_OPMASK (1ULL << 5) +#define XSTATE_ZMM (1ULL << 6) +#define XSTATE_HI_ZMM (1ULL << 7) #define XSTATE_LWP (1ULL << 62) /* AMD lightweight profiling */ #define XSTATE_FP_SSE (XSTATE_FP | XSTATE_SSE) -#define XCNTXT_MASK (XSTATE_FP | XSTATE_SSE | XSTATE_YMM | XSTATE_LWP) +#define XCNTXT_MASK (XSTATE_FP | XSTATE_SSE | XSTATE_YMM | XSTATE_OPMASK | \ + XSTATE_ZMM | XSTATE_HI_ZMM | XSTATE_NONLAZY) -#define XSTATE_ALL (~0) -#define XSTATE_NONLAZY (XSTATE_LWP) +#define XSTATE_ALL (~(1ULL << 63)) +#define XSTATE_NONLAZY (XSTATE_LWP | XSTATE_BNDREGS | XSTATE_BNDCSR) #define XSTATE_LAZY (XSTATE_ALL & ~XSTATE_NONLAZY) extern u64 xfeature_mask; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:02:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:02:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvk-00079I-SL; Sat, 01 Mar 2014 23:02:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvi-00078y-Qo for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:51 +0000 Received: from [193.109.254.147:32143] by server-11.bemta-14.messagelabs.com id 5E/94-24604-A1762135; Sat, 01 Mar 2014 23:02:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1393714968!3938559!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7537 invoked from network); 1 Mar 2014 23:02:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:02:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvg-0001zs-77 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsvg-0000Wh-6E for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:48 +0000 Date: Sat, 01 Mar 2014 23:02:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsave: enable support for new ISA extensions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8121c54ec8cc6a92ae2d7219e7a7fede6dfd137 Author: Jan Beulich AuthorDate: Tue Feb 25 09:34:04 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:34:04 2014 +0100 x86/xsave: enable support for new ISA extensions Intel has released a new version of Intel Architecture Instruction Set Extensions Programming Reference, adding new features like AVX-512, MPX, etc. Refer to http://download-software.intel.com/sites/default/files/319433-015.pdf This patch adds support for these new instruction set extensions without enabling this support for guest use, yet. It also adjusts XCR0 validation, at once fixing the definition of XSTATE_ALL (which is not supposed to include bit 63). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/xstate.c | 47 +++++++++++++++++++++++++++++------------ xen/include/asm-x86/xstate.h | 13 ++++++++--- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 9e74929..7d9b92b 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -253,7 +253,7 @@ void xstate_free_save_area(struct vcpu *v) /* Collect the information of processor's extended state */ void xstate_init(bool_t bsp) { - u32 eax, ebx, ecx, edx, min_size; + u32 eax, ebx, ecx, edx; u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) @@ -269,12 +269,6 @@ void xstate_init(bool_t bsp) BUG_ON((eax & XSTATE_YMM) && !(eax & XSTATE_SSE)); feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; - /* FP/SSE, XSAVE.HEADER, YMM */ - min_size = XSTATE_AREA_MIN_SIZE; - if ( eax & XSTATE_YMM ) - min_size += XSTATE_YMM_SIZE; - BUG_ON(ecx < min_size); - /* * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ @@ -327,14 +321,38 @@ unsigned int xstate_ctxt_size(u64 xcr0) return ebx; } +static bool_t valid_xcr0(u64 xcr0) +{ + /* FP must be unconditionally set. */ + if ( !(xcr0 & XSTATE_FP) ) + return 0; + + /* YMM depends on SSE. */ + if ( (xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE) ) + return 0; + + if ( xcr0 & (XSTATE_OPMASK | XSTATE_ZMM | XSTATE_HI_ZMM) ) + { + /* OPMASK, ZMM, and HI_ZMM require YMM. */ + if ( !(xcr0 & XSTATE_YMM) ) + return 0; + + /* OPMASK, ZMM, and HI_ZMM must be the same. */ + if ( ~xcr0 & (XSTATE_OPMASK | XSTATE_ZMM | XSTATE_HI_ZMM) ) + return 0; + } + + /* BNDREGS and BNDCSR must be the same. */ + return !(xcr0 & XSTATE_BNDREGS) == !(xcr0 & XSTATE_BNDCSR); +} + int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) { if ( (xcr0_accum & ~xfeat_mask) || (xstate_bv & ~xcr0_accum) || (xcr0 & ~xcr0_accum) || - !(xcr0 & XSTATE_FP) || - ((xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE)) || - ((xcr0_accum & XSTATE_YMM) && !(xcr0_accum & XSTATE_SSE)) ) + !valid_xcr0(xcr0) || + !valid_xcr0(xcr0_accum) ) return -EINVAL; if ( xcr0_accum & ~xfeature_mask ) @@ -351,10 +369,7 @@ int handle_xsetbv(u32 index, u64 new_bv) if ( index != XCR_XFEATURE_ENABLED_MASK ) return -EOPNOTSUPP; - if ( (new_bv & ~xfeature_mask) || !(new_bv & XSTATE_FP) ) - return -EINVAL; - - if ( (new_bv & XSTATE_YMM) && !(new_bv & XSTATE_SSE) ) + if ( (new_bv & ~xfeature_mask) || !valid_xcr0(new_bv) ) return -EINVAL; if ( !set_xcr0(new_bv) ) @@ -364,6 +379,10 @@ int handle_xsetbv(u32 index, u64 new_bv) curr->arch.xcr0 = new_bv; curr->arch.xcr0_accum |= new_bv; + /* LWP sets nonlazy_xstate_used independently. */ + if ( new_bv & (XSTATE_NONLAZY & ~XSTATE_LWP) ) + curr->arch.nonlazy_xstate_used = 1; + mask &= curr->fpu_dirtied ? ~XSTATE_FP_SSE : XSTATE_NONLAZY; if ( mask ) { diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index 5617963..de5711e 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -20,18 +20,23 @@ #define XCR_XFEATURE_ENABLED_MASK 0x00000000 /* index of XCR0 */ #define XSTATE_YMM_SIZE 256 -#define XSTATE_YMM_OFFSET XSAVE_AREA_MIN_SIZE #define XSTATE_AREA_MIN_SIZE (512 + 64) /* FP/SSE + XSAVE.HEADER */ #define XSTATE_FP (1ULL << 0) #define XSTATE_SSE (1ULL << 1) #define XSTATE_YMM (1ULL << 2) +#define XSTATE_BNDREGS (1ULL << 3) +#define XSTATE_BNDCSR (1ULL << 4) +#define XSTATE_OPMASK (1ULL << 5) +#define XSTATE_ZMM (1ULL << 6) +#define XSTATE_HI_ZMM (1ULL << 7) #define XSTATE_LWP (1ULL << 62) /* AMD lightweight profiling */ #define XSTATE_FP_SSE (XSTATE_FP | XSTATE_SSE) -#define XCNTXT_MASK (XSTATE_FP | XSTATE_SSE | XSTATE_YMM | XSTATE_LWP) +#define XCNTXT_MASK (XSTATE_FP | XSTATE_SSE | XSTATE_YMM | XSTATE_OPMASK | \ + XSTATE_ZMM | XSTATE_HI_ZMM | XSTATE_NONLAZY) -#define XSTATE_ALL (~0) -#define XSTATE_NONLAZY (XSTATE_LWP) +#define XSTATE_ALL (~(1ULL << 63)) +#define XSTATE_NONLAZY (XSTATE_LWP | XSTATE_BNDREGS | XSTATE_BNDCSR) #define XSTATE_LAZY (XSTATE_ALL & ~XSTATE_NONLAZY) extern u64 xfeature_mask; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:03:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:03:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvv-0007Au-0Z; Sat, 01 Mar 2014 23:03:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvt-0007Ae-1x for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:01 +0000 Received: from [193.109.254.147:12667] by server-6.bemta-14.messagelabs.com id A0/21-03396-42762135; Sat, 01 Mar 2014 23:03:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1393714978!7704086!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24567 invoked from network); 1 Mar 2014 23:02:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:02:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvq-0001zy-CR for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsvq-0000X3-B3 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:58 +0000 Date: Sat, 01 Mar 2014 23:02:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: MPX IA32_BNDCFGS msr handle X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 081f710070e2f5e5808ac8f92f7302bc8352dd57 Author: Xudong Hao AuthorDate: Tue Feb 25 09:38:21 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:38:21 2014 +0100 x86: MPX IA32_BNDCFGS msr handle When MPX supported, a new guest-state field for IA32_BNDCFGS is added to the VMCS. In addition, two new controls are added: - a VM-exit control called "clear BNDCFGS" - a VM-entry control called "load BNDCFGS." VM exits always save IA32_BNDCFGS into BNDCFGS field of VMCS. Signed-off-by: Xudong Hao Reviewed-by: Liu Jinsong Unlikely, but in case VMX support is not available, not expose MPX to hvm guest. Suggested-by: Andrew Cooper Suggested-by: Jan Beulich Signed-off-by: Liu Jinsong Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/hvm.c | 6 ++++++ xen/arch/x86/hvm/vmx/vmcs.c | 8 ++++++-- xen/include/asm-x86/cpufeature.h | 2 ++ xen/include/asm-x86/hvm/vmx/vmcs.h | 2 ++ xen/include/asm-x86/msr-index.h | 2 ++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 69f7e74..0991f6a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2909,6 +2909,12 @@ void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, if ( (count == 0) && !cpu_has_smep ) *ebx &= ~cpufeat_mask(X86_FEATURE_SMEP); + /* Don't expose MPX to hvm when VMX support is not available */ + if ( (count == 0) && + (!(vmx_vmexit_control & VM_EXIT_CLEAR_BNDCFGS) || + !(vmx_vmentry_control & VM_ENTRY_LOAD_BNDCFGS)) ) + *ebx &= ~cpufeat_mask(X86_FEATURE_MPX); + /* Don't expose INVPCID to non-hap hvm. */ if ( (count == 0) && !hap_enabled(d) ) *ebx &= ~cpufeat_mask(X86_FEATURE_INVPCID); diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 44f33cb..9ffb4af 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -269,7 +269,8 @@ static int vmx_init_vmcs_config(void) } min = VM_EXIT_ACK_INTR_ON_EXIT; - opt = VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_LOAD_HOST_PAT; + opt = VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_LOAD_HOST_PAT | + VM_EXIT_CLEAR_BNDCFGS; min |= VM_EXIT_IA32E_MODE; _vmx_vmexit_control = adjust_vmx_controls( "VMExit Control", min, opt, MSR_IA32_VMX_EXIT_CTLS, &mismatch); @@ -283,7 +284,7 @@ static int vmx_init_vmcs_config(void) _vmx_pin_based_exec_control &= ~ PIN_BASED_POSTED_INTERRUPT; min = 0; - opt = VM_ENTRY_LOAD_GUEST_PAT; + opt = VM_ENTRY_LOAD_GUEST_PAT | VM_ENTRY_LOAD_BNDCFGS; _vmx_vmentry_control = adjust_vmx_controls( "VMEntry Control", min, opt, MSR_IA32_VMX_ENTRY_CTLS, &mismatch); @@ -955,6 +956,9 @@ static int construct_vmcs(struct vcpu *v) vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_EIP, MSR_TYPE_R | MSR_TYPE_W); if ( paging_mode_hap(d) && (!iommu_enabled || iommu_snoop) ) vmx_disable_intercept_for_msr(v, MSR_IA32_CR_PAT, MSR_TYPE_R | MSR_TYPE_W); + if ( (vmexit_ctl & VM_EXIT_CLEAR_BNDCFGS) && + (vmentry_ctl & VM_ENTRY_LOAD_BNDCFGS) ) + vmx_disable_intercept_for_msr(v, MSR_IA32_BNDCFGS, MSR_TYPE_R | MSR_TYPE_W); } /* I/O access bitmap. */ diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 87d5f66..f38fde4 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -148,6 +148,7 @@ #define X86_FEATURE_INVPCID (7*32+10) /* Invalidate Process Context ID */ #define X86_FEATURE_RTM (7*32+11) /* Restricted Transactional Memory */ #define X86_FEATURE_NO_FPU_SEL (7*32+13) /* FPU CS/DS stored as zero */ +#define X86_FEATURE_MPX (7*32+14) /* Memory Protection Extensions */ #define X86_FEATURE_RDSEED (7*32+18) /* RDSEED instruction */ #define X86_FEATURE_ADX (7*32+19) /* ADCX, ADOX instructions */ #define X86_FEATURE_SMAP (7*32+20) /* Supervisor Mode Access Prevention */ @@ -199,6 +200,7 @@ #define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE) #define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX) #define cpu_has_lwp boot_cpu_has(X86_FEATURE_LWP) +#define cpu_has_mpx boot_cpu_has(X86_FEATURE_MPX) #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index ebaba5c..75cd653 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -186,6 +186,7 @@ extern u32 vmx_pin_based_exec_control; #define VM_EXIT_SAVE_GUEST_EFER 0x00100000 #define VM_EXIT_LOAD_HOST_EFER 0x00200000 #define VM_EXIT_SAVE_PREEMPT_TIMER 0x00400000 +#define VM_EXIT_CLEAR_BNDCFGS 0x00800000 extern u32 vmx_vmexit_control; #define VM_ENTRY_IA32E_MODE 0x00000200 @@ -194,6 +195,7 @@ extern u32 vmx_vmexit_control; #define VM_ENTRY_LOAD_PERF_GLOBAL_CTRL 0x00002000 #define VM_ENTRY_LOAD_GUEST_PAT 0x00004000 #define VM_ENTRY_LOAD_GUEST_EFER 0x00008000 +#define VM_ENTRY_LOAD_BNDCFGS 0x00010000 extern u32 vmx_vmentry_control; #define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001 diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index fc9fbc6..86b7d64 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -56,6 +56,8 @@ #define MSR_IA32_DS_AREA 0x00000600 #define MSR_IA32_PERF_CAPABILITIES 0x00000345 +#define MSR_IA32_BNDCFGS 0x00000D90 + #define MSR_MTRRfix64K_00000 0x00000250 #define MSR_MTRRfix16K_80000 0x00000258 #define MSR_MTRRfix16K_A0000 0x00000259 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:03:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:03:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvv-0007Au-0Z; Sat, 01 Mar 2014 23:03:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvt-0007Ae-1x for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:01 +0000 Received: from [193.109.254.147:12667] by server-6.bemta-14.messagelabs.com id A0/21-03396-42762135; Sat, 01 Mar 2014 23:03:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1393714978!7704086!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24567 invoked from network); 1 Mar 2014 23:02:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:02:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsvq-0001zy-CR for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsvq-0000X3-B3 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:02:58 +0000 Date: Sat, 01 Mar 2014 23:02:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: MPX IA32_BNDCFGS msr handle X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 081f710070e2f5e5808ac8f92f7302bc8352dd57 Author: Xudong Hao AuthorDate: Tue Feb 25 09:38:21 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:38:21 2014 +0100 x86: MPX IA32_BNDCFGS msr handle When MPX supported, a new guest-state field for IA32_BNDCFGS is added to the VMCS. In addition, two new controls are added: - a VM-exit control called "clear BNDCFGS" - a VM-entry control called "load BNDCFGS." VM exits always save IA32_BNDCFGS into BNDCFGS field of VMCS. Signed-off-by: Xudong Hao Reviewed-by: Liu Jinsong Unlikely, but in case VMX support is not available, not expose MPX to hvm guest. Suggested-by: Andrew Cooper Suggested-by: Jan Beulich Signed-off-by: Liu Jinsong Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/hvm.c | 6 ++++++ xen/arch/x86/hvm/vmx/vmcs.c | 8 ++++++-- xen/include/asm-x86/cpufeature.h | 2 ++ xen/include/asm-x86/hvm/vmx/vmcs.h | 2 ++ xen/include/asm-x86/msr-index.h | 2 ++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 69f7e74..0991f6a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2909,6 +2909,12 @@ void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, if ( (count == 0) && !cpu_has_smep ) *ebx &= ~cpufeat_mask(X86_FEATURE_SMEP); + /* Don't expose MPX to hvm when VMX support is not available */ + if ( (count == 0) && + (!(vmx_vmexit_control & VM_EXIT_CLEAR_BNDCFGS) || + !(vmx_vmentry_control & VM_ENTRY_LOAD_BNDCFGS)) ) + *ebx &= ~cpufeat_mask(X86_FEATURE_MPX); + /* Don't expose INVPCID to non-hap hvm. */ if ( (count == 0) && !hap_enabled(d) ) *ebx &= ~cpufeat_mask(X86_FEATURE_INVPCID); diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 44f33cb..9ffb4af 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -269,7 +269,8 @@ static int vmx_init_vmcs_config(void) } min = VM_EXIT_ACK_INTR_ON_EXIT; - opt = VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_LOAD_HOST_PAT; + opt = VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_LOAD_HOST_PAT | + VM_EXIT_CLEAR_BNDCFGS; min |= VM_EXIT_IA32E_MODE; _vmx_vmexit_control = adjust_vmx_controls( "VMExit Control", min, opt, MSR_IA32_VMX_EXIT_CTLS, &mismatch); @@ -283,7 +284,7 @@ static int vmx_init_vmcs_config(void) _vmx_pin_based_exec_control &= ~ PIN_BASED_POSTED_INTERRUPT; min = 0; - opt = VM_ENTRY_LOAD_GUEST_PAT; + opt = VM_ENTRY_LOAD_GUEST_PAT | VM_ENTRY_LOAD_BNDCFGS; _vmx_vmentry_control = adjust_vmx_controls( "VMEntry Control", min, opt, MSR_IA32_VMX_ENTRY_CTLS, &mismatch); @@ -955,6 +956,9 @@ static int construct_vmcs(struct vcpu *v) vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_EIP, MSR_TYPE_R | MSR_TYPE_W); if ( paging_mode_hap(d) && (!iommu_enabled || iommu_snoop) ) vmx_disable_intercept_for_msr(v, MSR_IA32_CR_PAT, MSR_TYPE_R | MSR_TYPE_W); + if ( (vmexit_ctl & VM_EXIT_CLEAR_BNDCFGS) && + (vmentry_ctl & VM_ENTRY_LOAD_BNDCFGS) ) + vmx_disable_intercept_for_msr(v, MSR_IA32_BNDCFGS, MSR_TYPE_R | MSR_TYPE_W); } /* I/O access bitmap. */ diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 87d5f66..f38fde4 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -148,6 +148,7 @@ #define X86_FEATURE_INVPCID (7*32+10) /* Invalidate Process Context ID */ #define X86_FEATURE_RTM (7*32+11) /* Restricted Transactional Memory */ #define X86_FEATURE_NO_FPU_SEL (7*32+13) /* FPU CS/DS stored as zero */ +#define X86_FEATURE_MPX (7*32+14) /* Memory Protection Extensions */ #define X86_FEATURE_RDSEED (7*32+18) /* RDSEED instruction */ #define X86_FEATURE_ADX (7*32+19) /* ADCX, ADOX instructions */ #define X86_FEATURE_SMAP (7*32+20) /* Supervisor Mode Access Prevention */ @@ -199,6 +200,7 @@ #define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE) #define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX) #define cpu_has_lwp boot_cpu_has(X86_FEATURE_LWP) +#define cpu_has_mpx boot_cpu_has(X86_FEATURE_MPX) #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index ebaba5c..75cd653 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -186,6 +186,7 @@ extern u32 vmx_pin_based_exec_control; #define VM_EXIT_SAVE_GUEST_EFER 0x00100000 #define VM_EXIT_LOAD_HOST_EFER 0x00200000 #define VM_EXIT_SAVE_PREEMPT_TIMER 0x00400000 +#define VM_EXIT_CLEAR_BNDCFGS 0x00800000 extern u32 vmx_vmexit_control; #define VM_ENTRY_IA32E_MODE 0x00000200 @@ -194,6 +195,7 @@ extern u32 vmx_vmexit_control; #define VM_ENTRY_LOAD_PERF_GLOBAL_CTRL 0x00002000 #define VM_ENTRY_LOAD_GUEST_PAT 0x00004000 #define VM_ENTRY_LOAD_GUEST_EFER 0x00008000 +#define VM_ENTRY_LOAD_BNDCFGS 0x00010000 extern u32 vmx_vmentry_control; #define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001 diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index fc9fbc6..86b7d64 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -56,6 +56,8 @@ #define MSR_IA32_DS_AREA 0x00000600 #define MSR_IA32_PERF_CAPABILITIES 0x00000345 +#define MSR_IA32_BNDCFGS 0x00000D90 + #define MSR_MTRRfix64K_00000 0x00000250 #define MSR_MTRRfix16K_80000 0x00000258 #define MSR_MTRRfix16K_A0000 0x00000259 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:03:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:03:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsw5-0007D6-5Z; Sat, 01 Mar 2014 23:03:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsw3-0007Ck-Dq for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:11 +0000 Received: from [85.158.143.35:51440] by server-3.bemta-4.messagelabs.com id 86/CB-11539-E2762135; Sat, 01 Mar 2014 23:03:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1393714988!9279243!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15586 invoked from network); 1 Mar 2014 23:03:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:03:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsw0-00020X-Iz for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsw0-0000Xh-H0 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:08 +0000 Date: Sat, 01 Mar 2014 23:03:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: generic MSRs save/restore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd1f0b45ff1fde2de8d2a2b397b9686a1185ed4e Author: Jan Beulich AuthorDate: Tue Feb 25 09:40:31 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:40:31 2014 +0100 x86: generic MSRs save/restore This patch introduces a generic MSRs save/restore mechanism, so that in the future new MSRs' save/restore could be added w/ smaller change than the full blown addition of a new save/restore type. Signed-off-by: Jan Beulich Reviewed-by: Liu Jinsong Acked-by: Keir Fraser --- xen/arch/x86/hvm/hvm.c | 128 +++++++++++++++++++++++++++++++- xen/include/asm-x86/hvm/hvm.h | 4 + xen/include/public/arch-x86/hvm/save.h | 20 +++++- 3 files changed, 147 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0991f6a..08fec34 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1127,10 +1127,117 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) return 0; } -/* We need variable length data chunk for xsave area, hence customized - * declaration other than HVM_REGISTER_SAVE_RESTORE. +#define HVM_CPU_MSR_SIZE(cnt) offsetof(struct hvm_msr, msr[cnt]) +static unsigned int __read_mostly msr_count_max; + +static int hvm_save_cpu_msrs(struct domain *d, hvm_domain_context_t *h) +{ + struct vcpu *v; + + for_each_vcpu ( d, v ) + { + struct hvm_msr *ctxt; + unsigned int i; + + if ( _hvm_init_entry(h, CPU_MSR_CODE, v->vcpu_id, + HVM_CPU_MSR_SIZE(msr_count_max)) ) + return 1; + ctxt = (struct hvm_msr *)&h->data[h->cur]; + ctxt->count = 0; + + if ( hvm_funcs.save_msr ) + hvm_funcs.save_msr(v, ctxt); + + for ( i = 0; i < ctxt->count; ++i ) + ctxt->msr[i]._rsvd = 0; + + if ( ctxt->count ) + h->cur += HVM_CPU_MSR_SIZE(ctxt->count); + else + h->cur -= sizeof(struct hvm_save_descriptor); + } + + return 0; +} + +static int hvm_load_cpu_msrs(struct domain *d, hvm_domain_context_t *h) +{ + unsigned int i, vcpuid = hvm_load_instance(h); + struct vcpu *v; + const struct hvm_save_descriptor *desc; + struct hvm_msr *ctxt; + int err = 0; + + if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL ) + { + dprintk(XENLOG_G_ERR, "HVM restore: dom%d has no vcpu%u\n", + d->domain_id, vcpuid); + return -EINVAL; + } + + /* Customized checking for entry since our entry is of variable length */ + desc = (struct hvm_save_descriptor *)&h->data[h->cur]; + if ( sizeof (*desc) > h->size - h->cur) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore: not enough data left to read MSR descriptor\n", + d->domain_id, vcpuid); + return -ENODATA; + } + if ( desc->length + sizeof (*desc) > h->size - h->cur) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore: not enough data left to read %u MSR bytes\n", + d->domain_id, vcpuid, desc->length); + return -ENODATA; + } + if ( desc->length < HVM_CPU_MSR_SIZE(1) ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: MSR length %u < %zu\n", + d->domain_id, vcpuid, desc->length, HVM_CPU_MSR_SIZE(1)); + return -EINVAL; + } + + h->cur += sizeof(*desc); + ctxt = (struct hvm_msr *)&h->data[h->cur]; + h->cur += desc->length; + + if ( desc->length != HVM_CPU_MSR_SIZE(ctxt->count) ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: MSR length %u != %zu\n", + d->domain_id, vcpuid, desc->length, + HVM_CPU_MSR_SIZE(ctxt->count)); + return -EOPNOTSUPP; + } + + for ( i = 0; i < ctxt->count; ++i ) + if ( ctxt->msr[i]._rsvd ) + return -EOPNOTSUPP; + /* Checking finished */ + + if ( hvm_funcs.load_msr ) + err = hvm_funcs.load_msr(v, ctxt); + + for ( i = 0; !err && i < ctxt->count; ++i ) + { + switch ( ctxt->msr[i].index ) + { + default: + if ( !ctxt->msr[i]._rsvd ) + err = -ENXIO; + break; + } + } + + return err; +} + +/* We need variable length data chunks for XSAVE area and MSRs, hence + * a custom declaration rather than HVM_REGISTER_SAVE_RESTORE. */ -static int __init __hvm_register_CPU_XSAVE_save_and_restore(void) +static int __init hvm_register_CPU_save_and_restore(void) { hvm_register_savevm(CPU_XSAVE_CODE, "CPU_XSAVE", @@ -1139,9 +1246,22 @@ static int __init __hvm_register_CPU_XSAVE_save_and_restore(void) HVM_CPU_XSAVE_SIZE(xfeature_mask) + sizeof(struct hvm_save_descriptor), HVMSR_PER_VCPU); + + if ( hvm_funcs.init_msr ) + msr_count_max += hvm_funcs.init_msr(); + + if ( msr_count_max ) + hvm_register_savevm(CPU_MSR_CODE, + "CPU_MSR", + hvm_save_cpu_msrs, + hvm_load_cpu_msrs, + HVM_CPU_MSR_SIZE(msr_count_max) + + sizeof(struct hvm_save_descriptor), + HVMSR_PER_VCPU); + return 0; } -__initcall(__hvm_register_CPU_XSAVE_save_and_restore); +__initcall(hvm_register_CPU_save_and_restore); int hvm_vcpu_initialise(struct vcpu *v) { diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index ccca5df..dcc3483 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -109,6 +109,10 @@ struct hvm_function_table { void (*save_cpu_ctxt)(struct vcpu *v, struct hvm_hw_cpu *ctxt); int (*load_cpu_ctxt)(struct vcpu *v, struct hvm_hw_cpu *ctxt); + unsigned int (*init_msr)(void); + void (*save_msr)(struct vcpu *, struct hvm_msr *); + int (*load_msr)(struct vcpu *, struct hvm_msr *); + /* Examine specifics of the guest state. */ unsigned int (*get_interrupt_shadow)(struct vcpu *v); void (*set_interrupt_shadow)(struct vcpu *v, unsigned int intr_shadow); diff --git a/xen/include/public/arch-x86/hvm/save.h b/xen/include/public/arch-x86/hvm/save.h index 3664aaf..5a13795 100644 --- a/xen/include/public/arch-x86/hvm/save.h +++ b/xen/include/public/arch-x86/hvm/save.h @@ -592,9 +592,27 @@ struct hvm_tsc_adjust { DECLARE_HVM_SAVE_TYPE(TSC_ADJUST, 19, struct hvm_tsc_adjust); + +struct hvm_msr { + uint32_t count; + struct hvm_one_msr { + uint32_t index; + uint32_t _rsvd; + uint64_t val; +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + } msr[]; +#elif defined(__GNUC__) + } msr[0]; +#else + } msr[1 /* variable size */]; +#endif +}; + +#define CPU_MSR_CODE 20 + /* * Largest type-code in use */ -#define HVM_SAVE_CODE_MAX 19 +#define HVM_SAVE_CODE_MAX 20 #endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:03:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:03:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsw5-0007D6-5Z; Sat, 01 Mar 2014 23:03:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsw3-0007Ck-Dq for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:11 +0000 Received: from [85.158.143.35:51440] by server-3.bemta-4.messagelabs.com id 86/CB-11539-E2762135; Sat, 01 Mar 2014 23:03:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1393714988!9279243!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15586 invoked from network); 1 Mar 2014 23:03:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:03:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsw0-00020X-Iz for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsw0-0000Xh-H0 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:08 +0000 Date: Sat, 01 Mar 2014 23:03:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: generic MSRs save/restore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd1f0b45ff1fde2de8d2a2b397b9686a1185ed4e Author: Jan Beulich AuthorDate: Tue Feb 25 09:40:31 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:40:31 2014 +0100 x86: generic MSRs save/restore This patch introduces a generic MSRs save/restore mechanism, so that in the future new MSRs' save/restore could be added w/ smaller change than the full blown addition of a new save/restore type. Signed-off-by: Jan Beulich Reviewed-by: Liu Jinsong Acked-by: Keir Fraser --- xen/arch/x86/hvm/hvm.c | 128 +++++++++++++++++++++++++++++++- xen/include/asm-x86/hvm/hvm.h | 4 + xen/include/public/arch-x86/hvm/save.h | 20 +++++- 3 files changed, 147 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0991f6a..08fec34 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1127,10 +1127,117 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) return 0; } -/* We need variable length data chunk for xsave area, hence customized - * declaration other than HVM_REGISTER_SAVE_RESTORE. +#define HVM_CPU_MSR_SIZE(cnt) offsetof(struct hvm_msr, msr[cnt]) +static unsigned int __read_mostly msr_count_max; + +static int hvm_save_cpu_msrs(struct domain *d, hvm_domain_context_t *h) +{ + struct vcpu *v; + + for_each_vcpu ( d, v ) + { + struct hvm_msr *ctxt; + unsigned int i; + + if ( _hvm_init_entry(h, CPU_MSR_CODE, v->vcpu_id, + HVM_CPU_MSR_SIZE(msr_count_max)) ) + return 1; + ctxt = (struct hvm_msr *)&h->data[h->cur]; + ctxt->count = 0; + + if ( hvm_funcs.save_msr ) + hvm_funcs.save_msr(v, ctxt); + + for ( i = 0; i < ctxt->count; ++i ) + ctxt->msr[i]._rsvd = 0; + + if ( ctxt->count ) + h->cur += HVM_CPU_MSR_SIZE(ctxt->count); + else + h->cur -= sizeof(struct hvm_save_descriptor); + } + + return 0; +} + +static int hvm_load_cpu_msrs(struct domain *d, hvm_domain_context_t *h) +{ + unsigned int i, vcpuid = hvm_load_instance(h); + struct vcpu *v; + const struct hvm_save_descriptor *desc; + struct hvm_msr *ctxt; + int err = 0; + + if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL ) + { + dprintk(XENLOG_G_ERR, "HVM restore: dom%d has no vcpu%u\n", + d->domain_id, vcpuid); + return -EINVAL; + } + + /* Customized checking for entry since our entry is of variable length */ + desc = (struct hvm_save_descriptor *)&h->data[h->cur]; + if ( sizeof (*desc) > h->size - h->cur) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore: not enough data left to read MSR descriptor\n", + d->domain_id, vcpuid); + return -ENODATA; + } + if ( desc->length + sizeof (*desc) > h->size - h->cur) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore: not enough data left to read %u MSR bytes\n", + d->domain_id, vcpuid, desc->length); + return -ENODATA; + } + if ( desc->length < HVM_CPU_MSR_SIZE(1) ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: MSR length %u < %zu\n", + d->domain_id, vcpuid, desc->length, HVM_CPU_MSR_SIZE(1)); + return -EINVAL; + } + + h->cur += sizeof(*desc); + ctxt = (struct hvm_msr *)&h->data[h->cur]; + h->cur += desc->length; + + if ( desc->length != HVM_CPU_MSR_SIZE(ctxt->count) ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: MSR length %u != %zu\n", + d->domain_id, vcpuid, desc->length, + HVM_CPU_MSR_SIZE(ctxt->count)); + return -EOPNOTSUPP; + } + + for ( i = 0; i < ctxt->count; ++i ) + if ( ctxt->msr[i]._rsvd ) + return -EOPNOTSUPP; + /* Checking finished */ + + if ( hvm_funcs.load_msr ) + err = hvm_funcs.load_msr(v, ctxt); + + for ( i = 0; !err && i < ctxt->count; ++i ) + { + switch ( ctxt->msr[i].index ) + { + default: + if ( !ctxt->msr[i]._rsvd ) + err = -ENXIO; + break; + } + } + + return err; +} + +/* We need variable length data chunks for XSAVE area and MSRs, hence + * a custom declaration rather than HVM_REGISTER_SAVE_RESTORE. */ -static int __init __hvm_register_CPU_XSAVE_save_and_restore(void) +static int __init hvm_register_CPU_save_and_restore(void) { hvm_register_savevm(CPU_XSAVE_CODE, "CPU_XSAVE", @@ -1139,9 +1246,22 @@ static int __init __hvm_register_CPU_XSAVE_save_and_restore(void) HVM_CPU_XSAVE_SIZE(xfeature_mask) + sizeof(struct hvm_save_descriptor), HVMSR_PER_VCPU); + + if ( hvm_funcs.init_msr ) + msr_count_max += hvm_funcs.init_msr(); + + if ( msr_count_max ) + hvm_register_savevm(CPU_MSR_CODE, + "CPU_MSR", + hvm_save_cpu_msrs, + hvm_load_cpu_msrs, + HVM_CPU_MSR_SIZE(msr_count_max) + + sizeof(struct hvm_save_descriptor), + HVMSR_PER_VCPU); + return 0; } -__initcall(__hvm_register_CPU_XSAVE_save_and_restore); +__initcall(hvm_register_CPU_save_and_restore); int hvm_vcpu_initialise(struct vcpu *v) { diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index ccca5df..dcc3483 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -109,6 +109,10 @@ struct hvm_function_table { void (*save_cpu_ctxt)(struct vcpu *v, struct hvm_hw_cpu *ctxt); int (*load_cpu_ctxt)(struct vcpu *v, struct hvm_hw_cpu *ctxt); + unsigned int (*init_msr)(void); + void (*save_msr)(struct vcpu *, struct hvm_msr *); + int (*load_msr)(struct vcpu *, struct hvm_msr *); + /* Examine specifics of the guest state. */ unsigned int (*get_interrupt_shadow)(struct vcpu *v); void (*set_interrupt_shadow)(struct vcpu *v, unsigned int intr_shadow); diff --git a/xen/include/public/arch-x86/hvm/save.h b/xen/include/public/arch-x86/hvm/save.h index 3664aaf..5a13795 100644 --- a/xen/include/public/arch-x86/hvm/save.h +++ b/xen/include/public/arch-x86/hvm/save.h @@ -592,9 +592,27 @@ struct hvm_tsc_adjust { DECLARE_HVM_SAVE_TYPE(TSC_ADJUST, 19, struct hvm_tsc_adjust); + +struct hvm_msr { + uint32_t count; + struct hvm_one_msr { + uint32_t index; + uint32_t _rsvd; + uint64_t val; +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + } msr[]; +#elif defined(__GNUC__) + } msr[0]; +#else + } msr[1 /* variable size */]; +#endif +}; + +#define CPU_MSR_CODE 20 + /* * Largest type-code in use */ -#define HVM_SAVE_CODE_MAX 19 +#define HVM_SAVE_CODE_MAX 20 #endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:03:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:03:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswF-0007F4-8N; Sat, 01 Mar 2014 23:03:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswD-0007En-G9 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:21 +0000 Received: from [85.158.143.35:54440] by server-2.bemta-4.messagelabs.com id 01/79-04779-83762135; Sat, 01 Mar 2014 23:03:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1393714999!9286065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26608 invoked from network); 1 Mar 2014 23:03:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:03:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswA-00020d-Tf for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJswA-0000Y7-Mg for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:18 +0000 Date: Sat, 01 Mar 2014 23:03:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: MSR_IA32_BNDCFGS save/restore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c2502450ef1cc6fa1fd6daab8dbed8af1b88a29 Author: Jan Beulich AuthorDate: Tue Feb 25 09:41:40 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:41:40 2014 +0100 x86: MSR_IA32_BNDCFGS save/restore Signed-off-by: Jan Beulich Reviewed-by: Liu Jinsong Acked-by: Keir Fraser --- xen/arch/x86/hvm/vmx/vmx.c | 52 ++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/hvm/vmx/vmcs.h | 2 + 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index baf3040..b128e81 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -580,6 +580,55 @@ static int vmx_load_vmcs_ctxt(struct vcpu *v, struct hvm_hw_cpu *ctxt) return 0; } +static unsigned int __init vmx_init_msr(void) +{ + return !!cpu_has_mpx; +} + +static void vmx_save_msr(struct vcpu *v, struct hvm_msr *ctxt) +{ + vmx_vmcs_enter(v); + + if ( cpu_has_mpx ) + { + __vmread(GUEST_BNDCFGS, &ctxt->msr[ctxt->count].val); + if ( ctxt->msr[ctxt->count].val ) + ctxt->msr[ctxt->count++].index = MSR_IA32_BNDCFGS; + } + + vmx_vmcs_exit(v); +} + +static int vmx_load_msr(struct vcpu *v, struct hvm_msr *ctxt) +{ + unsigned int i; + int err = 0; + + vmx_vmcs_enter(v); + + for ( i = 0; i < ctxt->count; ++i ) + { + switch ( ctxt->msr[i].index ) + { + case MSR_IA32_BNDCFGS: + if ( cpu_has_mpx ) + __vmwrite(GUEST_BNDCFGS, ctxt->msr[i].val); + else + err = -ENXIO; + break; + default: + continue; + } + if ( err ) + break; + ctxt->msr[i]._rsvd = 1; + } + + vmx_vmcs_exit(v); + + return err; +} + static void vmx_fpu_enter(struct vcpu *v) { vcpu_restore_fpu_lazy(v); @@ -1607,6 +1656,9 @@ static struct hvm_function_table __initdata vmx_function_table = { .vcpu_destroy = vmx_vcpu_destroy, .save_cpu_ctxt = vmx_save_vmcs_ctxt, .load_cpu_ctxt = vmx_load_vmcs_ctxt, + .init_msr = vmx_init_msr, + .save_msr = vmx_save_msr, + .load_msr = vmx_load_msr, .get_interrupt_shadow = vmx_get_interrupt_shadow, .set_interrupt_shadow = vmx_set_interrupt_shadow, .guest_x86_mode = vmx_guest_x86_mode, diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 75cd653..45dcfa1 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -367,6 +367,8 @@ enum vmcs_field { GUEST_PDPTR2_HIGH = 0x0000280f, GUEST_PDPTR3 = 0x00002810, GUEST_PDPTR3_HIGH = 0x00002811, + GUEST_BNDCFGS = 0x00002812, + GUEST_BNDCFGS_HIGH = 0x00002813, HOST_PAT = 0x00002c00, HOST_PAT_HIGH = 0x00002c01, HOST_EFER = 0x00002c02, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:03:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:03:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswF-0007F4-8N; Sat, 01 Mar 2014 23:03:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswD-0007En-G9 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:21 +0000 Received: from [85.158.143.35:54440] by server-2.bemta-4.messagelabs.com id 01/79-04779-83762135; Sat, 01 Mar 2014 23:03:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1393714999!9286065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26608 invoked from network); 1 Mar 2014 23:03:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:03:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswA-00020d-Tf for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJswA-0000Y7-Mg for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:18 +0000 Date: Sat, 01 Mar 2014 23:03:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: MSR_IA32_BNDCFGS save/restore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c2502450ef1cc6fa1fd6daab8dbed8af1b88a29 Author: Jan Beulich AuthorDate: Tue Feb 25 09:41:40 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 25 09:41:40 2014 +0100 x86: MSR_IA32_BNDCFGS save/restore Signed-off-by: Jan Beulich Reviewed-by: Liu Jinsong Acked-by: Keir Fraser --- xen/arch/x86/hvm/vmx/vmx.c | 52 ++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/hvm/vmx/vmcs.h | 2 + 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index baf3040..b128e81 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -580,6 +580,55 @@ static int vmx_load_vmcs_ctxt(struct vcpu *v, struct hvm_hw_cpu *ctxt) return 0; } +static unsigned int __init vmx_init_msr(void) +{ + return !!cpu_has_mpx; +} + +static void vmx_save_msr(struct vcpu *v, struct hvm_msr *ctxt) +{ + vmx_vmcs_enter(v); + + if ( cpu_has_mpx ) + { + __vmread(GUEST_BNDCFGS, &ctxt->msr[ctxt->count].val); + if ( ctxt->msr[ctxt->count].val ) + ctxt->msr[ctxt->count++].index = MSR_IA32_BNDCFGS; + } + + vmx_vmcs_exit(v); +} + +static int vmx_load_msr(struct vcpu *v, struct hvm_msr *ctxt) +{ + unsigned int i; + int err = 0; + + vmx_vmcs_enter(v); + + for ( i = 0; i < ctxt->count; ++i ) + { + switch ( ctxt->msr[i].index ) + { + case MSR_IA32_BNDCFGS: + if ( cpu_has_mpx ) + __vmwrite(GUEST_BNDCFGS, ctxt->msr[i].val); + else + err = -ENXIO; + break; + default: + continue; + } + if ( err ) + break; + ctxt->msr[i]._rsvd = 1; + } + + vmx_vmcs_exit(v); + + return err; +} + static void vmx_fpu_enter(struct vcpu *v) { vcpu_restore_fpu_lazy(v); @@ -1607,6 +1656,9 @@ static struct hvm_function_table __initdata vmx_function_table = { .vcpu_destroy = vmx_vcpu_destroy, .save_cpu_ctxt = vmx_save_vmcs_ctxt, .load_cpu_ctxt = vmx_load_vmcs_ctxt, + .init_msr = vmx_init_msr, + .save_msr = vmx_save_msr, + .load_msr = vmx_load_msr, .get_interrupt_shadow = vmx_get_interrupt_shadow, .set_interrupt_shadow = vmx_set_interrupt_shadow, .guest_x86_mode = vmx_guest_x86_mode, diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 75cd653..45dcfa1 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -367,6 +367,8 @@ enum vmcs_field { GUEST_PDPTR2_HIGH = 0x0000280f, GUEST_PDPTR3 = 0x00002810, GUEST_PDPTR3_HIGH = 0x00002811, + GUEST_BNDCFGS = 0x00002812, + GUEST_BNDCFGS_HIGH = 0x00002813, HOST_PAT = 0x00002c00, HOST_PAT_HIGH = 0x00002c01, HOST_EFER = 0x00002c02, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:03:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:03:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswO-0007Gf-B2; Sat, 01 Mar 2014 23:03:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswN-0007GW-LY for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:31 +0000 Received: from [193.109.254.147:11529] by server-10.bemta-14.messagelabs.com id 42/5F-10711-24762135; Sat, 01 Mar 2014 23:03:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1393715009!7704127!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26007 invoked from network); 1 Mar 2014 23:03:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:03:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswL-00020j-4v for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJswL-0000Yi-1Y for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:29 +0000 Date: Sat, 01 Mar 2014 23:03:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: Remove redundant RTC REG_B read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 565d6a734a440219f371c890af1b624081b6f54f Author: Andrew Cooper AuthorDate: Wed Feb 26 17:21:22 2014 +0100 Commit: Jan Beulich CommitDate: Wed Feb 26 17:21:22 2014 +0100 x86/time: Remove redundant RTC REG_B read RTC_ALWAYS_BCD is always defined by default, meaning that we will unconditionally enter the if statement. Reordering the condition allows short-circult evaluation to remove a redundant CMOS read. Signed-off-by: Andrew Cooper --- xen/arch/x86/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 6e31e1f..82492c1 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -661,7 +661,7 @@ static unsigned long __get_cmos_time(void) mon = CMOS_READ(RTC_MONTH); year = CMOS_READ(RTC_YEAR); - if ( !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD ) + if ( RTC_ALWAYS_BCD || !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) ) { BCD_TO_BIN(sec); BCD_TO_BIN(min); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:03:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:03:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswO-0007Gf-B2; Sat, 01 Mar 2014 23:03:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswN-0007GW-LY for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:31 +0000 Received: from [193.109.254.147:11529] by server-10.bemta-14.messagelabs.com id 42/5F-10711-24762135; Sat, 01 Mar 2014 23:03:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1393715009!7704127!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26007 invoked from network); 1 Mar 2014 23:03:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:03:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswL-00020j-4v for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJswL-0000Yi-1Y for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:29 +0000 Date: Sat, 01 Mar 2014 23:03:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: Remove redundant RTC REG_B read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 565d6a734a440219f371c890af1b624081b6f54f Author: Andrew Cooper AuthorDate: Wed Feb 26 17:21:22 2014 +0100 Commit: Jan Beulich CommitDate: Wed Feb 26 17:21:22 2014 +0100 x86/time: Remove redundant RTC REG_B read RTC_ALWAYS_BCD is always defined by default, meaning that we will unconditionally enter the if statement. Reordering the condition allows short-circult evaluation to remove a redundant CMOS read. Signed-off-by: Andrew Cooper --- xen/arch/x86/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 6e31e1f..82492c1 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -661,7 +661,7 @@ static unsigned long __get_cmos_time(void) mon = CMOS_READ(RTC_MONTH); year = CMOS_READ(RTC_YEAR); - if ( !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD ) + if ( RTC_ALWAYS_BCD || !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) ) { BCD_TO_BIN(sec); BCD_TO_BIN(min); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:03:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:03:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswZ-0007IY-Dm; Sat, 01 Mar 2014 23:03:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswY-0007IK-48 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:42 +0000 Received: from [85.158.139.211:25825] by server-3.bemta-5.messagelabs.com id A9/E5-13671-D4762135; Sat, 01 Mar 2014 23:03:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1393715019!7061322!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8600 invoked from network); 1 Mar 2014 23:03:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:03:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswV-00020p-B9 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJswV-0000ZZ-9b for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:39 +0000 Date: Sat, 01 Mar 2014 23:03:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpu: Store extended cpuid level in cpuinfo_x86 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aedad8031366ec9122dd0cc14fea784e18cc739a Author: Andrew Cooper AuthorDate: Wed Feb 26 17:22:30 2014 +0100 Commit: Jan Beulich CommitDate: Wed Feb 26 17:22:30 2014 +0100 x86/cpu: Store extended cpuid level in cpuinfo_x86 To save finding it repeatedly with cpuid instructions. The name "extended_cpuid_level" is chosen to match Linux. Signed-off-by: Andrew Cooper --- xen/arch/x86/cpu/amd.c | 4 ++-- xen/arch/x86/cpu/common.c | 22 ++++++++++------------ xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/oprofile/op_model_athlon.c | 5 +---- xen/include/asm-x86/processor.h | 1 + 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 44087fa..904ad2e 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -419,11 +419,11 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) display_cacheinfo(c); - if (cpuid_eax(0x80000000) >= 0x80000008) { + if (c->extended_cpuid_level >= 0x80000008) { c->x86_max_cores = (cpuid_ecx(0x80000008) & 0xff) + 1; } - if (cpuid_eax(0x80000000) >= 0x80000007) { + if (c->extended_cpuid_level >= 0x80000007) { c->x86_power = cpuid_edx(0x80000007); if (c->x86_power & (1<<8)) { set_bit(X86_FEATURE_CONSTANT_TSC, c->x86_capability); diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 32ca458..2c128e5 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -74,7 +74,7 @@ int __cpuinit get_model_name(struct cpuinfo_x86 *c) unsigned int *v; char *p, *q; - if (cpuid_eax(0x80000000) < 0x80000004) + if (c->extended_cpuid_level < 0x80000004) return 0; v = (unsigned int *) c->x86_model_id; @@ -101,11 +101,9 @@ int __cpuinit get_model_name(struct cpuinfo_x86 *c) void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) { - unsigned int n, dummy, ecx, edx, l2size; + unsigned int dummy, ecx, edx, l2size; - n = cpuid_eax(0x80000000); - - if (n >= 0x80000005) { + if (c->extended_cpuid_level >= 0x80000005) { cpuid(0x80000005, &dummy, &dummy, &ecx, &edx); if (opt_cpu_info) printk("CPU: L1 I cache %dK (%d bytes/line)," @@ -114,7 +112,7 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) c->x86_cache_size=(ecx>>24)+(edx>>24); } - if (n < 0x80000006) /* Some chips just has a large L1. */ + if (c->extended_cpuid_level < 0x80000006) /* Some chips just has a large L1. */ return; ecx = cpuid_ecx(0x80000006); @@ -195,7 +193,7 @@ static void __init early_cpu_detect(void) static void __cpuinit generic_identify(struct cpuinfo_x86 *c) { - u32 tfms, xlvl, capability, excap, ebx; + u32 tfms, capability, excap, ebx; /* Get vendor name */ cpuid(0x00000000, &c->cpuid_level, @@ -222,15 +220,15 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8; /* AMD-defined flags: level 0x80000001 */ - xlvl = cpuid_eax(0x80000000); - if ( (xlvl & 0xffff0000) == 0x80000000 ) { - if ( xlvl >= 0x80000001 ) { + c->extended_cpuid_level = cpuid_eax(0x80000000); + if ( (c->extended_cpuid_level & 0xffff0000) == 0x80000000 ) { + if ( c->extended_cpuid_level >= 0x80000001 ) { c->x86_capability[1] = cpuid_edx(0x80000001); c->x86_capability[6] = cpuid_ecx(0x80000001); } - if ( xlvl >= 0x80000004 ) + if ( c->extended_cpuid_level >= 0x80000004 ) get_model_name(c); /* Default name */ - if ( xlvl >= 0x80000008 ) + if ( c->extended_cpuid_level >= 0x80000008 ) paddr_bits = cpuid_eax(0x80000008) & 0xff; } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 406d394..61b1ec8 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1251,7 +1251,7 @@ const struct hvm_function_table * __init start_svm(void) setup_vmcb_dump(); - svm_feature_flags = ((cpuid_eax(0x80000000) >= 0x8000000A) ? + svm_feature_flags = (current_cpu_data.extended_cpuid_level >= 0x8000000A ? cpuid_edx(0x8000000A) : 0); printk("SVM: Supported advanced features:\n"); diff --git a/xen/arch/x86/oprofile/op_model_athlon.c b/xen/arch/x86/oprofile/op_model_athlon.c index e784018..ad84768 100644 --- a/xen/arch/x86/oprofile/op_model_athlon.c +++ b/xen/arch/x86/oprofile/op_model_athlon.c @@ -497,14 +497,11 @@ static int __init init_ibs_nmi(void) static void __init get_ibs_caps(void) { - unsigned int max_level; - if (!boot_cpu_has(X86_FEATURE_IBS)) return; /* check IBS cpuid feature flags */ - max_level = cpuid_eax(0x80000000); - if (max_level >= IBS_CPUID_FEATURES) + if (current_cpu_data.extended_cpuid_level >= IBS_CPUID_FEATURES) ibs_caps = cpuid_eax(IBS_CPUID_FEATURES); if (!(ibs_caps & IBS_CAPS_AVAIL)) /* cpuid flags not valid */ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index c120460..f1cccff 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -162,6 +162,7 @@ struct cpuinfo_x86 { __u8 x86_model; __u8 x86_mask; int cpuid_level; /* Maximum supported CPUID level, -1=no CPUID */ + __u32 extended_cpuid_level; /* Maximum supported CPUID extended level */ unsigned int x86_capability[NCAPINTS]; char x86_vendor_id[16]; char x86_model_id[64]; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:03:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:03:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswZ-0007IY-Dm; Sat, 01 Mar 2014 23:03:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswY-0007IK-48 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:42 +0000 Received: from [85.158.139.211:25825] by server-3.bemta-5.messagelabs.com id A9/E5-13671-D4762135; Sat, 01 Mar 2014 23:03:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1393715019!7061322!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8600 invoked from network); 1 Mar 2014 23:03:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:03:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswV-00020p-B9 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJswV-0000ZZ-9b for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:39 +0000 Date: Sat, 01 Mar 2014 23:03:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpu: Store extended cpuid level in cpuinfo_x86 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aedad8031366ec9122dd0cc14fea784e18cc739a Author: Andrew Cooper AuthorDate: Wed Feb 26 17:22:30 2014 +0100 Commit: Jan Beulich CommitDate: Wed Feb 26 17:22:30 2014 +0100 x86/cpu: Store extended cpuid level in cpuinfo_x86 To save finding it repeatedly with cpuid instructions. The name "extended_cpuid_level" is chosen to match Linux. Signed-off-by: Andrew Cooper --- xen/arch/x86/cpu/amd.c | 4 ++-- xen/arch/x86/cpu/common.c | 22 ++++++++++------------ xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/oprofile/op_model_athlon.c | 5 +---- xen/include/asm-x86/processor.h | 1 + 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 44087fa..904ad2e 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -419,11 +419,11 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) display_cacheinfo(c); - if (cpuid_eax(0x80000000) >= 0x80000008) { + if (c->extended_cpuid_level >= 0x80000008) { c->x86_max_cores = (cpuid_ecx(0x80000008) & 0xff) + 1; } - if (cpuid_eax(0x80000000) >= 0x80000007) { + if (c->extended_cpuid_level >= 0x80000007) { c->x86_power = cpuid_edx(0x80000007); if (c->x86_power & (1<<8)) { set_bit(X86_FEATURE_CONSTANT_TSC, c->x86_capability); diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 32ca458..2c128e5 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -74,7 +74,7 @@ int __cpuinit get_model_name(struct cpuinfo_x86 *c) unsigned int *v; char *p, *q; - if (cpuid_eax(0x80000000) < 0x80000004) + if (c->extended_cpuid_level < 0x80000004) return 0; v = (unsigned int *) c->x86_model_id; @@ -101,11 +101,9 @@ int __cpuinit get_model_name(struct cpuinfo_x86 *c) void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) { - unsigned int n, dummy, ecx, edx, l2size; + unsigned int dummy, ecx, edx, l2size; - n = cpuid_eax(0x80000000); - - if (n >= 0x80000005) { + if (c->extended_cpuid_level >= 0x80000005) { cpuid(0x80000005, &dummy, &dummy, &ecx, &edx); if (opt_cpu_info) printk("CPU: L1 I cache %dK (%d bytes/line)," @@ -114,7 +112,7 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) c->x86_cache_size=(ecx>>24)+(edx>>24); } - if (n < 0x80000006) /* Some chips just has a large L1. */ + if (c->extended_cpuid_level < 0x80000006) /* Some chips just has a large L1. */ return; ecx = cpuid_ecx(0x80000006); @@ -195,7 +193,7 @@ static void __init early_cpu_detect(void) static void __cpuinit generic_identify(struct cpuinfo_x86 *c) { - u32 tfms, xlvl, capability, excap, ebx; + u32 tfms, capability, excap, ebx; /* Get vendor name */ cpuid(0x00000000, &c->cpuid_level, @@ -222,15 +220,15 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8; /* AMD-defined flags: level 0x80000001 */ - xlvl = cpuid_eax(0x80000000); - if ( (xlvl & 0xffff0000) == 0x80000000 ) { - if ( xlvl >= 0x80000001 ) { + c->extended_cpuid_level = cpuid_eax(0x80000000); + if ( (c->extended_cpuid_level & 0xffff0000) == 0x80000000 ) { + if ( c->extended_cpuid_level >= 0x80000001 ) { c->x86_capability[1] = cpuid_edx(0x80000001); c->x86_capability[6] = cpuid_ecx(0x80000001); } - if ( xlvl >= 0x80000004 ) + if ( c->extended_cpuid_level >= 0x80000004 ) get_model_name(c); /* Default name */ - if ( xlvl >= 0x80000008 ) + if ( c->extended_cpuid_level >= 0x80000008 ) paddr_bits = cpuid_eax(0x80000008) & 0xff; } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 406d394..61b1ec8 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1251,7 +1251,7 @@ const struct hvm_function_table * __init start_svm(void) setup_vmcb_dump(); - svm_feature_flags = ((cpuid_eax(0x80000000) >= 0x8000000A) ? + svm_feature_flags = (current_cpu_data.extended_cpuid_level >= 0x8000000A ? cpuid_edx(0x8000000A) : 0); printk("SVM: Supported advanced features:\n"); diff --git a/xen/arch/x86/oprofile/op_model_athlon.c b/xen/arch/x86/oprofile/op_model_athlon.c index e784018..ad84768 100644 --- a/xen/arch/x86/oprofile/op_model_athlon.c +++ b/xen/arch/x86/oprofile/op_model_athlon.c @@ -497,14 +497,11 @@ static int __init init_ibs_nmi(void) static void __init get_ibs_caps(void) { - unsigned int max_level; - if (!boot_cpu_has(X86_FEATURE_IBS)) return; /* check IBS cpuid feature flags */ - max_level = cpuid_eax(0x80000000); - if (max_level >= IBS_CPUID_FEATURES) + if (current_cpu_data.extended_cpuid_level >= IBS_CPUID_FEATURES) ibs_caps = cpuid_eax(IBS_CPUID_FEATURES); if (!(ibs_caps & IBS_CAPS_AVAIL)) /* cpuid flags not valid */ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index c120460..f1cccff 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -162,6 +162,7 @@ struct cpuinfo_x86 { __u8 x86_model; __u8 x86_mask; int cpuid_level; /* Maximum supported CPUID level, -1=no CPUID */ + __u32 extended_cpuid_level; /* Maximum supported CPUID extended level */ unsigned int x86_capability[NCAPINTS]; char x86_vendor_id[16]; char x86_model_id[64]; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:03:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:03:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswj-0007K0-GW; Sat, 01 Mar 2014 23:03:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswi-0007Jo-3O for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:52 +0000 Received: from [193.109.254.147:17993] by server-16.bemta-14.messagelabs.com id D7/3F-21945-75762135; Sat, 01 Mar 2014 23:03:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1393715029!7760687!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25588 invoked from network); 1 Mar 2014 23:03:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:03:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswf-00020v-GY for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJswf-0000Zy-F5 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:49 +0000 Date: Sat, 01 Mar 2014 23:03:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/faulting: Use formal defines instead of opencoded bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ba8c2955681831dc1930a9f6595032b1c2ec288d Author: Andrew Cooper AuthorDate: Wed Feb 26 17:23:47 2014 +0100 Commit: Jan Beulich CommitDate: Wed Feb 26 17:23:47 2014 +0100 x86/faulting: Use formal defines instead of opencoded bits Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/cpu/intel.c | 7 ++++--- xen/include/asm-x86/msr-index.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 27fe762..9e02cf6 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -21,7 +21,8 @@ static unsigned int probe_intel_cpuid_faulting(void) { uint64_t x; - return !rdmsr_safe(MSR_INTEL_PLATFORM_INFO, x) && (x & (1u<<31)); + return !rdmsr_safe(MSR_INTEL_PLATFORM_INFO, x) && + (x & MSR_PLATFORM_INFO_CPUID_FAULTING); } static DEFINE_PER_CPU(bool_t, cpuid_faulting_enabled); @@ -34,9 +35,9 @@ void set_cpuid_faulting(bool_t enable) return; rdmsr(MSR_INTEL_MISC_FEATURES_ENABLES, lo, hi); - lo &= ~1; + lo &= ~MSR_MISC_FEATURES_CPUID_FAULTING; if (enable) - lo |= 1; + lo |= MSR_MISC_FEATURES_CPUID_FAULTING; wrmsr(MSR_INTEL_MISC_FEATURES_ENABLES, lo, hi); this_cpu(cpuid_faulting_enabled) = enable; diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 86b7d64..3269c43 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -486,7 +486,12 @@ /* Intel cpuid faulting MSRs */ #define MSR_INTEL_PLATFORM_INFO 0x000000ce +#define _MSR_PLATFORM_INFO_CPUID_FAULTING 31 +#define MSR_PLATFORM_INFO_CPUID_FAULTING (1ULL << _MSR_PLATFORM_INFO_CPUID_FAULTING) + #define MSR_INTEL_MISC_FEATURES_ENABLES 0x00000140 +#define _MSR_MISC_FEATURES_CPUID_FAULTING 0 +#define MSR_MISC_FEATURES_CPUID_FAULTING (1ULL << _MSR_MISC_FEATURES_CPUID_FAULTING) /* Geode defined MSRs */ #define MSR_GEODE_BUSCONT_CONF0 0x00001900 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:03:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:03:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswj-0007K0-GW; Sat, 01 Mar 2014 23:03:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswi-0007Jo-3O for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:52 +0000 Received: from [193.109.254.147:17993] by server-16.bemta-14.messagelabs.com id D7/3F-21945-75762135; Sat, 01 Mar 2014 23:03:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1393715029!7760687!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25588 invoked from network); 1 Mar 2014 23:03:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:03:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswf-00020v-GY for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJswf-0000Zy-F5 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:49 +0000 Date: Sat, 01 Mar 2014 23:03:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/faulting: Use formal defines instead of opencoded bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ba8c2955681831dc1930a9f6595032b1c2ec288d Author: Andrew Cooper AuthorDate: Wed Feb 26 17:23:47 2014 +0100 Commit: Jan Beulich CommitDate: Wed Feb 26 17:23:47 2014 +0100 x86/faulting: Use formal defines instead of opencoded bits Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/cpu/intel.c | 7 ++++--- xen/include/asm-x86/msr-index.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 27fe762..9e02cf6 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -21,7 +21,8 @@ static unsigned int probe_intel_cpuid_faulting(void) { uint64_t x; - return !rdmsr_safe(MSR_INTEL_PLATFORM_INFO, x) && (x & (1u<<31)); + return !rdmsr_safe(MSR_INTEL_PLATFORM_INFO, x) && + (x & MSR_PLATFORM_INFO_CPUID_FAULTING); } static DEFINE_PER_CPU(bool_t, cpuid_faulting_enabled); @@ -34,9 +35,9 @@ void set_cpuid_faulting(bool_t enable) return; rdmsr(MSR_INTEL_MISC_FEATURES_ENABLES, lo, hi); - lo &= ~1; + lo &= ~MSR_MISC_FEATURES_CPUID_FAULTING; if (enable) - lo |= 1; + lo |= MSR_MISC_FEATURES_CPUID_FAULTING; wrmsr(MSR_INTEL_MISC_FEATURES_ENABLES, lo, hi); this_cpu(cpuid_faulting_enabled) = enable; diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 86b7d64..3269c43 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -486,7 +486,12 @@ /* Intel cpuid faulting MSRs */ #define MSR_INTEL_PLATFORM_INFO 0x000000ce +#define _MSR_PLATFORM_INFO_CPUID_FAULTING 31 +#define MSR_PLATFORM_INFO_CPUID_FAULTING (1ULL << _MSR_PLATFORM_INFO_CPUID_FAULTING) + #define MSR_INTEL_MISC_FEATURES_ENABLES 0x00000140 +#define _MSR_MISC_FEATURES_CPUID_FAULTING 0 +#define MSR_MISC_FEATURES_CPUID_FAULTING (1ULL << _MSR_MISC_FEATURES_CPUID_FAULTING) /* Geode defined MSRs */ #define MSR_GEODE_BUSCONT_CONF0 0x00001900 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:04:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:04:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswt-0007M3-JA; Sat, 01 Mar 2014 23:04:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsws-0007Lo-Si for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:03 +0000 Received: from [193.109.254.147:38026] by server-4.bemta-14.messagelabs.com id 98/8F-32066-26762135; Sat, 01 Mar 2014 23:04:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1393715040!7704107!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12481 invoked from network); 1 Mar 2014 23:04:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:04:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswp-000211-Ky for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJswp-0000aK-JH for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:59 +0000 Date: Sat, 01 Mar 2014 23:03:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ns16550: Add support for UART present in Broadcom TruManage capable NetXtreme chips X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9f8e0aee507bec25104ca5535fde38efae6c6bc Author: Aravind Gopalakrishnan AuthorDate: Wed Feb 26 17:25:04 2014 +0100 Commit: Jan Beulich CommitDate: Wed Feb 26 17:25:04 2014 +0100 ns16550: Add support for UART present in Broadcom TruManage capable NetXtreme chips Since it is an MMIO device, the code has been modified to accept MMIO based devices as well. MMIO device settings are populated in the 'uart_config' table. It also advertises 64 bit BAR. Therefore, code is reworked to account for 64 bit BAR and 64 bit MMIO lengths. Some more quirks are - the need to shift the register offset by a specific value and we also need to verify (UART_LSR_THRE && UART_LSR_TEMT) bits before transmitting data. While testing, include com1=115200,8n1,pci,0 on the xen cmdline to observe output on console using SoL. Signed-off-by: Aravind Gopalakrishnan Signed-off-by: Suravee Suthikulpanit Signed-off-by: Thomas Lendacky Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/drivers/char/ns16550.c | 187 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 166 insertions(+), 21 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index e7cb0ba..53e49a1 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -46,13 +46,14 @@ string_param("com2", opt_com2); static struct ns16550 { int baud, clock_hz, data_bits, parity, stop_bits, fifo_size, irq; u64 io_base; /* I/O port or memory-mapped I/O address. */ - u32 io_size; + u64 io_size; int reg_shift; /* Bits to shift register offset by */ int reg_width; /* Size of access to use, the registers * themselves are still bytes */ char __iomem *remapped_io_base; /* Remapped virtual address of MMIO. */ /* UART with IRQ line: interrupt-driven I/O. */ struct irqaction irqaction; + u8 lsr_mask; #ifdef CONFIG_ARM struct vuart_info vuart; #endif @@ -69,14 +70,50 @@ static struct ns16550 { bool_t pb_bdf_enable; /* if =1, pb-bdf effective, port behind bridge */ bool_t ps_bdf_enable; /* if =1, ps_bdf effective, port on pci card */ u32 bar; + u32 bar64; u16 cr; u8 bar_idx; + bool_t enable_ro; /* Make MMIO devices read only to Dom0 */ #endif #ifdef HAS_DEVICE_TREE struct dt_irq dt_irq; #endif } ns16550_com[2] = { { 0 } }; +/* Defining uart config options for MMIO devices */ +struct ns16550_config_mmio { + u16 vendor_id; + u16 dev_id; + unsigned int reg_shift; + unsigned int reg_width; + unsigned int fifo_size; + u8 lsr_mask; + unsigned int max_bars; +}; + + +#ifdef HAS_PCI +/* + * Create lookup tables for specific MMIO devices.. + * It is assumed that if the device found is MMIO, + * then you have indexed it here. Else, the driver + * does nothing. + */ +static struct ns16550_config_mmio __initdata uart_config[] = +{ + /* Broadcom TruManage device */ + { + .vendor_id = 0x14e4, + .dev_id = 0x160a, + .reg_shift = 2, + .reg_width = 1, + .fifo_size = 16, + .lsr_mask = (UART_LSR_THRE | UART_LSR_TEMT), + .max_bars = 1, + }, +}; +#endif + static void ns16550_delayed_resume(void *data); static char ns_read_reg(struct ns16550 *uart, int reg) @@ -134,7 +171,7 @@ static void ns16550_interrupt( while ( !(ns_read_reg(uart, UART_IIR) & UART_IIR_NOINT) ) { char lsr = ns_read_reg(uart, UART_LSR); - if ( lsr & UART_LSR_THRE ) + if ( (lsr & uart->lsr_mask) == uart->lsr_mask ) serial_tx_interrupt(port, regs); if ( lsr & UART_LSR_DR ) serial_rx_interrupt(port, regs); @@ -160,7 +197,7 @@ static void __ns16550_poll(struct cpu_user_regs *regs) serial_rx_interrupt(port, regs); } - if ( ns_read_reg(uart, UART_LSR) & UART_LSR_THRE ) + if ( ( ns_read_reg(uart, UART_LSR) & uart->lsr_mask ) == uart->lsr_mask ) serial_tx_interrupt(port, regs); out: @@ -183,7 +220,9 @@ static int ns16550_tx_ready(struct serial_port *port) if ( ns16550_ioport_invalid(uart) ) return -EIO; - return ns_read_reg(uart, UART_LSR) & UART_LSR_THRE ? uart->fifo_size : 0; + + return ( (ns_read_reg(uart, UART_LSR) & + uart->lsr_mask ) == uart->lsr_mask ) ? uart->fifo_size : 0; } static void ns16550_putc(struct serial_port *port, char c) @@ -354,8 +393,24 @@ static void __init ns16550_init_postirq(struct serial_port *port) #ifdef HAS_PCI if ( uart->bar || uart->ps_bdf_enable ) - pci_hide_device(uart->ps_bdf[0], PCI_DEVFN(uart->ps_bdf[1], - uart->ps_bdf[2])); + { + if ( !uart->enable_ro ) + pci_hide_device(uart->ps_bdf[0], PCI_DEVFN(uart->ps_bdf[1], + uart->ps_bdf[2])); + else + { + if ( rangeset_add_range(mmio_ro_ranges, + uart->io_base, + uart->io_base + uart->io_size - 1) ) + printk(XENLOG_INFO "Error while adding MMIO range of device to mmio_ro_ranges\n"); + + if ( pci_ro_device(0, uart->ps_bdf[0], + PCI_DEVFN(uart->ps_bdf[1], uart->ps_bdf[2])) ) + printk(XENLOG_INFO "Could not mark config space of %02x:%02x.%u read-only.\n", + uart->ps_bdf[0], uart->ps_bdf[1], + uart->ps_bdf[2]); + } + } #endif } @@ -381,6 +436,13 @@ static void _ns16550_resume(struct serial_port *port) { pci_conf_write32(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], PCI_BASE_ADDRESS_0 + uart->bar_idx*4, uart->bar); + + /* If 64 bit BAR, write higher 32 bits to BAR+4 */ + if ( uart->bar & PCI_BASE_ADDRESS_MEM_TYPE_64 ) + pci_conf_write32(0, uart->ps_bdf[0], + uart->ps_bdf[1], uart->ps_bdf[2], + PCI_BASE_ADDRESS_0 + (uart->bar_idx+1)*4, uart->bar64); + pci_conf_write16(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], PCI_COMMAND, uart->cr); } @@ -546,11 +608,13 @@ static int __init check_existence(struct ns16550 *uart) } #ifdef HAS_PCI -static int +static int __init pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) { - uint32_t bar, len; - int b, d, f, nextf; + uint32_t bar, bar_64 = 0, len, len_64; + u64 size, mask; + unsigned int b, d, f, nextf, i; + u16 vendor, device; /* NB. Start at bus 1 to avoid AMT: a plug-in card cannot be on bus 0. */ for ( b = skip_amt ? 1 : 0; b < 0x100; b++ ) @@ -579,24 +643,98 @@ pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) bar = pci_conf_read32(0, b, d, f, PCI_BASE_ADDRESS_0 + bar_idx*4); - /* Not IO */ + /* MMIO based */ if ( !(bar & PCI_BASE_ADDRESS_SPACE_IO) ) - continue; - - pci_conf_write32(0, b, d, f, PCI_BASE_ADDRESS_0, ~0u); - len = pci_conf_read32(0, b, d, f, PCI_BASE_ADDRESS_0); - pci_conf_write32(0, b, d, f, PCI_BASE_ADDRESS_0 + bar_idx*4, bar); - - /* Not 8 bytes */ - if ( (len & 0xffff) != 0xfff9 ) - continue; + { + vendor = pci_conf_read16(0, b, d, f, PCI_VENDOR_ID); + device = pci_conf_read16(0, b, d, f, PCI_DEVICE_ID); + + pci_conf_write32(0, b, d, f, + PCI_BASE_ADDRESS_0 + bar_idx*4, ~0u); + len = pci_conf_read32(0, b, d, f, PCI_BASE_ADDRESS_0 + bar_idx*4); + pci_conf_write32(0, b, d, f, + PCI_BASE_ADDRESS_0 + bar_idx*4, bar); + + /* Handle 64 bit BAR if found */ + if ( bar & PCI_BASE_ADDRESS_MEM_TYPE_64 ) + { + bar_64 = pci_conf_read32(0, b, d, f, + PCI_BASE_ADDRESS_0 + (bar_idx+1)*4); + pci_conf_write32(0, b, d, f, + PCI_BASE_ADDRESS_0 + (bar_idx+1)*4, ~0u); + len_64 = pci_conf_read32(0, b, d, f, + PCI_BASE_ADDRESS_0 + (bar_idx+1)*4); + pci_conf_write32(0, b, d, f, + PCI_BASE_ADDRESS_0 + (bar_idx+1)*4, bar_64); + mask = ((u64)~0 << 32) | PCI_BASE_ADDRESS_MEM_MASK; + size = (((u64)len_64 << 32) | len) & mask; + } + else + size = len & PCI_BASE_ADDRESS_MEM_MASK; + + size &= -size; + + /* Check for quirks in uart_config lookup table */ + for ( i = 0; i < ARRAY_SIZE(uart_config); i++) + { + if ( uart_config[i].vendor_id != vendor ) + continue; + + if ( uart_config[i].dev_id != device ) + continue; + + /* + * Force length of mmio region to be at least + * 8 bytes times (1 << reg_shift) + */ + if ( size < (0x8 * (1 << uart_config[i].reg_shift)) ) + continue; + + if ( bar_idx >= uart_config[i].max_bars ) + continue; + + if ( uart_config[i].fifo_size ) + uart->fifo_size = uart_config[i].fifo_size; + + uart->reg_shift = uart_config[i].reg_shift; + uart->reg_width = uart_config[i].reg_width; + uart->lsr_mask = uart_config[i].lsr_mask; + uart->io_base = ((u64)bar_64 << 32) | + (bar & PCI_BASE_ADDRESS_MEM_MASK); + /* Set device and MMIO region read only to Dom0 */ + uart->enable_ro = 1; + break; + } + + /* If we have an io_base, then we succeeded in the lookup */ + if ( !uart->io_base ) + continue; + } + /* IO based */ + else + { + pci_conf_write32(0, b, d, f, + PCI_BASE_ADDRESS_0 + bar_idx*4, ~0u); + len = pci_conf_read32(0, b, d, f, PCI_BASE_ADDRESS_0); + pci_conf_write32(0, b, d, f, + PCI_BASE_ADDRESS_0 + bar_idx*4, bar); + size = len & PCI_BASE_ADDRESS_IO_MASK; + size &= -size; + + /* Not 8 bytes */ + if ( size != 0x8 ) + continue; + + uart->io_base = bar & ~PCI_BASE_ADDRESS_SPACE_IO; + } uart->ps_bdf[0] = b; uart->ps_bdf[1] = d; uart->ps_bdf[2] = f; - uart->bar = bar; uart->bar_idx = bar_idx; - uart->io_base = bar & ~PCI_BASE_ADDRESS_SPACE_IO; + uart->bar = bar; + uart->bar64 = bar_64; + uart->io_size = size; uart->irq = pci_conf_read8(0, b, d, f, PCI_INTERRUPT_PIN) ? pci_conf_read8(0, b, d, f, PCI_INTERRUPT_LINE) : 0; @@ -743,9 +881,16 @@ void __init ns16550_init(int index, struct ns16550_defaults *defaults) uart->reg_width = 1; uart->reg_shift = 0; +#ifdef HAS_PCI + uart->enable_ro = 0; +#endif + /* Default is no transmit FIFO. */ uart->fifo_size = 1; + /* Default lsr_mask = UART_LSR_THRE */ + uart->lsr_mask = UART_LSR_THRE; + ns16550_parse_port_config(uart, (index == 0) ? opt_com1 : opt_com2); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:04:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:04:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswt-0007M3-JA; Sat, 01 Mar 2014 23:04:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsws-0007Lo-Si for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:03 +0000 Received: from [193.109.254.147:38026] by server-4.bemta-14.messagelabs.com id 98/8F-32066-26762135; Sat, 01 Mar 2014 23:04:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1393715040!7704107!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12481 invoked from network); 1 Mar 2014 23:04:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:04:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswp-000211-Ky for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJswp-0000aK-JH for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:03:59 +0000 Date: Sat, 01 Mar 2014 23:03:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ns16550: Add support for UART present in Broadcom TruManage capable NetXtreme chips X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9f8e0aee507bec25104ca5535fde38efae6c6bc Author: Aravind Gopalakrishnan AuthorDate: Wed Feb 26 17:25:04 2014 +0100 Commit: Jan Beulich CommitDate: Wed Feb 26 17:25:04 2014 +0100 ns16550: Add support for UART present in Broadcom TruManage capable NetXtreme chips Since it is an MMIO device, the code has been modified to accept MMIO based devices as well. MMIO device settings are populated in the 'uart_config' table. It also advertises 64 bit BAR. Therefore, code is reworked to account for 64 bit BAR and 64 bit MMIO lengths. Some more quirks are - the need to shift the register offset by a specific value and we also need to verify (UART_LSR_THRE && UART_LSR_TEMT) bits before transmitting data. While testing, include com1=115200,8n1,pci,0 on the xen cmdline to observe output on console using SoL. Signed-off-by: Aravind Gopalakrishnan Signed-off-by: Suravee Suthikulpanit Signed-off-by: Thomas Lendacky Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/drivers/char/ns16550.c | 187 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 166 insertions(+), 21 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index e7cb0ba..53e49a1 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -46,13 +46,14 @@ string_param("com2", opt_com2); static struct ns16550 { int baud, clock_hz, data_bits, parity, stop_bits, fifo_size, irq; u64 io_base; /* I/O port or memory-mapped I/O address. */ - u32 io_size; + u64 io_size; int reg_shift; /* Bits to shift register offset by */ int reg_width; /* Size of access to use, the registers * themselves are still bytes */ char __iomem *remapped_io_base; /* Remapped virtual address of MMIO. */ /* UART with IRQ line: interrupt-driven I/O. */ struct irqaction irqaction; + u8 lsr_mask; #ifdef CONFIG_ARM struct vuart_info vuart; #endif @@ -69,14 +70,50 @@ static struct ns16550 { bool_t pb_bdf_enable; /* if =1, pb-bdf effective, port behind bridge */ bool_t ps_bdf_enable; /* if =1, ps_bdf effective, port on pci card */ u32 bar; + u32 bar64; u16 cr; u8 bar_idx; + bool_t enable_ro; /* Make MMIO devices read only to Dom0 */ #endif #ifdef HAS_DEVICE_TREE struct dt_irq dt_irq; #endif } ns16550_com[2] = { { 0 } }; +/* Defining uart config options for MMIO devices */ +struct ns16550_config_mmio { + u16 vendor_id; + u16 dev_id; + unsigned int reg_shift; + unsigned int reg_width; + unsigned int fifo_size; + u8 lsr_mask; + unsigned int max_bars; +}; + + +#ifdef HAS_PCI +/* + * Create lookup tables for specific MMIO devices.. + * It is assumed that if the device found is MMIO, + * then you have indexed it here. Else, the driver + * does nothing. + */ +static struct ns16550_config_mmio __initdata uart_config[] = +{ + /* Broadcom TruManage device */ + { + .vendor_id = 0x14e4, + .dev_id = 0x160a, + .reg_shift = 2, + .reg_width = 1, + .fifo_size = 16, + .lsr_mask = (UART_LSR_THRE | UART_LSR_TEMT), + .max_bars = 1, + }, +}; +#endif + static void ns16550_delayed_resume(void *data); static char ns_read_reg(struct ns16550 *uart, int reg) @@ -134,7 +171,7 @@ static void ns16550_interrupt( while ( !(ns_read_reg(uart, UART_IIR) & UART_IIR_NOINT) ) { char lsr = ns_read_reg(uart, UART_LSR); - if ( lsr & UART_LSR_THRE ) + if ( (lsr & uart->lsr_mask) == uart->lsr_mask ) serial_tx_interrupt(port, regs); if ( lsr & UART_LSR_DR ) serial_rx_interrupt(port, regs); @@ -160,7 +197,7 @@ static void __ns16550_poll(struct cpu_user_regs *regs) serial_rx_interrupt(port, regs); } - if ( ns_read_reg(uart, UART_LSR) & UART_LSR_THRE ) + if ( ( ns_read_reg(uart, UART_LSR) & uart->lsr_mask ) == uart->lsr_mask ) serial_tx_interrupt(port, regs); out: @@ -183,7 +220,9 @@ static int ns16550_tx_ready(struct serial_port *port) if ( ns16550_ioport_invalid(uart) ) return -EIO; - return ns_read_reg(uart, UART_LSR) & UART_LSR_THRE ? uart->fifo_size : 0; + + return ( (ns_read_reg(uart, UART_LSR) & + uart->lsr_mask ) == uart->lsr_mask ) ? uart->fifo_size : 0; } static void ns16550_putc(struct serial_port *port, char c) @@ -354,8 +393,24 @@ static void __init ns16550_init_postirq(struct serial_port *port) #ifdef HAS_PCI if ( uart->bar || uart->ps_bdf_enable ) - pci_hide_device(uart->ps_bdf[0], PCI_DEVFN(uart->ps_bdf[1], - uart->ps_bdf[2])); + { + if ( !uart->enable_ro ) + pci_hide_device(uart->ps_bdf[0], PCI_DEVFN(uart->ps_bdf[1], + uart->ps_bdf[2])); + else + { + if ( rangeset_add_range(mmio_ro_ranges, + uart->io_base, + uart->io_base + uart->io_size - 1) ) + printk(XENLOG_INFO "Error while adding MMIO range of device to mmio_ro_ranges\n"); + + if ( pci_ro_device(0, uart->ps_bdf[0], + PCI_DEVFN(uart->ps_bdf[1], uart->ps_bdf[2])) ) + printk(XENLOG_INFO "Could not mark config space of %02x:%02x.%u read-only.\n", + uart->ps_bdf[0], uart->ps_bdf[1], + uart->ps_bdf[2]); + } + } #endif } @@ -381,6 +436,13 @@ static void _ns16550_resume(struct serial_port *port) { pci_conf_write32(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], PCI_BASE_ADDRESS_0 + uart->bar_idx*4, uart->bar); + + /* If 64 bit BAR, write higher 32 bits to BAR+4 */ + if ( uart->bar & PCI_BASE_ADDRESS_MEM_TYPE_64 ) + pci_conf_write32(0, uart->ps_bdf[0], + uart->ps_bdf[1], uart->ps_bdf[2], + PCI_BASE_ADDRESS_0 + (uart->bar_idx+1)*4, uart->bar64); + pci_conf_write16(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], PCI_COMMAND, uart->cr); } @@ -546,11 +608,13 @@ static int __init check_existence(struct ns16550 *uart) } #ifdef HAS_PCI -static int +static int __init pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) { - uint32_t bar, len; - int b, d, f, nextf; + uint32_t bar, bar_64 = 0, len, len_64; + u64 size, mask; + unsigned int b, d, f, nextf, i; + u16 vendor, device; /* NB. Start at bus 1 to avoid AMT: a plug-in card cannot be on bus 0. */ for ( b = skip_amt ? 1 : 0; b < 0x100; b++ ) @@ -579,24 +643,98 @@ pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) bar = pci_conf_read32(0, b, d, f, PCI_BASE_ADDRESS_0 + bar_idx*4); - /* Not IO */ + /* MMIO based */ if ( !(bar & PCI_BASE_ADDRESS_SPACE_IO) ) - continue; - - pci_conf_write32(0, b, d, f, PCI_BASE_ADDRESS_0, ~0u); - len = pci_conf_read32(0, b, d, f, PCI_BASE_ADDRESS_0); - pci_conf_write32(0, b, d, f, PCI_BASE_ADDRESS_0 + bar_idx*4, bar); - - /* Not 8 bytes */ - if ( (len & 0xffff) != 0xfff9 ) - continue; + { + vendor = pci_conf_read16(0, b, d, f, PCI_VENDOR_ID); + device = pci_conf_read16(0, b, d, f, PCI_DEVICE_ID); + + pci_conf_write32(0, b, d, f, + PCI_BASE_ADDRESS_0 + bar_idx*4, ~0u); + len = pci_conf_read32(0, b, d, f, PCI_BASE_ADDRESS_0 + bar_idx*4); + pci_conf_write32(0, b, d, f, + PCI_BASE_ADDRESS_0 + bar_idx*4, bar); + + /* Handle 64 bit BAR if found */ + if ( bar & PCI_BASE_ADDRESS_MEM_TYPE_64 ) + { + bar_64 = pci_conf_read32(0, b, d, f, + PCI_BASE_ADDRESS_0 + (bar_idx+1)*4); + pci_conf_write32(0, b, d, f, + PCI_BASE_ADDRESS_0 + (bar_idx+1)*4, ~0u); + len_64 = pci_conf_read32(0, b, d, f, + PCI_BASE_ADDRESS_0 + (bar_idx+1)*4); + pci_conf_write32(0, b, d, f, + PCI_BASE_ADDRESS_0 + (bar_idx+1)*4, bar_64); + mask = ((u64)~0 << 32) | PCI_BASE_ADDRESS_MEM_MASK; + size = (((u64)len_64 << 32) | len) & mask; + } + else + size = len & PCI_BASE_ADDRESS_MEM_MASK; + + size &= -size; + + /* Check for quirks in uart_config lookup table */ + for ( i = 0; i < ARRAY_SIZE(uart_config); i++) + { + if ( uart_config[i].vendor_id != vendor ) + continue; + + if ( uart_config[i].dev_id != device ) + continue; + + /* + * Force length of mmio region to be at least + * 8 bytes times (1 << reg_shift) + */ + if ( size < (0x8 * (1 << uart_config[i].reg_shift)) ) + continue; + + if ( bar_idx >= uart_config[i].max_bars ) + continue; + + if ( uart_config[i].fifo_size ) + uart->fifo_size = uart_config[i].fifo_size; + + uart->reg_shift = uart_config[i].reg_shift; + uart->reg_width = uart_config[i].reg_width; + uart->lsr_mask = uart_config[i].lsr_mask; + uart->io_base = ((u64)bar_64 << 32) | + (bar & PCI_BASE_ADDRESS_MEM_MASK); + /* Set device and MMIO region read only to Dom0 */ + uart->enable_ro = 1; + break; + } + + /* If we have an io_base, then we succeeded in the lookup */ + if ( !uart->io_base ) + continue; + } + /* IO based */ + else + { + pci_conf_write32(0, b, d, f, + PCI_BASE_ADDRESS_0 + bar_idx*4, ~0u); + len = pci_conf_read32(0, b, d, f, PCI_BASE_ADDRESS_0); + pci_conf_write32(0, b, d, f, + PCI_BASE_ADDRESS_0 + bar_idx*4, bar); + size = len & PCI_BASE_ADDRESS_IO_MASK; + size &= -size; + + /* Not 8 bytes */ + if ( size != 0x8 ) + continue; + + uart->io_base = bar & ~PCI_BASE_ADDRESS_SPACE_IO; + } uart->ps_bdf[0] = b; uart->ps_bdf[1] = d; uart->ps_bdf[2] = f; - uart->bar = bar; uart->bar_idx = bar_idx; - uart->io_base = bar & ~PCI_BASE_ADDRESS_SPACE_IO; + uart->bar = bar; + uart->bar64 = bar_64; + uart->io_size = size; uart->irq = pci_conf_read8(0, b, d, f, PCI_INTERRUPT_PIN) ? pci_conf_read8(0, b, d, f, PCI_INTERRUPT_LINE) : 0; @@ -743,9 +881,16 @@ void __init ns16550_init(int index, struct ns16550_defaults *defaults) uart->reg_width = 1; uart->reg_shift = 0; +#ifdef HAS_PCI + uart->enable_ro = 0; +#endif + /* Default is no transmit FIFO. */ uart->fifo_size = 1; + /* Default lsr_mask = UART_LSR_THRE */ + uart->lsr_mask = UART_LSR_THRE; + ns16550_parse_port_config(uart, (index == 0) ? opt_com1 : opt_com2); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:04:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:04:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsx3-0007No-Nq; Sat, 01 Mar 2014 23:04:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsx2-0007Nc-JU for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:12 +0000 Received: from [85.158.143.35:58386] by server-1.bemta-4.messagelabs.com id 42/B2-31661-B6762135; Sat, 01 Mar 2014 23:04:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1393715050!9245558!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22555 invoked from network); 1 Mar 2014 23:04:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:04:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswz-00021a-Qv for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJswz-0000b7-Ox for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:09 +0000 Date: Sat, 01 Mar 2014 23:04:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mem_event: Return previous value of CR0/CR3/CR4 on change. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a93b8e8ca54cc2c90d9272a06d7944d6ca615d42 Author: Tamas K Lengyel AuthorDate: Thu Jan 30 22:34:16 2014 +0100 Commit: Tim Deegan CommitDate: Thu Feb 27 10:44:29 2014 +0000 mem_event: Return previous value of CR0/CR3/CR4 on change. This patch extends the information returned for CR0/CR3/CR4 register write events with the previous value of the register. The old value was already passed to the trap processing function, just never placed into the returned request. By returning this value, applications subscribing the CR events obtain additional context about the event. Signed-off-by: Tamas K Lengyel Acked-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 4 ++++ xen/include/public/mem_event.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 08fec34..9e85c13 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4808,6 +4808,10 @@ static int hvm_memory_event_traps(long p, uint32_t reason, req.gla = gla; req.gla_valid = 1; } + else + { + req.gla = old; + } mem_event_put_request(d, &d->mem_event->access, &req); diff --git a/xen/include/public/mem_event.h b/xen/include/public/mem_event.h index c9ed546..3831b41 100644 --- a/xen/include/public/mem_event.h +++ b/xen/include/public/mem_event.h @@ -40,9 +40,9 @@ /* Reasons for the memory event request */ #define MEM_EVENT_REASON_UNKNOWN 0 /* typical reason */ #define MEM_EVENT_REASON_VIOLATION 1 /* access violation, GFN is address */ -#define MEM_EVENT_REASON_CR0 2 /* CR0 was hit: gfn is CR0 value */ -#define MEM_EVENT_REASON_CR3 3 /* CR3 was hit: gfn is CR3 value */ -#define MEM_EVENT_REASON_CR4 4 /* CR4 was hit: gfn is CR4 value */ +#define MEM_EVENT_REASON_CR0 2 /* CR0 was hit: gfn is new CR0 value, gla is previous */ +#define MEM_EVENT_REASON_CR3 3 /* CR3 was hit: gfn is new CR3 value, gla is previous */ +#define MEM_EVENT_REASON_CR4 4 /* CR4 was hit: gfn is new CR4 value, gla is previous */ #define MEM_EVENT_REASON_INT3 5 /* int3 was hit: gla/gfn are RIP */ #define MEM_EVENT_REASON_SINGLESTEP 6 /* single step was invoked: gla/gfn are RIP */ #define MEM_EVENT_REASON_MSR 7 /* MSR was hit: gfn is MSR value, gla is MSR address; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:04:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:04:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsx3-0007No-Nq; Sat, 01 Mar 2014 23:04:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsx2-0007Nc-JU for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:12 +0000 Received: from [85.158.143.35:58386] by server-1.bemta-4.messagelabs.com id 42/B2-31661-B6762135; Sat, 01 Mar 2014 23:04:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1393715050!9245558!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22555 invoked from network); 1 Mar 2014 23:04:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:04:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJswz-00021a-Qv for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJswz-0000b7-Ox for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:09 +0000 Date: Sat, 01 Mar 2014 23:04:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mem_event: Return previous value of CR0/CR3/CR4 on change. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a93b8e8ca54cc2c90d9272a06d7944d6ca615d42 Author: Tamas K Lengyel AuthorDate: Thu Jan 30 22:34:16 2014 +0100 Commit: Tim Deegan CommitDate: Thu Feb 27 10:44:29 2014 +0000 mem_event: Return previous value of CR0/CR3/CR4 on change. This patch extends the information returned for CR0/CR3/CR4 register write events with the previous value of the register. The old value was already passed to the trap processing function, just never placed into the returned request. By returning this value, applications subscribing the CR events obtain additional context about the event. Signed-off-by: Tamas K Lengyel Acked-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 4 ++++ xen/include/public/mem_event.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 08fec34..9e85c13 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4808,6 +4808,10 @@ static int hvm_memory_event_traps(long p, uint32_t reason, req.gla = gla; req.gla_valid = 1; } + else + { + req.gla = old; + } mem_event_put_request(d, &d->mem_event->access, &req); diff --git a/xen/include/public/mem_event.h b/xen/include/public/mem_event.h index c9ed546..3831b41 100644 --- a/xen/include/public/mem_event.h +++ b/xen/include/public/mem_event.h @@ -40,9 +40,9 @@ /* Reasons for the memory event request */ #define MEM_EVENT_REASON_UNKNOWN 0 /* typical reason */ #define MEM_EVENT_REASON_VIOLATION 1 /* access violation, GFN is address */ -#define MEM_EVENT_REASON_CR0 2 /* CR0 was hit: gfn is CR0 value */ -#define MEM_EVENT_REASON_CR3 3 /* CR3 was hit: gfn is CR3 value */ -#define MEM_EVENT_REASON_CR4 4 /* CR4 was hit: gfn is CR4 value */ +#define MEM_EVENT_REASON_CR0 2 /* CR0 was hit: gfn is new CR0 value, gla is previous */ +#define MEM_EVENT_REASON_CR3 3 /* CR3 was hit: gfn is new CR3 value, gla is previous */ +#define MEM_EVENT_REASON_CR4 4 /* CR4 was hit: gfn is new CR4 value, gla is previous */ #define MEM_EVENT_REASON_INT3 5 /* int3 was hit: gla/gfn are RIP */ #define MEM_EVENT_REASON_SINGLESTEP 6 /* single step was invoked: gla/gfn are RIP */ #define MEM_EVENT_REASON_MSR 7 /* MSR was hit: gfn is MSR value, gla is MSR address; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:04:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:04:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxD-0007Pj-Rs; Sat, 01 Mar 2014 23:04:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxC-0007PT-Tk for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:23 +0000 Received: from [85.158.139.211:16334] by server-2.bemta-5.messagelabs.com id A2/AC-23037-67762135; Sat, 01 Mar 2014 23:04:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1393715060!7109460!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11574 invoked from network); 1 Mar 2014 23:04:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:04:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxA-00021g-0S for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsx9-0000bi-VJ for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:19 +0000 Date: Sat, 01 Mar 2014 23:04:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: Don't allow p2m allocation after memory is allocated. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6931067c8ef969a55ff4ba8b8d0e8d0ffb8ce0cd Author: Tim Deegan AuthorDate: Thu Nov 21 13:02:34 2013 +0000 Commit: Tim Deegan CommitDate: Thu Feb 27 12:28:41 2014 +0000 x86/mm: Don't allow p2m allocation after memory is allocated. This avoids a potentially long loop populating the p2m table from the m2p. Since there's no reason to turn on translate mode after the domain is already running, this shouldn't be a problem. Signed-off-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/arch/x86/mm/p2m.c | 32 +++++++++----------------------- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 8f380ed..d7dd480 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -379,14 +379,19 @@ void p2m_free_ptp(struct p2m_domain *p2m, struct page_info *pg) // int p2m_alloc_table(struct p2m_domain *p2m) { - mfn_t mfn = _mfn(INVALID_MFN); - struct page_info *page, *p2m_top; - unsigned int page_count = 0; - unsigned long gfn = -1UL; + struct page_info *p2m_top; struct domain *d = p2m->domain; p2m_lock(p2m); + if ( !p2m_is_nestedp2m(p2m) + && !page_list_empty(&d->page_list) ) + { + P2M_ERROR("dom %d already has memory allocated\n", d->domain_id); + p2m_unlock(p2m); + return -EINVAL; + } + if ( pagetable_get_pfn(p2m_get_pagetable(p2m)) != 0 ) { P2M_ERROR("p2m already allocated for this domain\n"); @@ -415,31 +420,12 @@ int p2m_alloc_table(struct p2m_domain *p2m) if ( !set_p2m_entry(p2m, 0, _mfn(INVALID_MFN), PAGE_ORDER_4K, p2m_invalid, p2m->default_access) ) goto error; - - if ( !p2m_is_nestedp2m(p2m) ) - { - /* Copy all existing mappings from the page list and m2p */ - spin_lock(&p2m->domain->page_alloc_lock); - page_list_for_each(page, &p2m->domain->page_list) - { - mfn = page_to_mfn(page); - gfn = get_gpfn_from_mfn(mfn_x(mfn)); - /* Pages should not be shared that early */ - ASSERT(gfn != SHARED_M2P_ENTRY); - page_count++; - if ( gfn != INVALID_M2P_ENTRY - && !set_p2m_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2m_ram_rw, p2m->default_access) ) - goto error_unlock; - } - spin_unlock(&p2m->domain->page_alloc_lock); - } p2m->defer_nested_flush = 0; P2M_PRINTK("p2m table initialised (%u pages)\n", page_count); p2m_unlock(p2m); return 0; -error_unlock: spin_unlock(&p2m->domain->page_alloc_lock); error: P2M_PRINTK("failed to initialize p2m table, gfn=%05lx, mfn=%" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:04:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:04:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxD-0007Pj-Rs; Sat, 01 Mar 2014 23:04:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxC-0007PT-Tk for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:23 +0000 Received: from [85.158.139.211:16334] by server-2.bemta-5.messagelabs.com id A2/AC-23037-67762135; Sat, 01 Mar 2014 23:04:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1393715060!7109460!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11574 invoked from network); 1 Mar 2014 23:04:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:04:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxA-00021g-0S for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsx9-0000bi-VJ for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:19 +0000 Date: Sat, 01 Mar 2014 23:04:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: Don't allow p2m allocation after memory is allocated. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6931067c8ef969a55ff4ba8b8d0e8d0ffb8ce0cd Author: Tim Deegan AuthorDate: Thu Nov 21 13:02:34 2013 +0000 Commit: Tim Deegan CommitDate: Thu Feb 27 12:28:41 2014 +0000 x86/mm: Don't allow p2m allocation after memory is allocated. This avoids a potentially long loop populating the p2m table from the m2p. Since there's no reason to turn on translate mode after the domain is already running, this shouldn't be a problem. Signed-off-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/arch/x86/mm/p2m.c | 32 +++++++++----------------------- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 8f380ed..d7dd480 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -379,14 +379,19 @@ void p2m_free_ptp(struct p2m_domain *p2m, struct page_info *pg) // int p2m_alloc_table(struct p2m_domain *p2m) { - mfn_t mfn = _mfn(INVALID_MFN); - struct page_info *page, *p2m_top; - unsigned int page_count = 0; - unsigned long gfn = -1UL; + struct page_info *p2m_top; struct domain *d = p2m->domain; p2m_lock(p2m); + if ( !p2m_is_nestedp2m(p2m) + && !page_list_empty(&d->page_list) ) + { + P2M_ERROR("dom %d already has memory allocated\n", d->domain_id); + p2m_unlock(p2m); + return -EINVAL; + } + if ( pagetable_get_pfn(p2m_get_pagetable(p2m)) != 0 ) { P2M_ERROR("p2m already allocated for this domain\n"); @@ -415,31 +420,12 @@ int p2m_alloc_table(struct p2m_domain *p2m) if ( !set_p2m_entry(p2m, 0, _mfn(INVALID_MFN), PAGE_ORDER_4K, p2m_invalid, p2m->default_access) ) goto error; - - if ( !p2m_is_nestedp2m(p2m) ) - { - /* Copy all existing mappings from the page list and m2p */ - spin_lock(&p2m->domain->page_alloc_lock); - page_list_for_each(page, &p2m->domain->page_list) - { - mfn = page_to_mfn(page); - gfn = get_gpfn_from_mfn(mfn_x(mfn)); - /* Pages should not be shared that early */ - ASSERT(gfn != SHARED_M2P_ENTRY); - page_count++; - if ( gfn != INVALID_M2P_ENTRY - && !set_p2m_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2m_ram_rw, p2m->default_access) ) - goto error_unlock; - } - spin_unlock(&p2m->domain->page_alloc_lock); - } p2m->defer_nested_flush = 0; P2M_PRINTK("p2m table initialised (%u pages)\n", page_count); p2m_unlock(p2m); return 0; -error_unlock: spin_unlock(&p2m->domain->page_alloc_lock); error: P2M_PRINTK("failed to initialize p2m table, gfn=%05lx, mfn=%" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:04:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:04:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxN-0007RO-UY; Sat, 01 Mar 2014 23:04:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxM-0007R9-K8 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:32 +0000 Received: from [193.109.254.147:19001] by server-5.bemta-14.messagelabs.com id 83/CC-16688-F7762135; Sat, 01 Mar 2014 23:04:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1393715070!7760745!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27619 invoked from network); 1 Mar 2014 23:04:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:04:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxK-00021m-6a for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsxK-0000co-4a for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:30 +0000 Date: Sat, 01 Mar 2014 23:04:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/p2m: drop second pass looking for shared pages. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7bedbbb5c31ec7d7e653b4fc606c9871661d5e89 Author: Tim Deegan AuthorDate: Wed Dec 18 14:12:31 2013 +0000 Commit: Tim Deegan CommitDate: Thu Feb 27 12:28:41 2014 +0000 x86/p2m: drop second pass looking for shared pages. We have run relinquish_shared_pages() already by the time this teardown happens, and page_make_sharable() exits early if the owning domain is dying. Signed-off-by: Tim Deegan Acked-by: Andres Lagar-Cavilla --- xen/arch/x86/mm/p2m.c | 21 +-------------------- 1 files changed, 1 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index d7dd480..c0ddef0 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -440,9 +440,6 @@ void p2m_teardown(struct p2m_domain *p2m) { struct page_info *pg; struct domain *d; - unsigned long gfn; - p2m_type_t t; - mfn_t mfn; if (p2m == NULL) return; @@ -450,23 +447,7 @@ void p2m_teardown(struct p2m_domain *p2m) d = p2m->domain; p2m_lock(p2m); - - /* Try to unshare any remaining shared p2m entries. Safeguard - * Since relinquish_shared_pages should have done the work. */ - for ( gfn=0; gfn < p2m->max_mapped_pfn; gfn++ ) - { - p2m_access_t a; - if ( atomic_read(&d->shr_pages) == 0 ) - break; - mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL); - if ( mfn_valid(mfn) && (t == p2m_ram_shared) ) - { - ASSERT(!p2m_is_nestedp2m(p2m)); - /* Does not fail with ENOMEM given the DESTROY flag */ - BUG_ON(mem_sharing_unshare_page(d, gfn, MEM_SHARING_DESTROY_GFN)); - } - } - + ASSERT(atomic_read(&d->shr_pages) == 0); p2m->phys_table = pagetable_null(); while ( (pg = page_list_remove_head(&p2m->pages)) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:04:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:04:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxN-0007RO-UY; Sat, 01 Mar 2014 23:04:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxM-0007R9-K8 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:32 +0000 Received: from [193.109.254.147:19001] by server-5.bemta-14.messagelabs.com id 83/CC-16688-F7762135; Sat, 01 Mar 2014 23:04:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1393715070!7760745!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27619 invoked from network); 1 Mar 2014 23:04:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:04:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxK-00021m-6a for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsxK-0000co-4a for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:30 +0000 Date: Sat, 01 Mar 2014 23:04:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/p2m: drop second pass looking for shared pages. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7bedbbb5c31ec7d7e653b4fc606c9871661d5e89 Author: Tim Deegan AuthorDate: Wed Dec 18 14:12:31 2013 +0000 Commit: Tim Deegan CommitDate: Thu Feb 27 12:28:41 2014 +0000 x86/p2m: drop second pass looking for shared pages. We have run relinquish_shared_pages() already by the time this teardown happens, and page_make_sharable() exits early if the owning domain is dying. Signed-off-by: Tim Deegan Acked-by: Andres Lagar-Cavilla --- xen/arch/x86/mm/p2m.c | 21 +-------------------- 1 files changed, 1 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index d7dd480..c0ddef0 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -440,9 +440,6 @@ void p2m_teardown(struct p2m_domain *p2m) { struct page_info *pg; struct domain *d; - unsigned long gfn; - p2m_type_t t; - mfn_t mfn; if (p2m == NULL) return; @@ -450,23 +447,7 @@ void p2m_teardown(struct p2m_domain *p2m) d = p2m->domain; p2m_lock(p2m); - - /* Try to unshare any remaining shared p2m entries. Safeguard - * Since relinquish_shared_pages should have done the work. */ - for ( gfn=0; gfn < p2m->max_mapped_pfn; gfn++ ) - { - p2m_access_t a; - if ( atomic_read(&d->shr_pages) == 0 ) - break; - mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL); - if ( mfn_valid(mfn) && (t == p2m_ram_shared) ) - { - ASSERT(!p2m_is_nestedp2m(p2m)); - /* Does not fail with ENOMEM given the DESTROY flag */ - BUG_ON(mem_sharing_unshare_page(d, gfn, MEM_SHARING_DESTROY_GFN)); - } - } - + ASSERT(atomic_read(&d->shr_pages) == 0); p2m->phys_table = pagetable_null(); while ( (pg = page_list_remove_head(&p2m->pages)) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:04:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:04:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxZ-0007TE-16; Sat, 01 Mar 2014 23:04:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxX-0007T0-Hh for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:43 +0000 Received: from [85.158.143.35:59661] by server-3.bemta-4.messagelabs.com id 40/6C-11539-A8762135; Sat, 01 Mar 2014 23:04:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1393715080!9271937!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3363 invoked from network); 1 Mar 2014 23:04:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:04:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxU-00021s-CU for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsxU-0000dV-BW for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:40 +0000 Date: Sat, 01 Mar 2014 23:04:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vsprintf: introduce %pv extended format specifier to print domain/vcpu ID pair X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2315025ccedb63e9aff69f8f2425258bca6921f4 Author: Jan Beulich AuthorDate: Fri Feb 28 17:04:04 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 28 17:04:04 2014 +0100 vsprintf: introduce %pv extended format specifier to print domain/vcpu ID pair ... in a simplified and consistent way. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: George Dunlap Acked-by: Keir Fraser --- docs/misc/printk-formats.txt | 3 ++ xen/arch/x86/cpu/mcheck/vmce.c | 11 +++----- xen/arch/x86/hvm/vmx/vmx.c | 4 +- xen/arch/x86/hvm/vmx/vpmu_core2.c | 8 +++--- xen/arch/x86/mm/shadow/common.c | 3 +- xen/arch/x86/traps.c | 7 ++--- xen/common/domain.c | 5 --- xen/common/keyhandler.c | 5 +-- xen/common/sched_credit2.c | 55 ++++++++++--------------------------- xen/common/schedule.c | 6 +--- xen/common/vsprintf.c | 14 +++++++++ xen/include/xen/config.h | 5 +-- 12 files changed, 52 insertions(+), 74 deletions(-) diff --git a/docs/misc/printk-formats.txt b/docs/misc/printk-formats.txt index 4c4222b..3b4323a 100644 --- a/docs/misc/printk-formats.txt +++ b/docs/misc/printk-formats.txt @@ -15,3 +15,6 @@ Symbol/Function pointers: In the case that an appropriate symbol name can't be found, %p[sS] will fall back to '%p' and print the address in hex. + + %pv Domain and vCPU ID from a 'struct vcpu *' (printed as + "dv") diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index be9bb5e..ed00f7c 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -82,10 +82,9 @@ int vmce_restore_vcpu(struct vcpu *v, const struct hvm_vmce_vcpu *ctxt) if ( ctxt->caps & ~guest_mcg_cap & ~MCG_CAP_COUNT & ~MCG_CTL_P ) { dprintk(XENLOG_G_ERR, "%s restore: unsupported MCA capabilities" - " %#" PRIx64 " for d%d:v%u (supported: %#Lx)\n", + " %#" PRIx64 " for %pv (supported: %#Lx)\n", has_hvm_container_vcpu(v) ? "HVM" : "PV", ctxt->caps, - v->domain->domain_id, v->vcpu_id, - guest_mcg_cap & ~MCG_CAP_COUNT); + v, guest_mcg_cap & ~MCG_CAP_COUNT); return -EPERM; } @@ -361,15 +360,13 @@ int inject_vmce(struct domain *d, int vcpu) guest_has_trap_callback(d, v->vcpu_id, TRAP_machine_check)) && !test_and_set_bool(v->mce_pending) ) { - mce_printk(MCE_VERBOSE, "MCE: inject vMCE to d%d:v%d\n", - d->domain_id, v->vcpu_id); + mce_printk(MCE_VERBOSE, "MCE: inject vMCE to %pv\n", v); vcpu_kick(v); ret = 0; } else { - mce_printk(MCE_QUIET, "Failed to inject vMCE to d%d:v%d\n", - d->domain_id, v->vcpu_id); + mce_printk(MCE_QUIET, "Failed to inject vMCE to %pv\n", v); ret = -EBUSY; break; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index b128e81..8395e86 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -734,10 +734,10 @@ void vmx_get_segment_register(struct vcpu *v, enum x86_segment seg, if ( !warned ) { warned = 1; - printk(XENLOG_WARNING "Segment register inaccessible for d%dv%d\n" + printk(XENLOG_WARNING "Segment register inaccessible for %pv\n" "(If you see this outside of debugging activity," " please report to xen-devel@lists.xenproject.org)\n", - v->domain->domain_id, v->vcpu_id); + v); } memset(reg, 0, sizeof(*reg)); return; diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index ee26362..8b23afa 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -769,8 +769,8 @@ static int core2_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) if ( !cpu_has(c, X86_FEATURE_DTES64) ) { printk(XENLOG_G_WARNING "CPU doesn't support 64-bit DS Area" - " - Debug Store disabled for d%d:v%d\n", - v->domain->domain_id, v->vcpu_id); + " - Debug Store disabled for %pv\n", + v); goto func_out; } vpmu_set(vpmu, VPMU_CPU_HAS_DS); @@ -780,8 +780,8 @@ static int core2_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) /* If BTS_UNAVAIL is set reset the DS feature. */ vpmu_reset(vpmu, VPMU_CPU_HAS_DS); printk(XENLOG_G_WARNING "CPU has set BTS_UNAVAIL" - " - Debug Store disabled for d%d:v%d\n", - v->domain->domain_id, v->vcpu_id); + " - Debug Store disabled for %pv\n", + v); } else { diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 11c6b62..b2bd7c2 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -786,8 +786,7 @@ static void oos_hash_remove(struct vcpu *v, mfn_t gmfn) mfn_t *oos; struct domain *d = v->domain; - SHADOW_PRINTK("D%dV%d gmfn %lx\n", - v->domain->domain_id, v->vcpu_id, mfn_x(gmfn)); + SHADOW_PRINTK("%pv gmfn %lx\n", v, mfn_x(gmfn)); for_each_vcpu(d, v) { diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c736dd1..c462317 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1070,8 +1070,8 @@ void do_machine_check(struct cpu_user_regs *regs) static void reserved_bit_page_fault( unsigned long addr, struct cpu_user_regs *regs) { - printk("d%d:v%d: reserved bit in page table (ec=%04X)\n", - current->domain->domain_id, current->vcpu_id, regs->error_code); + printk("%pv: reserved bit in page table (ec=%04X)\n", + current, regs->error_code); show_page_walk(addr); show_execution_state(regs); } @@ -1113,8 +1113,7 @@ struct trap_bounce *propagate_page_fault(unsigned long addr, u16 error_code) tb->flags |= TBF_INTERRUPT; if ( unlikely(null_trap_bounce(v, tb)) ) { - printk("d%d:v%d: unhandled page fault (ec=%04X)\n", - v->domain->domain_id, v->vcpu_id, error_code); + printk("%pv: unhandled page fault (ec=%04X)\n", v, error_code); show_page_walk(addr); } diff --git a/xen/common/domain.c b/xen/common/domain.c index 2636fc9..ad8a1b6 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -65,11 +65,6 @@ struct vcpu *idle_vcpu[NR_CPUS] __read_mostly; vcpu_info_t dummy_vcpu_info; -int current_domain_id(void) -{ - return current->domain->domain_id; -} - static void __domain_finalise_shutdown(struct domain *d) { struct vcpu *v; diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 8e4b3f8..5a974b1 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -89,9 +89,8 @@ void dump_execstate(struct cpu_user_regs *regs) if ( !is_idle_vcpu(current) ) { - printk("*** Dumping CPU%u guest state (d%d:v%d): ***\n", - smp_processor_id(), current->domain->domain_id, - current->vcpu_id); + printk("*** Dumping CPU%u guest state (%pv): ***\n", + smp_processor_id(), current); show_execution_state(guest_cpu_user_regs()); printk("\n"); } diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 4e68375..6729564 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -413,9 +413,7 @@ __runq_insert(struct list_head *runq, struct csched_vcpu *svc) struct list_head *iter; int pos = 0; - d2printk("rqi d%dv%d\n", - svc->vcpu->domain->domain_id, - svc->vcpu->vcpu_id); + d2printk("rqi %pv\n", svc->vcpu); BUG_ON(&svc->rqd->runq != runq); /* Idle vcpus not allowed on the runqueue anymore */ @@ -429,10 +427,7 @@ __runq_insert(struct list_head *runq, struct csched_vcpu *svc) if ( svc->credit > iter_svc->credit ) { - d2printk(" p%d d%dv%d\n", - pos, - iter_svc->vcpu->domain->domain_id, - iter_svc->vcpu->vcpu_id); + d2printk(" p%d %pv\n", pos, iter_svc->vcpu); break; } pos++; @@ -492,11 +487,7 @@ runq_tickle(const struct scheduler *ops, unsigned int cpu, struct csched_vcpu *n cpumask_t mask; struct csched_vcpu * cur; - d2printk("rqt d%dv%d cd%dv%d\n", - new->vcpu->domain->domain_id, - new->vcpu->vcpu_id, - current->domain->domain_id, - current->vcpu_id); + d2printk("rqt %pv curr %pv\n", new->vcpu, current); BUG_ON(new->vcpu->processor != cpu); BUG_ON(new->rqd != rqd); @@ -681,10 +672,7 @@ void burn_credits(struct csched_runqueue_data *rqd, struct csched_vcpu *svc, s_t t2c_update(rqd, delta, svc); svc->start_time = now; - d2printk("b d%dv%d c%d\n", - svc->vcpu->domain->domain_id, - svc->vcpu->vcpu_id, - svc->credit); + d2printk("b %pv c%d\n", svc->vcpu, svc->credit); } else { d2printk("%s: Time went backwards? now %"PRI_stime" start %"PRI_stime"\n", __func__, now, svc->start_time); @@ -871,11 +859,9 @@ static void csched_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) { struct csched_vcpu *svc = vc->sched_priv; - struct domain * const dom = vc->domain; struct csched_dom * const sdom = svc->sdom; - printk("%s: Inserting d%dv%d\n", - __func__, dom->domain_id, vc->vcpu_id); + printk("%s: Inserting %pv\n", __func__, vc); /* NB: On boot, idle vcpus are inserted before alloc_pdata() has * been called for that cpu. @@ -965,7 +951,7 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) /* Schedule lock should be held at this point. */ - d2printk("w d%dv%d\n", vc->domain->domain_id, vc->vcpu_id); + d2printk("w %pv\n", vc); BUG_ON( is_idle_vcpu(vc) ); @@ -1074,7 +1060,7 @@ choose_cpu(const struct scheduler *ops, struct vcpu *vc) { if ( test_and_clear_bit(__CSFLAG_runq_migrate_request, &svc->flags) ) { - d2printk("d%dv%d -\n", svc->vcpu->domain->domain_id, svc->vcpu->vcpu_id); + d2printk("%pv -\n", svc->vcpu); clear_bit(__CSFLAG_runq_migrate_request, &svc->flags); } /* Leave it where it is for now. When we actually pay attention @@ -1094,7 +1080,7 @@ choose_cpu(const struct scheduler *ops, struct vcpu *vc) } else { - d2printk("d%dv%d +\n", svc->vcpu->domain->domain_id, svc->vcpu->vcpu_id); + d2printk("%pv +\n", svc->vcpu); new_cpu = cpumask_cycle(vc->processor, &svc->migrate_rqd->active); goto out_up; } @@ -1203,8 +1189,7 @@ void migrate(const struct scheduler *ops, { if ( test_bit(__CSFLAG_scheduled, &svc->flags) ) { - d2printk("d%dv%d %d-%d a\n", svc->vcpu->domain->domain_id, svc->vcpu->vcpu_id, - svc->rqd->id, trqd->id); + d2printk("%pv %d-%d a\n", svc->vcpu, svc->rqd->id, trqd->id); /* It's running; mark it to migrate. */ svc->migrate_rqd = trqd; set_bit(_VPF_migrating, &svc->vcpu->pause_flags); @@ -1214,8 +1199,7 @@ void migrate(const struct scheduler *ops, { int on_runq=0; /* It's not running; just move it */ - d2printk("d%dv%d %d-%d i\n", svc->vcpu->domain->domain_id, svc->vcpu->vcpu_id, - svc->rqd->id, trqd->id); + d2printk("%pv %d-%d i\n", svc->vcpu, svc->rqd->id, trqd->id); if ( __vcpu_on_runq(svc) ) { __runq_remove(svc); @@ -1662,11 +1646,7 @@ csched_schedule( SCHED_STAT_CRANK(schedule); CSCHED_VCPU_CHECK(current); - d2printk("sc p%d c d%dv%d now %"PRI_stime"\n", - cpu, - scurr->vcpu->domain->domain_id, - scurr->vcpu->vcpu_id, - now); + d2printk("sc p%d c %pv now %"PRI_stime"\n", cpu, scurr->vcpu, now); BUG_ON(!cpumask_test_cpu(cpu, &CSCHED_PRIV(ops)->initialized)); @@ -1693,12 +1673,11 @@ csched_schedule( } } } - printk("%s: pcpu %d rq %d, but scurr d%dv%d assigned to " + printk("%s: pcpu %d rq %d, but scurr %pv assigned to " "pcpu %d rq %d!\n", __func__, cpu, this_rqi, - scurr->vcpu->domain->domain_id, scurr->vcpu->vcpu_id, - scurr->vcpu->processor, other_rqi); + scurr->vcpu, scurr->vcpu->processor, other_rqi); } BUG_ON(!is_idle_vcpu(scurr->vcpu) && scurr->rqd != rqd); @@ -1755,12 +1734,8 @@ csched_schedule( __runq_remove(snext); if ( snext->vcpu->is_running ) { - printk("p%d: snext d%dv%d running on p%d! scurr d%dv%d\n", - cpu, - snext->vcpu->domain->domain_id, snext->vcpu->vcpu_id, - snext->vcpu->processor, - scurr->vcpu->domain->domain_id, - scurr->vcpu->vcpu_id); + printk("p%d: snext %pv running on p%d! scurr %pv\n", + cpu, snext->vcpu, snext->vcpu->processor, scurr->vcpu); BUG(); } set_bit(__CSFLAG_scheduled, &snext->flags); diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 1192fe2..c174c41 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -559,8 +559,7 @@ void restore_vcpu_affinity(struct domain *d) if ( v->affinity_broken ) { - printk(XENLOG_DEBUG "Restoring affinity for d%dv%d\n", - d->domain_id, v->vcpu_id); + printk(XENLOG_DEBUG "Restoring affinity for %pv\n", v); cpumask_copy(v->cpu_affinity, v->cpu_affinity_saved); v->affinity_broken = 0; } @@ -608,8 +607,7 @@ int cpu_disable_scheduler(unsigned int cpu) if ( cpumask_empty(&online_affinity) && cpumask_test_cpu(cpu, v->cpu_affinity) ) { - printk(XENLOG_DEBUG "Breaking affinity for d%dv%d\n", - d->domain_id, v->vcpu_id); + printk(XENLOG_DEBUG "Breaking affinity for %pv\n", v); if (system_state == SYS_STATE_suspend) { diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index 1a6198e..f7cb0f1 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -301,6 +302,19 @@ static char *pointer(char *str, char *end, const char **fmt_ptr, return str; } + + case 'v': /* dv from a struct vcpu */ + { + const struct vcpu *v = arg; + + ++*fmt_ptr; + if ( str <= end ) + *str = 'd'; + str = number(str + 1, end, v->domain->domain_id, 10, -1, -1, 0); + if ( str <= end ) + *str = 'v'; + return number(str + 1, end, v->vcpu_id, 10, -1, -1, 0); + } } if ( field_width == -1 ) diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 657c6e5..8bae6e6 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -74,12 +74,11 @@ #ifndef __ASSEMBLY__ -int current_domain_id(void); #define dprintk(_l, _f, _a...) \ printk(_l "%s:%d: " _f, __FILE__ , __LINE__ , ## _a ) #define gdprintk(_l, _f, _a...) \ - printk(XENLOG_GUEST _l "%s:%d:d%d " _f, __FILE__, \ - __LINE__, current_domain_id() , ## _a ) + printk(XENLOG_GUEST _l "%s:%d:%pv " _f, __FILE__, \ + __LINE__, current, ## _a ) #endif /* !__ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:04:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:04:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxZ-0007TE-16; Sat, 01 Mar 2014 23:04:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxX-0007T0-Hh for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:43 +0000 Received: from [85.158.143.35:59661] by server-3.bemta-4.messagelabs.com id 40/6C-11539-A8762135; Sat, 01 Mar 2014 23:04:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1393715080!9271937!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3363 invoked from network); 1 Mar 2014 23:04:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:04:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxU-00021s-CU for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsxU-0000dV-BW for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:40 +0000 Date: Sat, 01 Mar 2014 23:04:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vsprintf: introduce %pv extended format specifier to print domain/vcpu ID pair X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2315025ccedb63e9aff69f8f2425258bca6921f4 Author: Jan Beulich AuthorDate: Fri Feb 28 17:04:04 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 28 17:04:04 2014 +0100 vsprintf: introduce %pv extended format specifier to print domain/vcpu ID pair ... in a simplified and consistent way. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: George Dunlap Acked-by: Keir Fraser --- docs/misc/printk-formats.txt | 3 ++ xen/arch/x86/cpu/mcheck/vmce.c | 11 +++----- xen/arch/x86/hvm/vmx/vmx.c | 4 +- xen/arch/x86/hvm/vmx/vpmu_core2.c | 8 +++--- xen/arch/x86/mm/shadow/common.c | 3 +- xen/arch/x86/traps.c | 7 ++--- xen/common/domain.c | 5 --- xen/common/keyhandler.c | 5 +-- xen/common/sched_credit2.c | 55 ++++++++++--------------------------- xen/common/schedule.c | 6 +--- xen/common/vsprintf.c | 14 +++++++++ xen/include/xen/config.h | 5 +-- 12 files changed, 52 insertions(+), 74 deletions(-) diff --git a/docs/misc/printk-formats.txt b/docs/misc/printk-formats.txt index 4c4222b..3b4323a 100644 --- a/docs/misc/printk-formats.txt +++ b/docs/misc/printk-formats.txt @@ -15,3 +15,6 @@ Symbol/Function pointers: In the case that an appropriate symbol name can't be found, %p[sS] will fall back to '%p' and print the address in hex. + + %pv Domain and vCPU ID from a 'struct vcpu *' (printed as + "dv") diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index be9bb5e..ed00f7c 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -82,10 +82,9 @@ int vmce_restore_vcpu(struct vcpu *v, const struct hvm_vmce_vcpu *ctxt) if ( ctxt->caps & ~guest_mcg_cap & ~MCG_CAP_COUNT & ~MCG_CTL_P ) { dprintk(XENLOG_G_ERR, "%s restore: unsupported MCA capabilities" - " %#" PRIx64 " for d%d:v%u (supported: %#Lx)\n", + " %#" PRIx64 " for %pv (supported: %#Lx)\n", has_hvm_container_vcpu(v) ? "HVM" : "PV", ctxt->caps, - v->domain->domain_id, v->vcpu_id, - guest_mcg_cap & ~MCG_CAP_COUNT); + v, guest_mcg_cap & ~MCG_CAP_COUNT); return -EPERM; } @@ -361,15 +360,13 @@ int inject_vmce(struct domain *d, int vcpu) guest_has_trap_callback(d, v->vcpu_id, TRAP_machine_check)) && !test_and_set_bool(v->mce_pending) ) { - mce_printk(MCE_VERBOSE, "MCE: inject vMCE to d%d:v%d\n", - d->domain_id, v->vcpu_id); + mce_printk(MCE_VERBOSE, "MCE: inject vMCE to %pv\n", v); vcpu_kick(v); ret = 0; } else { - mce_printk(MCE_QUIET, "Failed to inject vMCE to d%d:v%d\n", - d->domain_id, v->vcpu_id); + mce_printk(MCE_QUIET, "Failed to inject vMCE to %pv\n", v); ret = -EBUSY; break; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index b128e81..8395e86 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -734,10 +734,10 @@ void vmx_get_segment_register(struct vcpu *v, enum x86_segment seg, if ( !warned ) { warned = 1; - printk(XENLOG_WARNING "Segment register inaccessible for d%dv%d\n" + printk(XENLOG_WARNING "Segment register inaccessible for %pv\n" "(If you see this outside of debugging activity," " please report to xen-devel@lists.xenproject.org)\n", - v->domain->domain_id, v->vcpu_id); + v); } memset(reg, 0, sizeof(*reg)); return; diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index ee26362..8b23afa 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -769,8 +769,8 @@ static int core2_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) if ( !cpu_has(c, X86_FEATURE_DTES64) ) { printk(XENLOG_G_WARNING "CPU doesn't support 64-bit DS Area" - " - Debug Store disabled for d%d:v%d\n", - v->domain->domain_id, v->vcpu_id); + " - Debug Store disabled for %pv\n", + v); goto func_out; } vpmu_set(vpmu, VPMU_CPU_HAS_DS); @@ -780,8 +780,8 @@ static int core2_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) /* If BTS_UNAVAIL is set reset the DS feature. */ vpmu_reset(vpmu, VPMU_CPU_HAS_DS); printk(XENLOG_G_WARNING "CPU has set BTS_UNAVAIL" - " - Debug Store disabled for d%d:v%d\n", - v->domain->domain_id, v->vcpu_id); + " - Debug Store disabled for %pv\n", + v); } else { diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 11c6b62..b2bd7c2 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -786,8 +786,7 @@ static void oos_hash_remove(struct vcpu *v, mfn_t gmfn) mfn_t *oos; struct domain *d = v->domain; - SHADOW_PRINTK("D%dV%d gmfn %lx\n", - v->domain->domain_id, v->vcpu_id, mfn_x(gmfn)); + SHADOW_PRINTK("%pv gmfn %lx\n", v, mfn_x(gmfn)); for_each_vcpu(d, v) { diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c736dd1..c462317 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1070,8 +1070,8 @@ void do_machine_check(struct cpu_user_regs *regs) static void reserved_bit_page_fault( unsigned long addr, struct cpu_user_regs *regs) { - printk("d%d:v%d: reserved bit in page table (ec=%04X)\n", - current->domain->domain_id, current->vcpu_id, regs->error_code); + printk("%pv: reserved bit in page table (ec=%04X)\n", + current, regs->error_code); show_page_walk(addr); show_execution_state(regs); } @@ -1113,8 +1113,7 @@ struct trap_bounce *propagate_page_fault(unsigned long addr, u16 error_code) tb->flags |= TBF_INTERRUPT; if ( unlikely(null_trap_bounce(v, tb)) ) { - printk("d%d:v%d: unhandled page fault (ec=%04X)\n", - v->domain->domain_id, v->vcpu_id, error_code); + printk("%pv: unhandled page fault (ec=%04X)\n", v, error_code); show_page_walk(addr); } diff --git a/xen/common/domain.c b/xen/common/domain.c index 2636fc9..ad8a1b6 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -65,11 +65,6 @@ struct vcpu *idle_vcpu[NR_CPUS] __read_mostly; vcpu_info_t dummy_vcpu_info; -int current_domain_id(void) -{ - return current->domain->domain_id; -} - static void __domain_finalise_shutdown(struct domain *d) { struct vcpu *v; diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 8e4b3f8..5a974b1 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -89,9 +89,8 @@ void dump_execstate(struct cpu_user_regs *regs) if ( !is_idle_vcpu(current) ) { - printk("*** Dumping CPU%u guest state (d%d:v%d): ***\n", - smp_processor_id(), current->domain->domain_id, - current->vcpu_id); + printk("*** Dumping CPU%u guest state (%pv): ***\n", + smp_processor_id(), current); show_execution_state(guest_cpu_user_regs()); printk("\n"); } diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 4e68375..6729564 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -413,9 +413,7 @@ __runq_insert(struct list_head *runq, struct csched_vcpu *svc) struct list_head *iter; int pos = 0; - d2printk("rqi d%dv%d\n", - svc->vcpu->domain->domain_id, - svc->vcpu->vcpu_id); + d2printk("rqi %pv\n", svc->vcpu); BUG_ON(&svc->rqd->runq != runq); /* Idle vcpus not allowed on the runqueue anymore */ @@ -429,10 +427,7 @@ __runq_insert(struct list_head *runq, struct csched_vcpu *svc) if ( svc->credit > iter_svc->credit ) { - d2printk(" p%d d%dv%d\n", - pos, - iter_svc->vcpu->domain->domain_id, - iter_svc->vcpu->vcpu_id); + d2printk(" p%d %pv\n", pos, iter_svc->vcpu); break; } pos++; @@ -492,11 +487,7 @@ runq_tickle(const struct scheduler *ops, unsigned int cpu, struct csched_vcpu *n cpumask_t mask; struct csched_vcpu * cur; - d2printk("rqt d%dv%d cd%dv%d\n", - new->vcpu->domain->domain_id, - new->vcpu->vcpu_id, - current->domain->domain_id, - current->vcpu_id); + d2printk("rqt %pv curr %pv\n", new->vcpu, current); BUG_ON(new->vcpu->processor != cpu); BUG_ON(new->rqd != rqd); @@ -681,10 +672,7 @@ void burn_credits(struct csched_runqueue_data *rqd, struct csched_vcpu *svc, s_t t2c_update(rqd, delta, svc); svc->start_time = now; - d2printk("b d%dv%d c%d\n", - svc->vcpu->domain->domain_id, - svc->vcpu->vcpu_id, - svc->credit); + d2printk("b %pv c%d\n", svc->vcpu, svc->credit); } else { d2printk("%s: Time went backwards? now %"PRI_stime" start %"PRI_stime"\n", __func__, now, svc->start_time); @@ -871,11 +859,9 @@ static void csched_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) { struct csched_vcpu *svc = vc->sched_priv; - struct domain * const dom = vc->domain; struct csched_dom * const sdom = svc->sdom; - printk("%s: Inserting d%dv%d\n", - __func__, dom->domain_id, vc->vcpu_id); + printk("%s: Inserting %pv\n", __func__, vc); /* NB: On boot, idle vcpus are inserted before alloc_pdata() has * been called for that cpu. @@ -965,7 +951,7 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) /* Schedule lock should be held at this point. */ - d2printk("w d%dv%d\n", vc->domain->domain_id, vc->vcpu_id); + d2printk("w %pv\n", vc); BUG_ON( is_idle_vcpu(vc) ); @@ -1074,7 +1060,7 @@ choose_cpu(const struct scheduler *ops, struct vcpu *vc) { if ( test_and_clear_bit(__CSFLAG_runq_migrate_request, &svc->flags) ) { - d2printk("d%dv%d -\n", svc->vcpu->domain->domain_id, svc->vcpu->vcpu_id); + d2printk("%pv -\n", svc->vcpu); clear_bit(__CSFLAG_runq_migrate_request, &svc->flags); } /* Leave it where it is for now. When we actually pay attention @@ -1094,7 +1080,7 @@ choose_cpu(const struct scheduler *ops, struct vcpu *vc) } else { - d2printk("d%dv%d +\n", svc->vcpu->domain->domain_id, svc->vcpu->vcpu_id); + d2printk("%pv +\n", svc->vcpu); new_cpu = cpumask_cycle(vc->processor, &svc->migrate_rqd->active); goto out_up; } @@ -1203,8 +1189,7 @@ void migrate(const struct scheduler *ops, { if ( test_bit(__CSFLAG_scheduled, &svc->flags) ) { - d2printk("d%dv%d %d-%d a\n", svc->vcpu->domain->domain_id, svc->vcpu->vcpu_id, - svc->rqd->id, trqd->id); + d2printk("%pv %d-%d a\n", svc->vcpu, svc->rqd->id, trqd->id); /* It's running; mark it to migrate. */ svc->migrate_rqd = trqd; set_bit(_VPF_migrating, &svc->vcpu->pause_flags); @@ -1214,8 +1199,7 @@ void migrate(const struct scheduler *ops, { int on_runq=0; /* It's not running; just move it */ - d2printk("d%dv%d %d-%d i\n", svc->vcpu->domain->domain_id, svc->vcpu->vcpu_id, - svc->rqd->id, trqd->id); + d2printk("%pv %d-%d i\n", svc->vcpu, svc->rqd->id, trqd->id); if ( __vcpu_on_runq(svc) ) { __runq_remove(svc); @@ -1662,11 +1646,7 @@ csched_schedule( SCHED_STAT_CRANK(schedule); CSCHED_VCPU_CHECK(current); - d2printk("sc p%d c d%dv%d now %"PRI_stime"\n", - cpu, - scurr->vcpu->domain->domain_id, - scurr->vcpu->vcpu_id, - now); + d2printk("sc p%d c %pv now %"PRI_stime"\n", cpu, scurr->vcpu, now); BUG_ON(!cpumask_test_cpu(cpu, &CSCHED_PRIV(ops)->initialized)); @@ -1693,12 +1673,11 @@ csched_schedule( } } } - printk("%s: pcpu %d rq %d, but scurr d%dv%d assigned to " + printk("%s: pcpu %d rq %d, but scurr %pv assigned to " "pcpu %d rq %d!\n", __func__, cpu, this_rqi, - scurr->vcpu->domain->domain_id, scurr->vcpu->vcpu_id, - scurr->vcpu->processor, other_rqi); + scurr->vcpu, scurr->vcpu->processor, other_rqi); } BUG_ON(!is_idle_vcpu(scurr->vcpu) && scurr->rqd != rqd); @@ -1755,12 +1734,8 @@ csched_schedule( __runq_remove(snext); if ( snext->vcpu->is_running ) { - printk("p%d: snext d%dv%d running on p%d! scurr d%dv%d\n", - cpu, - snext->vcpu->domain->domain_id, snext->vcpu->vcpu_id, - snext->vcpu->processor, - scurr->vcpu->domain->domain_id, - scurr->vcpu->vcpu_id); + printk("p%d: snext %pv running on p%d! scurr %pv\n", + cpu, snext->vcpu, snext->vcpu->processor, scurr->vcpu); BUG(); } set_bit(__CSFLAG_scheduled, &snext->flags); diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 1192fe2..c174c41 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -559,8 +559,7 @@ void restore_vcpu_affinity(struct domain *d) if ( v->affinity_broken ) { - printk(XENLOG_DEBUG "Restoring affinity for d%dv%d\n", - d->domain_id, v->vcpu_id); + printk(XENLOG_DEBUG "Restoring affinity for %pv\n", v); cpumask_copy(v->cpu_affinity, v->cpu_affinity_saved); v->affinity_broken = 0; } @@ -608,8 +607,7 @@ int cpu_disable_scheduler(unsigned int cpu) if ( cpumask_empty(&online_affinity) && cpumask_test_cpu(cpu, v->cpu_affinity) ) { - printk(XENLOG_DEBUG "Breaking affinity for d%dv%d\n", - d->domain_id, v->vcpu_id); + printk(XENLOG_DEBUG "Breaking affinity for %pv\n", v); if (system_state == SYS_STATE_suspend) { diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index 1a6198e..f7cb0f1 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -301,6 +302,19 @@ static char *pointer(char *str, char *end, const char **fmt_ptr, return str; } + + case 'v': /* dv from a struct vcpu */ + { + const struct vcpu *v = arg; + + ++*fmt_ptr; + if ( str <= end ) + *str = 'd'; + str = number(str + 1, end, v->domain->domain_id, 10, -1, -1, 0); + if ( str <= end ) + *str = 'v'; + return number(str + 1, end, v->vcpu_id, 10, -1, -1, 0); + } } if ( field_width == -1 ) diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 657c6e5..8bae6e6 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -74,12 +74,11 @@ #ifndef __ASSEMBLY__ -int current_domain_id(void); #define dprintk(_l, _f, _a...) \ printk(_l "%s:%d: " _f, __FILE__ , __LINE__ , ## _a ) #define gdprintk(_l, _f, _a...) \ - printk(XENLOG_GUEST _l "%s:%d:d%d " _f, __FILE__, \ - __LINE__, current_domain_id() , ## _a ) + printk(XENLOG_GUEST _l "%s:%d:%pv " _f, __FILE__, \ + __LINE__, current, ## _a ) #endif /* !__ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:04:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:04:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxj-0007V7-6A; Sat, 01 Mar 2014 23:04:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxh-0007Us-PS for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:54 +0000 Received: from [85.158.139.211:16922] by server-12.bemta-5.messagelabs.com id F1/89-15415-59762135; Sat, 01 Mar 2014 23:04:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1393715090!7061398!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9738 invoked from network); 1 Mar 2014 23:04:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:04:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxe-000222-IO for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsxe-0000e9-Gk for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:50 +0000 Date: Sat, 01 Mar 2014 23:04:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: add compat mode guest support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f7d29f7ba96e6ac32957bec21debb7b053e18c13 Author: Jan Beulich AuthorDate: Fri Feb 28 17:08:36 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 28 17:08:36 2014 +0100 flask: add compat mode guest support ... which has been missing since the introduction of the new interface in the 4.2 development cycle. Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Keir Fraser --- xen/arch/x86/x86_64/compat/entry.S | 2 +- xen/include/Makefile | 5 +- xen/include/xlat.lst | 13 ++++ xen/include/xsm/dummy.h | 7 ++ xen/include/xsm/xsm.h | 10 +++ xen/xsm/dummy.c | 3 + xen/xsm/flask/flask_op.c | 118 ++++++++++++++++++++++++++++------- xen/xsm/flask/hooks.c | 4 + xen/xsm/xsm_core.c | 7 ++- 9 files changed, 142 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 594b0b9..32b3bcc 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -404,7 +404,7 @@ ENTRY(compat_hypercall_table) .quad compat_vcpu_op .quad compat_ni_hypercall /* 25 */ .quad compat_mmuext_op - .quad do_xsm_op + .quad compat_xsm_op .quad compat_nmi_op .quad compat_sched_op .quad compat_callback_op /* 30 */ diff --git a/xen/include/Makefile b/xen/include/Makefile index 62846a1..9bf90c0 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -27,6 +27,7 @@ headers-$(CONFIG_X86) += compat/arch-x86/xen-mca.h headers-$(CONFIG_X86) += compat/arch-x86/xen.h headers-$(CONFIG_X86) += compat/arch-x86/xen-$(compat-arch-y).h headers-y += compat/arch-$(compat-arch-y).h compat/xlat.h +headers-$(FLASK_ENABLE) += compat/xsm/flask_op.h cppflags-y := -include public/xen-compat.h cppflags-$(CONFIG_X86) += -m32 @@ -69,7 +70,9 @@ compat/xlat.h: xlat.lst $(filter-out compat/xlat.h,$(headers-y)) $(BASEDIR)/tool export PYTHON=$(PYTHON); \ grep -v '^[ ]*#' xlat.lst | \ while read what name hdr; do \ - $(SHELL) $(BASEDIR)/tools/get-fields.sh "$$what" compat_$$name $$(echo compat/$$hdr | sed 's,@arch@,$(compat-arch-y),g') || exit $$?; \ + hdr="compat/$$(echo $$hdr | sed 's,@arch@,$(compat-arch-y),g')"; \ + echo '$(headers-y)' | grep -q "$$hdr" || continue; \ + $(SHELL) $(BASEDIR)/tools/get-fields.sh "$$what" compat_$$name $$hdr || exit $$?; \ done >$@.new mv -f $@.new $@ diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 8caede6..5d354d8 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -99,3 +99,16 @@ ! vcpu_set_singleshot_timer vcpu.h ? xenoprof_init xenoprof.h ? xenoprof_passive xenoprof.h +? flask_access xsm/flask_op.h +! flask_boolean xsm/flask_op.h +? flask_cache_stats xsm/flask_op.h +? flask_hash_stats xsm/flask_op.h +! flask_load xsm/flask_op.h +? flask_ocontext xsm/flask_op.h +? flask_peersid xsm/flask_op.h +? flask_relabel xsm/flask_op.h +? flask_setavc_threshold xsm/flask_op.h +? flask_setenforce xsm/flask_op.h +! flask_sid_context xsm/flask_op.h +? flask_transition xsm/flask_op.h +! flask_userlist xsm/flask_op.h diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index eb9e1a1..a84218d 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -412,6 +412,13 @@ static XSM_INLINE long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) return -ENOSYS; } +#ifdef CONFIG_COMPAT +static XSM_INLINE int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +{ + return -ENOSYS; +} +#endif + static XSM_INLINE char *xsm_show_irq_sid(int irq) { return NULL; diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 5d35455..de9cf86 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -129,6 +129,9 @@ struct xsm_operations { int (*tmem_control)(void); long (*do_xsm_op) (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op); +#ifdef CONFIG_COMPAT + int (*do_compat_op) (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op); +#endif int (*hvm_param) (struct domain *d, unsigned long op); int (*hvm_param_nested) (struct domain *d); @@ -499,6 +502,13 @@ static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) return xsm_ops->do_xsm_op(op); } +#ifdef CONFIG_COMPAT +static inline int xsm_do_compat_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +{ + return xsm_ops->do_compat_op(op); +} +#endif + static inline int xsm_hvm_param (xsm_default_t def, struct domain *d, unsigned long op) { return xsm_ops->hvm_param(d, op); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 31e4f73..3fe4c59 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -105,6 +105,9 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, hvm_param_nested); set_to_dummy_if_null(ops, do_xsm_op); +#ifdef CONFIG_COMPAT + set_to_dummy_if_null(ops, do_compat_op); +#endif set_to_dummy_if_null(ops, add_to_physmap); set_to_dummy_if_null(ops, remove_from_physmap); diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index dddef29..3b84679 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -7,7 +7,7 @@ * it under the terms of the GNU General Public License version 2, * as published by the Free Software Foundation. */ - +#ifndef COMPAT #include #include #include @@ -20,6 +20,10 @@ #include #include +#define ret_t long +#define _copy_to_guest copy_to_guest +#define _copy_from_guest copy_from_guest + #ifdef FLASK_DEVELOP int flask_enforcing = 0; integer_param("flask_enforcing", flask_enforcing); @@ -95,6 +99,8 @@ static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, return 0; } +#endif /* COMPAT */ + static int flask_security_user(struct xen_flask_userlist *arg) { char *user; @@ -119,7 +125,7 @@ static int flask_security_user(struct xen_flask_userlist *arg) arg->size = nsids; - if ( copy_to_guest(arg->u.sids, sids, nsids) ) + if ( _copy_to_guest(arg->u.sids, sids, nsids) ) rv = -EFAULT; xfree(sids); @@ -128,6 +134,8 @@ static int flask_security_user(struct xen_flask_userlist *arg) return rv; } +#ifndef COMPAT + static int flask_security_relabel(struct xen_flask_transition *arg) { int rv; @@ -208,6 +216,8 @@ static int flask_security_setenforce(struct xen_flask_setenforce *arg) return 0; } +#endif /* COMPAT */ + static int flask_security_context(struct xen_flask_sid_context *arg) { int rv; @@ -252,7 +262,7 @@ static int flask_security_sid(struct xen_flask_sid_context *arg) arg->size = len; - if ( !rv && copy_to_guest(arg->context, context, len) ) + if ( !rv && _copy_to_guest(arg->context, context, len) ) rv = -EFAULT; xfree(context); @@ -260,6 +270,8 @@ static int flask_security_sid(struct xen_flask_sid_context *arg) return rv; } +#ifndef COMPAT + int flask_disable(void) { static int flask_disabled = 0; @@ -302,6 +314,8 @@ static int flask_security_setavc_threshold(struct xen_flask_setavc_threshold *ar return rv; } +#endif /* COMPAT */ + static int flask_security_resolve_bool(struct xen_flask_boolean *arg) { char *name; @@ -382,24 +396,6 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) return rv; } -static int flask_security_commit_bools(void) -{ - int rv; - - spin_lock(&sel_sem); - - rv = domain_has_security(current->domain, SECURITY__SETBOOL); - if ( rv ) - goto out; - - if ( bool_pending_values ) - rv = security_set_bools(bool_num, bool_pending_values); - - out: - spin_unlock(&sel_sem); - return rv; -} - static int flask_security_get_bool(struct xen_flask_boolean *arg) { int rv; @@ -431,7 +427,7 @@ static int flask_security_get_bool(struct xen_flask_boolean *arg) rv = -ERANGE; arg->size = nameout_len; - if ( !rv && copy_to_guest(arg->name, nameout, nameout_len) ) + if ( !rv && _copy_to_guest(arg->name, nameout, nameout_len) ) rv = -EFAULT; xfree(nameout); } @@ -441,6 +437,26 @@ static int flask_security_get_bool(struct xen_flask_boolean *arg) return rv; } +#ifndef COMPAT + +static int flask_security_commit_bools(void) +{ + int rv; + + spin_lock(&sel_sem); + + rv = domain_has_security(current->domain, SECURITY__SETBOOL); + if ( rv ) + goto out; + + if ( bool_pending_values ) + rv = security_set_bools(bool_num, bool_pending_values); + + out: + spin_unlock(&sel_sem); + return rv; +} + static int flask_security_make_bools(void) { int ret = 0; @@ -484,6 +500,7 @@ static int flask_security_avc_cachestats(struct xen_flask_cache_stats *arg) } #endif +#endif /* COMPAT */ static int flask_security_load(struct xen_flask_load *load) { @@ -501,7 +518,7 @@ static int flask_security_load(struct xen_flask_load *load) if ( !buf ) return -ENOMEM; - if ( copy_from_guest(buf, load->buffer, load->size) ) + if ( _copy_from_guest(buf, load->buffer, load->size) ) { ret = -EFAULT; goto out_free; @@ -524,6 +541,8 @@ static int flask_security_load(struct xen_flask_load *load) return ret; } +#ifndef COMPAT + static int flask_ocontext_del(struct xen_flask_ocontext *arg) { int rv; @@ -636,7 +655,9 @@ static int flask_relabel_domain(struct xen_flask_relabel *arg) return rc; } -long do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) +#endif /* !COMPAT */ + +ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) { xen_flask_op_t op; int rv; @@ -763,3 +784,52 @@ long do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) out: return rv; } + +#ifndef COMPAT +#undef _copy_to_guest +#define _copy_to_guest copy_to_compat +#undef _copy_from_guest +#define _copy_from_guest copy_from_compat + +#include +#include + +CHECK_flask_access; +CHECK_flask_cache_stats; +CHECK_flask_hash_stats; +CHECK_flask_ocontext; +CHECK_flask_peersid; +CHECK_flask_relabel; +CHECK_flask_setavc_threshold; +CHECK_flask_setenforce; +CHECK_flask_transition; + +#define COMPAT +#define flask_copyin_string(ch, pb, sz, mx) ({ \ + XEN_GUEST_HANDLE_PARAM(char) gh; \ + guest_from_compat_handle(gh, ch); \ + flask_copyin_string(gh, pb, sz, mx); \ +}) + +#define xen_flask_load compat_flask_load +#define flask_security_load compat_security_load + +#define xen_flask_userlist compat_flask_userlist +#define flask_security_user compat_security_user + +#define xen_flask_sid_context compat_flask_sid_context +#define flask_security_context compat_security_context +#define flask_security_sid compat_security_sid + +#define xen_flask_boolean compat_flask_boolean +#define flask_security_resolve_bool compat_security_resolve_bool +#define flask_security_get_bool compat_security_get_bool +#define flask_security_set_bool compat_security_set_bool + +#define xen_flask_op_t compat_flask_op_t +#undef ret_t +#define ret_t int +#define do_flask_op compat_flask_op + +#include "flask_op.c" +#endif diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index d94ab77..717dcf0 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1464,6 +1464,7 @@ static int flask_map_gmfn_foreign(struct domain *d, struct domain *t) #endif long do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op); +int compat_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op); static struct xsm_operations flask_ops = { .security_domaininfo = flask_security_domaininfo, @@ -1538,6 +1539,9 @@ static struct xsm_operations flask_ops = { .hvm_param_nested = flask_hvm_param_nested, .do_xsm_op = do_flask_op, +#ifdef CONFIG_COMPAT + .do_compat_op = compat_flask_op, +#endif .add_to_physmap = flask_add_to_physmap, .remove_from_physmap = flask_remove_from_physmap, diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index ca28f91..b16c071 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -116,4 +116,9 @@ long do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) return xsm_do_xsm_op(op); } - +#ifdef CONFIG_COMPAT +int compat_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +{ + return xsm_do_compat_op(op); +} +#endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:04:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:04:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxj-0007V7-6A; Sat, 01 Mar 2014 23:04:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxh-0007Us-PS for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:54 +0000 Received: from [85.158.139.211:16922] by server-12.bemta-5.messagelabs.com id F1/89-15415-59762135; Sat, 01 Mar 2014 23:04:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1393715090!7061398!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9738 invoked from network); 1 Mar 2014 23:04:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:04:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxe-000222-IO for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsxe-0000e9-Gk for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:04:50 +0000 Date: Sat, 01 Mar 2014 23:04:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: add compat mode guest support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f7d29f7ba96e6ac32957bec21debb7b053e18c13 Author: Jan Beulich AuthorDate: Fri Feb 28 17:08:36 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 28 17:08:36 2014 +0100 flask: add compat mode guest support ... which has been missing since the introduction of the new interface in the 4.2 development cycle. Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Keir Fraser --- xen/arch/x86/x86_64/compat/entry.S | 2 +- xen/include/Makefile | 5 +- xen/include/xlat.lst | 13 ++++ xen/include/xsm/dummy.h | 7 ++ xen/include/xsm/xsm.h | 10 +++ xen/xsm/dummy.c | 3 + xen/xsm/flask/flask_op.c | 118 ++++++++++++++++++++++++++++------- xen/xsm/flask/hooks.c | 4 + xen/xsm/xsm_core.c | 7 ++- 9 files changed, 142 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 594b0b9..32b3bcc 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -404,7 +404,7 @@ ENTRY(compat_hypercall_table) .quad compat_vcpu_op .quad compat_ni_hypercall /* 25 */ .quad compat_mmuext_op - .quad do_xsm_op + .quad compat_xsm_op .quad compat_nmi_op .quad compat_sched_op .quad compat_callback_op /* 30 */ diff --git a/xen/include/Makefile b/xen/include/Makefile index 62846a1..9bf90c0 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -27,6 +27,7 @@ headers-$(CONFIG_X86) += compat/arch-x86/xen-mca.h headers-$(CONFIG_X86) += compat/arch-x86/xen.h headers-$(CONFIG_X86) += compat/arch-x86/xen-$(compat-arch-y).h headers-y += compat/arch-$(compat-arch-y).h compat/xlat.h +headers-$(FLASK_ENABLE) += compat/xsm/flask_op.h cppflags-y := -include public/xen-compat.h cppflags-$(CONFIG_X86) += -m32 @@ -69,7 +70,9 @@ compat/xlat.h: xlat.lst $(filter-out compat/xlat.h,$(headers-y)) $(BASEDIR)/tool export PYTHON=$(PYTHON); \ grep -v '^[ ]*#' xlat.lst | \ while read what name hdr; do \ - $(SHELL) $(BASEDIR)/tools/get-fields.sh "$$what" compat_$$name $$(echo compat/$$hdr | sed 's,@arch@,$(compat-arch-y),g') || exit $$?; \ + hdr="compat/$$(echo $$hdr | sed 's,@arch@,$(compat-arch-y),g')"; \ + echo '$(headers-y)' | grep -q "$$hdr" || continue; \ + $(SHELL) $(BASEDIR)/tools/get-fields.sh "$$what" compat_$$name $$hdr || exit $$?; \ done >$@.new mv -f $@.new $@ diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 8caede6..5d354d8 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -99,3 +99,16 @@ ! vcpu_set_singleshot_timer vcpu.h ? xenoprof_init xenoprof.h ? xenoprof_passive xenoprof.h +? flask_access xsm/flask_op.h +! flask_boolean xsm/flask_op.h +? flask_cache_stats xsm/flask_op.h +? flask_hash_stats xsm/flask_op.h +! flask_load xsm/flask_op.h +? flask_ocontext xsm/flask_op.h +? flask_peersid xsm/flask_op.h +? flask_relabel xsm/flask_op.h +? flask_setavc_threshold xsm/flask_op.h +? flask_setenforce xsm/flask_op.h +! flask_sid_context xsm/flask_op.h +? flask_transition xsm/flask_op.h +! flask_userlist xsm/flask_op.h diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index eb9e1a1..a84218d 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -412,6 +412,13 @@ static XSM_INLINE long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) return -ENOSYS; } +#ifdef CONFIG_COMPAT +static XSM_INLINE int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +{ + return -ENOSYS; +} +#endif + static XSM_INLINE char *xsm_show_irq_sid(int irq) { return NULL; diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 5d35455..de9cf86 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -129,6 +129,9 @@ struct xsm_operations { int (*tmem_control)(void); long (*do_xsm_op) (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op); +#ifdef CONFIG_COMPAT + int (*do_compat_op) (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op); +#endif int (*hvm_param) (struct domain *d, unsigned long op); int (*hvm_param_nested) (struct domain *d); @@ -499,6 +502,13 @@ static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) return xsm_ops->do_xsm_op(op); } +#ifdef CONFIG_COMPAT +static inline int xsm_do_compat_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +{ + return xsm_ops->do_compat_op(op); +} +#endif + static inline int xsm_hvm_param (xsm_default_t def, struct domain *d, unsigned long op) { return xsm_ops->hvm_param(d, op); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 31e4f73..3fe4c59 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -105,6 +105,9 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, hvm_param_nested); set_to_dummy_if_null(ops, do_xsm_op); +#ifdef CONFIG_COMPAT + set_to_dummy_if_null(ops, do_compat_op); +#endif set_to_dummy_if_null(ops, add_to_physmap); set_to_dummy_if_null(ops, remove_from_physmap); diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index dddef29..3b84679 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -7,7 +7,7 @@ * it under the terms of the GNU General Public License version 2, * as published by the Free Software Foundation. */ - +#ifndef COMPAT #include #include #include @@ -20,6 +20,10 @@ #include #include +#define ret_t long +#define _copy_to_guest copy_to_guest +#define _copy_from_guest copy_from_guest + #ifdef FLASK_DEVELOP int flask_enforcing = 0; integer_param("flask_enforcing", flask_enforcing); @@ -95,6 +99,8 @@ static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, return 0; } +#endif /* COMPAT */ + static int flask_security_user(struct xen_flask_userlist *arg) { char *user; @@ -119,7 +125,7 @@ static int flask_security_user(struct xen_flask_userlist *arg) arg->size = nsids; - if ( copy_to_guest(arg->u.sids, sids, nsids) ) + if ( _copy_to_guest(arg->u.sids, sids, nsids) ) rv = -EFAULT; xfree(sids); @@ -128,6 +134,8 @@ static int flask_security_user(struct xen_flask_userlist *arg) return rv; } +#ifndef COMPAT + static int flask_security_relabel(struct xen_flask_transition *arg) { int rv; @@ -208,6 +216,8 @@ static int flask_security_setenforce(struct xen_flask_setenforce *arg) return 0; } +#endif /* COMPAT */ + static int flask_security_context(struct xen_flask_sid_context *arg) { int rv; @@ -252,7 +262,7 @@ static int flask_security_sid(struct xen_flask_sid_context *arg) arg->size = len; - if ( !rv && copy_to_guest(arg->context, context, len) ) + if ( !rv && _copy_to_guest(arg->context, context, len) ) rv = -EFAULT; xfree(context); @@ -260,6 +270,8 @@ static int flask_security_sid(struct xen_flask_sid_context *arg) return rv; } +#ifndef COMPAT + int flask_disable(void) { static int flask_disabled = 0; @@ -302,6 +314,8 @@ static int flask_security_setavc_threshold(struct xen_flask_setavc_threshold *ar return rv; } +#endif /* COMPAT */ + static int flask_security_resolve_bool(struct xen_flask_boolean *arg) { char *name; @@ -382,24 +396,6 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) return rv; } -static int flask_security_commit_bools(void) -{ - int rv; - - spin_lock(&sel_sem); - - rv = domain_has_security(current->domain, SECURITY__SETBOOL); - if ( rv ) - goto out; - - if ( bool_pending_values ) - rv = security_set_bools(bool_num, bool_pending_values); - - out: - spin_unlock(&sel_sem); - return rv; -} - static int flask_security_get_bool(struct xen_flask_boolean *arg) { int rv; @@ -431,7 +427,7 @@ static int flask_security_get_bool(struct xen_flask_boolean *arg) rv = -ERANGE; arg->size = nameout_len; - if ( !rv && copy_to_guest(arg->name, nameout, nameout_len) ) + if ( !rv && _copy_to_guest(arg->name, nameout, nameout_len) ) rv = -EFAULT; xfree(nameout); } @@ -441,6 +437,26 @@ static int flask_security_get_bool(struct xen_flask_boolean *arg) return rv; } +#ifndef COMPAT + +static int flask_security_commit_bools(void) +{ + int rv; + + spin_lock(&sel_sem); + + rv = domain_has_security(current->domain, SECURITY__SETBOOL); + if ( rv ) + goto out; + + if ( bool_pending_values ) + rv = security_set_bools(bool_num, bool_pending_values); + + out: + spin_unlock(&sel_sem); + return rv; +} + static int flask_security_make_bools(void) { int ret = 0; @@ -484,6 +500,7 @@ static int flask_security_avc_cachestats(struct xen_flask_cache_stats *arg) } #endif +#endif /* COMPAT */ static int flask_security_load(struct xen_flask_load *load) { @@ -501,7 +518,7 @@ static int flask_security_load(struct xen_flask_load *load) if ( !buf ) return -ENOMEM; - if ( copy_from_guest(buf, load->buffer, load->size) ) + if ( _copy_from_guest(buf, load->buffer, load->size) ) { ret = -EFAULT; goto out_free; @@ -524,6 +541,8 @@ static int flask_security_load(struct xen_flask_load *load) return ret; } +#ifndef COMPAT + static int flask_ocontext_del(struct xen_flask_ocontext *arg) { int rv; @@ -636,7 +655,9 @@ static int flask_relabel_domain(struct xen_flask_relabel *arg) return rc; } -long do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) +#endif /* !COMPAT */ + +ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) { xen_flask_op_t op; int rv; @@ -763,3 +784,52 @@ long do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) out: return rv; } + +#ifndef COMPAT +#undef _copy_to_guest +#define _copy_to_guest copy_to_compat +#undef _copy_from_guest +#define _copy_from_guest copy_from_compat + +#include +#include + +CHECK_flask_access; +CHECK_flask_cache_stats; +CHECK_flask_hash_stats; +CHECK_flask_ocontext; +CHECK_flask_peersid; +CHECK_flask_relabel; +CHECK_flask_setavc_threshold; +CHECK_flask_setenforce; +CHECK_flask_transition; + +#define COMPAT +#define flask_copyin_string(ch, pb, sz, mx) ({ \ + XEN_GUEST_HANDLE_PARAM(char) gh; \ + guest_from_compat_handle(gh, ch); \ + flask_copyin_string(gh, pb, sz, mx); \ +}) + +#define xen_flask_load compat_flask_load +#define flask_security_load compat_security_load + +#define xen_flask_userlist compat_flask_userlist +#define flask_security_user compat_security_user + +#define xen_flask_sid_context compat_flask_sid_context +#define flask_security_context compat_security_context +#define flask_security_sid compat_security_sid + +#define xen_flask_boolean compat_flask_boolean +#define flask_security_resolve_bool compat_security_resolve_bool +#define flask_security_get_bool compat_security_get_bool +#define flask_security_set_bool compat_security_set_bool + +#define xen_flask_op_t compat_flask_op_t +#undef ret_t +#define ret_t int +#define do_flask_op compat_flask_op + +#include "flask_op.c" +#endif diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index d94ab77..717dcf0 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1464,6 +1464,7 @@ static int flask_map_gmfn_foreign(struct domain *d, struct domain *t) #endif long do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op); +int compat_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op); static struct xsm_operations flask_ops = { .security_domaininfo = flask_security_domaininfo, @@ -1538,6 +1539,9 @@ static struct xsm_operations flask_ops = { .hvm_param_nested = flask_hvm_param_nested, .do_xsm_op = do_flask_op, +#ifdef CONFIG_COMPAT + .do_compat_op = compat_flask_op, +#endif .add_to_physmap = flask_add_to_physmap, .remove_from_physmap = flask_remove_from_physmap, diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index ca28f91..b16c071 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -116,4 +116,9 @@ long do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) return xsm_do_xsm_op(op); } - +#ifdef CONFIG_COMPAT +int compat_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +{ + return xsm_do_compat_op(op); +} +#endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:05:05 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:05:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxt-0007Wd-9A; Sat, 01 Mar 2014 23:05:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxr-0007WE-Qc for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:04 +0000 Received: from [85.158.143.35:60475] by server-3.bemta-4.messagelabs.com id 70/8C-11539-F9762135; Sat, 01 Mar 2014 23:05:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1393715100!9291312!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32695 invoked from network); 1 Mar 2014 23:05:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:05:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxo-000228-N0 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsxo-0000eo-M3 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:00 +0000 Date: Sat, 01 Mar 2014 23:05:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: use xzalloc() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25d81b1a2003efd4b60093a0a83f5b9a28a3b6b8 Author: Jan Beulich AuthorDate: Fri Feb 28 17:12:13 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 28 17:12:13 2014 +0100 flask: use xzalloc() Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf --- xen/xsm/flask/avc.c | 3 +- xen/xsm/flask/hooks.c | 10 +------- xen/xsm/flask/ss/avtab.c | 5 +-- xen/xsm/flask/ss/conditional.c | 14 +++-------- xen/xsm/flask/ss/ebitmap.c | 11 +++------ xen/xsm/flask/ss/hashtab.c | 14 ++--------- xen/xsm/flask/ss/policydb.c | 45 +++++++++++++-------------------------- xen/xsm/flask/ss/services.c | 17 ++++++-------- 8 files changed, 38 insertions(+), 81 deletions(-) diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c index 7fede00..a27cf7d 100644 --- a/xen/xsm/flask/avc.c +++ b/xen/xsm/flask/avc.c @@ -360,11 +360,10 @@ static struct avc_node *avc_alloc_node(void) { struct avc_node *node; - node = xmalloc(struct avc_node); + node = xzalloc(struct avc_node); if (!node) goto out; - memset(node, 0, sizeof(*node)); INIT_RCU_HEAD(&node->rhead); INIT_HLIST_NODE(&node->list); avc_cache_stats_incr(allocations); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 717dcf0..96276ac 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -132,13 +132,10 @@ static int flask_domain_alloc_security(struct domain *d) { struct domain_security_struct *dsec; - dsec = xmalloc(struct domain_security_struct); - + dsec = xzalloc(struct domain_security_struct); if ( !dsec ) return -ENOMEM; - memset(dsec, 0, sizeof(struct domain_security_struct)); - switch ( d->domain_id ) { case DOMID_IDLE: @@ -294,13 +291,10 @@ static int flask_alloc_security_evtchn(struct evtchn *chn) { struct evtchn_security_struct *esec; - esec = xmalloc(struct evtchn_security_struct); - + esec = xzalloc(struct evtchn_security_struct); if ( !esec ) return -ENOMEM; - memset(esec, 0, sizeof(struct evtchn_security_struct)); - esec->sid = SECINITSID_UNLABELED; chn->ssid = esec; diff --git a/xen/xsm/flask/ss/avtab.c b/xen/xsm/flask/ss/avtab.c index 47912e9..bfc91c8 100644 --- a/xen/xsm/flask/ss/avtab.c +++ b/xen/xsm/flask/ss/avtab.c @@ -38,11 +38,10 @@ static struct avtab_node* avtab_insert_node(struct avtab *h, int hvalue, struct avtab_node * prev, struct avtab_node * cur, struct avtab_key *key, struct avtab_datum *datum) { - struct avtab_node * newnode; - newnode = xmalloc(struct avtab_node); + struct avtab_node *newnode = xzalloc(struct avtab_node); + if ( newnode == NULL ) return NULL; - memset(newnode, 0, sizeof(struct avtab_node)); newnode->key = *key; newnode->datum = *datum; if ( prev ) diff --git a/xen/xsm/flask/ss/conditional.c b/xen/xsm/flask/ss/conditional.c index 123d839..098ddc0 100644 --- a/xen/xsm/flask/ss/conditional.c +++ b/xen/xsm/flask/ss/conditional.c @@ -228,10 +228,9 @@ int cond_read_bool(struct policydb *p, struct hashtab *h, void *fp) u32 len; int rc; - booldatum = xmalloc(struct cond_bool_datum); + booldatum = xzalloc(struct cond_bool_datum); if ( !booldatum ) return -1; - memset(booldatum, 0, sizeof(struct cond_bool_datum)); rc = next_entry(buf, fp, sizeof buf); if ( rc < 0 ) @@ -343,10 +342,9 @@ static int cond_insertf(struct avtab *a, struct avtab_key *k, goto err; } - list = xmalloc(struct cond_av_list); + list = xzalloc(struct cond_av_list); if ( !list ) goto err; - memset(list, 0, sizeof(*list)); list->node = node_ptr; if ( !data->head ) @@ -441,12 +439,9 @@ static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp) if ( rc < 0 ) goto err; - expr = xmalloc(struct cond_expr); + expr = xzalloc(struct cond_expr); if ( !expr ) - { goto err; - } - memset(expr, 0, sizeof(struct cond_expr)); expr->expr_type = le32_to_cpu(buf[0]); expr->bool = le32_to_cpu(buf[1]); @@ -494,10 +489,9 @@ int cond_read_list(struct policydb *p, void *fp) for ( i = 0; i < len; i++ ) { - node = xmalloc(struct cond_node); + node = xzalloc(struct cond_node); if ( !node ) goto err; - memset(node, 0, sizeof(struct cond_node)); if ( cond_read_node(p, node, fp) != 0 ) goto err; diff --git a/xen/xsm/flask/ss/ebitmap.c b/xen/xsm/flask/ss/ebitmap.c index 61f38d8..bb3ec8e 100644 --- a/xen/xsm/flask/ss/ebitmap.c +++ b/xen/xsm/flask/ss/ebitmap.c @@ -50,13 +50,12 @@ int ebitmap_cpy(struct ebitmap *dst, struct ebitmap *src) prev = NULL; while ( n ) { - new = xmalloc(struct ebitmap_node); + new = xzalloc(struct ebitmap_node); if ( !new ) { ebitmap_destroy(dst); return -ENOMEM; } - memset(new, 0, sizeof(*new)); new->startbit = n->startbit; memcpy(new->maps, n->maps, EBITMAP_SIZE / 8); new->next = NULL; @@ -176,10 +175,9 @@ int ebitmap_set_bit(struct ebitmap *e, unsigned long bit, int value) if ( !value ) return 0; - new = xmalloc(struct ebitmap_node); + new = xzalloc(struct ebitmap_node); if ( !new ) return -ENOMEM; - memset(new, 0, sizeof(*new)); new->startbit = bit - (bit % EBITMAP_SIZE); ebitmap_node_set_bit(new, bit); @@ -284,8 +282,8 @@ int ebitmap_read(struct ebitmap *e, void *fp) if ( !n || startbit >= n->startbit + EBITMAP_SIZE ) { - struct ebitmap_node *tmp; - tmp = xmalloc(struct ebitmap_node); + struct ebitmap_node *tmp = xzalloc(struct ebitmap_node); + if ( !tmp ) { printk(KERN_ERR @@ -293,7 +291,6 @@ int ebitmap_read(struct ebitmap *e, void *fp) rc = -ENOMEM; goto bad; } - memset(tmp, 0, sizeof(*tmp)); /* round down */ tmp->startbit = startbit - (startbit % EBITMAP_SIZE); if ( n ) diff --git a/xen/xsm/flask/ss/hashtab.c b/xen/xsm/flask/ss/hashtab.c index 5be7a88..f35c0dc 100644 --- a/xen/xsm/flask/ss/hashtab.c +++ b/xen/xsm/flask/ss/hashtab.c @@ -16,28 +16,21 @@ struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, int (*keycmp)(struct hashtab *h, const void *key1, const void *key2), u32 size) { - struct hashtab *p; - u32 i; + struct hashtab *p = xzalloc(struct hashtab); - p = xmalloc(struct hashtab); if ( p == NULL ) return p; - memset(p, 0, sizeof(*p)); p->size = size; - p->nel = 0; p->hash_value = hash_value; p->keycmp = keycmp; - p->htable = xmalloc_array(struct hashtab_node *, size); + p->htable = xzalloc_array(struct hashtab_node *, size); if ( p->htable == NULL ) { xfree(p); return NULL; } - for ( i = 0; i < size; i++ ) - p->htable[i] = NULL; - return p; } @@ -61,10 +54,9 @@ int hashtab_insert(struct hashtab *h, void *key, void *datum) if ( cur && (h->keycmp(h, key, cur->key) == 0) ) return -EEXIST; - newnode = xmalloc(struct hashtab_node); + newnode = xzalloc(struct hashtab_node); if ( newnode == NULL ) return -ENOMEM; - memset(newnode, 0, sizeof(*newnode)); newnode->key = key; newnode->datum = datum; if ( prev ) diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c index bdec4ac..a2aac03 100644 --- a/xen/xsm/flask/ss/policydb.c +++ b/xen/xsm/flask/ss/policydb.c @@ -166,13 +166,12 @@ static int roles_init(struct policydb *p) int rc; struct role_datum *role; - role = xmalloc(struct role_datum); + role = xzalloc(struct role_datum); if ( !role ) { rc = -ENOMEM; goto out; } - memset(role, 0, sizeof(*role)); role->value = ++p->p_roles.nprim; if ( role->value != OBJECT_R_VAL ) { @@ -950,13 +949,12 @@ static int perm_read(struct policydb *p, struct hashtab *h, void *fp) __le32 buf[2]; u32 len; - perdatum = xmalloc(struct perm_datum); + perdatum = xzalloc(struct perm_datum); if ( !perdatum ) { rc = -ENOMEM; goto out; } - memset(perdatum, 0, sizeof(*perdatum)); rc = next_entry(buf, fp, sizeof buf); if ( rc < 0 ) @@ -994,13 +992,12 @@ static int common_read(struct policydb *p, struct hashtab *h, void *fp) u32 len, nel; int i, rc; - comdatum = xmalloc(struct common_datum); + comdatum = xzalloc(struct common_datum); if ( !comdatum ) { rc = -ENOMEM; goto out; } - memset(comdatum, 0, sizeof(*comdatum)); rc = next_entry(buf, fp, sizeof buf); if ( rc < 0 ) @@ -1055,10 +1052,9 @@ static int read_cons_helper(struct constraint_node **nodep, int ncons, lc = NULL; for ( i = 0; i < ncons; i++ ) { - c = xmalloc(struct constraint_node); + c = xzalloc(struct constraint_node); if ( !c ) return -ENOMEM; - memset(c, 0, sizeof(*c)); if ( lc ) { @@ -1078,10 +1074,9 @@ static int read_cons_helper(struct constraint_node **nodep, int ncons, depth = -1; for ( j = 0; j < nexpr; j++ ) { - e = xmalloc(struct constraint_expr); + e = xzalloc(struct constraint_expr); if ( !e ) return -ENOMEM; - memset(e, 0, sizeof(*e)); if ( le ) le->next = e; @@ -1142,13 +1137,12 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp) u32 len, len2, ncons, nel; int i, rc; - cladatum = xmalloc(struct class_datum); + cladatum = xzalloc(struct class_datum); if ( !cladatum ) { rc = -ENOMEM; goto out; } - memset(cladatum, 0, sizeof(*cladatum)); rc = next_entry(buf, fp, sizeof(u32)*6); if ( rc < 0 ) @@ -1226,13 +1220,12 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp) __le32 buf[3]; u32 len; - role = xmalloc(struct role_datum); + role = xzalloc(struct role_datum); if ( !role ) { rc = -ENOMEM; goto out; } - memset(role, 0, sizeof(*role)); if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY ) rc = next_entry(buf, fp, sizeof(buf[0]) * 3); @@ -1297,13 +1290,12 @@ static int type_read(struct policydb *p, struct hashtab *h, void *fp) __le32 buf[4]; u32 len; - typdatum = xmalloc(struct type_datum); + typdatum = xzalloc(struct type_datum); if ( !typdatum ) { rc = -ENOMEM; return rc; } - memset(typdatum, 0, sizeof(*typdatum)); if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY ) rc = next_entry(buf, fp, sizeof(buf[0]) * 4); @@ -1391,13 +1383,12 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp) __le32 buf[3]; u32 len; - usrdatum = xmalloc(struct user_datum); + usrdatum = xzalloc(struct user_datum); if ( !usrdatum ) { rc = -ENOMEM; goto out; } - memset(usrdatum, 0, sizeof(*usrdatum)); if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY ) rc = next_entry(buf, fp, sizeof(buf[0]) * 3); @@ -1455,13 +1446,12 @@ static int sens_read(struct policydb *p, struct hashtab *h, void *fp) __le32 buf[2]; u32 len; - levdatum = xmalloc(struct level_datum); + levdatum = xzalloc(struct level_datum); if ( !levdatum ) { rc = -ENOMEM; goto out; } - memset(levdatum, 0, sizeof(*levdatum)); rc = next_entry(buf, fp, sizeof buf); if ( rc < 0 ) @@ -1511,13 +1501,12 @@ static int cat_read(struct policydb *p, struct hashtab *h, void *fp) __le32 buf[3]; u32 len; - catdatum = xmalloc(struct cat_datum); + catdatum = xzalloc(struct cat_datum); if ( !catdatum ) { rc = -ENOMEM; goto out; } - memset(catdatum, 0, sizeof(*catdatum)); rc = next_entry(buf, fp, sizeof buf); if ( rc < 0 ) @@ -1875,13 +1864,12 @@ int policydb_read(struct policydb *p, void *fp) ltr = NULL; for ( i = 0; i < nel; i++ ) { - tr = xmalloc(struct role_trans); + tr = xzalloc(struct role_trans); if ( !tr ) { rc = -ENOMEM; goto bad; } - memset(tr, 0, sizeof(*tr)); if ( ltr ) ltr->next = tr; else @@ -1909,13 +1897,12 @@ int policydb_read(struct policydb *p, void *fp) lra = NULL; for ( i = 0; i < nel; i++ ) { - ra = xmalloc(struct role_allow); + ra = xzalloc(struct role_allow); if ( !ra ) { rc = -ENOMEM; goto bad; } - memset(ra, 0, sizeof(*ra)); if ( lra ) lra->next = ra; else @@ -1951,13 +1938,12 @@ int policydb_read(struct policydb *p, void *fp) l = NULL; for ( j = 0; j < nel; j++ ) { - c = xmalloc(struct ocontext); + c = xzalloc(struct ocontext); if ( !c ) { rc = -ENOMEM; goto bad; } - memset(c, 0, sizeof(*c)); if ( l ) l->next = c; else @@ -2067,13 +2053,12 @@ int policydb_read(struct policydb *p, void *fp) lrt = NULL; for ( i = 0; i < nel; i++ ) { - rt = xmalloc(struct range_trans); + rt = xzalloc(struct range_trans); if ( !rt ) { rc = -ENOMEM; goto bad; } - memset(rt, 0, sizeof(*rt)); if ( lrt ) lrt->next = rt; else diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 6067317..4b9c46e 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1771,13 +1771,12 @@ int security_get_user_sids(u32 fromsid, char *username, u32 **sids, u32 *nel) } usercon.user = user->value; - mysids = xmalloc_array(u32, maxnel); + mysids = xzalloc_array(u32, maxnel); if ( !mysids ) { rc = -ENOMEM; goto out_unlock; } - memset(mysids, 0, maxnel*sizeof(*mysids)); ebitmap_for_each_positive_bit(&user->roles, rnode, i) { @@ -1808,14 +1807,13 @@ int security_get_user_sids(u32 fromsid, char *username, u32 **sids, u32 *nel) else { maxnel += SIDS_NEL; - mysids2 = xmalloc_array(u32, maxnel); + mysids2 = xzalloc_array(u32, maxnel); if ( !mysids2 ) { rc = -ENOMEM; xfree(mysids); goto out_unlock; } - memset(mysids2, 0, maxnel*sizeof(*mysids2)); memcpy(mysids2, mysids, mynel * sizeof(*mysids2)); xfree(mysids); mysids = mysids2; @@ -1868,14 +1866,14 @@ int security_get_bools(int *len, char ***names, int **values, size_t *maxstr) goto out; } - if ( names ) { - *names = (char**)xmalloc_array(char*, *len); + if ( names ) + { + *names = xzalloc_array(char *, *len); if ( !*names ) goto err; - memset(*names, 0, sizeof(char*) * *len); } - *values = (int*)xmalloc_array(int, *len); + *values = xmalloc_array(int, *len); if ( !*values ) goto err; @@ -2059,9 +2057,8 @@ int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high struct ocontext *prev; struct ocontext *add; - if ( (add = xmalloc(struct ocontext)) == NULL ) + if ( (add = xzalloc(struct ocontext)) == NULL ) return -ENOMEM; - memset(add, 0, sizeof(struct ocontext)); add->sid[0] = sid; POLICY_WRLOCK; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:05:05 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:05:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxt-0007Wd-9A; Sat, 01 Mar 2014 23:05:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxr-0007WE-Qc for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:04 +0000 Received: from [85.158.143.35:60475] by server-3.bemta-4.messagelabs.com id 70/8C-11539-F9762135; Sat, 01 Mar 2014 23:05:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1393715100!9291312!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32695 invoked from network); 1 Mar 2014 23:05:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:05:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxo-000228-N0 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsxo-0000eo-M3 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:00 +0000 Date: Sat, 01 Mar 2014 23:05:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: use xzalloc() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25d81b1a2003efd4b60093a0a83f5b9a28a3b6b8 Author: Jan Beulich AuthorDate: Fri Feb 28 17:12:13 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 28 17:12:13 2014 +0100 flask: use xzalloc() Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf --- xen/xsm/flask/avc.c | 3 +- xen/xsm/flask/hooks.c | 10 +------- xen/xsm/flask/ss/avtab.c | 5 +-- xen/xsm/flask/ss/conditional.c | 14 +++-------- xen/xsm/flask/ss/ebitmap.c | 11 +++------ xen/xsm/flask/ss/hashtab.c | 14 ++--------- xen/xsm/flask/ss/policydb.c | 45 +++++++++++++-------------------------- xen/xsm/flask/ss/services.c | 17 ++++++-------- 8 files changed, 38 insertions(+), 81 deletions(-) diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c index 7fede00..a27cf7d 100644 --- a/xen/xsm/flask/avc.c +++ b/xen/xsm/flask/avc.c @@ -360,11 +360,10 @@ static struct avc_node *avc_alloc_node(void) { struct avc_node *node; - node = xmalloc(struct avc_node); + node = xzalloc(struct avc_node); if (!node) goto out; - memset(node, 0, sizeof(*node)); INIT_RCU_HEAD(&node->rhead); INIT_HLIST_NODE(&node->list); avc_cache_stats_incr(allocations); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 717dcf0..96276ac 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -132,13 +132,10 @@ static int flask_domain_alloc_security(struct domain *d) { struct domain_security_struct *dsec; - dsec = xmalloc(struct domain_security_struct); - + dsec = xzalloc(struct domain_security_struct); if ( !dsec ) return -ENOMEM; - memset(dsec, 0, sizeof(struct domain_security_struct)); - switch ( d->domain_id ) { case DOMID_IDLE: @@ -294,13 +291,10 @@ static int flask_alloc_security_evtchn(struct evtchn *chn) { struct evtchn_security_struct *esec; - esec = xmalloc(struct evtchn_security_struct); - + esec = xzalloc(struct evtchn_security_struct); if ( !esec ) return -ENOMEM; - memset(esec, 0, sizeof(struct evtchn_security_struct)); - esec->sid = SECINITSID_UNLABELED; chn->ssid = esec; diff --git a/xen/xsm/flask/ss/avtab.c b/xen/xsm/flask/ss/avtab.c index 47912e9..bfc91c8 100644 --- a/xen/xsm/flask/ss/avtab.c +++ b/xen/xsm/flask/ss/avtab.c @@ -38,11 +38,10 @@ static struct avtab_node* avtab_insert_node(struct avtab *h, int hvalue, struct avtab_node * prev, struct avtab_node * cur, struct avtab_key *key, struct avtab_datum *datum) { - struct avtab_node * newnode; - newnode = xmalloc(struct avtab_node); + struct avtab_node *newnode = xzalloc(struct avtab_node); + if ( newnode == NULL ) return NULL; - memset(newnode, 0, sizeof(struct avtab_node)); newnode->key = *key; newnode->datum = *datum; if ( prev ) diff --git a/xen/xsm/flask/ss/conditional.c b/xen/xsm/flask/ss/conditional.c index 123d839..098ddc0 100644 --- a/xen/xsm/flask/ss/conditional.c +++ b/xen/xsm/flask/ss/conditional.c @@ -228,10 +228,9 @@ int cond_read_bool(struct policydb *p, struct hashtab *h, void *fp) u32 len; int rc; - booldatum = xmalloc(struct cond_bool_datum); + booldatum = xzalloc(struct cond_bool_datum); if ( !booldatum ) return -1; - memset(booldatum, 0, sizeof(struct cond_bool_datum)); rc = next_entry(buf, fp, sizeof buf); if ( rc < 0 ) @@ -343,10 +342,9 @@ static int cond_insertf(struct avtab *a, struct avtab_key *k, goto err; } - list = xmalloc(struct cond_av_list); + list = xzalloc(struct cond_av_list); if ( !list ) goto err; - memset(list, 0, sizeof(*list)); list->node = node_ptr; if ( !data->head ) @@ -441,12 +439,9 @@ static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp) if ( rc < 0 ) goto err; - expr = xmalloc(struct cond_expr); + expr = xzalloc(struct cond_expr); if ( !expr ) - { goto err; - } - memset(expr, 0, sizeof(struct cond_expr)); expr->expr_type = le32_to_cpu(buf[0]); expr->bool = le32_to_cpu(buf[1]); @@ -494,10 +489,9 @@ int cond_read_list(struct policydb *p, void *fp) for ( i = 0; i < len; i++ ) { - node = xmalloc(struct cond_node); + node = xzalloc(struct cond_node); if ( !node ) goto err; - memset(node, 0, sizeof(struct cond_node)); if ( cond_read_node(p, node, fp) != 0 ) goto err; diff --git a/xen/xsm/flask/ss/ebitmap.c b/xen/xsm/flask/ss/ebitmap.c index 61f38d8..bb3ec8e 100644 --- a/xen/xsm/flask/ss/ebitmap.c +++ b/xen/xsm/flask/ss/ebitmap.c @@ -50,13 +50,12 @@ int ebitmap_cpy(struct ebitmap *dst, struct ebitmap *src) prev = NULL; while ( n ) { - new = xmalloc(struct ebitmap_node); + new = xzalloc(struct ebitmap_node); if ( !new ) { ebitmap_destroy(dst); return -ENOMEM; } - memset(new, 0, sizeof(*new)); new->startbit = n->startbit; memcpy(new->maps, n->maps, EBITMAP_SIZE / 8); new->next = NULL; @@ -176,10 +175,9 @@ int ebitmap_set_bit(struct ebitmap *e, unsigned long bit, int value) if ( !value ) return 0; - new = xmalloc(struct ebitmap_node); + new = xzalloc(struct ebitmap_node); if ( !new ) return -ENOMEM; - memset(new, 0, sizeof(*new)); new->startbit = bit - (bit % EBITMAP_SIZE); ebitmap_node_set_bit(new, bit); @@ -284,8 +282,8 @@ int ebitmap_read(struct ebitmap *e, void *fp) if ( !n || startbit >= n->startbit + EBITMAP_SIZE ) { - struct ebitmap_node *tmp; - tmp = xmalloc(struct ebitmap_node); + struct ebitmap_node *tmp = xzalloc(struct ebitmap_node); + if ( !tmp ) { printk(KERN_ERR @@ -293,7 +291,6 @@ int ebitmap_read(struct ebitmap *e, void *fp) rc = -ENOMEM; goto bad; } - memset(tmp, 0, sizeof(*tmp)); /* round down */ tmp->startbit = startbit - (startbit % EBITMAP_SIZE); if ( n ) diff --git a/xen/xsm/flask/ss/hashtab.c b/xen/xsm/flask/ss/hashtab.c index 5be7a88..f35c0dc 100644 --- a/xen/xsm/flask/ss/hashtab.c +++ b/xen/xsm/flask/ss/hashtab.c @@ -16,28 +16,21 @@ struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, int (*keycmp)(struct hashtab *h, const void *key1, const void *key2), u32 size) { - struct hashtab *p; - u32 i; + struct hashtab *p = xzalloc(struct hashtab); - p = xmalloc(struct hashtab); if ( p == NULL ) return p; - memset(p, 0, sizeof(*p)); p->size = size; - p->nel = 0; p->hash_value = hash_value; p->keycmp = keycmp; - p->htable = xmalloc_array(struct hashtab_node *, size); + p->htable = xzalloc_array(struct hashtab_node *, size); if ( p->htable == NULL ) { xfree(p); return NULL; } - for ( i = 0; i < size; i++ ) - p->htable[i] = NULL; - return p; } @@ -61,10 +54,9 @@ int hashtab_insert(struct hashtab *h, void *key, void *datum) if ( cur && (h->keycmp(h, key, cur->key) == 0) ) return -EEXIST; - newnode = xmalloc(struct hashtab_node); + newnode = xzalloc(struct hashtab_node); if ( newnode == NULL ) return -ENOMEM; - memset(newnode, 0, sizeof(*newnode)); newnode->key = key; newnode->datum = datum; if ( prev ) diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c index bdec4ac..a2aac03 100644 --- a/xen/xsm/flask/ss/policydb.c +++ b/xen/xsm/flask/ss/policydb.c @@ -166,13 +166,12 @@ static int roles_init(struct policydb *p) int rc; struct role_datum *role; - role = xmalloc(struct role_datum); + role = xzalloc(struct role_datum); if ( !role ) { rc = -ENOMEM; goto out; } - memset(role, 0, sizeof(*role)); role->value = ++p->p_roles.nprim; if ( role->value != OBJECT_R_VAL ) { @@ -950,13 +949,12 @@ static int perm_read(struct policydb *p, struct hashtab *h, void *fp) __le32 buf[2]; u32 len; - perdatum = xmalloc(struct perm_datum); + perdatum = xzalloc(struct perm_datum); if ( !perdatum ) { rc = -ENOMEM; goto out; } - memset(perdatum, 0, sizeof(*perdatum)); rc = next_entry(buf, fp, sizeof buf); if ( rc < 0 ) @@ -994,13 +992,12 @@ static int common_read(struct policydb *p, struct hashtab *h, void *fp) u32 len, nel; int i, rc; - comdatum = xmalloc(struct common_datum); + comdatum = xzalloc(struct common_datum); if ( !comdatum ) { rc = -ENOMEM; goto out; } - memset(comdatum, 0, sizeof(*comdatum)); rc = next_entry(buf, fp, sizeof buf); if ( rc < 0 ) @@ -1055,10 +1052,9 @@ static int read_cons_helper(struct constraint_node **nodep, int ncons, lc = NULL; for ( i = 0; i < ncons; i++ ) { - c = xmalloc(struct constraint_node); + c = xzalloc(struct constraint_node); if ( !c ) return -ENOMEM; - memset(c, 0, sizeof(*c)); if ( lc ) { @@ -1078,10 +1074,9 @@ static int read_cons_helper(struct constraint_node **nodep, int ncons, depth = -1; for ( j = 0; j < nexpr; j++ ) { - e = xmalloc(struct constraint_expr); + e = xzalloc(struct constraint_expr); if ( !e ) return -ENOMEM; - memset(e, 0, sizeof(*e)); if ( le ) le->next = e; @@ -1142,13 +1137,12 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp) u32 len, len2, ncons, nel; int i, rc; - cladatum = xmalloc(struct class_datum); + cladatum = xzalloc(struct class_datum); if ( !cladatum ) { rc = -ENOMEM; goto out; } - memset(cladatum, 0, sizeof(*cladatum)); rc = next_entry(buf, fp, sizeof(u32)*6); if ( rc < 0 ) @@ -1226,13 +1220,12 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp) __le32 buf[3]; u32 len; - role = xmalloc(struct role_datum); + role = xzalloc(struct role_datum); if ( !role ) { rc = -ENOMEM; goto out; } - memset(role, 0, sizeof(*role)); if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY ) rc = next_entry(buf, fp, sizeof(buf[0]) * 3); @@ -1297,13 +1290,12 @@ static int type_read(struct policydb *p, struct hashtab *h, void *fp) __le32 buf[4]; u32 len; - typdatum = xmalloc(struct type_datum); + typdatum = xzalloc(struct type_datum); if ( !typdatum ) { rc = -ENOMEM; return rc; } - memset(typdatum, 0, sizeof(*typdatum)); if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY ) rc = next_entry(buf, fp, sizeof(buf[0]) * 4); @@ -1391,13 +1383,12 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp) __le32 buf[3]; u32 len; - usrdatum = xmalloc(struct user_datum); + usrdatum = xzalloc(struct user_datum); if ( !usrdatum ) { rc = -ENOMEM; goto out; } - memset(usrdatum, 0, sizeof(*usrdatum)); if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY ) rc = next_entry(buf, fp, sizeof(buf[0]) * 3); @@ -1455,13 +1446,12 @@ static int sens_read(struct policydb *p, struct hashtab *h, void *fp) __le32 buf[2]; u32 len; - levdatum = xmalloc(struct level_datum); + levdatum = xzalloc(struct level_datum); if ( !levdatum ) { rc = -ENOMEM; goto out; } - memset(levdatum, 0, sizeof(*levdatum)); rc = next_entry(buf, fp, sizeof buf); if ( rc < 0 ) @@ -1511,13 +1501,12 @@ static int cat_read(struct policydb *p, struct hashtab *h, void *fp) __le32 buf[3]; u32 len; - catdatum = xmalloc(struct cat_datum); + catdatum = xzalloc(struct cat_datum); if ( !catdatum ) { rc = -ENOMEM; goto out; } - memset(catdatum, 0, sizeof(*catdatum)); rc = next_entry(buf, fp, sizeof buf); if ( rc < 0 ) @@ -1875,13 +1864,12 @@ int policydb_read(struct policydb *p, void *fp) ltr = NULL; for ( i = 0; i < nel; i++ ) { - tr = xmalloc(struct role_trans); + tr = xzalloc(struct role_trans); if ( !tr ) { rc = -ENOMEM; goto bad; } - memset(tr, 0, sizeof(*tr)); if ( ltr ) ltr->next = tr; else @@ -1909,13 +1897,12 @@ int policydb_read(struct policydb *p, void *fp) lra = NULL; for ( i = 0; i < nel; i++ ) { - ra = xmalloc(struct role_allow); + ra = xzalloc(struct role_allow); if ( !ra ) { rc = -ENOMEM; goto bad; } - memset(ra, 0, sizeof(*ra)); if ( lra ) lra->next = ra; else @@ -1951,13 +1938,12 @@ int policydb_read(struct policydb *p, void *fp) l = NULL; for ( j = 0; j < nel; j++ ) { - c = xmalloc(struct ocontext); + c = xzalloc(struct ocontext); if ( !c ) { rc = -ENOMEM; goto bad; } - memset(c, 0, sizeof(*c)); if ( l ) l->next = c; else @@ -2067,13 +2053,12 @@ int policydb_read(struct policydb *p, void *fp) lrt = NULL; for ( i = 0; i < nel; i++ ) { - rt = xmalloc(struct range_trans); + rt = xzalloc(struct range_trans); if ( !rt ) { rc = -ENOMEM; goto bad; } - memset(rt, 0, sizeof(*rt)); if ( lrt ) lrt->next = rt; else diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 6067317..4b9c46e 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1771,13 +1771,12 @@ int security_get_user_sids(u32 fromsid, char *username, u32 **sids, u32 *nel) } usercon.user = user->value; - mysids = xmalloc_array(u32, maxnel); + mysids = xzalloc_array(u32, maxnel); if ( !mysids ) { rc = -ENOMEM; goto out_unlock; } - memset(mysids, 0, maxnel*sizeof(*mysids)); ebitmap_for_each_positive_bit(&user->roles, rnode, i) { @@ -1808,14 +1807,13 @@ int security_get_user_sids(u32 fromsid, char *username, u32 **sids, u32 *nel) else { maxnel += SIDS_NEL; - mysids2 = xmalloc_array(u32, maxnel); + mysids2 = xzalloc_array(u32, maxnel); if ( !mysids2 ) { rc = -ENOMEM; xfree(mysids); goto out_unlock; } - memset(mysids2, 0, maxnel*sizeof(*mysids2)); memcpy(mysids2, mysids, mynel * sizeof(*mysids2)); xfree(mysids); mysids = mysids2; @@ -1868,14 +1866,14 @@ int security_get_bools(int *len, char ***names, int **values, size_t *maxstr) goto out; } - if ( names ) { - *names = (char**)xmalloc_array(char*, *len); + if ( names ) + { + *names = xzalloc_array(char *, *len); if ( !*names ) goto err; - memset(*names, 0, sizeof(char*) * *len); } - *values = (int*)xmalloc_array(int, *len); + *values = xmalloc_array(int, *len); if ( !*values ) goto err; @@ -2059,9 +2057,8 @@ int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high struct ocontext *prev; struct ocontext *add; - if ( (add = xmalloc(struct ocontext)) == NULL ) + if ( (add = xzalloc(struct ocontext)) == NULL ) return -ENOMEM; - memset(add, 0, sizeof(struct ocontext)); add->sid[0] = sid; POLICY_WRLOCK; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:05:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:05:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsy3-0007Yf-Ee; Sat, 01 Mar 2014 23:05:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsy2-0007YK-57 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:14 +0000 Received: from [85.158.143.35:60946] by server-1.bemta-4.messagelabs.com id A6/13-31661-9A762135; Sat, 01 Mar 2014 23:05:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1393715111!9291333!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 877 invoked from network); 1 Mar 2014 23:05:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:05:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxy-00022h-TQ for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsxy-0000fR-Qy for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:10 +0000 Date: Sat, 01 Mar 2014 23:05:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: use # printk format modifier X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb27e29ddcd37c8a151270a870ee0841ca180949 Author: Jan Beulich AuthorDate: Fri Feb 28 17:13:05 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 28 17:13:05 2014 +0100 xsm: use # printk format modifier Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf --- xen/xsm/flask/avc.c | 8 ++++---- xen/xsm/flask/ss/policydb.c | 4 ++-- xen/xsm/flask/ss/services.c | 12 ++++++------ xen/xsm/xsm_policy.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c index a27cf7d..a26b34a 100644 --- a/xen/xsm/flask/avc.c +++ b/xen/xsm/flask/avc.c @@ -197,7 +197,7 @@ static void avc_dump_av(struct avc_dump_buf *buf, u16 tclass, u32 av) } if ( av ) - avc_printk(buf, " 0x%x", av); + avc_printk(buf, " %#x", av); avc_printk(buf, " }"); } @@ -591,16 +591,16 @@ void avc_audit(u32 ssid, u32 tsid, u16 tclass, u32 requested, avc_printk(&buf, "domid=%d ", cdom->domain_id); switch ( a ? a->type : 0 ) { case AVC_AUDIT_DATA_DEV: - avc_printk(&buf, "device=0x%lx ", a->device); + avc_printk(&buf, "device=%#lx ", a->device); break; case AVC_AUDIT_DATA_IRQ: avc_printk(&buf, "irq=%d ", a->irq); break; case AVC_AUDIT_DATA_RANGE: - avc_printk(&buf, "range=0x%lx-0x%lx ", a->range.start, a->range.end); + avc_printk(&buf, "range=%#lx-%#lx ", a->range.start, a->range.end); break; case AVC_AUDIT_DATA_MEMORY: - avc_printk(&buf, "pte=0x%lx mfn=0x%lx ", a->memory.pte, a->memory.mfn); + avc_printk(&buf, "pte=%#lx mfn=%#lx ", a->memory.pte, a->memory.mfn); break; } diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c index a2aac03..50b2c78 100644 --- a/xen/xsm/flask/ss/policydb.c +++ b/xen/xsm/flask/ss/policydb.c @@ -1716,8 +1716,8 @@ int policydb_read(struct policydb *p, void *fp) if ( le32_to_cpu(buf[0]) != POLICYDB_MAGIC ) { - printk(KERN_ERR "Flask: policydb magic number 0x%x does " - "not match expected magic number 0x%x\n", + printk(KERN_ERR "Flask: policydb magic number %#x does " + "not match expected magic number %#x\n", le32_to_cpu(buf[0]), POLICYDB_MAGIC); goto bad; } diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 4b9c46e..aebbec7 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -2111,7 +2111,7 @@ int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high c->u.ioport.high_ioport == high && c->sid[0] == sid) break; - printk("%s: IO Port overlap with entry 0x%x - 0x%x\n", + printk("%s: IO Port overlap with entry %#x - %#x\n", __FUNCTION__, c->u.ioport.low_ioport, c->u.ioport.high_ioport); ret = -EEXIST; @@ -2145,7 +2145,7 @@ int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high c->u.iomem.high_iomem == high && c->sid[0] == sid) break; - printk("%s: IO Memory overlap with entry 0x%x - 0x%x\n", + printk("%s: IO Memory overlap with entry %#x - %#x\n", __FUNCTION__, c->u.iomem.low_iomem, c->u.iomem.high_iomem); ret = -EEXIST; @@ -2177,7 +2177,7 @@ int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high if ( c->sid[0] == sid ) break; - printk("%s: Duplicate PCI Device 0x%x\n", __FUNCTION__, + printk("%s: Duplicate PCI Device %#x\n", __FUNCTION__, add->u.device); ret = -EEXIST; break; @@ -2257,7 +2257,7 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: ioport 0x%x - 0x%x\n", __FUNCTION__, + printk("%s: ocontext not found: ioport %#x - %#x\n", __FUNCTION__, low, high); ret = -ENOENT; break; @@ -2284,7 +2284,7 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: iomem 0x%x - 0x%x\n", __FUNCTION__, + printk("%s: ocontext not found: iomem %#x - %#x\n", __FUNCTION__, low, high); ret = -ENOENT; break; @@ -2310,7 +2310,7 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: pcidevice 0x%x\n", __FUNCTION__, low); + printk("%s: ocontext not found: pcidevice %#x\n", __FUNCTION__, low); ret = -ENOENT; break; diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index cad7964..0186f30 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -52,7 +52,7 @@ int __init xsm_policy_init(unsigned long *module_map, policy_buffer = (char *)_policy_start; policy_size = _policy_len; - printk("Policy len 0x%lx, start at %p.\n", + printk("Policy len %#lx, start at %p.\n", _policy_len,_policy_start); __clear_bit(i, module_map); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:05:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:05:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsy3-0007Yf-Ee; Sat, 01 Mar 2014 23:05:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsy2-0007YK-57 for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:14 +0000 Received: from [85.158.143.35:60946] by server-1.bemta-4.messagelabs.com id A6/13-31661-9A762135; Sat, 01 Mar 2014 23:05:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1393715111!9291333!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 877 invoked from network); 1 Mar 2014 23:05:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:05:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsxy-00022h-TQ for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsxy-0000fR-Qy for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:10 +0000 Date: Sat, 01 Mar 2014 23:05:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: use # printk format modifier X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb27e29ddcd37c8a151270a870ee0841ca180949 Author: Jan Beulich AuthorDate: Fri Feb 28 17:13:05 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 28 17:13:05 2014 +0100 xsm: use # printk format modifier Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf --- xen/xsm/flask/avc.c | 8 ++++---- xen/xsm/flask/ss/policydb.c | 4 ++-- xen/xsm/flask/ss/services.c | 12 ++++++------ xen/xsm/xsm_policy.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c index a27cf7d..a26b34a 100644 --- a/xen/xsm/flask/avc.c +++ b/xen/xsm/flask/avc.c @@ -197,7 +197,7 @@ static void avc_dump_av(struct avc_dump_buf *buf, u16 tclass, u32 av) } if ( av ) - avc_printk(buf, " 0x%x", av); + avc_printk(buf, " %#x", av); avc_printk(buf, " }"); } @@ -591,16 +591,16 @@ void avc_audit(u32 ssid, u32 tsid, u16 tclass, u32 requested, avc_printk(&buf, "domid=%d ", cdom->domain_id); switch ( a ? a->type : 0 ) { case AVC_AUDIT_DATA_DEV: - avc_printk(&buf, "device=0x%lx ", a->device); + avc_printk(&buf, "device=%#lx ", a->device); break; case AVC_AUDIT_DATA_IRQ: avc_printk(&buf, "irq=%d ", a->irq); break; case AVC_AUDIT_DATA_RANGE: - avc_printk(&buf, "range=0x%lx-0x%lx ", a->range.start, a->range.end); + avc_printk(&buf, "range=%#lx-%#lx ", a->range.start, a->range.end); break; case AVC_AUDIT_DATA_MEMORY: - avc_printk(&buf, "pte=0x%lx mfn=0x%lx ", a->memory.pte, a->memory.mfn); + avc_printk(&buf, "pte=%#lx mfn=%#lx ", a->memory.pte, a->memory.mfn); break; } diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c index a2aac03..50b2c78 100644 --- a/xen/xsm/flask/ss/policydb.c +++ b/xen/xsm/flask/ss/policydb.c @@ -1716,8 +1716,8 @@ int policydb_read(struct policydb *p, void *fp) if ( le32_to_cpu(buf[0]) != POLICYDB_MAGIC ) { - printk(KERN_ERR "Flask: policydb magic number 0x%x does " - "not match expected magic number 0x%x\n", + printk(KERN_ERR "Flask: policydb magic number %#x does " + "not match expected magic number %#x\n", le32_to_cpu(buf[0]), POLICYDB_MAGIC); goto bad; } diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 4b9c46e..aebbec7 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -2111,7 +2111,7 @@ int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high c->u.ioport.high_ioport == high && c->sid[0] == sid) break; - printk("%s: IO Port overlap with entry 0x%x - 0x%x\n", + printk("%s: IO Port overlap with entry %#x - %#x\n", __FUNCTION__, c->u.ioport.low_ioport, c->u.ioport.high_ioport); ret = -EEXIST; @@ -2145,7 +2145,7 @@ int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high c->u.iomem.high_iomem == high && c->sid[0] == sid) break; - printk("%s: IO Memory overlap with entry 0x%x - 0x%x\n", + printk("%s: IO Memory overlap with entry %#x - %#x\n", __FUNCTION__, c->u.iomem.low_iomem, c->u.iomem.high_iomem); ret = -EEXIST; @@ -2177,7 +2177,7 @@ int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high if ( c->sid[0] == sid ) break; - printk("%s: Duplicate PCI Device 0x%x\n", __FUNCTION__, + printk("%s: Duplicate PCI Device %#x\n", __FUNCTION__, add->u.device); ret = -EEXIST; break; @@ -2257,7 +2257,7 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: ioport 0x%x - 0x%x\n", __FUNCTION__, + printk("%s: ocontext not found: ioport %#x - %#x\n", __FUNCTION__, low, high); ret = -ENOENT; break; @@ -2284,7 +2284,7 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: iomem 0x%x - 0x%x\n", __FUNCTION__, + printk("%s: ocontext not found: iomem %#x - %#x\n", __FUNCTION__, low, high); ret = -ENOENT; break; @@ -2310,7 +2310,7 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: pcidevice 0x%x\n", __FUNCTION__, low); + printk("%s: ocontext not found: pcidevice %#x\n", __FUNCTION__, low); ret = -ENOENT; break; diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index cad7964..0186f30 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -52,7 +52,7 @@ int __init xsm_policy_init(unsigned long *module_map, policy_buffer = (char *)_policy_start; policy_size = _policy_len; - printk("Policy len 0x%lx, start at %p.\n", + printk("Policy len %#lx, start at %p.\n", _policy_len,_policy_start); __clear_bit(i, module_map); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:05:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:05:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsyH-0007aS-Hk; Sat, 01 Mar 2014 23:05:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsyG-0007aM-7C for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:28 +0000 Received: from [85.158.143.35:61393] by server-2.bemta-4.messagelabs.com id C4/3A-04779-7B762135; Sat, 01 Mar 2014 23:05:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1393715126!9271993!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6950 invoked from network); 1 Mar 2014 23:05:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:05:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsy9-00022n-4W for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsy9-0000gF-1u for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:21 +0000 Date: Sat, 01 Mar 2014 23:05:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: streamline xsm_default_action() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e0fabe8e81000c924d211e4731d0626357630c69 Author: Jan Beulich AuthorDate: Fri Feb 28 17:13:47 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 28 17:13:47 2014 +0100 xsm: streamline xsm_default_action() The privileges being strongly ordered is better reflected by using fall through within the respective switch statement. Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf --- xen/include/xsm/dummy.h | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index a84218d..3bcd941 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -59,20 +59,14 @@ static always_inline int xsm_default_action( switch ( action ) { case XSM_HOOK: return 0; - case XSM_DM_PRIV: - if ( src->is_privileged ) - return 0; - if ( target && src->target == target ) - return 0; - return -EPERM; case XSM_TARGET: if ( src == target ) return 0; - if ( src->is_privileged ) - return 0; + /* fall through */ + case XSM_DM_PRIV: if ( target && src->target == target ) return 0; - return -EPERM; + /* fall through */ case XSM_PRIV: if ( src->is_privileged ) return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:05:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:05:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsyH-0007aS-Hk; Sat, 01 Mar 2014 23:05:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsyG-0007aM-7C for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:28 +0000 Received: from [85.158.143.35:61393] by server-2.bemta-4.messagelabs.com id C4/3A-04779-7B762135; Sat, 01 Mar 2014 23:05:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1393715126!9271993!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6950 invoked from network); 1 Mar 2014 23:05:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:05:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsy9-00022n-4W for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsy9-0000gF-1u for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:21 +0000 Date: Sat, 01 Mar 2014 23:05:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: streamline xsm_default_action() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e0fabe8e81000c924d211e4731d0626357630c69 Author: Jan Beulich AuthorDate: Fri Feb 28 17:13:47 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 28 17:13:47 2014 +0100 xsm: streamline xsm_default_action() The privileges being strongly ordered is better reflected by using fall through within the respective switch statement. Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf --- xen/include/xsm/dummy.h | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index a84218d..3bcd941 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -59,20 +59,14 @@ static always_inline int xsm_default_action( switch ( action ) { case XSM_HOOK: return 0; - case XSM_DM_PRIV: - if ( src->is_privileged ) - return 0; - if ( target && src->target == target ) - return 0; - return -EPERM; case XSM_TARGET: if ( src == target ) return 0; - if ( src->is_privileged ) - return 0; + /* fall through */ + case XSM_DM_PRIV: if ( target && src->target == target ) return 0; - return -EPERM; + /* fall through */ case XSM_PRIV: if ( src->is_privileged ) return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:05:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:05:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsyN-0007bg-L4; Sat, 01 Mar 2014 23:05:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsyM-0007bO-3E for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:34 +0000 Received: from [85.158.139.211:15039] by server-17.bemta-5.messagelabs.com id CA/58-31975-DB762135; Sat, 01 Mar 2014 23:05:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1393715131!7108563!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11952 invoked from network); 1 Mar 2014 23:05:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:05:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsyJ-00022q-9b for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsyJ-0000hZ-7k for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:31 +0000 Date: Sat, 01 Mar 2014 23:05:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mm: ensure useful progress in decrease_reservation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 79de2d31f1ff8910231b7ec15519405953e6571a Author: Wei Liu AuthorDate: Fri Feb 28 17:35:15 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 28 17:35:15 2014 +0100 mm: ensure useful progress in decrease_reservation During my fun time playing with balloon driver I found that hypervisor's preemption check kept decrease_reservation from doing any useful work for 32 bit guests, resulting in hanging the guests. As Andrew suggested, we can force the check to fail for the first iteration to ensure progress. We did this in d3a55d7d9 "x86/mm: Ensure useful progress in alloc_l2_table()" already. After this change I cannot see the hang caused by continuation logic anymore. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/common/memory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 5a0efd5..9d0d32e 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -268,7 +268,7 @@ static void decrease_reservation(struct memop_args *a) for ( i = a->nr_done; i < a->nr_extents; i++ ) { - if ( hypercall_preempt_check() ) + if ( hypercall_preempt_check() && i != a->nr_done ) { a->preempted = 1; goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 01 23:05:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Mar 2014 23:05:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsyN-0007bg-L4; Sat, 01 Mar 2014 23:05:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsyM-0007bO-3E for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:34 +0000 Received: from [85.158.139.211:15039] by server-17.bemta-5.messagelabs.com id CA/58-31975-DB762135; Sat, 01 Mar 2014 23:05:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1393715131!7108563!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11952 invoked from network); 1 Mar 2014 23:05:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2014 23:05:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WJsyJ-00022q-9b for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WJsyJ-0000hZ-7k for xen-changelog@lists.xensource.com; Sat, 01 Mar 2014 23:05:31 +0000 Date: Sat, 01 Mar 2014 23:05:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mm: ensure useful progress in decrease_reservation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 79de2d31f1ff8910231b7ec15519405953e6571a Author: Wei Liu AuthorDate: Fri Feb 28 17:35:15 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 28 17:35:15 2014 +0100 mm: ensure useful progress in decrease_reservation During my fun time playing with balloon driver I found that hypervisor's preemption check kept decrease_reservation from doing any useful work for 32 bit guests, resulting in hanging the guests. As Andrew suggested, we can force the check to fail for the first iteration to ensure progress. We did this in d3a55d7d9 "x86/mm: Ensure useful progress in alloc_l2_table()" already. After this change I cannot see the hang caused by continuation logic anymore. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/common/memory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 5a0efd5..9d0d32e 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -268,7 +268,7 @@ static void decrease_reservation(struct memop_args *a) for ( i = a->nr_done; i < a->nr_extents; i++ ) { - if ( hypercall_preempt_check() ) + if ( hypercall_preempt_check() && i != a->nr_done ) { a->preempted = 1; goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:00:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:00:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wA-0004XW-Qv; Wed, 05 Mar 2014 05:00:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3w8-0004WT-C9 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:08 +0000 Received: from [85.158.139.211:46594] by server-4.bemta-5.messagelabs.com id 73/FE-08092-75FA6135; Wed, 05 Mar 2014 05:00:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1393995605!7742188!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17952 invoked from network); 5 Mar 2014 05:00:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:00:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3w5-0004X1-5U for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3w3-0007xV-Ko for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:04 +0000 Date: Wed, 05 Mar 2014 05:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] IOMMU: generalize and correct softirq processing during Dom0 device setup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ef5aa944a6a0df7f5938983043c7e46f158bbc6 Author: Jan Beulich AuthorDate: Tue Mar 4 10:52:20 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 10:52:20 2014 +0100 IOMMU: generalize and correct softirq processing during Dom0 device setup c/s 21039:95f5a4ce8f24 ("VT-d: reduce default verbosity") having put a call to process_pending_softirqs() in VT-d's domain_context_mapping() was wrong in two ways: For one we shouldn't be doing this when setting up a device during DomU assignment. And then - I didn't check whether that was the case already back then - we shouldn't call that function with the pcidevs_lock (or in fact any spin lock) held. Move the "preemption" into generic code, at once dealing with further actual (too much output elsewhere - particularly on systems with very many host bridge like devices - having been observed to still cause the watchdog to trigger when enabled) and potential (other IOMMU code may also end up being too verbose) issues. Do the "preemption" once per device actually being set up when in verbose mode, and once per bus otherwise. Note that dropping pcidevs_lock around the process_pending_softirqs() invocation is specifically not a problem here: We're in an __init function and aren't racing with potential additions/removals of PCI devices. Not acquiring the lock in setup_dom0_pci_devices() otoh is not an option, as there are too many places that assert the lock being held. Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang --- xen/drivers/passthrough/pci.c | 15 +++++++++++++++ xen/drivers/passthrough/vtd/iommu.c | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index c5c8344..ff78142 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -922,6 +923,20 @@ static int __init _setup_dom0_pci_devices(struct pci_seg *pseg, void *arg) printk(XENLOG_WARNING "Dom%d owning %04x:%02x:%02x.%u?\n", pdev->domain->domain_id, pseg->nr, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); + + if ( iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); + } + } + + if ( !iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); } } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index d5ce5b7..d4be75c 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -1494,9 +1493,6 @@ static int domain_context_mapping( break; } - if ( iommu_verbose ) - process_pending_softirqs(); - return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:00:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:00:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wA-0004XW-Qv; Wed, 05 Mar 2014 05:00:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3w8-0004WT-C9 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:08 +0000 Received: from [85.158.139.211:46594] by server-4.bemta-5.messagelabs.com id 73/FE-08092-75FA6135; Wed, 05 Mar 2014 05:00:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1393995605!7742188!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17952 invoked from network); 5 Mar 2014 05:00:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:00:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3w5-0004X1-5U for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3w3-0007xV-Ko for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:04 +0000 Date: Wed, 05 Mar 2014 05:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] IOMMU: generalize and correct softirq processing during Dom0 device setup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ef5aa944a6a0df7f5938983043c7e46f158bbc6 Author: Jan Beulich AuthorDate: Tue Mar 4 10:52:20 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 10:52:20 2014 +0100 IOMMU: generalize and correct softirq processing during Dom0 device setup c/s 21039:95f5a4ce8f24 ("VT-d: reduce default verbosity") having put a call to process_pending_softirqs() in VT-d's domain_context_mapping() was wrong in two ways: For one we shouldn't be doing this when setting up a device during DomU assignment. And then - I didn't check whether that was the case already back then - we shouldn't call that function with the pcidevs_lock (or in fact any spin lock) held. Move the "preemption" into generic code, at once dealing with further actual (too much output elsewhere - particularly on systems with very many host bridge like devices - having been observed to still cause the watchdog to trigger when enabled) and potential (other IOMMU code may also end up being too verbose) issues. Do the "preemption" once per device actually being set up when in verbose mode, and once per bus otherwise. Note that dropping pcidevs_lock around the process_pending_softirqs() invocation is specifically not a problem here: We're in an __init function and aren't racing with potential additions/removals of PCI devices. Not acquiring the lock in setup_dom0_pci_devices() otoh is not an option, as there are too many places that assert the lock being held. Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang --- xen/drivers/passthrough/pci.c | 15 +++++++++++++++ xen/drivers/passthrough/vtd/iommu.c | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index c5c8344..ff78142 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -922,6 +923,20 @@ static int __init _setup_dom0_pci_devices(struct pci_seg *pseg, void *arg) printk(XENLOG_WARNING "Dom%d owning %04x:%02x:%02x.%u?\n", pdev->domain->domain_id, pseg->nr, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); + + if ( iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); + } + } + + if ( !iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); } } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index d5ce5b7..d4be75c 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -1494,9 +1493,6 @@ static int domain_context_mapping( break; } - if ( iommu_verbose ) - process_pending_softirqs(); - return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:00:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:00:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wL-0004Z9-GW; Wed, 05 Mar 2014 05:00:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wI-0004Y8-DV for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:18 +0000 Received: from [85.158.143.35:54268] by server-1.bemta-4.messagelabs.com id 2E/7C-09853-16FA6135; Wed, 05 Mar 2014 05:00:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1393995615!10035615!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29708 invoked from network); 5 Mar 2014 05:00:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:00:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wF-0004X4-OY for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3wF-0007yZ-9u for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:15 +0000 Date: Wed, 05 Mar 2014 05:00:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e72747e2d1d67818d56eacbc9a8423c4259b64ca Author: Jan Beulich AuthorDate: Tue Mar 4 10:54:21 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 10:54:21 2014 +0100 x86/time: cleanup Eliminate effectively unused variables mistakenly left in place by 9539:08aede767c63 ("Rename update_dom_time() to update_vcpu_system_time()"). Drop the pointless casts. Use SECONDS() instead of open coding it. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/time.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 82492c1..b2c8dc7 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -921,15 +921,15 @@ int cpu_frequency_change(u64 freq) void do_settime(unsigned long secs, unsigned long nsecs, u64 system_time_base) { u64 x; - u32 y, _wc_sec, _wc_nsec; + u32 y; struct domain *d; - x = (secs * 1000000000ULL) + (u64)nsecs - system_time_base; + x = SECONDS(secs) + (u64)nsecs - system_time_base; y = do_div(x, 1000000000); spin_lock(&wc_lock); - wc_sec = _wc_sec = (u32)x; - wc_nsec = _wc_nsec = (u32)y; + wc_sec = x; + wc_nsec = y; spin_unlock(&wc_lock); rcu_read_lock(&domlist_read_lock); @@ -1548,8 +1548,8 @@ unsigned long get_localtime(struct domain *d) /* Return microsecs after 00:00:00 localtime, 1 January, 1970. */ uint64_t get_localtime_us(struct domain *d) { - return ((wc_sec + d->time_offset_seconds) * 1000000000ULL - + wc_nsec + NOW()) / 1000UL; + return (SECONDS(wc_sec + d->time_offset_seconds) + wc_nsec + NOW()) + / 1000UL; } unsigned long get_sec(void) @@ -1651,7 +1651,7 @@ struct tm wallclock_time(void) if ( !wc_sec ) return (struct tm) { 0 }; - seconds = NOW() + (wc_sec * 1000000000ull) + wc_nsec; + seconds = NOW() + SECONDS(wc_sec) + wc_nsec; do_div(seconds, 1000000000); return gmtime(seconds); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:00:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:00:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wL-0004Z9-GW; Wed, 05 Mar 2014 05:00:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wI-0004Y8-DV for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:18 +0000 Received: from [85.158.143.35:54268] by server-1.bemta-4.messagelabs.com id 2E/7C-09853-16FA6135; Wed, 05 Mar 2014 05:00:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1393995615!10035615!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29708 invoked from network); 5 Mar 2014 05:00:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:00:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wF-0004X4-OY for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3wF-0007yZ-9u for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:15 +0000 Date: Wed, 05 Mar 2014 05:00:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e72747e2d1d67818d56eacbc9a8423c4259b64ca Author: Jan Beulich AuthorDate: Tue Mar 4 10:54:21 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 10:54:21 2014 +0100 x86/time: cleanup Eliminate effectively unused variables mistakenly left in place by 9539:08aede767c63 ("Rename update_dom_time() to update_vcpu_system_time()"). Drop the pointless casts. Use SECONDS() instead of open coding it. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/time.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 82492c1..b2c8dc7 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -921,15 +921,15 @@ int cpu_frequency_change(u64 freq) void do_settime(unsigned long secs, unsigned long nsecs, u64 system_time_base) { u64 x; - u32 y, _wc_sec, _wc_nsec; + u32 y; struct domain *d; - x = (secs * 1000000000ULL) + (u64)nsecs - system_time_base; + x = SECONDS(secs) + (u64)nsecs - system_time_base; y = do_div(x, 1000000000); spin_lock(&wc_lock); - wc_sec = _wc_sec = (u32)x; - wc_nsec = _wc_nsec = (u32)y; + wc_sec = x; + wc_nsec = y; spin_unlock(&wc_lock); rcu_read_lock(&domlist_read_lock); @@ -1548,8 +1548,8 @@ unsigned long get_localtime(struct domain *d) /* Return microsecs after 00:00:00 localtime, 1 January, 1970. */ uint64_t get_localtime_us(struct domain *d) { - return ((wc_sec + d->time_offset_seconds) * 1000000000ULL - + wc_nsec + NOW()) / 1000UL; + return (SECONDS(wc_sec + d->time_offset_seconds) + wc_nsec + NOW()) + / 1000UL; } unsigned long get_sec(void) @@ -1651,7 +1651,7 @@ struct tm wallclock_time(void) if ( !wc_sec ) return (struct tm) { 0 }; - seconds = NOW() + (wc_sec * 1000000000ull) + wc_nsec; + seconds = NOW() + SECONDS(wc_sec) + wc_nsec; do_div(seconds, 1000000000); return gmtime(seconds); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:00:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wT-0004b2-MA; Wed, 05 Mar 2014 05:00:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wS-0004as-J6 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:28 +0000 Received: from [85.158.137.68:14643] by server-11.bemta-3.messagelabs.com id 23/BD-04255-B6FA6135; Wed, 05 Mar 2014 05:00:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1393995626!5701866!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16056 invoked from network); 5 Mar 2014 05:00:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:00:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wQ-0004XA-0m for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3wP-0007zy-SW for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:25 +0000 Date: Wed, 05 Mar 2014 05:00:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: avoid redundant this_cpu() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 58bebfdb790c5639d28d5e1b5fd49a3352c5fc25 Author: Andrew Cooper AuthorDate: Tue Mar 4 10:55:56 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 10:55:56 2014 +0100 x86/time: avoid redundant this_cpu() this_cpu() makes use of RELOC_HIDE() to prevent unsafe optimisations, forcing a recalculation of the per-cpu data area. Don't use it needlessly. Signed-off-by: Andrew Cooper --- xen/arch/x86/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index b2c8dc7..000191b 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1323,7 +1323,7 @@ void init_percpu_time(void) s_time_t now; /* Initial estimate for TSC rate. */ - this_cpu(cpu_time).tsc_scale = per_cpu(cpu_time, 0).tsc_scale; + t->tsc_scale = per_cpu(cpu_time, 0).tsc_scale; local_irq_save(flags); rdtscll(t->local_tsc_stamp); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:00:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wT-0004b2-MA; Wed, 05 Mar 2014 05:00:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wS-0004as-J6 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:28 +0000 Received: from [85.158.137.68:14643] by server-11.bemta-3.messagelabs.com id 23/BD-04255-B6FA6135; Wed, 05 Mar 2014 05:00:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1393995626!5701866!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16056 invoked from network); 5 Mar 2014 05:00:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:00:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wQ-0004XA-0m for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3wP-0007zy-SW for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:25 +0000 Date: Wed, 05 Mar 2014 05:00:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: avoid redundant this_cpu() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 58bebfdb790c5639d28d5e1b5fd49a3352c5fc25 Author: Andrew Cooper AuthorDate: Tue Mar 4 10:55:56 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 10:55:56 2014 +0100 x86/time: avoid redundant this_cpu() this_cpu() makes use of RELOC_HIDE() to prevent unsafe optimisations, forcing a recalculation of the per-cpu data area. Don't use it needlessly. Signed-off-by: Andrew Cooper --- xen/arch/x86/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index b2c8dc7..000191b 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1323,7 +1323,7 @@ void init_percpu_time(void) s_time_t now; /* Initial estimate for TSC rate. */ - this_cpu(cpu_time).tsc_scale = per_cpu(cpu_time, 0).tsc_scale; + t->tsc_scale = per_cpu(cpu_time, 0).tsc_scale; local_irq_save(flags); rdtscll(t->local_tsc_stamp); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:00:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:00:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3we-0004dH-Ro; Wed, 05 Mar 2014 05:00:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wd-0004cf-0K for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:39 +0000 Received: from [85.158.137.68:43637] by server-14.bemta-3.messagelabs.com id E5/AE-08196-67FA6135; Wed, 05 Mar 2014 05:00:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1393995636!5701890!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16520 invoked from network); 5 Mar 2014 05:00:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:00:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wa-0004XM-6O for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3wa-00080V-5N for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:36 +0000 Date: Wed, 05 Mar 2014 05:00:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't propagate acpi_skip_timer_override do Dom0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8db22866dbbcabf30ad6e3814489c730b53d1cf4 Author: Jan Beulich AuthorDate: Tue Mar 4 10:58:19 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 10:58:19 2014 +0100 x86: don't propagate acpi_skip_timer_override do Dom0 It's unclear why c/s 4850:923dd9975981 added this - Dom0 isn't controlling the timer interrupt, and hence has no need to know. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Reviewed-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 4 +++- xen/arch/x86/setup.c | 7 ------- xen/include/asm-x86/acpi.h | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 6d7984f..ea6ba9a 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -56,7 +56,9 @@ bool_t __initdata acpi_ht = 1; /* enable HT */ bool_t __initdata acpi_lapic; bool_t __initdata acpi_ioapic; -bool_t acpi_skip_timer_override __initdata; +/* acpi_skip_timer_override: Skip IRQ0 overrides. */ +static bool_t acpi_skip_timer_override __initdata; +boolean_param("acpi_skip_timer_override", acpi_skip_timer_override); #ifdef CONFIG_X86_LOCAL_APIC static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index b49256d..c743606 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -71,10 +71,6 @@ static void parse_acpi_param(char *s); custom_param("acpi", parse_acpi_param); /* **** Linux config option: propagated to domain0. */ -/* acpi_skip_timer_override: Skip IRQ0 overrides. */ -boolean_param("acpi_skip_timer_override", acpi_skip_timer_override); - -/* **** Linux config option: propagated to domain0. */ /* noapic: Disable IOAPIC setup. */ boolean_param("noapic", skip_ioapic_setup); @@ -1365,9 +1361,6 @@ void __init __start_xen(unsigned long mbi_p) /* Append any extra parameters. */ if ( skip_ioapic_setup && !strstr(dom0_cmdline, "noapic") ) safe_strcat(dom0_cmdline, " noapic"); - if ( acpi_skip_timer_override && - !strstr(dom0_cmdline, "acpi_skip_timer_override") ) - safe_strcat(dom0_cmdline, " acpi_skip_timer_override"); if ( (strlen(acpi_param) == 0) && acpi_disabled ) { printk("ACPI is disabled, notifying Domain 0 (acpi=off)\n"); diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h index a7b11b8..5e85b38 100644 --- a/xen/include/asm-x86/acpi.h +++ b/xen/include/asm-x86/acpi.h @@ -80,7 +80,6 @@ int __acpi_release_global_lock(unsigned int *lock); extern bool_t acpi_lapic, acpi_ioapic, acpi_noirq; extern bool_t acpi_force, acpi_ht, acpi_disabled; -extern bool_t acpi_skip_timer_override; extern u32 acpi_smi_cmd; extern u8 acpi_enable_value, acpi_disable_value; void acpi_pic_sci_set_trigger(unsigned int, u16); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:00:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:00:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3we-0004dH-Ro; Wed, 05 Mar 2014 05:00:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wd-0004cf-0K for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:39 +0000 Received: from [85.158.137.68:43637] by server-14.bemta-3.messagelabs.com id E5/AE-08196-67FA6135; Wed, 05 Mar 2014 05:00:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1393995636!5701890!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16520 invoked from network); 5 Mar 2014 05:00:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:00:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wa-0004XM-6O for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3wa-00080V-5N for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:36 +0000 Date: Wed, 05 Mar 2014 05:00:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't propagate acpi_skip_timer_override do Dom0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8db22866dbbcabf30ad6e3814489c730b53d1cf4 Author: Jan Beulich AuthorDate: Tue Mar 4 10:58:19 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 10:58:19 2014 +0100 x86: don't propagate acpi_skip_timer_override do Dom0 It's unclear why c/s 4850:923dd9975981 added this - Dom0 isn't controlling the timer interrupt, and hence has no need to know. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Reviewed-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 4 +++- xen/arch/x86/setup.c | 7 ------- xen/include/asm-x86/acpi.h | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 6d7984f..ea6ba9a 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -56,7 +56,9 @@ bool_t __initdata acpi_ht = 1; /* enable HT */ bool_t __initdata acpi_lapic; bool_t __initdata acpi_ioapic; -bool_t acpi_skip_timer_override __initdata; +/* acpi_skip_timer_override: Skip IRQ0 overrides. */ +static bool_t acpi_skip_timer_override __initdata; +boolean_param("acpi_skip_timer_override", acpi_skip_timer_override); #ifdef CONFIG_X86_LOCAL_APIC static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index b49256d..c743606 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -71,10 +71,6 @@ static void parse_acpi_param(char *s); custom_param("acpi", parse_acpi_param); /* **** Linux config option: propagated to domain0. */ -/* acpi_skip_timer_override: Skip IRQ0 overrides. */ -boolean_param("acpi_skip_timer_override", acpi_skip_timer_override); - -/* **** Linux config option: propagated to domain0. */ /* noapic: Disable IOAPIC setup. */ boolean_param("noapic", skip_ioapic_setup); @@ -1365,9 +1361,6 @@ void __init __start_xen(unsigned long mbi_p) /* Append any extra parameters. */ if ( skip_ioapic_setup && !strstr(dom0_cmdline, "noapic") ) safe_strcat(dom0_cmdline, " noapic"); - if ( acpi_skip_timer_override && - !strstr(dom0_cmdline, "acpi_skip_timer_override") ) - safe_strcat(dom0_cmdline, " acpi_skip_timer_override"); if ( (strlen(acpi_param) == 0) && acpi_disabled ) { printk("ACPI is disabled, notifying Domain 0 (acpi=off)\n"); diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h index a7b11b8..5e85b38 100644 --- a/xen/include/asm-x86/acpi.h +++ b/xen/include/asm-x86/acpi.h @@ -80,7 +80,6 @@ int __acpi_release_global_lock(unsigned int *lock); extern bool_t acpi_lapic, acpi_ioapic, acpi_noirq; extern bool_t acpi_force, acpi_ht, acpi_disabled; -extern bool_t acpi_skip_timer_override; extern u32 acpi_smi_cmd; extern u8 acpi_enable_value, acpi_disable_value; void acpi_pic_sci_set_trigger(unsigned int, u16); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:01:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:01:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wo-0004gh-Uz; Wed, 05 Mar 2014 05:00:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wn-0004gC-5s for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:49 +0000 Received: from [85.158.137.68:50101] by server-5.bemta-3.messagelabs.com id A5/0A-04712-08FA6135; Wed, 05 Mar 2014 05:00:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1393995646!232211!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7959 invoked from network); 5 Mar 2014 05:00:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:00:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wk-0004XV-Ed for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3wk-00080r-AJ for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:46 +0000 Date: Wed, 05 Mar 2014 05:00:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/AMD: re-use function wide variables in init_amd() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 658a736299f7c91b7db1e1c12b01cc8b8f232fa8 Author: Jan Beulich AuthorDate: Tue Mar 4 10:59:44 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 10:59:44 2014 +0100 x86/AMD: re-use function wide variables in init_amd() Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/amd.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 904ad2e..08ec56a 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -399,13 +399,9 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) * revision D (model = 0x14) and later actually support it. * (AMD Erratum #110, docId: 25759). */ - unsigned int lo, hi; - clear_bit(X86_FEATURE_LAHF_LM, c->x86_capability); - if (!rdmsr_amd_safe(0xc001100d, &lo, &hi)) { - hi &= ~1; - wrmsr_amd_safe(0xc001100d, lo, hi); - } + if (!rdmsr_amd_safe(0xc001100d, &l, &h)) + wrmsr_amd_safe(0xc001100d, l, h & ~1); } switch(c->x86) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:01:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:01:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wo-0004gh-Uz; Wed, 05 Mar 2014 05:00:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wn-0004gC-5s for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:49 +0000 Received: from [85.158.137.68:50101] by server-5.bemta-3.messagelabs.com id A5/0A-04712-08FA6135; Wed, 05 Mar 2014 05:00:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1393995646!232211!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7959 invoked from network); 5 Mar 2014 05:00:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:00:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wk-0004XV-Ed for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3wk-00080r-AJ for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:46 +0000 Date: Wed, 05 Mar 2014 05:00:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/AMD: re-use function wide variables in init_amd() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 658a736299f7c91b7db1e1c12b01cc8b8f232fa8 Author: Jan Beulich AuthorDate: Tue Mar 4 10:59:44 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 10:59:44 2014 +0100 x86/AMD: re-use function wide variables in init_amd() Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/amd.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 904ad2e..08ec56a 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -399,13 +399,9 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) * revision D (model = 0x14) and later actually support it. * (AMD Erratum #110, docId: 25759). */ - unsigned int lo, hi; - clear_bit(X86_FEATURE_LAHF_LM, c->x86_capability); - if (!rdmsr_amd_safe(0xc001100d, &lo, &hi)) { - hi &= ~1; - wrmsr_amd_safe(0xc001100d, lo, hi); - } + if (!rdmsr_amd_safe(0xc001100d, &l, &h)) + wrmsr_amd_safe(0xc001100d, l, h & ~1); } switch(c->x86) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:01:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:01:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3x1-0004iZ-1c; Wed, 05 Mar 2014 05:01:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wy-0004i4-TH for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:01 +0000 Received: from [85.158.137.68:63870] by server-16.bemta-3.messagelabs.com id 2A/C1-29917-C8FA6135; Wed, 05 Mar 2014 05:01:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1393995656!5657513!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10748 invoked from network); 5 Mar 2014 05:00:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:00:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wu-0004XY-NY for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3wu-00081J-IQ for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:56 +0000 Date: Wed, 05 Mar 2014 05:00:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ACPI: also print address space for PM1x fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7acf827b951b4e8501a777676ddf050d200103a4 Author: Jan Beulich AuthorDate: Tue Mar 4 11:00:26 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:00:26 2014 +0100 x86/ACPI: also print address space for PM1x fields At least one vendor is in the process of making systems available where these live in MMIO, not in I/O port space. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/acpi/boot.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index ea6ba9a..63ae05a 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -404,11 +404,15 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) acpi_fadt_copy_address(pm1b_evt, pm1b_event, pm1_event); printk(KERN_INFO PREFIX - "SLEEP INFO: pm1x_cnt[%"PRIx64",%"PRIx64"], " - "pm1x_evt[%"PRIx64",%"PRIx64"]\n", + "SLEEP INFO: pm1x_cnt[%d:%"PRIx64",%d:%"PRIx64"], " + "pm1x_evt[%d:%"PRIx64",%d:%"PRIx64"]\n", + acpi_sinfo.pm1a_cnt_blk.space_id, acpi_sinfo.pm1a_cnt_blk.address, + acpi_sinfo.pm1b_cnt_blk.space_id, acpi_sinfo.pm1b_cnt_blk.address, + acpi_sinfo.pm1a_evt_blk.space_id, acpi_sinfo.pm1a_evt_blk.address, + acpi_sinfo.pm1b_evt_blk.space_id, acpi_sinfo.pm1b_evt_blk.address); /* Now FACS... */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:01:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:01:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3x1-0004iZ-1c; Wed, 05 Mar 2014 05:01:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wy-0004i4-TH for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:01 +0000 Received: from [85.158.137.68:63870] by server-16.bemta-3.messagelabs.com id 2A/C1-29917-C8FA6135; Wed, 05 Mar 2014 05:01:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1393995656!5657513!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10748 invoked from network); 5 Mar 2014 05:00:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:00:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3wu-0004XY-NY for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3wu-00081J-IQ for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:00:56 +0000 Date: Wed, 05 Mar 2014 05:00:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ACPI: also print address space for PM1x fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7acf827b951b4e8501a777676ddf050d200103a4 Author: Jan Beulich AuthorDate: Tue Mar 4 11:00:26 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:00:26 2014 +0100 x86/ACPI: also print address space for PM1x fields At least one vendor is in the process of making systems available where these live in MMIO, not in I/O port space. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/acpi/boot.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index ea6ba9a..63ae05a 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -404,11 +404,15 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) acpi_fadt_copy_address(pm1b_evt, pm1b_event, pm1_event); printk(KERN_INFO PREFIX - "SLEEP INFO: pm1x_cnt[%"PRIx64",%"PRIx64"], " - "pm1x_evt[%"PRIx64",%"PRIx64"]\n", + "SLEEP INFO: pm1x_cnt[%d:%"PRIx64",%d:%"PRIx64"], " + "pm1x_evt[%d:%"PRIx64",%d:%"PRIx64"]\n", + acpi_sinfo.pm1a_cnt_blk.space_id, acpi_sinfo.pm1a_cnt_blk.address, + acpi_sinfo.pm1b_cnt_blk.space_id, acpi_sinfo.pm1b_cnt_blk.address, + acpi_sinfo.pm1a_evt_blk.space_id, acpi_sinfo.pm1a_evt_blk.address, + acpi_sinfo.pm1b_evt_blk.space_id, acpi_sinfo.pm1b_evt_blk.address); /* Now FACS... */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:01:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:01:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3x9-0004jo-4Z; Wed, 05 Mar 2014 05:01:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3x7-0004jc-Ns for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:09 +0000 Received: from [85.158.137.68:64290] by server-1.bemta-3.messagelabs.com id 09/09-17293-49FA6135; Wed, 05 Mar 2014 05:01:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1393995667!5662218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29727 invoked from network); 5 Mar 2014 05:01:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:01:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3x4-0004Y9-TH for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3x4-00082L-SM for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:06 +0000 Date: Wed, 05 Mar 2014 05:01:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] correctly use gcc's -x option X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3cdb47bcf2d33b5c6b49b25c4cb7b85de89e5cc4 Author: Jan Beulich AuthorDate: Tue Mar 4 11:01:57 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:01:57 2014 +0100 correctly use gcc's -x option In Linux the improper use was found to cause problems with certain distributed build environments. Even if not directly affecting us, be on the safe side. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- Config.mk | 2 +- xen/include/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 84c558b..6a93533 100644 --- a/Config.mk +++ b/Config.mk @@ -101,7 +101,7 @@ PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)" # # Usage: cflags-y += $(call cc-option,$(CC),-march=winchip-c6,-march=i586) cc-option = $(shell if test -z "`echo 'void*p=1;' | \ - $(1) $(2) -S -o /dev/null -xc - 2>&1 | grep -- $(2) -`"; \ + $(1) $(2) -S -o /dev/null -x c - 2>&1 | grep -- $(2) -`"; \ then echo "$(2)"; else echo "$(3)"; fi ;) # cc-option-add: Add an option to compilation flags, but only if supported. diff --git a/xen/include/Makefile b/xen/include/Makefile index 9bf90c0..5f2bcf7 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -81,7 +81,7 @@ ifeq ($(XEN_TARGET_ARCH),$(XEN_COMPILE_ARCH)) all: headers.chk headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile - for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new + for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -x c $$i || exit 1; echo $$i; done >$@.new mv $@.new $@ endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:01:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:01:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3x9-0004jo-4Z; Wed, 05 Mar 2014 05:01:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3x7-0004jc-Ns for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:09 +0000 Received: from [85.158.137.68:64290] by server-1.bemta-3.messagelabs.com id 09/09-17293-49FA6135; Wed, 05 Mar 2014 05:01:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1393995667!5662218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29727 invoked from network); 5 Mar 2014 05:01:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:01:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3x4-0004Y9-TH for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3x4-00082L-SM for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:06 +0000 Date: Wed, 05 Mar 2014 05:01:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] correctly use gcc's -x option X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3cdb47bcf2d33b5c6b49b25c4cb7b85de89e5cc4 Author: Jan Beulich AuthorDate: Tue Mar 4 11:01:57 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:01:57 2014 +0100 correctly use gcc's -x option In Linux the improper use was found to cause problems with certain distributed build environments. Even if not directly affecting us, be on the safe side. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- Config.mk | 2 +- xen/include/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 84c558b..6a93533 100644 --- a/Config.mk +++ b/Config.mk @@ -101,7 +101,7 @@ PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)" # # Usage: cflags-y += $(call cc-option,$(CC),-march=winchip-c6,-march=i586) cc-option = $(shell if test -z "`echo 'void*p=1;' | \ - $(1) $(2) -S -o /dev/null -xc - 2>&1 | grep -- $(2) -`"; \ + $(1) $(2) -S -o /dev/null -x c - 2>&1 | grep -- $(2) -`"; \ then echo "$(2)"; else echo "$(3)"; fi ;) # cc-option-add: Add an option to compilation flags, but only if supported. diff --git a/xen/include/Makefile b/xen/include/Makefile index 9bf90c0..5f2bcf7 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -81,7 +81,7 @@ ifeq ($(XEN_TARGET_ARCH),$(XEN_COMPILE_ARCH)) all: headers.chk headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile - for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new + for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -x c $$i || exit 1; echo $$i; done >$@.new mv $@.new $@ endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:02:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xJ-0004lI-7O; Wed, 05 Mar 2014 05:01:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xH-0004kx-S7 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:20 +0000 Received: from [85.158.137.68:51517] by server-11.bemta-3.messagelabs.com id FB/5E-04255-F9FA6135; Wed, 05 Mar 2014 05:01:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1393995677!2897722!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2358 invoked from network); 5 Mar 2014 05:01:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:01:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xF-0004YI-2N for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3xE-00082p-WB for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:17 +0000 Date: Wed, 05 Mar 2014 05:01:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] include: parallelize compat/xlat.h generation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e9009891688202a7ffb63761b94e9ae0a53795a Author: Jan Beulich AuthorDate: Tue Mar 4 11:03:13 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:03:13 2014 +0100 include: parallelize compat/xlat.h generation Splitting this up into pieces signficantly speeds up building on multi- CPU systems when making use of make's -j option. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/include/Makefile | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/xen/include/Makefile b/xen/include/Makefile index 5f2bcf7..d6f0cf7 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -66,14 +66,24 @@ compat/%.c: public/%.h xlat.lst Makefile $(BASEDIR)/tools/compat-build-source.py $(PYTHON) $(BASEDIR)/tools/compat-build-source.py >$@.new mv -f $@.new $@ -compat/xlat.h: xlat.lst $(filter-out compat/xlat.h,$(headers-y)) $(BASEDIR)/tools/get-fields.sh Makefile +compat/.xlat/%.h: compat/%.h compat/.xlat/%.lst $(BASEDIR)/tools/get-fields.sh Makefile export PYTHON=$(PYTHON); \ - grep -v '^[ ]*#' xlat.lst | \ - while read what name hdr; do \ - hdr="compat/$$(echo $$hdr | sed 's,@arch@,$(compat-arch-y),g')"; \ - echo '$(headers-y)' | grep -q "$$hdr" || continue; \ - $(SHELL) $(BASEDIR)/tools/get-fields.sh "$$what" compat_$$name $$hdr || exit $$?; \ - done >$@.new + while read what name; do \ + $(SHELL) $(BASEDIR)/tools/get-fields.sh "$$what" compat_$$name $< || exit $$?; \ + done <$(patsubst compat/%,compat/.xlat/%,$(basename $<)).lst >$@.new + mv -f $@.new $@ + +.PRECIOUS: compat/.xlat/%.lst +compat/.xlat/%.lst: xlat.lst Makefile + mkdir -p $(@D) + grep -v '^[ \t]*#' $< | sed -ne 's,@arch@,$(compat-arch-y),g' -e 's,[ \t]\+$*\.h[ \t]*$$,,p' >$@.new + $(call move-if-changed,$@.new,$@) + +xlat-y := $(shell sed -ne 's,@arch@,$(compat-arch-y),g' -e 's,^[?!][ \t]\+[^ \t]\+[ \t]\+,,p' xlat.lst | uniq) +xlat-y := $(filter $(patsubst compat/%,%,$(headers-y)),$(xlat-y)) + +compat/xlat.h: $(addprefix compat/.xlat/,$(xlat-y)) Makefile + cat $(filter %.h,$^) >$@.new mv -f $@.new $@ ifeq ($(XEN_TARGET_ARCH),$(XEN_COMPILE_ARCH)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:02:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xJ-0004lI-7O; Wed, 05 Mar 2014 05:01:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xH-0004kx-S7 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:20 +0000 Received: from [85.158.137.68:51517] by server-11.bemta-3.messagelabs.com id FB/5E-04255-F9FA6135; Wed, 05 Mar 2014 05:01:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1393995677!2897722!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2358 invoked from network); 5 Mar 2014 05:01:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:01:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xF-0004YI-2N for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3xE-00082p-WB for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:17 +0000 Date: Wed, 05 Mar 2014 05:01:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] include: parallelize compat/xlat.h generation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e9009891688202a7ffb63761b94e9ae0a53795a Author: Jan Beulich AuthorDate: Tue Mar 4 11:03:13 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:03:13 2014 +0100 include: parallelize compat/xlat.h generation Splitting this up into pieces signficantly speeds up building on multi- CPU systems when making use of make's -j option. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/include/Makefile | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/xen/include/Makefile b/xen/include/Makefile index 5f2bcf7..d6f0cf7 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -66,14 +66,24 @@ compat/%.c: public/%.h xlat.lst Makefile $(BASEDIR)/tools/compat-build-source.py $(PYTHON) $(BASEDIR)/tools/compat-build-source.py >$@.new mv -f $@.new $@ -compat/xlat.h: xlat.lst $(filter-out compat/xlat.h,$(headers-y)) $(BASEDIR)/tools/get-fields.sh Makefile +compat/.xlat/%.h: compat/%.h compat/.xlat/%.lst $(BASEDIR)/tools/get-fields.sh Makefile export PYTHON=$(PYTHON); \ - grep -v '^[ ]*#' xlat.lst | \ - while read what name hdr; do \ - hdr="compat/$$(echo $$hdr | sed 's,@arch@,$(compat-arch-y),g')"; \ - echo '$(headers-y)' | grep -q "$$hdr" || continue; \ - $(SHELL) $(BASEDIR)/tools/get-fields.sh "$$what" compat_$$name $$hdr || exit $$?; \ - done >$@.new + while read what name; do \ + $(SHELL) $(BASEDIR)/tools/get-fields.sh "$$what" compat_$$name $< || exit $$?; \ + done <$(patsubst compat/%,compat/.xlat/%,$(basename $<)).lst >$@.new + mv -f $@.new $@ + +.PRECIOUS: compat/.xlat/%.lst +compat/.xlat/%.lst: xlat.lst Makefile + mkdir -p $(@D) + grep -v '^[ \t]*#' $< | sed -ne 's,@arch@,$(compat-arch-y),g' -e 's,[ \t]\+$*\.h[ \t]*$$,,p' >$@.new + $(call move-if-changed,$@.new,$@) + +xlat-y := $(shell sed -ne 's,@arch@,$(compat-arch-y),g' -e 's,^[?!][ \t]\+[^ \t]\+[ \t]\+,,p' xlat.lst | uniq) +xlat-y := $(filter $(patsubst compat/%,%,$(headers-y)),$(xlat-y)) + +compat/xlat.h: $(addprefix compat/.xlat/,$(xlat-y)) Makefile + cat $(filter %.h,$^) >$@.new mv -f $@.new $@ ifeq ($(XEN_TARGET_ARCH),$(XEN_COMPILE_ARCH)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:02:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xT-0004n7-CX; Wed, 05 Mar 2014 05:01:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xS-0004mo-28 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:30 +0000 Received: from [85.158.137.68:58013] by server-13.bemta-3.messagelabs.com id B2/5C-26923-9AFA6135; Wed, 05 Mar 2014 05:01:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1393995687!4426341!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18228 invoked from network); 5 Mar 2014 05:01:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:01:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xP-0004YR-8Z for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3xP-00083x-72 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:27 +0000 Date: Wed, 05 Mar 2014 05:01:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/crash: fix up declaration of do_nmi_crash() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8179247eaec09a3e2c6bec6d251af4b74ce09b08 Author: Andrew Cooper AuthorDate: Tue Mar 4 11:14:53 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:14:53 2014 +0100 x86/crash: fix up declaration of do_nmi_crash() ... so it can correctly be annotated as noreturn. Move the declaration of nmi_crash() to be effectively private in crash.c Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Keir Fraser --- xen/arch/x86/crash.c | 3 ++- xen/include/asm-x86/processor.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 01fd906..ec586bd 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -36,7 +36,7 @@ static unsigned int crashing_cpu; static DEFINE_PER_CPU_READ_MOSTLY(bool_t, crash_save_done); /* This becomes the NMI handler for non-crashing CPUs, when Xen is crashing. */ -void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs) +void do_nmi_crash(struct cpu_user_regs *regs) { int cpu = smp_processor_id(); @@ -113,6 +113,7 @@ void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs) halt(); } +void nmi_crash(void); static void nmi_shootdown_cpus(void) { unsigned long msecs; diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index f1cccff..4629b32 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -530,7 +530,6 @@ void do_ ## _name(struct cpu_user_regs *regs) DECLARE_TRAP_HANDLER(divide_error); DECLARE_TRAP_HANDLER(debug); DECLARE_TRAP_HANDLER(nmi); -DECLARE_TRAP_HANDLER(nmi_crash); DECLARE_TRAP_HANDLER(int3); DECLARE_TRAP_HANDLER(overflow); DECLARE_TRAP_HANDLER(bounds); @@ -551,6 +550,7 @@ DECLARE_TRAP_HANDLER(spurious_interrupt_bug); void trap_nop(void); void enable_nmis(void); +void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs); void syscall_enter(void); void sysenter_entry(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:02:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xd-0004oF-FX; Wed, 05 Mar 2014 05:01:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xc-0004nz-6m for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:40 +0000 Received: from [85.158.139.211:55779] by server-5.bemta-5.messagelabs.com id 00/C7-32749-3BFA6135; Wed, 05 Mar 2014 05:01:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1393995697!7769492!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25074 invoked from network); 5 Mar 2014 05:01:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:01:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xZ-0004YU-EA for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3xZ-00084d-DE for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:37 +0000 Date: Wed, 05 Mar 2014 05:01:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] compiler: replace opencoded __attribute__((noreturn)) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0a1082e8fd83ec648f5ddeb09b1b73e6865e675e Author: Andrew Cooper AuthorDate: Tue Mar 4 11:15:47 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:15:47 2014 +0100 compiler: replace opencoded __attribute__((noreturn)) Make a formal define for noreturn in compiler.h, and fix up opencoded uses of __attribute__((noreturn)). This includes removing redundant uses with function definitions which have a public declaration. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/arm/early_printk.c | 2 +- xen/arch/x86/efi/boot.c | 4 ++-- xen/arch/x86/shutdown.c | 2 +- xen/include/asm-arm/early_printk.h | 4 ++-- xen/include/asm-x86/processor.h | 2 +- xen/include/xen/compiler.h | 2 ++ xen/include/xen/lib.h | 2 +- xen/include/xen/sched.h | 4 ++-- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/early_printk.c b/xen/arch/arm/early_printk.c index 41938bb..2870a30 100644 --- a/xen/arch/arm/early_printk.c +++ b/xen/arch/arm/early_printk.c @@ -52,7 +52,7 @@ void __init early_printk(const char *fmt, ...) va_end(args); } -void __attribute__((noreturn)) __init +void __init early_panic(const char *fmt, ...) { va_list args; diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 0dd935c..a26e0af 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -183,7 +183,7 @@ static bool_t __init match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2) !memcmp(guid1->Data4, guid2->Data4, sizeof(guid1->Data4)); } -static void __init __attribute__((__noreturn__)) blexit(const CHAR16 *str) +static void __init noreturn blexit(const CHAR16 *str) { if ( str ) PrintStr((CHAR16 *)str); @@ -762,7 +762,7 @@ static void __init relocate_trampoline(unsigned long phys) *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = phys >> 4; } -void EFIAPI __init __attribute__((__noreturn__)) +void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { static EFI_GUID __initdata loaded_image_guid = LOADED_IMAGE_PROTOCOL; diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 6eba271..6143c40 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -85,7 +85,7 @@ static inline void kb_wait(void) break; } -static void __attribute__((noreturn)) __machine_halt(void *unused) +static void noreturn __machine_halt(void *unused) { local_irq_disable(); for ( ; ; ) diff --git a/xen/include/asm-arm/early_printk.h b/xen/include/asm-arm/early_printk.h index 707bbf7..8047141 100644 --- a/xen/include/asm-arm/early_printk.h +++ b/xen/include/asm-arm/early_printk.h @@ -26,7 +26,7 @@ void early_printk(const char *fmt, ...) __attribute__((format (printf, 1, 2))); -void early_panic(const char *fmt, ...) __attribute__((noreturn)) +void noreturn early_panic(const char *fmt, ...) __attribute__((format (printf, 1, 2))); #else @@ -35,7 +35,7 @@ static inline __attribute__((format (printf, 1, 2))) void early_printk(const char *fmt, ...) {} -static inline void __attribute__((noreturn)) +static inline void noreturn __attribute__((format (printf, 1, 2))) early_panic(const char *fmt, ...) {while(1);} diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 4629b32..4da545e 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -550,7 +550,7 @@ DECLARE_TRAP_HANDLER(spurious_interrupt_bug); void trap_nop(void); void enable_nmis(void); -void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs); +void noreturn do_nmi_crash(struct cpu_user_regs *regs); void syscall_enter(void); void sysenter_entry(void); diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 7d6805c..c80398d 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -14,6 +14,8 @@ #define always_inline __inline__ __attribute__ ((always_inline)) #define noinline __attribute__((noinline)) +#define noreturn __attribute__((noreturn)) + #if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) #define unreachable() do {} while (1) #else diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 5b258fd..0d1a5d3 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -8,7 +8,7 @@ #include #include -void __bug(char *file, int line) __attribute__((noreturn)); +void noreturn __bug(char *file, int line); void __warn(char *file, int line); #define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index fb8bd36..00f0eba 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -580,7 +580,7 @@ void __domain_crash(struct domain *d); * Mark current domain as crashed and synchronously deschedule from the local * processor. This function never returns. */ -void __domain_crash_synchronous(void) __attribute__((noreturn)); +void noreturn __domain_crash_synchronous(void); #define domain_crash_synchronous() do { \ printk("domain_crash_sync called from %s:%d\n", __FILE__, __LINE__); \ __domain_crash_synchronous(); \ @@ -591,7 +591,7 @@ void __domain_crash_synchronous(void) __attribute__((noreturn)); * the crash occured. If addr is 0, look up address from last extable * redirection. */ -void asm_domain_crash_synchronous(unsigned long addr) __attribute__((noreturn)); +void noreturn asm_domain_crash_synchronous(unsigned long addr); #define set_current_state(_s) do { current->state = (_s); } while (0) void scheduler_init(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:02:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xn-0004pj-W6; Wed, 05 Mar 2014 05:01:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xm-0004pY-L5 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:50 +0000 Received: from [193.109.254.147:47975] by server-1.bemta-14.messagelabs.com id B6/C8-29588-EBFA6135; Wed, 05 Mar 2014 05:01:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1393995708!8427855!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32356 invoked from network); 5 Mar 2014 05:01:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:01:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xj-0004YY-OT for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3xj-00084z-IG for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:47 +0000 Date: Wed, 05 Mar 2014 05:01:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] identify panic and reboot/halt functions as noreturn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b2ae19ef12a5fff51c810a1e0310105800f733c Author: Andrew Cooper AuthorDate: Tue Mar 4 11:17:03 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:17:03 2014 +0100 identify panic and reboot/halt functions as noreturn On an x86 build (GCC Debian 4.7.2-5), this substantially reduces the size of .text and .init.text sections. Experimentally, even in a non-debug build, GCC uses `call` rather than `jmp` so there should be no impact on any stack trace generation. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/arm/shutdown.c | 2 +- xen/arch/x86/cpu/mcheck/mce.h | 2 +- xen/arch/x86/shutdown.c | 2 +- xen/common/shutdown.c | 2 +- xen/include/asm-arm/smp.h | 2 +- xen/include/asm-x86/processor.h | 2 +- xen/include/xen/lib.h | 2 +- xen/include/xen/shutdown.h | 8 +++++--- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/shutdown.c b/xen/arch/arm/shutdown.c index 767cc12..adc0529 100644 --- a/xen/arch/arm/shutdown.c +++ b/xen/arch/arm/shutdown.c @@ -11,7 +11,7 @@ static void raw_machine_reset(void) platform_reset(); } -static void halt_this_cpu(void *arg) +static void noreturn halt_this_cpu(void *arg) { stop_cpu(); } diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index cbd123d..33bd1ab 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -57,7 +57,7 @@ int mce_available(struct cpuinfo_x86 *c); unsigned int mce_firstbank(struct cpuinfo_x86 *c); /* Helper functions used for collecting error telemetry */ struct mc_info *x86_mcinfo_getptr(void); -void mc_panic(char *s); +void noreturn mc_panic(char *s); void x86_mc_get_cpu_info(unsigned, uint32_t *, uint16_t *, uint16_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *); diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 6143c40..827515d 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -452,7 +452,7 @@ static int __init reboot_init(void) } __initcall(reboot_init); -static void __machine_restart(void *pdelay) +static void noreturn __machine_restart(void *pdelay) { machine_restart(*(unsigned int *)pdelay); } diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c index 9bccd34..fadb69b 100644 --- a/xen/common/shutdown.c +++ b/xen/common/shutdown.c @@ -17,7 +17,7 @@ bool_t __read_mostly opt_noreboot; boolean_param("noreboot", opt_noreboot); -static void maybe_reboot(void) +static void noreturn maybe_reboot(void) { if ( opt_noreboot ) { diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h index a1de03c..91b1e52 100644 --- a/xen/include/asm-arm/smp.h +++ b/xen/include/asm-arm/smp.h @@ -15,7 +15,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); #define raw_smp_processor_id() (get_processor_id()) -extern void stop_cpu(void); +extern void noreturn stop_cpu(void); extern int arch_smp_init(void); extern int arch_cpu_init(int cpu, struct dt_device_node *dn); diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 4da545e..498d8a7 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -515,7 +515,7 @@ void show_registers(struct cpu_user_regs *regs); void show_execution_state(struct cpu_user_regs *regs); #define dump_execution_state() run_in_exception_handler(show_execution_state) void show_page_walk(unsigned long addr); -void fatal_trap(int trapnr, struct cpu_user_regs *regs); +void noreturn fatal_trap(int trapnr, struct cpu_user_regs *regs); void compat_show_guest_stack(struct vcpu *, struct cpu_user_regs *, int lines); diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 0d1a5d3..1369b2b 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -87,7 +87,7 @@ extern void printk(const char *format, ...) __attribute__ ((format (printf, 1, 2))); extern void guest_printk(const struct domain *d, const char *format, ...) __attribute__ ((format (printf, 2, 3))); -extern void panic(const char *format, ...) +extern void noreturn panic(const char *format, ...) __attribute__ ((format (printf, 1, 2))); extern long vm_assist(struct domain *, unsigned int, unsigned int); extern int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst); diff --git a/xen/include/xen/shutdown.h b/xen/include/xen/shutdown.h index 2bee748..f04905b 100644 --- a/xen/include/xen/shutdown.h +++ b/xen/include/xen/shutdown.h @@ -1,13 +1,15 @@ #ifndef __XEN_SHUTDOWN_H__ #define __XEN_SHUTDOWN_H__ +#include + /* opt_noreboot: If true, machine will need manual reset on error. */ extern bool_t opt_noreboot; -void dom0_shutdown(u8 reason); +void noreturn dom0_shutdown(u8 reason); -void machine_restart(unsigned int delay_millisecs); -void machine_halt(void); +void noreturn machine_restart(unsigned int delay_millisecs); +void noreturn machine_halt(void); void machine_power_off(void); #endif /* __XEN_SHUTDOWN_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:02:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xy-0004r0-3d; Wed, 05 Mar 2014 05:02:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xw-0004qj-K6 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:02:00 +0000 Received: from [85.158.137.68:9226] by server-14.bemta-3.messagelabs.com id 68/AF-08196-7CFA6135; Wed, 05 Mar 2014 05:01:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1393995718!5720406!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5247 invoked from network); 5 Mar 2014 05:01:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:01:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xt-0004Yb-Tx for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3xt-00085N-Sh for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:57 +0000 Date: Wed, 05 Mar 2014 05:01:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] misc cleanup as a result of the previous patches X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f600b324bc5235a179eb6c6f57e564667b8fb8de Author: Andrew Cooper AuthorDate: Tue Mar 4 11:18:28 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:18:28 2014 +0100 misc cleanup as a result of the previous patches This includes: * A stale comment in sh_skip_sync() * A dead for ever loop in __bug() * A prototype for machine_power_off() which unimplemented in any architecture * Replacing a for(;;); loop with unreachable() Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Tim Deegan Acked-by: Keir Fraser --- xen/arch/x86/efi/boot.c | 2 +- xen/arch/x86/mm/shadow/common.c | 1 - xen/drivers/char/console.c | 1 - xen/include/xen/shutdown.h | 1 - 4 files changed, 1 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index a26e0af..62c4812 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -201,7 +201,7 @@ static void __init noreturn blexit(const CHAR16 *str) efi_bs->FreePages(xsm.addr, PFN_UP(xsm.size)); efi_bs->Exit(efi_ih, EFI_SUCCESS, 0, NULL); - for( ; ; ); /* not reached */ + unreachable(); /* not reached */ } /* generic routine for printing error messages */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index b2bd7c2..6eb781e 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -874,7 +874,6 @@ static int sh_skip_sync(struct vcpu *v, mfn_t gl1mfn) SHADOW_ERROR("gmfn %#lx was OOS but not shadowed as an l1.\n", mfn_x(gl1mfn)); BUG(); - return 0; /* BUG() is no longer __attribute__((noreturn)). */ } diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 532c426..7d4383c 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1089,7 +1089,6 @@ void __bug(char *file, int line) printk("Xen BUG at %s:%d\n", file, line); dump_execution_state(); panic("Xen BUG at %s:%d", file, line); - for ( ; ; ) ; } void __warn(char *file, int line) diff --git a/xen/include/xen/shutdown.h b/xen/include/xen/shutdown.h index f04905b..a00bfef 100644 --- a/xen/include/xen/shutdown.h +++ b/xen/include/xen/shutdown.h @@ -10,6 +10,5 @@ void noreturn dom0_shutdown(u8 reason); void noreturn machine_restart(unsigned int delay_millisecs); void noreturn machine_halt(void); -void machine_power_off(void); #endif /* __XEN_SHUTDOWN_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:02:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xT-0004n7-CX; Wed, 05 Mar 2014 05:01:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xS-0004mo-28 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:30 +0000 Received: from [85.158.137.68:58013] by server-13.bemta-3.messagelabs.com id B2/5C-26923-9AFA6135; Wed, 05 Mar 2014 05:01:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1393995687!4426341!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18228 invoked from network); 5 Mar 2014 05:01:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:01:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xP-0004YR-8Z for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3xP-00083x-72 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:27 +0000 Date: Wed, 05 Mar 2014 05:01:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/crash: fix up declaration of do_nmi_crash() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8179247eaec09a3e2c6bec6d251af4b74ce09b08 Author: Andrew Cooper AuthorDate: Tue Mar 4 11:14:53 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:14:53 2014 +0100 x86/crash: fix up declaration of do_nmi_crash() ... so it can correctly be annotated as noreturn. Move the declaration of nmi_crash() to be effectively private in crash.c Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Keir Fraser --- xen/arch/x86/crash.c | 3 ++- xen/include/asm-x86/processor.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 01fd906..ec586bd 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -36,7 +36,7 @@ static unsigned int crashing_cpu; static DEFINE_PER_CPU_READ_MOSTLY(bool_t, crash_save_done); /* This becomes the NMI handler for non-crashing CPUs, when Xen is crashing. */ -void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs) +void do_nmi_crash(struct cpu_user_regs *regs) { int cpu = smp_processor_id(); @@ -113,6 +113,7 @@ void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs) halt(); } +void nmi_crash(void); static void nmi_shootdown_cpus(void) { unsigned long msecs; diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index f1cccff..4629b32 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -530,7 +530,6 @@ void do_ ## _name(struct cpu_user_regs *regs) DECLARE_TRAP_HANDLER(divide_error); DECLARE_TRAP_HANDLER(debug); DECLARE_TRAP_HANDLER(nmi); -DECLARE_TRAP_HANDLER(nmi_crash); DECLARE_TRAP_HANDLER(int3); DECLARE_TRAP_HANDLER(overflow); DECLARE_TRAP_HANDLER(bounds); @@ -551,6 +550,7 @@ DECLARE_TRAP_HANDLER(spurious_interrupt_bug); void trap_nop(void); void enable_nmis(void); +void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs); void syscall_enter(void); void sysenter_entry(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:02:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xn-0004pj-W6; Wed, 05 Mar 2014 05:01:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xm-0004pY-L5 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:50 +0000 Received: from [193.109.254.147:47975] by server-1.bemta-14.messagelabs.com id B6/C8-29588-EBFA6135; Wed, 05 Mar 2014 05:01:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1393995708!8427855!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32356 invoked from network); 5 Mar 2014 05:01:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:01:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xj-0004YY-OT for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3xj-00084z-IG for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:47 +0000 Date: Wed, 05 Mar 2014 05:01:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] identify panic and reboot/halt functions as noreturn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b2ae19ef12a5fff51c810a1e0310105800f733c Author: Andrew Cooper AuthorDate: Tue Mar 4 11:17:03 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:17:03 2014 +0100 identify panic and reboot/halt functions as noreturn On an x86 build (GCC Debian 4.7.2-5), this substantially reduces the size of .text and .init.text sections. Experimentally, even in a non-debug build, GCC uses `call` rather than `jmp` so there should be no impact on any stack trace generation. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/arm/shutdown.c | 2 +- xen/arch/x86/cpu/mcheck/mce.h | 2 +- xen/arch/x86/shutdown.c | 2 +- xen/common/shutdown.c | 2 +- xen/include/asm-arm/smp.h | 2 +- xen/include/asm-x86/processor.h | 2 +- xen/include/xen/lib.h | 2 +- xen/include/xen/shutdown.h | 8 +++++--- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/shutdown.c b/xen/arch/arm/shutdown.c index 767cc12..adc0529 100644 --- a/xen/arch/arm/shutdown.c +++ b/xen/arch/arm/shutdown.c @@ -11,7 +11,7 @@ static void raw_machine_reset(void) platform_reset(); } -static void halt_this_cpu(void *arg) +static void noreturn halt_this_cpu(void *arg) { stop_cpu(); } diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index cbd123d..33bd1ab 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -57,7 +57,7 @@ int mce_available(struct cpuinfo_x86 *c); unsigned int mce_firstbank(struct cpuinfo_x86 *c); /* Helper functions used for collecting error telemetry */ struct mc_info *x86_mcinfo_getptr(void); -void mc_panic(char *s); +void noreturn mc_panic(char *s); void x86_mc_get_cpu_info(unsigned, uint32_t *, uint16_t *, uint16_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *); diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 6143c40..827515d 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -452,7 +452,7 @@ static int __init reboot_init(void) } __initcall(reboot_init); -static void __machine_restart(void *pdelay) +static void noreturn __machine_restart(void *pdelay) { machine_restart(*(unsigned int *)pdelay); } diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c index 9bccd34..fadb69b 100644 --- a/xen/common/shutdown.c +++ b/xen/common/shutdown.c @@ -17,7 +17,7 @@ bool_t __read_mostly opt_noreboot; boolean_param("noreboot", opt_noreboot); -static void maybe_reboot(void) +static void noreturn maybe_reboot(void) { if ( opt_noreboot ) { diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h index a1de03c..91b1e52 100644 --- a/xen/include/asm-arm/smp.h +++ b/xen/include/asm-arm/smp.h @@ -15,7 +15,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); #define raw_smp_processor_id() (get_processor_id()) -extern void stop_cpu(void); +extern void noreturn stop_cpu(void); extern int arch_smp_init(void); extern int arch_cpu_init(int cpu, struct dt_device_node *dn); diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 4da545e..498d8a7 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -515,7 +515,7 @@ void show_registers(struct cpu_user_regs *regs); void show_execution_state(struct cpu_user_regs *regs); #define dump_execution_state() run_in_exception_handler(show_execution_state) void show_page_walk(unsigned long addr); -void fatal_trap(int trapnr, struct cpu_user_regs *regs); +void noreturn fatal_trap(int trapnr, struct cpu_user_regs *regs); void compat_show_guest_stack(struct vcpu *, struct cpu_user_regs *, int lines); diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 0d1a5d3..1369b2b 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -87,7 +87,7 @@ extern void printk(const char *format, ...) __attribute__ ((format (printf, 1, 2))); extern void guest_printk(const struct domain *d, const char *format, ...) __attribute__ ((format (printf, 2, 3))); -extern void panic(const char *format, ...) +extern void noreturn panic(const char *format, ...) __attribute__ ((format (printf, 1, 2))); extern long vm_assist(struct domain *, unsigned int, unsigned int); extern int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst); diff --git a/xen/include/xen/shutdown.h b/xen/include/xen/shutdown.h index 2bee748..f04905b 100644 --- a/xen/include/xen/shutdown.h +++ b/xen/include/xen/shutdown.h @@ -1,13 +1,15 @@ #ifndef __XEN_SHUTDOWN_H__ #define __XEN_SHUTDOWN_H__ +#include + /* opt_noreboot: If true, machine will need manual reset on error. */ extern bool_t opt_noreboot; -void dom0_shutdown(u8 reason); +void noreturn dom0_shutdown(u8 reason); -void machine_restart(unsigned int delay_millisecs); -void machine_halt(void); +void noreturn machine_restart(unsigned int delay_millisecs); +void noreturn machine_halt(void); void machine_power_off(void); #endif /* __XEN_SHUTDOWN_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:02:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xy-0004r0-3d; Wed, 05 Mar 2014 05:02:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xw-0004qj-K6 for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:02:00 +0000 Received: from [85.158.137.68:9226] by server-14.bemta-3.messagelabs.com id 68/AF-08196-7CFA6135; Wed, 05 Mar 2014 05:01:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1393995718!5720406!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5247 invoked from network); 5 Mar 2014 05:01:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:01:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xt-0004Yb-Tx for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3xt-00085N-Sh for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:57 +0000 Date: Wed, 05 Mar 2014 05:01:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] misc cleanup as a result of the previous patches X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f600b324bc5235a179eb6c6f57e564667b8fb8de Author: Andrew Cooper AuthorDate: Tue Mar 4 11:18:28 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:18:28 2014 +0100 misc cleanup as a result of the previous patches This includes: * A stale comment in sh_skip_sync() * A dead for ever loop in __bug() * A prototype for machine_power_off() which unimplemented in any architecture * Replacing a for(;;); loop with unreachable() Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Tim Deegan Acked-by: Keir Fraser --- xen/arch/x86/efi/boot.c | 2 +- xen/arch/x86/mm/shadow/common.c | 1 - xen/drivers/char/console.c | 1 - xen/include/xen/shutdown.h | 1 - 4 files changed, 1 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index a26e0af..62c4812 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -201,7 +201,7 @@ static void __init noreturn blexit(const CHAR16 *str) efi_bs->FreePages(xsm.addr, PFN_UP(xsm.size)); efi_bs->Exit(efi_ih, EFI_SUCCESS, 0, NULL); - for( ; ; ); /* not reached */ + unreachable(); /* not reached */ } /* generic routine for printing error messages */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index b2bd7c2..6eb781e 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -874,7 +874,6 @@ static int sh_skip_sync(struct vcpu *v, mfn_t gl1mfn) SHADOW_ERROR("gmfn %#lx was OOS but not shadowed as an l1.\n", mfn_x(gl1mfn)); BUG(); - return 0; /* BUG() is no longer __attribute__((noreturn)). */ } diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 532c426..7d4383c 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1089,7 +1089,6 @@ void __bug(char *file, int line) printk("Xen BUG at %s:%d\n", file, line); dump_execution_state(); panic("Xen BUG at %s:%d", file, line); - for ( ; ; ) ; } void __warn(char *file, int line) diff --git a/xen/include/xen/shutdown.h b/xen/include/xen/shutdown.h index f04905b..a00bfef 100644 --- a/xen/include/xen/shutdown.h +++ b/xen/include/xen/shutdown.h @@ -10,6 +10,5 @@ void noreturn dom0_shutdown(u8 reason); void noreturn machine_restart(unsigned int delay_millisecs); void noreturn machine_halt(void); -void machine_power_off(void); #endif /* __XEN_SHUTDOWN_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:02:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xd-0004oF-FX; Wed, 05 Mar 2014 05:01:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xc-0004nz-6m for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:40 +0000 Received: from [85.158.139.211:55779] by server-5.bemta-5.messagelabs.com id 00/C7-32749-3BFA6135; Wed, 05 Mar 2014 05:01:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1393995697!7769492!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25074 invoked from network); 5 Mar 2014 05:01:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:01:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3xZ-0004YU-EA for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3xZ-00084d-DE for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:01:37 +0000 Date: Wed, 05 Mar 2014 05:01:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] compiler: replace opencoded __attribute__((noreturn)) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0a1082e8fd83ec648f5ddeb09b1b73e6865e675e Author: Andrew Cooper AuthorDate: Tue Mar 4 11:15:47 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:15:47 2014 +0100 compiler: replace opencoded __attribute__((noreturn)) Make a formal define for noreturn in compiler.h, and fix up opencoded uses of __attribute__((noreturn)). This includes removing redundant uses with function definitions which have a public declaration. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/arm/early_printk.c | 2 +- xen/arch/x86/efi/boot.c | 4 ++-- xen/arch/x86/shutdown.c | 2 +- xen/include/asm-arm/early_printk.h | 4 ++-- xen/include/asm-x86/processor.h | 2 +- xen/include/xen/compiler.h | 2 ++ xen/include/xen/lib.h | 2 +- xen/include/xen/sched.h | 4 ++-- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/early_printk.c b/xen/arch/arm/early_printk.c index 41938bb..2870a30 100644 --- a/xen/arch/arm/early_printk.c +++ b/xen/arch/arm/early_printk.c @@ -52,7 +52,7 @@ void __init early_printk(const char *fmt, ...) va_end(args); } -void __attribute__((noreturn)) __init +void __init early_panic(const char *fmt, ...) { va_list args; diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 0dd935c..a26e0af 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -183,7 +183,7 @@ static bool_t __init match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2) !memcmp(guid1->Data4, guid2->Data4, sizeof(guid1->Data4)); } -static void __init __attribute__((__noreturn__)) blexit(const CHAR16 *str) +static void __init noreturn blexit(const CHAR16 *str) { if ( str ) PrintStr((CHAR16 *)str); @@ -762,7 +762,7 @@ static void __init relocate_trampoline(unsigned long phys) *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = phys >> 4; } -void EFIAPI __init __attribute__((__noreturn__)) +void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { static EFI_GUID __initdata loaded_image_guid = LOADED_IMAGE_PROTOCOL; diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 6eba271..6143c40 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -85,7 +85,7 @@ static inline void kb_wait(void) break; } -static void __attribute__((noreturn)) __machine_halt(void *unused) +static void noreturn __machine_halt(void *unused) { local_irq_disable(); for ( ; ; ) diff --git a/xen/include/asm-arm/early_printk.h b/xen/include/asm-arm/early_printk.h index 707bbf7..8047141 100644 --- a/xen/include/asm-arm/early_printk.h +++ b/xen/include/asm-arm/early_printk.h @@ -26,7 +26,7 @@ void early_printk(const char *fmt, ...) __attribute__((format (printf, 1, 2))); -void early_panic(const char *fmt, ...) __attribute__((noreturn)) +void noreturn early_panic(const char *fmt, ...) __attribute__((format (printf, 1, 2))); #else @@ -35,7 +35,7 @@ static inline __attribute__((format (printf, 1, 2))) void early_printk(const char *fmt, ...) {} -static inline void __attribute__((noreturn)) +static inline void noreturn __attribute__((format (printf, 1, 2))) early_panic(const char *fmt, ...) {while(1);} diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 4629b32..4da545e 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -550,7 +550,7 @@ DECLARE_TRAP_HANDLER(spurious_interrupt_bug); void trap_nop(void); void enable_nmis(void); -void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs); +void noreturn do_nmi_crash(struct cpu_user_regs *regs); void syscall_enter(void); void sysenter_entry(void); diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 7d6805c..c80398d 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -14,6 +14,8 @@ #define always_inline __inline__ __attribute__ ((always_inline)) #define noinline __attribute__((noinline)) +#define noreturn __attribute__((noreturn)) + #if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) #define unreachable() do {} while (1) #else diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 5b258fd..0d1a5d3 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -8,7 +8,7 @@ #include #include -void __bug(char *file, int line) __attribute__((noreturn)); +void noreturn __bug(char *file, int line); void __warn(char *file, int line); #define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index fb8bd36..00f0eba 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -580,7 +580,7 @@ void __domain_crash(struct domain *d); * Mark current domain as crashed and synchronously deschedule from the local * processor. This function never returns. */ -void __domain_crash_synchronous(void) __attribute__((noreturn)); +void noreturn __domain_crash_synchronous(void); #define domain_crash_synchronous() do { \ printk("domain_crash_sync called from %s:%d\n", __FILE__, __LINE__); \ __domain_crash_synchronous(); \ @@ -591,7 +591,7 @@ void __domain_crash_synchronous(void) __attribute__((noreturn)); * the crash occured. If addr is 0, look up address from last extable * redirection. */ -void asm_domain_crash_synchronous(unsigned long addr) __attribute__((noreturn)); +void noreturn asm_domain_crash_synchronous(unsigned long addr); #define set_current_state(_s) do { current->state = (_s); } while (0) void scheduler_init(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:02:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:02:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3y8-0004uW-6d; Wed, 05 Mar 2014 05:02:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3y6-0004ty-TK for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:02:11 +0000 Received: from [85.158.143.35:9484] by server-2.bemta-4.messagelabs.com id F1/92-06539-2DFA6135; Wed, 05 Mar 2014 05:02:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1393995728!10039130!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5737 invoked from network); 5 Mar 2014 05:02:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:02:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3y4-0004ZG-3W for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:02:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3y4-00085t-2d for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:02:08 +0000 Date: Wed, 05 Mar 2014 05:02:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: identify reset_stack_and_jump() as noreturn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ceff76a5be3caaca028ea8a6cbce5744eaf2b2db Author: Andrew Cooper AuthorDate: Tue Mar 4 11:19:20 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:19:20 2014 +0100 x86: identify reset_stack_and_jump() as noreturn reset_stack_and_jump() is actually a macro, but can effectivly become noreturn by giving it an unreachable() declaration. Propagate the 'noreturn-ness' up through the direct and indirect callers. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 6 ++---- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/setup.c | 2 +- xen/include/asm-x86/current.h | 11 +++++++---- xen/include/asm-x86/domain.h | 2 +- xen/include/asm-x86/hvm/vmx/vmx.h | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 6618ae6..c42a079 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -133,12 +133,12 @@ void startup_cpu_idle_loop(void) reset_stack_and_jump(idle_loop); } -static void continue_idle_domain(struct vcpu *v) +static void noreturn continue_idle_domain(struct vcpu *v) { reset_stack_and_jump(idle_loop); } -static void continue_nonidle_domain(struct vcpu *v) +static void noreturn continue_nonidle_domain(struct vcpu *v) { check_wakeup_from_wait(); mark_regs_dirty(guest_cpu_user_regs()); @@ -1521,13 +1521,11 @@ void context_switch(struct vcpu *prev, struct vcpu *next) update_vcpu_system_time(next); schedule_tail(next); - BUG(); } void continue_running(struct vcpu *same) { schedule_tail(same); - BUG(); } int __sync_local_execstate(void) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 61b1ec8..4fd5376 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -911,7 +911,7 @@ static void svm_ctxt_switch_to(struct vcpu *v) wrmsrl(MSR_TSC_AUX, hvm_msr_tsc_aux(v)); } -static void svm_do_resume(struct vcpu *v) +static void noreturn svm_do_resume(struct vcpu *v) { struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; bool_t debug_state = v->domain->debugger_attached; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index c743606..4dbf2b7 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -537,7 +537,7 @@ static char * __init cmdline_cook(char *p, char *loader_name) return p; } -void __init __start_xen(unsigned long mbi_p) +void __init noreturn __start_xen(unsigned long mbi_p) { char *memmap_type = NULL; char *cmdline, *kextra, *loader; diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index c2792ce..4d1f20e 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -59,10 +59,13 @@ static inline struct cpu_info *get_cpu_info(void) ((sp & (~(STACK_SIZE-1))) + \ (STACK_SIZE - sizeof(struct cpu_info) - sizeof(unsigned long))) -#define reset_stack_and_jump(__fn) \ - __asm__ __volatile__ ( \ - "mov %0,%%"__OP"sp; jmp %c1" \ - : : "r" (guest_cpu_user_regs()), "i" (__fn) : "memory" ) +#define reset_stack_and_jump(__fn) \ + ({ \ + __asm__ __volatile__ ( \ + "mov %0,%%"__OP"sp; jmp %c1" \ + : : "r" (guest_cpu_user_regs()), "i" (__fn) : "memory" ); \ + unreachable(); \ + }) #define schedule_tail(vcpu) (((vcpu)->arch.schedule_tail)(vcpu)) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 4ff89f0..49f7c0c 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -395,7 +395,7 @@ struct arch_vcpu unsigned long flags; /* TF_ */ - void (*schedule_tail) (struct vcpu *); + void noreturn (*schedule_tail) (struct vcpu *); void (*ctxt_switch_from) (struct vcpu *); void (*ctxt_switch_to) (struct vcpu *); diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index 6f6b672..827c97e 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -91,7 +91,7 @@ typedef enum { void vmx_asm_vmexit_handler(struct cpu_user_regs); void vmx_asm_do_vmentry(void); void vmx_intr_assist(void); -void vmx_do_resume(struct vcpu *); +void noreturn vmx_do_resume(struct vcpu *); void vmx_vlapic_msr_changed(struct vcpu *v); void vmx_realmode(struct cpu_user_regs *regs); void vmx_update_debug_state(struct vcpu *v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 05 05:02:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Mar 2014 05:02:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3y8-0004uW-6d; Wed, 05 Mar 2014 05:02:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3y6-0004ty-TK for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:02:11 +0000 Received: from [85.158.143.35:9484] by server-2.bemta-4.messagelabs.com id F1/92-06539-2DFA6135; Wed, 05 Mar 2014 05:02:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1393995728!10039130!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5737 invoked from network); 5 Mar 2014 05:02:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Mar 2014 05:02:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WL3y4-0004ZG-3W for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:02:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WL3y4-00085t-2d for xen-changelog@lists.xensource.com; Wed, 05 Mar 2014 05:02:08 +0000 Date: Wed, 05 Mar 2014 05:02:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: identify reset_stack_and_jump() as noreturn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ceff76a5be3caaca028ea8a6cbce5744eaf2b2db Author: Andrew Cooper AuthorDate: Tue Mar 4 11:19:20 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 4 11:19:20 2014 +0100 x86: identify reset_stack_and_jump() as noreturn reset_stack_and_jump() is actually a macro, but can effectivly become noreturn by giving it an unreachable() declaration. Propagate the 'noreturn-ness' up through the direct and indirect callers. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 6 ++---- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/setup.c | 2 +- xen/include/asm-x86/current.h | 11 +++++++---- xen/include/asm-x86/domain.h | 2 +- xen/include/asm-x86/hvm/vmx/vmx.h | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 6618ae6..c42a079 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -133,12 +133,12 @@ void startup_cpu_idle_loop(void) reset_stack_and_jump(idle_loop); } -static void continue_idle_domain(struct vcpu *v) +static void noreturn continue_idle_domain(struct vcpu *v) { reset_stack_and_jump(idle_loop); } -static void continue_nonidle_domain(struct vcpu *v) +static void noreturn continue_nonidle_domain(struct vcpu *v) { check_wakeup_from_wait(); mark_regs_dirty(guest_cpu_user_regs()); @@ -1521,13 +1521,11 @@ void context_switch(struct vcpu *prev, struct vcpu *next) update_vcpu_system_time(next); schedule_tail(next); - BUG(); } void continue_running(struct vcpu *same) { schedule_tail(same); - BUG(); } int __sync_local_execstate(void) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 61b1ec8..4fd5376 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -911,7 +911,7 @@ static void svm_ctxt_switch_to(struct vcpu *v) wrmsrl(MSR_TSC_AUX, hvm_msr_tsc_aux(v)); } -static void svm_do_resume(struct vcpu *v) +static void noreturn svm_do_resume(struct vcpu *v) { struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; bool_t debug_state = v->domain->debugger_attached; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index c743606..4dbf2b7 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -537,7 +537,7 @@ static char * __init cmdline_cook(char *p, char *loader_name) return p; } -void __init __start_xen(unsigned long mbi_p) +void __init noreturn __start_xen(unsigned long mbi_p) { char *memmap_type = NULL; char *cmdline, *kextra, *loader; diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index c2792ce..4d1f20e 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -59,10 +59,13 @@ static inline struct cpu_info *get_cpu_info(void) ((sp & (~(STACK_SIZE-1))) + \ (STACK_SIZE - sizeof(struct cpu_info) - sizeof(unsigned long))) -#define reset_stack_and_jump(__fn) \ - __asm__ __volatile__ ( \ - "mov %0,%%"__OP"sp; jmp %c1" \ - : : "r" (guest_cpu_user_regs()), "i" (__fn) : "memory" ) +#define reset_stack_and_jump(__fn) \ + ({ \ + __asm__ __volatile__ ( \ + "mov %0,%%"__OP"sp; jmp %c1" \ + : : "r" (guest_cpu_user_regs()), "i" (__fn) : "memory" ); \ + unreachable(); \ + }) #define schedule_tail(vcpu) (((vcpu)->arch.schedule_tail)(vcpu)) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 4ff89f0..49f7c0c 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -395,7 +395,7 @@ struct arch_vcpu unsigned long flags; /* TF_ */ - void (*schedule_tail) (struct vcpu *); + void noreturn (*schedule_tail) (struct vcpu *); void (*ctxt_switch_from) (struct vcpu *); void (*ctxt_switch_to) (struct vcpu *); diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index 6f6b672..827c97e 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -91,7 +91,7 @@ typedef enum { void vmx_asm_vmexit_handler(struct cpu_user_regs); void vmx_asm_do_vmentry(void); void vmx_intr_assist(void); -void vmx_do_resume(struct vcpu *); +void noreturn vmx_do_resume(struct vcpu *); void vmx_vlapic_msr_changed(struct vcpu *v); void vmx_realmode(struct cpu_user_regs *regs); void vmx_update_debug_state(struct vcpu *v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 06 22:33:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Mar 2014 22:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLgqg-0005Du-6A; Thu, 06 Mar 2014 22:33:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLgqe-0005CN-Us for xen-changelog@lists.xensource.com; Thu, 06 Mar 2014 22:33:05 +0000 Received: from [85.158.143.35:31048] by server-2.bemta-4.messagelabs.com id CB/81-06539-0A7F8135; Thu, 06 Mar 2014 22:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1394145182!257277!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7915 invoked from network); 6 Mar 2014 22:33:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2014 22:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLgqc-0003Po-F4 for xen-changelog@lists.xensource.com; Thu, 06 Mar 2014 22:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLgqc-0000G5-5R for xen-changelog@lists.xensource.com; Thu, 06 Mar 2014 22:33:02 +0000 Date: Thu, 06 Mar 2014 22:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/AMD: work around erratum 793 for 32-bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 934858f00267a92bc2a2995a0c634d02d2c60fbd Author: Jan Beulich AuthorDate: Thu Feb 20 08:43:11 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 20 08:43:11 2014 +0100 x86/AMD: work around erratum 793 for 32-bit The original change went into a 64-bit only code section, thus leaving the issue unfixed on 32-bit. Re-order code to address this. This is part of CVE-2013-6885 / XSA-82. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/x86/cpu/amd.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 54ca33c..e1190ef 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -649,6 +649,18 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) "*** Pass \"allow_unsafe\" if you're trusting" " all your (PV) guest kernels. ***\n"); + /* AMD CPUs do not support SYSENTER outside of legacy mode. */ + clear_bit(X86_FEATURE_SEP, c->x86_capability); + + if (c->x86 == 0x10) { + /* do this for boot cpu */ + if (c == &boot_cpu_data) + check_enable_amd_mmconf_dmi(); + + fam10h_check_enable_mmcfg(); + } +#endif + if (c->x86 == 0x16 && c->x86_model <= 0xf) { rdmsrl(MSR_AMD64_LS_CFG, value); if (!(value & (1 << 15))) { @@ -663,18 +675,6 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) } } - /* AMD CPUs do not support SYSENTER outside of legacy mode. */ - clear_bit(X86_FEATURE_SEP, c->x86_capability); - - if (c->x86 == 0x10) { - /* do this for boot cpu */ - if (c == &boot_cpu_data) - check_enable_amd_mmconf_dmi(); - - fam10h_check_enable_mmcfg(); - } -#endif - if (c->x86 == 0x10) { /* * On family 10h BIOS may not have properly enabled WC+ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 06 22:33:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Mar 2014 22:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLgqg-0005Du-6A; Thu, 06 Mar 2014 22:33:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLgqe-0005CN-Us for xen-changelog@lists.xensource.com; Thu, 06 Mar 2014 22:33:05 +0000 Received: from [85.158.143.35:31048] by server-2.bemta-4.messagelabs.com id CB/81-06539-0A7F8135; Thu, 06 Mar 2014 22:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1394145182!257277!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7915 invoked from network); 6 Mar 2014 22:33:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2014 22:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLgqc-0003Po-F4 for xen-changelog@lists.xensource.com; Thu, 06 Mar 2014 22:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLgqc-0000G5-5R for xen-changelog@lists.xensource.com; Thu, 06 Mar 2014 22:33:02 +0000 Date: Thu, 06 Mar 2014 22:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/AMD: work around erratum 793 for 32-bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 934858f00267a92bc2a2995a0c634d02d2c60fbd Author: Jan Beulich AuthorDate: Thu Feb 20 08:43:11 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 20 08:43:11 2014 +0100 x86/AMD: work around erratum 793 for 32-bit The original change went into a 64-bit only code section, thus leaving the issue unfixed on 32-bit. Re-order code to address this. This is part of CVE-2013-6885 / XSA-82. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/x86/cpu/amd.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 54ca33c..e1190ef 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -649,6 +649,18 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) "*** Pass \"allow_unsafe\" if you're trusting" " all your (PV) guest kernels. ***\n"); + /* AMD CPUs do not support SYSENTER outside of legacy mode. */ + clear_bit(X86_FEATURE_SEP, c->x86_capability); + + if (c->x86 == 0x10) { + /* do this for boot cpu */ + if (c == &boot_cpu_data) + check_enable_amd_mmconf_dmi(); + + fam10h_check_enable_mmcfg(); + } +#endif + if (c->x86 == 0x16 && c->x86_model <= 0xf) { rdmsrl(MSR_AMD64_LS_CFG, value); if (!(value & (1 << 15))) { @@ -663,18 +675,6 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) } } - /* AMD CPUs do not support SYSENTER outside of legacy mode. */ - clear_bit(X86_FEATURE_SEP, c->x86_capability); - - if (c->x86 == 0x10) { - /* do this for boot cpu */ - if (c == &boot_cpu_data) - check_enable_amd_mmconf_dmi(); - - fam10h_check_enable_mmcfg(); - } -#endif - if (c->x86 == 0x10) { /* * On family 10h BIOS may not have properly enabled WC+ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:44:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoVr-000513-F6; Fri, 07 Mar 2014 06:44:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoVq-00050p-QU for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:06 +0000 Received: from [85.158.137.68:40102] by server-17.bemta-3.messagelabs.com id 88/D7-22569-5BA69135; Fri, 07 Mar 2014 06:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1394174644!768857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19657 invoked from network); 7 Mar 2014 06:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoVo-0006uj-0G for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoVn-0007Ee-K0 for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:03 +0000 Date: Fri, 07 Mar 2014 06:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/vsprintf: Explicitly treat negative lengths as 'unlimited' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 034a5199c620596c9fc95a8cb7de122a922dc428 Author: Tim Deegan AuthorDate: Thu Nov 28 14:33:06 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 6 10:12:38 2014 +0000 common/vsprintf: Explicitly treat negative lengths as 'unlimited' The old code relied on implictly casting negative numbers to size_t making a very large limit, which was correct but non-obvious. Coverity CID 1128575 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/common/vsprintf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index f7cb0f1..8c43282 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -240,7 +240,7 @@ static char *number( static char *string(char *str, char *end, const char *s, int field_width, int precision, int flags) { - int i, len = strnlen(s, precision); + int i, len = (precision < 0) ? strlen(s) : strnlen(s, precision); if (!(flags & LEFT)) { while (len < field_width--) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:44:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoVr-000513-F6; Fri, 07 Mar 2014 06:44:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoVq-00050p-QU for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:06 +0000 Received: from [85.158.137.68:40102] by server-17.bemta-3.messagelabs.com id 88/D7-22569-5BA69135; Fri, 07 Mar 2014 06:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1394174644!768857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19657 invoked from network); 7 Mar 2014 06:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoVo-0006uj-0G for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoVn-0007Ee-K0 for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:03 +0000 Date: Fri, 07 Mar 2014 06:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/vsprintf: Explicitly treat negative lengths as 'unlimited' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 034a5199c620596c9fc95a8cb7de122a922dc428 Author: Tim Deegan AuthorDate: Thu Nov 28 14:33:06 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 6 10:12:38 2014 +0000 common/vsprintf: Explicitly treat negative lengths as 'unlimited' The old code relied on implictly casting negative numbers to size_t making a very large limit, which was correct but non-obvious. Coverity CID 1128575 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/common/vsprintf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index f7cb0f1..8c43282 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -240,7 +240,7 @@ static char *number( static char *string(char *str, char *end, const char *s, int field_width, int precision, int flags) { - int i, len = strnlen(s, precision); + int i, len = (precision < 0) ? strlen(s) : strnlen(s, precision); if (!(flags & LEFT)) { while (len < field_width--) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoW2-00051q-Mr; Fri, 07 Mar 2014 06:44:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoW1-00051j-Go for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:17 +0000 Received: from [85.158.143.35:33415] by server-1.bemta-4.messagelabs.com id 45/80-09853-0CA69135; Fri, 07 Mar 2014 06:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1394174654!308809!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31560 invoked from network); 7 Mar 2014 06:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoVy-0006up-Jd for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoVy-0007F2-3W for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:14 +0000 Date: Fri, 07 Mar 2014 06:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Drop shadow_mode_trap_reads() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 985cd75eea0d55964a9ba675306559bf390035cc Author: Tim Deegan AuthorDate: Thu Nov 28 14:59:07 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 6 10:12:57 2014 +0000 x86/shadow: Drop shadow_mode_trap_reads() This was never actually implemented, and is confusing coverity. Coverity CID 1090354 Signed-off-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 30 ++++-------------------------- xen/include/asm-x86/shadow.h | 4 ---- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 3d35537..5c7a7ac 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -692,21 +692,7 @@ _sh_propagate(struct vcpu *v, && (ft == ft_demand_write)) #endif /* OOS */ ) ) - { - if ( shadow_mode_trap_reads(d) ) - { - // if we are trapping both reads & writes, then mark this page - // as not present... - // - sflags &= ~_PAGE_PRESENT; - } - else - { - // otherwise, just prevent any writes... - // - sflags &= ~_PAGE_RW; - } - } + sflags &= ~_PAGE_RW; // PV guests in 64-bit mode use two different page tables for user vs // supervisor permissions, making the guest's _PAGE_USER bit irrelevant. @@ -3181,18 +3167,10 @@ static int sh_page_fault(struct vcpu *v, && !(mfn_is_out_of_sync(gmfn) && !(regs->error_code & PFEC_user_mode)) #endif - ) + && (ft == ft_demand_write) ) { - if ( ft == ft_demand_write ) - { - perfc_incr(shadow_fault_emulate_write); - goto emulate; - } - else if ( shadow_mode_trap_reads(d) && ft == ft_demand_read ) - { - perfc_incr(shadow_fault_emulate_read); - goto emulate; - } + perfc_incr(shadow_fault_emulate_write); + goto emulate; } /* Need to hand off device-model MMIO to the device model */ diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 348915e..f40cab4 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -44,10 +44,6 @@ #define shadow_mode_external(_d) (paging_mode_shadow(_d) && \ paging_mode_external(_d)) -/* Xen traps & emulates all reads of all page table pages: - * not yet supported */ -#define shadow_mode_trap_reads(_d) ({ (void)(_d); 0; }) - /***************************************************************************** * Entry points into the shadow code */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoW2-00051q-Mr; Fri, 07 Mar 2014 06:44:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoW1-00051j-Go for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:17 +0000 Received: from [85.158.143.35:33415] by server-1.bemta-4.messagelabs.com id 45/80-09853-0CA69135; Fri, 07 Mar 2014 06:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1394174654!308809!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31560 invoked from network); 7 Mar 2014 06:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoVy-0006up-Jd for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoVy-0007F2-3W for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:14 +0000 Date: Fri, 07 Mar 2014 06:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Drop shadow_mode_trap_reads() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 985cd75eea0d55964a9ba675306559bf390035cc Author: Tim Deegan AuthorDate: Thu Nov 28 14:59:07 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 6 10:12:57 2014 +0000 x86/shadow: Drop shadow_mode_trap_reads() This was never actually implemented, and is confusing coverity. Coverity CID 1090354 Signed-off-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 30 ++++-------------------------- xen/include/asm-x86/shadow.h | 4 ---- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 3d35537..5c7a7ac 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -692,21 +692,7 @@ _sh_propagate(struct vcpu *v, && (ft == ft_demand_write)) #endif /* OOS */ ) ) - { - if ( shadow_mode_trap_reads(d) ) - { - // if we are trapping both reads & writes, then mark this page - // as not present... - // - sflags &= ~_PAGE_PRESENT; - } - else - { - // otherwise, just prevent any writes... - // - sflags &= ~_PAGE_RW; - } - } + sflags &= ~_PAGE_RW; // PV guests in 64-bit mode use two different page tables for user vs // supervisor permissions, making the guest's _PAGE_USER bit irrelevant. @@ -3181,18 +3167,10 @@ static int sh_page_fault(struct vcpu *v, && !(mfn_is_out_of_sync(gmfn) && !(regs->error_code & PFEC_user_mode)) #endif - ) + && (ft == ft_demand_write) ) { - if ( ft == ft_demand_write ) - { - perfc_incr(shadow_fault_emulate_write); - goto emulate; - } - else if ( shadow_mode_trap_reads(d) && ft == ft_demand_read ) - { - perfc_incr(shadow_fault_emulate_read); - goto emulate; - } + perfc_incr(shadow_fault_emulate_write); + goto emulate; } /* Need to hand off device-model MMIO to the device model */ diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 348915e..f40cab4 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -44,10 +44,6 @@ #define shadow_mode_external(_d) (paging_mode_shadow(_d) && \ paging_mode_external(_d)) -/* Xen traps & emulates all reads of all page table pages: - * not yet supported */ -#define shadow_mode_trap_reads(_d) ({ (void)(_d); 0; }) - /***************************************************************************** * Entry points into the shadow code */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWC-000539-PZ; Fri, 07 Mar 2014 06:44:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWB-00052m-JA for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:27 +0000 Received: from [85.158.137.68:43807] by server-14.bemta-3.messagelabs.com id 60/C4-08196-ACA69135; Fri, 07 Mar 2014 06:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1394174665!6260390!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32586 invoked from network); 7 Mar 2014 06:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoW8-0006uv-OQ for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoW8-0007FO-MS for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:24 +0000 Date: Fri, 07 Mar 2014 06:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_sharing: drop unused variable. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c66713c93c00d0e6f4b9904c3363ba5a4a45a7d3 Author: Tim Deegan AuthorDate: Thu Nov 28 15:02:39 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 6 10:13:07 2014 +0000 x86/mem_sharing: drop unused variable. Coverity CID 1087198 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Andres Lagar-Cavilla --- xen/arch/x86/mm/mem_sharing.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 4a5d9e8..7ed6594 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -846,7 +846,6 @@ int mem_sharing_nominate_page(struct domain *d, mfn_t mfn; struct page_info *page = NULL; /* gcc... */ int ret; - struct gfn_info *gfn_info; *phandle = 0UL; @@ -905,7 +904,7 @@ int mem_sharing_nominate_page(struct domain *d, page->sharing->handle = get_next_handle(); /* Create the local gfn info */ - if ( (gfn_info = mem_sharing_gfn_alloc(page, d, gfn)) == NULL ) + if ( mem_sharing_gfn_alloc(page, d, gfn) == NULL ) { xfree(page->sharing); page->sharing = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWC-000539-PZ; Fri, 07 Mar 2014 06:44:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWB-00052m-JA for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:27 +0000 Received: from [85.158.137.68:43807] by server-14.bemta-3.messagelabs.com id 60/C4-08196-ACA69135; Fri, 07 Mar 2014 06:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1394174665!6260390!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32586 invoked from network); 7 Mar 2014 06:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoW8-0006uv-OQ for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoW8-0007FO-MS for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:24 +0000 Date: Fri, 07 Mar 2014 06:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_sharing: drop unused variable. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c66713c93c00d0e6f4b9904c3363ba5a4a45a7d3 Author: Tim Deegan AuthorDate: Thu Nov 28 15:02:39 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 6 10:13:07 2014 +0000 x86/mem_sharing: drop unused variable. Coverity CID 1087198 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Andres Lagar-Cavilla --- xen/arch/x86/mm/mem_sharing.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 4a5d9e8..7ed6594 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -846,7 +846,6 @@ int mem_sharing_nominate_page(struct domain *d, mfn_t mfn; struct page_info *page = NULL; /* gcc... */ int ret; - struct gfn_info *gfn_info; *phandle = 0UL; @@ -905,7 +904,7 @@ int mem_sharing_nominate_page(struct domain *d, page->sharing->handle = get_next_handle(); /* Create the local gfn info */ - if ( (gfn_info = mem_sharing_gfn_alloc(page, d, gfn)) == NULL ) + if ( mem_sharing_gfn_alloc(page, d, gfn) == NULL ) { xfree(page->sharing); page->sharing = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWM-00054I-SH; Fri, 07 Mar 2014 06:44:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWL-00053z-RG for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:38 +0000 Received: from [193.109.254.147:20008] by server-14.bemta-14.messagelabs.com id F5/CD-29228-5DA69135; Fri, 07 Mar 2014 06:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1394174675!8234!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23415 invoked from network); 7 Mar 2014 06:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWI-0006v1-T5 for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoWI-0007Fo-S4 for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:34 +0000 Date: Fri, 07 Mar 2014 06:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] bitmaps/bitops: Clarify tests for small constant size. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd1913d8734686cb869778e03273cc8133973aff Author: Tim Deegan AuthorDate: Thu Nov 28 15:40:48 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 6 10:13:12 2014 +0000 bitmaps/bitops: Clarify tests for small constant size. No semantic changes, just makes the control flow a bit clearer. I was looking at this bcause the (-!__builtin_constant_p(x) | x__) formula is too clever for Coverity, but in fact it always takes me a minute or two to understand it too. :) Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/include/asm-x86/bitops.h | 62 +++++++++++++++++++----------------------- xen/include/xen/bitmap.h | 30 ++++++++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/xen/include/asm-x86/bitops.h b/xen/include/asm-x86/bitops.h index ab21d92..82a08ee 100644 --- a/xen/include/asm-x86/bitops.h +++ b/xen/include/asm-x86/bitops.h @@ -335,23 +335,20 @@ static inline unsigned int __scanbit(unsigned long val, unsigned long max) * @offset: The bitnumber to start searching at * @size: The maximum size to search */ -#define find_next_bit(addr, size, off) ({ \ - unsigned int r__ = (size); \ - unsigned int o__ = (off); \ - switch ( -!__builtin_constant_p(size) | r__ ) \ - { \ - case 0: (void)(addr); break; \ - case 1 ... BITS_PER_LONG: \ - r__ = o__ + __scanbit(*(const unsigned long *)(addr) >> o__, r__); \ - break; \ - default: \ - if ( __builtin_constant_p(off) && !o__ ) \ - r__ = __find_first_bit(addr, r__); \ - else \ - r__ = __find_next_bit(addr, r__, o__); \ - break; \ - } \ - r__; \ +#define find_next_bit(addr, size, off) ({ \ + unsigned int r__; \ + const unsigned long *a__ = (addr); \ + unsigned int s__ = (size); \ + unsigned int o__ = (off); \ + if ( __builtin_constant_p(size) && !s__ ) \ + r__ = s__; \ + else if ( __builtin_constant_p(size) && s__ <= BITS_PER_LONG ) \ + r__ = o__ + __scanbit(*(const unsigned long *)(a__) >> o__, s__); \ + else if ( __builtin_constant_p(off) && !o__ ) \ + r__ = __find_first_bit(a__, s__); \ + else \ + r__ = __find_next_bit(a__, s__, o__); \ + r__; \ }) /** @@ -370,23 +367,20 @@ static inline unsigned int __scanbit(unsigned long val, unsigned long max) * @offset: The bitnumber to start searching at * @size: The maximum size to search */ -#define find_next_zero_bit(addr, size, off) ({ \ - unsigned int r__ = (size); \ - unsigned int o__ = (off); \ - switch ( -!__builtin_constant_p(size) | r__ ) \ - { \ - case 0: (void)(addr); break; \ - case 1 ... BITS_PER_LONG: \ - r__ = o__ + __scanbit(~*(const unsigned long *)(addr) >> o__, r__); \ - break; \ - default: \ - if ( __builtin_constant_p(off) && !o__ ) \ - r__ = __find_first_zero_bit(addr, r__); \ - else \ - r__ = __find_next_zero_bit(addr, r__, o__); \ - break; \ - } \ - r__; \ +#define find_next_zero_bit(addr, size, off) ({ \ + unsigned int r__; \ + const unsigned long *a__ = (addr); \ + unsigned int s__ = (size); \ + unsigned int o__ = (off); \ + if ( __builtin_constant_p(size) && !s__ ) \ + r__ = s__; \ + else if ( __builtin_constant_p(size) && s__ <= BITS_PER_LONG ) \ + r__ = o__ + __scanbit(~*(const unsigned long *)(a__) >> o__, s__); \ + else if ( __builtin_constant_p(off) && !o__ ) \ + r__ = __find_first_zero_bit(a__, s__); \ + else \ + r__ = __find_next_zero_bit(a__, s__, o__); \ + r__; \ }) /** diff --git a/xen/include/xen/bitmap.h b/xen/include/xen/bitmap.h index b5ec455..e2a3686 100644 --- a/xen/include/xen/bitmap.h +++ b/xen/include/xen/bitmap.h @@ -110,13 +110,14 @@ extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order); #define bitmap_bytes(nbits) (BITS_TO_LONGS(nbits) * sizeof(unsigned long)) -#define bitmap_switch(nbits, zero_ret, small, large) \ - switch (-!__builtin_constant_p(nbits) | (nbits)) { \ - case 0: return zero_ret; \ - case 1 ... BITS_PER_LONG: \ - small; break; \ - default: \ - large; break; \ +#define bitmap_switch(nbits, zero, small, large) \ + unsigned int n__ = (nbits); \ + if (__builtin_constant_p(nbits) && !n__) { \ + zero; \ + } else if (__builtin_constant_p(nbits) && n__ <= BITS_PER_LONG) { \ + small; \ + } else { \ + large; \ } static inline void bitmap_zero(unsigned long *dst, int nbits) @@ -191,7 +192,8 @@ static inline void bitmap_complement(unsigned long *dst, const unsigned long *sr static inline int bitmap_equal(const unsigned long *src1, const unsigned long *src2, int nbits) { - bitmap_switch(nbits, -1, + bitmap_switch(nbits, + return -1, return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)), return __bitmap_equal(src1, src2, nbits)); } @@ -199,7 +201,8 @@ static inline int bitmap_equal(const unsigned long *src1, static inline int bitmap_intersects(const unsigned long *src1, const unsigned long *src2, int nbits) { - bitmap_switch(nbits, -1, + bitmap_switch(nbits, + return -1, return ((*src1 & *src2) & BITMAP_LAST_WORD_MASK(nbits)) != 0, return __bitmap_intersects(src1, src2, nbits)); } @@ -207,21 +210,24 @@ static inline int bitmap_intersects(const unsigned long *src1, static inline int bitmap_subset(const unsigned long *src1, const unsigned long *src2, int nbits) { - bitmap_switch(nbits, -1, + bitmap_switch(nbits, + return -1, return !((*src1 & ~*src2) & BITMAP_LAST_WORD_MASK(nbits)), return __bitmap_subset(src1, src2, nbits)); } static inline int bitmap_empty(const unsigned long *src, int nbits) { - bitmap_switch(nbits, -1, + bitmap_switch(nbits, + return -1, return !(*src & BITMAP_LAST_WORD_MASK(nbits)), return __bitmap_empty(src, nbits)); } static inline int bitmap_full(const unsigned long *src, int nbits) { - bitmap_switch(nbits, -1, + bitmap_switch(nbits, + return -1, return !(~*src & BITMAP_LAST_WORD_MASK(nbits)), return __bitmap_full(src, nbits)); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWM-00054I-SH; Fri, 07 Mar 2014 06:44:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWL-00053z-RG for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:38 +0000 Received: from [193.109.254.147:20008] by server-14.bemta-14.messagelabs.com id F5/CD-29228-5DA69135; Fri, 07 Mar 2014 06:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1394174675!8234!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23415 invoked from network); 7 Mar 2014 06:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWI-0006v1-T5 for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoWI-0007Fo-S4 for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:34 +0000 Date: Fri, 07 Mar 2014 06:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] bitmaps/bitops: Clarify tests for small constant size. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd1913d8734686cb869778e03273cc8133973aff Author: Tim Deegan AuthorDate: Thu Nov 28 15:40:48 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 6 10:13:12 2014 +0000 bitmaps/bitops: Clarify tests for small constant size. No semantic changes, just makes the control flow a bit clearer. I was looking at this bcause the (-!__builtin_constant_p(x) | x__) formula is too clever for Coverity, but in fact it always takes me a minute or two to understand it too. :) Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/include/asm-x86/bitops.h | 62 +++++++++++++++++++----------------------- xen/include/xen/bitmap.h | 30 ++++++++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/xen/include/asm-x86/bitops.h b/xen/include/asm-x86/bitops.h index ab21d92..82a08ee 100644 --- a/xen/include/asm-x86/bitops.h +++ b/xen/include/asm-x86/bitops.h @@ -335,23 +335,20 @@ static inline unsigned int __scanbit(unsigned long val, unsigned long max) * @offset: The bitnumber to start searching at * @size: The maximum size to search */ -#define find_next_bit(addr, size, off) ({ \ - unsigned int r__ = (size); \ - unsigned int o__ = (off); \ - switch ( -!__builtin_constant_p(size) | r__ ) \ - { \ - case 0: (void)(addr); break; \ - case 1 ... BITS_PER_LONG: \ - r__ = o__ + __scanbit(*(const unsigned long *)(addr) >> o__, r__); \ - break; \ - default: \ - if ( __builtin_constant_p(off) && !o__ ) \ - r__ = __find_first_bit(addr, r__); \ - else \ - r__ = __find_next_bit(addr, r__, o__); \ - break; \ - } \ - r__; \ +#define find_next_bit(addr, size, off) ({ \ + unsigned int r__; \ + const unsigned long *a__ = (addr); \ + unsigned int s__ = (size); \ + unsigned int o__ = (off); \ + if ( __builtin_constant_p(size) && !s__ ) \ + r__ = s__; \ + else if ( __builtin_constant_p(size) && s__ <= BITS_PER_LONG ) \ + r__ = o__ + __scanbit(*(const unsigned long *)(a__) >> o__, s__); \ + else if ( __builtin_constant_p(off) && !o__ ) \ + r__ = __find_first_bit(a__, s__); \ + else \ + r__ = __find_next_bit(a__, s__, o__); \ + r__; \ }) /** @@ -370,23 +367,20 @@ static inline unsigned int __scanbit(unsigned long val, unsigned long max) * @offset: The bitnumber to start searching at * @size: The maximum size to search */ -#define find_next_zero_bit(addr, size, off) ({ \ - unsigned int r__ = (size); \ - unsigned int o__ = (off); \ - switch ( -!__builtin_constant_p(size) | r__ ) \ - { \ - case 0: (void)(addr); break; \ - case 1 ... BITS_PER_LONG: \ - r__ = o__ + __scanbit(~*(const unsigned long *)(addr) >> o__, r__); \ - break; \ - default: \ - if ( __builtin_constant_p(off) && !o__ ) \ - r__ = __find_first_zero_bit(addr, r__); \ - else \ - r__ = __find_next_zero_bit(addr, r__, o__); \ - break; \ - } \ - r__; \ +#define find_next_zero_bit(addr, size, off) ({ \ + unsigned int r__; \ + const unsigned long *a__ = (addr); \ + unsigned int s__ = (size); \ + unsigned int o__ = (off); \ + if ( __builtin_constant_p(size) && !s__ ) \ + r__ = s__; \ + else if ( __builtin_constant_p(size) && s__ <= BITS_PER_LONG ) \ + r__ = o__ + __scanbit(~*(const unsigned long *)(a__) >> o__, s__); \ + else if ( __builtin_constant_p(off) && !o__ ) \ + r__ = __find_first_zero_bit(a__, s__); \ + else \ + r__ = __find_next_zero_bit(a__, s__, o__); \ + r__; \ }) /** diff --git a/xen/include/xen/bitmap.h b/xen/include/xen/bitmap.h index b5ec455..e2a3686 100644 --- a/xen/include/xen/bitmap.h +++ b/xen/include/xen/bitmap.h @@ -110,13 +110,14 @@ extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order); #define bitmap_bytes(nbits) (BITS_TO_LONGS(nbits) * sizeof(unsigned long)) -#define bitmap_switch(nbits, zero_ret, small, large) \ - switch (-!__builtin_constant_p(nbits) | (nbits)) { \ - case 0: return zero_ret; \ - case 1 ... BITS_PER_LONG: \ - small; break; \ - default: \ - large; break; \ +#define bitmap_switch(nbits, zero, small, large) \ + unsigned int n__ = (nbits); \ + if (__builtin_constant_p(nbits) && !n__) { \ + zero; \ + } else if (__builtin_constant_p(nbits) && n__ <= BITS_PER_LONG) { \ + small; \ + } else { \ + large; \ } static inline void bitmap_zero(unsigned long *dst, int nbits) @@ -191,7 +192,8 @@ static inline void bitmap_complement(unsigned long *dst, const unsigned long *sr static inline int bitmap_equal(const unsigned long *src1, const unsigned long *src2, int nbits) { - bitmap_switch(nbits, -1, + bitmap_switch(nbits, + return -1, return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)), return __bitmap_equal(src1, src2, nbits)); } @@ -199,7 +201,8 @@ static inline int bitmap_equal(const unsigned long *src1, static inline int bitmap_intersects(const unsigned long *src1, const unsigned long *src2, int nbits) { - bitmap_switch(nbits, -1, + bitmap_switch(nbits, + return -1, return ((*src1 & *src2) & BITMAP_LAST_WORD_MASK(nbits)) != 0, return __bitmap_intersects(src1, src2, nbits)); } @@ -207,21 +210,24 @@ static inline int bitmap_intersects(const unsigned long *src1, static inline int bitmap_subset(const unsigned long *src1, const unsigned long *src2, int nbits) { - bitmap_switch(nbits, -1, + bitmap_switch(nbits, + return -1, return !((*src1 & ~*src2) & BITMAP_LAST_WORD_MASK(nbits)), return __bitmap_subset(src1, src2, nbits)); } static inline int bitmap_empty(const unsigned long *src, int nbits) { - bitmap_switch(nbits, -1, + bitmap_switch(nbits, + return -1, return !(*src & BITMAP_LAST_WORD_MASK(nbits)), return __bitmap_empty(src, nbits)); } static inline int bitmap_full(const unsigned long *src, int nbits) { - bitmap_switch(nbits, -1, + bitmap_switch(nbits, + return -1, return !(~*src & BITMAP_LAST_WORD_MASK(nbits)), return __bitmap_full(src, nbits)); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:44:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWW-00055d-V4; Fri, 07 Mar 2014 06:44:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWV-00055S-Gx for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:47 +0000 Received: from [85.158.143.35:38828] by server-3.bemta-4.messagelabs.com id 1A/16-13602-EDA69135; Fri, 07 Mar 2014 06:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1394174685!309718!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25250 invoked from network); 7 Mar 2014 06:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWT-0006vD-1I for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoWS-0007GB-Vm for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:45 +0000 Date: Fri, 07 Mar 2014 06:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: assert that we we saved a sane number of MSRs. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 891219a9d3958860b915021f622f7119b9b880d8 Author: Tim Deegan AuthorDate: Thu Feb 27 15:06:33 2014 +0000 Commit: Tim Deegan CommitDate: Thu Mar 6 10:13:30 2014 +0000 x86/hvm: assert that we we saved a sane number of MSRs. Just as a backstop measure against later changes that add MSRs to the save function without updating the count in the init function. Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 9e85c13..ae24211 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1148,6 +1148,8 @@ static int hvm_save_cpu_msrs(struct domain *d, hvm_domain_context_t *h) if ( hvm_funcs.save_msr ) hvm_funcs.save_msr(v, ctxt); + ASSERT(ctxt->count <= msr_count_max); + for ( i = 0; i < ctxt->count; ++i ) ctxt->msr[i]._rsvd = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:44:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWW-00055d-V4; Fri, 07 Mar 2014 06:44:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWV-00055S-Gx for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:47 +0000 Received: from [85.158.143.35:38828] by server-3.bemta-4.messagelabs.com id 1A/16-13602-EDA69135; Fri, 07 Mar 2014 06:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1394174685!309718!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25250 invoked from network); 7 Mar 2014 06:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWT-0006vD-1I for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoWS-0007GB-Vm for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:45 +0000 Date: Fri, 07 Mar 2014 06:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: assert that we we saved a sane number of MSRs. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 891219a9d3958860b915021f622f7119b9b880d8 Author: Tim Deegan AuthorDate: Thu Feb 27 15:06:33 2014 +0000 Commit: Tim Deegan CommitDate: Thu Mar 6 10:13:30 2014 +0000 x86/hvm: assert that we we saved a sane number of MSRs. Just as a backstop measure against later changes that add MSRs to the save function without updating the count in the init function. Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 9e85c13..ae24211 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1148,6 +1148,8 @@ static int hvm_save_cpu_msrs(struct domain *d, hvm_domain_context_t *h) if ( hvm_funcs.save_msr ) hvm_funcs.save_msr(v, ctxt); + ASSERT(ctxt->count <= msr_count_max); + for ( i = 0; i < ctxt->count; ++i ) ctxt->msr[i]._rsvd = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:45:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWh-000572-1T; Fri, 07 Mar 2014 06:44:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWf-00056e-Ow for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:58 +0000 Received: from [85.158.137.68:10797] by server-11.bemta-3.messagelabs.com id 32/C8-04255-9EA69135; Fri, 07 Mar 2014 06:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1394174695!6199581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10396 invoked from network); 7 Mar 2014 06:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWd-0006vG-4t for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoWd-0007Ge-3n for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:55 +0000 Date: Fri, 07 Mar 2014 06:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit: change default timeslice to 5ms X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 348dee3b8afb72cb4713d2e6600b4e86e0cc1723 Author: George Dunlap AuthorDate: Thu Mar 6 12:19:39 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 6 12:19:39 2014 +0100 credit: change default timeslice to 5ms The 30ms timeslice was chosen nearly a decade ago now, with cpu "burning" workloads in mind. In the mean time, processors have gotten faster and VMEXITs have gotten faster. A timeslice of 30ms has a major cost when running latency-sensitive workloads like network or audio streaming: getting caught behind just one or two other VMs can introduce a processing delay of up to 60ms, and the "round-robin" nature of the credit scheduler means this delay may be introduced every time the VM yields for periods of time. The XenServer performance team at Citrix have done extensive testing with various timeslices, including 30ms, 10ms, 5ms, and 2ms. None of the workloads exhibited any performance degradation with a 5ms timeslice. Signed-off-by: George Dunlap Reviewed-by: Dario Faggioli Acked-by: Tim Deegan --- xen/common/sched_credit.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index db5512e..61553d9 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -29,9 +29,9 @@ * Basic constants */ #define CSCHED_DEFAULT_WEIGHT 256 -#define CSCHED_TICKS_PER_TSLICE 3 -/* Default timeslice: 30ms */ -#define CSCHED_DEFAULT_TSLICE_MS 30 +#define CSCHED_TICKS_PER_TSLICE 1 +/* Default timeslice: 5ms */ +#define CSCHED_DEFAULT_TSLICE_MS 5 #define CSCHED_CREDITS_PER_MSEC 10 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:45:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWh-000572-1T; Fri, 07 Mar 2014 06:44:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWf-00056e-Ow for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:58 +0000 Received: from [85.158.137.68:10797] by server-11.bemta-3.messagelabs.com id 32/C8-04255-9EA69135; Fri, 07 Mar 2014 06:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1394174695!6199581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10396 invoked from network); 7 Mar 2014 06:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWd-0006vG-4t for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoWd-0007Ge-3n for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:44:55 +0000 Date: Fri, 07 Mar 2014 06:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit: change default timeslice to 5ms X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 348dee3b8afb72cb4713d2e6600b4e86e0cc1723 Author: George Dunlap AuthorDate: Thu Mar 6 12:19:39 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 6 12:19:39 2014 +0100 credit: change default timeslice to 5ms The 30ms timeslice was chosen nearly a decade ago now, with cpu "burning" workloads in mind. In the mean time, processors have gotten faster and VMEXITs have gotten faster. A timeslice of 30ms has a major cost when running latency-sensitive workloads like network or audio streaming: getting caught behind just one or two other VMs can introduce a processing delay of up to 60ms, and the "round-robin" nature of the credit scheduler means this delay may be introduced every time the VM yields for periods of time. The XenServer performance team at Citrix have done extensive testing with various timeslices, including 30ms, 10ms, 5ms, and 2ms. None of the workloads exhibited any performance degradation with a 5ms timeslice. Signed-off-by: George Dunlap Reviewed-by: Dario Faggioli Acked-by: Tim Deegan --- xen/common/sched_credit.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index db5512e..61553d9 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -29,9 +29,9 @@ * Basic constants */ #define CSCHED_DEFAULT_WEIGHT 256 -#define CSCHED_TICKS_PER_TSLICE 3 -/* Default timeslice: 30ms */ -#define CSCHED_DEFAULT_TSLICE_MS 30 +#define CSCHED_TICKS_PER_TSLICE 1 +/* Default timeslice: 5ms */ +#define CSCHED_DEFAULT_TSLICE_MS 5 #define CSCHED_CREDITS_PER_MSEC 10 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:45:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:45:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWr-00058g-6F; Fri, 07 Mar 2014 06:45:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWq-00058F-Bx for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:08 +0000 Received: from [85.158.139.211:17298] by server-7.bemta-5.messagelabs.com id A2/01-14867-3FA69135; Fri, 07 Mar 2014 06:45:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1394174705!8233117!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16335 invoked from network); 7 Mar 2014 06:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWn-0006wG-DH for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoWn-0007Ho-7g for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:05 +0000 Date: Fri, 07 Mar 2014 06:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: drop a gross goto usage X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f5c613287e79b44d4e4b10e0193581b7442249a Author: Konrad Rzeszutek Wilk AuthorDate: Thu Mar 6 12:23:25 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 6 12:23:25 2014 +0100 tmem: drop a gross goto usage No need to do it that way. Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index d9e912b..02e7e2e 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -2614,17 +2614,15 @@ long do_tmem_op(tmem_cli_op_t uops) if ( client != NULL && client->domain->is_dying ) { - rc = -ENODEV; - simple_error: errored_tmem_ops++; - return rc; + return -ENODEV; } if ( unlikely(tmem_get_tmemop_from_client(&op, uops) != 0) ) { tmem_client_err("tmem: can't get tmem struct from %s\n", tmem_client_str); - rc = -EFAULT; - goto simple_error; + errored_tmem_ops++; + return -EFAULT; } if ( op.cmd == TMEM_CONTROL ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:45:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:45:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWr-00058g-6F; Fri, 07 Mar 2014 06:45:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWq-00058F-Bx for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:08 +0000 Received: from [85.158.139.211:17298] by server-7.bemta-5.messagelabs.com id A2/01-14867-3FA69135; Fri, 07 Mar 2014 06:45:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1394174705!8233117!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16335 invoked from network); 7 Mar 2014 06:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWn-0006wG-DH for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoWn-0007Ho-7g for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:05 +0000 Date: Fri, 07 Mar 2014 06:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: drop a gross goto usage X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f5c613287e79b44d4e4b10e0193581b7442249a Author: Konrad Rzeszutek Wilk AuthorDate: Thu Mar 6 12:23:25 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 6 12:23:25 2014 +0100 tmem: drop a gross goto usage No need to do it that way. Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index d9e912b..02e7e2e 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -2614,17 +2614,15 @@ long do_tmem_op(tmem_cli_op_t uops) if ( client != NULL && client->domain->is_dying ) { - rc = -ENODEV; - simple_error: errored_tmem_ops++; - return rc; + return -ENODEV; } if ( unlikely(tmem_get_tmemop_from_client(&op, uops) != 0) ) { tmem_client_err("tmem: can't get tmem struct from %s\n", tmem_client_str); - rc = -EFAULT; - goto simple_error; + errored_tmem_ops++; + return -EFAULT; } if ( op.cmd == TMEM_CONTROL ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:45:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:45:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoXB-0005C5-49; Fri, 07 Mar 2014 06:45:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoXA-0005Bt-M1 for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:28 +0000 Received: from [85.158.139.211:30168] by server-15.bemta-5.messagelabs.com id 50/A0-24395-70B69135; Fri, 07 Mar 2014 06:45:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1394174726!8313863!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22682 invoked from network); 7 Mar 2014 06:45:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:45:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoX7-0006wT-Nr for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoX7-0007IZ-Lg for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:25 +0000 Date: Fri, 07 Mar 2014 06:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: add a clarifying assertion X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4888ac5891f3daa37bdb3059893db084b50f497b Author: Jan Beulich AuthorDate: Thu Mar 6 11:32:48 2014 +0000 Commit: Tim Deegan CommitDate: Thu Mar 6 13:10:14 2014 +0000 x86/shadow: add a clarifying assertion ... documenting that we don't have to worry about merging guest provided flags with the ones we want to enforce ourselves. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 5c7a7ac..3c1b25b 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -592,6 +592,8 @@ _sh_propagate(struct vcpu *v, { unsigned int type; + ASSERT(!(sflags & (_PAGE_PAT | _PAGE_PCD | _PAGE_PWT))); + /* compute the PAT index for shadow page entry when VT-d is enabled * and device assigned. * 1) direct MMIO: compute the PAT index with gMTRR=UC and gPAT. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:45:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:45:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoXB-0005C5-49; Fri, 07 Mar 2014 06:45:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoXA-0005Bt-M1 for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:28 +0000 Received: from [85.158.139.211:30168] by server-15.bemta-5.messagelabs.com id 50/A0-24395-70B69135; Fri, 07 Mar 2014 06:45:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1394174726!8313863!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22682 invoked from network); 7 Mar 2014 06:45:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:45:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoX7-0006wT-Nr for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoX7-0007IZ-Lg for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:25 +0000 Date: Fri, 07 Mar 2014 06:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: add a clarifying assertion X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4888ac5891f3daa37bdb3059893db084b50f497b Author: Jan Beulich AuthorDate: Thu Mar 6 11:32:48 2014 +0000 Commit: Tim Deegan CommitDate: Thu Mar 6 13:10:14 2014 +0000 x86/shadow: add a clarifying assertion ... documenting that we don't have to worry about merging guest provided flags with the ones we want to enforce ourselves. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 5c7a7ac..3c1b25b 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -592,6 +592,8 @@ _sh_propagate(struct vcpu *v, { unsigned int type; + ASSERT(!(sflags & (_PAGE_PAT | _PAGE_PCD | _PAGE_PWT))); + /* compute the PAT index for shadow page entry when VT-d is enabled * and device assigned. * 1) direct MMIO: compute the PAT index with gMTRR=UC and gPAT. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:46:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:46:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoX3-0005Ak-Be; Fri, 07 Mar 2014 06:45:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoX0-0005A7-Bb for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:18 +0000 Received: from [85.158.137.68:51928] by server-7.bemta-3.messagelabs.com id 71/1B-13775-DFA69135; Fri, 07 Mar 2014 06:45:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1394174715!242120!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6372 invoked from network); 7 Mar 2014 06:45:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWx-0006wN-Ie for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoWx-0007ID-Ft for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:15 +0000 Date: Fri, 07 Mar 2014 06:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "credit: change default timeslice to 5ms" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit db8d09f56310be2e818b63d90e2b520892088573 Author: Jan Beulich AuthorDate: Thu Mar 6 13:44:42 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 6 13:44:42 2014 +0100 Revert "credit: change default timeslice to 5ms" This reverts commit 348dee3b8afb72cb4713d2e6600b4e86e0cc1723 (retracted by author/maintainer). --- xen/common/sched_credit.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 61553d9..db5512e 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -29,9 +29,9 @@ * Basic constants */ #define CSCHED_DEFAULT_WEIGHT 256 -#define CSCHED_TICKS_PER_TSLICE 1 -/* Default timeslice: 5ms */ -#define CSCHED_DEFAULT_TSLICE_MS 5 +#define CSCHED_TICKS_PER_TSLICE 3 +/* Default timeslice: 30ms */ +#define CSCHED_DEFAULT_TSLICE_MS 30 #define CSCHED_CREDITS_PER_MSEC 10 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 07 06:46:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Mar 2014 06:46:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoX3-0005Ak-Be; Fri, 07 Mar 2014 06:45:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoX0-0005A7-Bb for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:18 +0000 Received: from [85.158.137.68:51928] by server-7.bemta-3.messagelabs.com id 71/1B-13775-DFA69135; Fri, 07 Mar 2014 06:45:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1394174715!242120!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6372 invoked from network); 7 Mar 2014 06:45:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Mar 2014 06:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLoWx-0006wN-Ie for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WLoWx-0007ID-Ft for xen-changelog@lists.xensource.com; Fri, 07 Mar 2014 06:45:15 +0000 Date: Fri, 07 Mar 2014 06:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "credit: change default timeslice to 5ms" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit db8d09f56310be2e818b63d90e2b520892088573 Author: Jan Beulich AuthorDate: Thu Mar 6 13:44:42 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 6 13:44:42 2014 +0100 Revert "credit: change default timeslice to 5ms" This reverts commit 348dee3b8afb72cb4713d2e6600b4e86e0cc1723 (retracted by author/maintainer). --- xen/common/sched_credit.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 61553d9..db5512e 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -29,9 +29,9 @@ * Basic constants */ #define CSCHED_DEFAULT_WEIGHT 256 -#define CSCHED_TICKS_PER_TSLICE 1 -/* Default timeslice: 5ms */ -#define CSCHED_DEFAULT_TSLICE_MS 5 +#define CSCHED_TICKS_PER_TSLICE 3 +/* Default timeslice: 30ms */ +#define CSCHED_DEFAULT_TSLICE_MS 30 #define CSCHED_CREDITS_PER_MSEC 10 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 08 00:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 08 Mar 2014 00:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WM5N8-0007N2-2u; Sat, 08 Mar 2014 00:44:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WM5N3-0007Mx-6v for xen-changelog@lists.xensource.com; Sat, 08 Mar 2014 00:44:12 +0000 Received: from [85.158.137.68:20068] by server-5.bemta-3.messagelabs.com id F8/AD-04712-8D76A135; Sat, 08 Mar 2014 00:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1394239443!447661!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6351 invoked from network); 8 Mar 2014 00:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Mar 2014 00:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WM5Mx-0001TM-9P for xen-changelog@lists.xensource.com; Sat, 08 Mar 2014 00:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WM5Mw-0006AE-KQ for xen-changelog@lists.xensource.com; Sat, 08 Mar 2014 00:44:02 +0000 Date: Sat, 08 Mar 2014 00:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Config.mk: update QEMU_TAG and QEMU_UPSTREAM_REVISION X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 598327889cd718003393c9379836c70f8e20fbea Author: Ian Jackson AuthorDate: Fri Mar 7 15:41:35 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 7 15:41:35 2014 +0000 Config.mk: update QEMU_TAG and QEMU_UPSTREAM_REVISION Update these to the -rc6 tags. These refer to the same commits as the previously-referenced tags. Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index acde711..330ca46 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.4-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc4 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc6 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.0-rc3 +QEMU_TAG ?= xen-4.4.0-rc6 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 08 00:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 08 Mar 2014 00:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WM5N8-0007N2-2u; Sat, 08 Mar 2014 00:44:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WM5N3-0007Mx-6v for xen-changelog@lists.xensource.com; Sat, 08 Mar 2014 00:44:12 +0000 Received: from [85.158.137.68:20068] by server-5.bemta-3.messagelabs.com id F8/AD-04712-8D76A135; Sat, 08 Mar 2014 00:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1394239443!447661!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6351 invoked from network); 8 Mar 2014 00:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Mar 2014 00:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WM5Mx-0001TM-9P for xen-changelog@lists.xensource.com; Sat, 08 Mar 2014 00:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WM5Mw-0006AE-KQ for xen-changelog@lists.xensource.com; Sat, 08 Mar 2014 00:44:02 +0000 Date: Sat, 08 Mar 2014 00:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Config.mk: update QEMU_TAG and QEMU_UPSTREAM_REVISION X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 598327889cd718003393c9379836c70f8e20fbea Author: Ian Jackson AuthorDate: Fri Mar 7 15:41:35 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 7 15:41:35 2014 +0000 Config.mk: update QEMU_TAG and QEMU_UPSTREAM_REVISION Update these to the -rc6 tags. These refer to the same commits as the previously-referenced tags. Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index acde711..330ca46 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.4-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc4 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc6 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.0-rc3 +QEMU_TAG ?= xen-4.4.0-rc6 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 08 00:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 08 Mar 2014 00:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WM5NC-0007NG-Dv; Sat, 08 Mar 2014 00:44:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WM5NA-0007N9-G1 for xen-changelog@lists.xensource.com; Sat, 08 Mar 2014 00:44:16 +0000 Received: from [85.158.139.211:36220] by server-1.bemta-5.messagelabs.com id 70/8A-12859-FD76A135; Sat, 08 Mar 2014 00:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1394239453!8485540!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23494 invoked from network); 8 Mar 2014 00:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 8 Mar 2014 00:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WM5N7-0001TP-IF for xen-changelog@lists.xensource.com; Sat, 08 Mar 2014 00:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WM5N7-0006Ac-DT for xen-changelog@lists.xensource.com; Sat, 08 Mar 2014 00:44:13 +0000 Date: Sat, 08 Mar 2014 00:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] README, xen/Makefile: Change in-tree version numbers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 27c99b9131e545c3984c74008e2549d982091767 Author: Ian Jackson AuthorDate: Fri Mar 7 15:45:32 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 7 15:45:32 2014 +0000 README, xen/Makefile: Change in-tree version numbers Change these to 4.4.0 in preparation for the release. (We can still make a change to the released codebase if something turns up between now and the actual release.) Signed-off-by: Ian Jackson --- README | 10 +++++----- xen/Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index 4148a26..dba4640 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# -__ __ _ _ _ _ _ _ _ -\ \/ /___ _ __ | || | | || | _ _ _ __ ___| |_ __ _| |__ | | ___ - \ // _ \ '_ \ | || |_| || |_ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ - / \ __/ | | | |__ _|__ _|_____| |_| | | | \__ \ || (_| | |_) | | __/ -/_/\_\___|_| |_| |_|(_) |_| \__,_|_| |_|___/\__\__,_|_.__/|_|\___| +__ __ _ _ _ _ ___ +\ \/ /___ _ __ | || | | || | / _ \ + \ // _ \ '_ \ | || |_| || |_| | | | + / \ __/ | | | |__ _|__ _| |_| | +/_/\_\___|_| |_| |_|(_) |_|(_)___/ ################################# diff --git a/xen/Makefile b/xen/Makefile index 576d239..39839a3 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= -rc$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .0$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 08 00:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 08 Mar 2014 00:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WM5NC-0007NG-Dv; Sat, 08 Mar 2014 00:44:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WM5NA-0007N9-G1 for xen-changelog@lists.xensource.com; Sat, 08 Mar 2014 00:44:16 +0000 Received: from [85.158.139.211:36220] by server-1.bemta-5.messagelabs.com id 70/8A-12859-FD76A135; Sat, 08 Mar 2014 00:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1394239453!8485540!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23494 invoked from network); 8 Mar 2014 00:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 8 Mar 2014 00:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WM5N7-0001TP-IF for xen-changelog@lists.xensource.com; Sat, 08 Mar 2014 00:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WM5N7-0006Ac-DT for xen-changelog@lists.xensource.com; Sat, 08 Mar 2014 00:44:13 +0000 Date: Sat, 08 Mar 2014 00:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] README, xen/Makefile: Change in-tree version numbers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 27c99b9131e545c3984c74008e2549d982091767 Author: Ian Jackson AuthorDate: Fri Mar 7 15:45:32 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 7 15:45:32 2014 +0000 README, xen/Makefile: Change in-tree version numbers Change these to 4.4.0 in preparation for the release. (We can still make a change to the released codebase if something turns up between now and the actual release.) Signed-off-by: Ian Jackson --- README | 10 +++++----- xen/Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index 4148a26..dba4640 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# -__ __ _ _ _ _ _ _ _ -\ \/ /___ _ __ | || | | || | _ _ _ __ ___| |_ __ _| |__ | | ___ - \ // _ \ '_ \ | || |_| || |_ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ - / \ __/ | | | |__ _|__ _|_____| |_| | | | \__ \ || (_| | |_) | | __/ -/_/\_\___|_| |_| |_|(_) |_| \__,_|_| |_|___/\__\__,_|_.__/|_|\___| +__ __ _ _ _ _ ___ +\ \/ /___ _ __ | || | | || | / _ \ + \ // _ \ '_ \ | || |_| || |_| | | | + / \ __/ | | | |__ _|__ _| |_| | +/_/\_\___|_| |_| |_|(_) |_|(_)___/ ################################# diff --git a/xen/Makefile b/xen/Makefile index 576d239..39839a3 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= -rc$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .0$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 00:00:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 00:00:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNA7M-0002S3-S1; Tue, 11 Mar 2014 00:00:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNA7L-0002Ry-3D for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 00:00:23 +0000 Received: from [85.158.143.35:41344] by server-3.bemta-4.messagelabs.com id 2C/36-13602-6125E135; Tue, 11 Mar 2014 00:00:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1394496020!1067588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21667 invoked from network); 11 Mar 2014 00:00:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 00:00:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNA7I-00078S-7m for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 00:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNA72-0007CC-06 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 00:00:20 +0000 Date: Tue, 11 Mar 2014 00:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Config.mk: update QEMU_TAG and QEMU_UPSTREAM_REVISION X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d4c6e4662cc8838a936a570549320c9d295340fc Author: Ian Jackson AuthorDate: Mon Mar 10 10:18:23 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 10:18:23 2014 +0000 Config.mk: update QEMU_TAG and QEMU_UPSTREAM_REVISION Update these to the Xen 4.4.0 tags. These refer to the same commits as the previously-referenced tags. Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 330ca46..eb2c192 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.4-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc6 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.0-rc6 +QEMU_TAG ?= xen-4.4.0 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 00:00:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 00:00:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNA7M-0002S3-S1; Tue, 11 Mar 2014 00:00:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNA7L-0002Ry-3D for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 00:00:23 +0000 Received: from [85.158.143.35:41344] by server-3.bemta-4.messagelabs.com id 2C/36-13602-6125E135; Tue, 11 Mar 2014 00:00:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1394496020!1067588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21667 invoked from network); 11 Mar 2014 00:00:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 00:00:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNA7I-00078S-7m for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 00:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNA72-0007CC-06 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 00:00:20 +0000 Date: Tue, 11 Mar 2014 00:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Config.mk: update QEMU_TAG and QEMU_UPSTREAM_REVISION X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d4c6e4662cc8838a936a570549320c9d295340fc Author: Ian Jackson AuthorDate: Mon Mar 10 10:18:23 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 10:18:23 2014 +0000 Config.mk: update QEMU_TAG and QEMU_UPSTREAM_REVISION Update these to the Xen 4.4.0 tags. These refer to the same commits as the previously-referenced tags. Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 330ca46..eb2c192 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.4-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc6 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.0-rc6 +QEMU_TAG ?= xen-4.4.0 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 00:00:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 00:00:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNA7W-0002SV-HN; Tue, 11 Mar 2014 00:00:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNA7V-0002SM-I5 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 00:00:33 +0000 Received: from [85.158.139.211:47395] by server-2.bemta-5.messagelabs.com id 86/CB-12074-0225E135; Tue, 11 Mar 2014 00:00:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1394496030!235317!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18440 invoked from network); 11 Mar 2014 00:00:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 00:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNA7S-00078V-Jm for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 00:00:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNA7S-0007Kd-Db for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 00:00:30 +0000 Date: Tue, 11 Mar 2014 00:00:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] 4.4 release: Update README X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 816e8d88db5bb82c80dc989747948cef91b32d58 Author: George Dunlap AuthorDate: Mon Mar 10 10:23:39 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 10:43:57 2014 +0000 4.4 release: Update README Update paragraph bragging about the features. Also, remove the ".0" from the end of the banner, so we don't have to keep updating it every point release. Signed-off-by: George Dunlap --- README | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README b/README index dba4640..bc2146b 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# -__ __ _ _ _ _ ___ -\ \/ /___ _ __ | || | | || | / _ \ - \ // _ \ '_ \ | || |_| || |_| | | | - / \ __/ | | | |__ _|__ _| |_| | -/_/\_\___|_| |_| |_|(_) |_|(_)___/ +__ __ _ _ _ _ +\ \/ /___ _ __ | || | | || | + \ // _ \ '_ \ | || |_| || |_ + / \ __/ | | | |__ _|__ _| +/_/\_\___|_| |_| |_|(_) |_| ################################# @@ -19,14 +19,16 @@ is freely-distributable Open Source software, released under the GNU GPL. Since its initial public release, Xen has grown a large development community, spearheaded by xen.org (http://www.xen.org). -The 4.3 release offers a number of improvements, including NUMA -scheduling affinity, openvswitch integration, and defaulting to -qemu-xen rather than qemu-traditional for non-stubdom guests. -(qemu-xen is kept very close to the upstream project.) We also have a -number of updates to vTPM, and improvements to XSM and Flask to allow -greater disaggregation. Additionally, 4.3 contains a basic version of -Xen for the new ARM server architecture, both 32- and 64-bit. And as -always, there are a number of performance, stability, and security +The 4.4 release offers a number of improvements, including solid +support for libvirt running on libxl, a new scalable event channel +interface, improved flexibility for driver domains, an experimental +"PVH" virtualization mode, improved kexec support, and improved +support for SPICE clients. Additionally, the ARM platform has had a +number of improvements. The most important of these is that the +hypervisor ABIs for both arm32 and arm64 have been declared stable. +Additionally, many new ARM platforms have been added, and changes have +been made that will make adding new platforms easier. And as always, +there are a number of performance, stability, and security improvements under-the hood. This file contains some quick-start instructions to install Xen on -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 00:00:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 00:00:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNA7W-0002SV-HN; Tue, 11 Mar 2014 00:00:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNA7V-0002SM-I5 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 00:00:33 +0000 Received: from [85.158.139.211:47395] by server-2.bemta-5.messagelabs.com id 86/CB-12074-0225E135; Tue, 11 Mar 2014 00:00:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1394496030!235317!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18440 invoked from network); 11 Mar 2014 00:00:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 00:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNA7S-00078V-Jm for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 00:00:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNA7S-0007Kd-Db for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 00:00:30 +0000 Date: Tue, 11 Mar 2014 00:00:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] 4.4 release: Update README X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 816e8d88db5bb82c80dc989747948cef91b32d58 Author: George Dunlap AuthorDate: Mon Mar 10 10:23:39 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 10:43:57 2014 +0000 4.4 release: Update README Update paragraph bragging about the features. Also, remove the ".0" from the end of the banner, so we don't have to keep updating it every point release. Signed-off-by: George Dunlap --- README | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README b/README index dba4640..bc2146b 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# -__ __ _ _ _ _ ___ -\ \/ /___ _ __ | || | | || | / _ \ - \ // _ \ '_ \ | || |_| || |_| | | | - / \ __/ | | | |__ _|__ _| |_| | -/_/\_\___|_| |_| |_|(_) |_|(_)___/ +__ __ _ _ _ _ +\ \/ /___ _ __ | || | | || | + \ // _ \ '_ \ | || |_| || |_ + / \ __/ | | | |__ _|__ _| +/_/\_\___|_| |_| |_|(_) |_| ################################# @@ -19,14 +19,16 @@ is freely-distributable Open Source software, released under the GNU GPL. Since its initial public release, Xen has grown a large development community, spearheaded by xen.org (http://www.xen.org). -The 4.3 release offers a number of improvements, including NUMA -scheduling affinity, openvswitch integration, and defaulting to -qemu-xen rather than qemu-traditional for non-stubdom guests. -(qemu-xen is kept very close to the upstream project.) We also have a -number of updates to vTPM, and improvements to XSM and Flask to allow -greater disaggregation. Additionally, 4.3 contains a basic version of -Xen for the new ARM server architecture, both 32- and 64-bit. And as -always, there are a number of performance, stability, and security +The 4.4 release offers a number of improvements, including solid +support for libvirt running on libxl, a new scalable event channel +interface, improved flexibility for driver domains, an experimental +"PVH" virtualization mode, improved kexec support, and improved +support for SPICE clients. Additionally, the ARM platform has had a +number of improvements. The most important of these is that the +hypervisor ABIs for both arm32 and arm64 have been declared stable. +Additionally, many new ARM platforms have been added, and changes have +been made that will make adding new platforms easier. And as always, +there are a number of performance, stability, and security improvements under-the hood. This file contains some quick-start instructions to install Xen on -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 13:44:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 13:44:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNMyX-0003NJ-IA; Tue, 11 Mar 2014 13:44:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNMyW-0003My-81 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 13:44:08 +0000 Received: from [85.158.143.35:34268] by server-3.bemta-4.messagelabs.com id 45/1D-13602-7231F135; Tue, 11 Mar 2014 13:44:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1394545443!1245791!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14748 invoked from network); 11 Mar 2014 13:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 13:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNMyR-0005Ia-5z for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 13:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNMyR-00009l-3m for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 13:44:03 +0000 Message-Id: Date: Tue, 11 Mar 2014 13:44:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] sync Xen public headers to 4.4.0 level X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1394543238 -3600 # Node ID 56e74559c3746bfde7ff9455d4f8af11ae1c673d # Parent c319bf65ef0495756ee9cc340ba7cb2e3388027e sync Xen public headers to 4.4.0 level --- diff -r c319bf65ef04 -r 56e74559c374 include/xen/interface/domctl.h --- a/include/xen/interface/domctl.h Mon Feb 17 12:33:36 2014 +0100 +++ b/include/xen/interface/domctl.h Tue Mar 11 14:07:18 2014 +0100 @@ -907,6 +907,17 @@ struct xen_domctl_set_max_evtchn { typedef struct xen_domctl_set_max_evtchn xen_domctl_set_max_evtchn_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_max_evtchn_t); +/* + * ARM: Clean and invalidate caches associated with given region of + * guest memory. + */ +struct xen_domctl_cacheflush { + /* IN: page range to flush. */ + xen_pfn_t start_pfn, nr_pfns; +}; +typedef struct xen_domctl_cacheflush xen_domctl_cacheflush_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_cacheflush_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -976,6 +987,7 @@ struct xen_domctl { #define XEN_DOMCTL_setnodeaffinity 68 #define XEN_DOMCTL_getnodeaffinity 69 #define XEN_DOMCTL_set_max_evtchn 70 +#define XEN_DOMCTL_cacheflush 71 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1035,6 +1047,7 @@ struct xen_domctl { struct xen_domctl_set_max_evtchn set_max_evtchn; struct xen_domctl_gdbsx_memio gdbsx_guest_memio; struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; + struct xen_domctl_cacheflush cacheflush; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; uint8_t pad[128]; diff -r c319bf65ef04 -r 56e74559c374 include/xen/interface/io/blkif.h --- a/include/xen/interface/io/blkif.h Mon Feb 17 12:33:36 2014 +0100 +++ b/include/xen/interface/io/blkif.h Tue Mar 11 14:07:18 2014 +0100 @@ -175,7 +175,7 @@ * *------------------------- Backend Device Properties ------------------------- * - * discard-aligment + * discard-alignment * Values: * Default Value: 0 * Notes: 4, 5 @@ -194,6 +194,7 @@ * discard-secure * Values: 0/1 (boolean) * Default Value: 0 + * Notes: 10 * * A value of "1" indicates that the backend can process BLKIF_OP_DISCARD * requests with the BLKIF_DISCARD_SECURE flag set. @@ -323,9 +324,15 @@ * For full interoperability, block front and backends should publish * identical ring parameters, adjusted for unit differences, to the * XenStore nodes used in both schemes. - * (4) Devices that support discard functionality may internally allocate - * space (discardable extents) in units that are larger than the - * exported logical block size. + * (4) Devices that support discard functionality may internally allocate space + * (discardable extents) in units that are larger than the exported logical + * block size. If the backing device has such discardable extents the + * backend should provide both discard-granularity and discard-alignment. + * Providing just one of the two may be considered an error by the frontend. + * Backends supporting discard should include discard-granularity and + * discard-alignment even if it supports discarding individual sectors. + * Frontends should assume discard-alignment == 0 and discard-granularity + * == sector size if these keys are missing. * (5) The discard-alignment parameter allows a physical device to be * partitioned into virtual devices that do not necessarily begin or * end on a discardable extent boundary. @@ -344,6 +351,8 @@ * grants that can be persistently mapped in the frontend driver, but * due to the frontent driver implementation it should never be bigger * than RING_SIZE * BLKIF_MAX_SEGMENTS_PER_REQUEST. + *(10) The discard-secure property may be present and will be set to 1 if the + * backing device supports secure discard. */ /* @@ -478,13 +487,13 @@ * it's less than the number provided by the backend. The indirect_grefs field * in blkif_request_indirect should be filled by the frontend with the * grant references of the pages that are holding the indirect segments. - * This pages are filled with an array of blkif_request_segment_aligned - * that hold the information about the segments. The number of indirect - * pages to use is determined by the maximum number of segments - * an indirect request contains. Every indirect page can contain a maximum - * of 512 segments (PAGE_SIZE/sizeof(blkif_request_segment_aligned)), - * so to calculate the number of indirect pages to use we have to do - * ceil(indirect_segments/512). + * These pages are filled with an array of blkif_request_segment that hold the + * information about the segments. The number of indirect pages to use is + * determined by the number of segments an indirect request contains. Every + * indirect page can contain a maximum of + * (PAGE_SIZE / sizeof(struct blkif_request_segment)) segments, so to + * calculate the number of indirect pages to use we have to do + * ceil(indirect_segments / (PAGE_SIZE / sizeof(struct blkif_request_segment))). * * If a backend does not recognize BLKIF_OP_INDIRECT, it should *not* * create the "feature-max-indirect-segments" node! @@ -560,14 +569,6 @@ struct blkif_request_indirect { }; typedef struct blkif_request_indirect blkif_request_indirect_t; -struct blkif_request_segment_aligned { - grant_ref_t gref; /* reference to I/O buffer frame */ - /* @first_sect: first sector in frame to transfer (inclusive). */ - /* @last_sect: last sector in frame to transfer (inclusive). */ - uint8_t first_sect, last_sect; - uint16_t _pad; /* padding to make it 8 bytes, so it's cache-aligned */ -}; - struct blkif_response { uint64_t id; /* copied from request */ uint8_t operation; /* copied from request */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 13:44:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 13:44:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNMyX-0003NJ-IA; Tue, 11 Mar 2014 13:44:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNMyW-0003My-81 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 13:44:08 +0000 Received: from [85.158.143.35:34268] by server-3.bemta-4.messagelabs.com id 45/1D-13602-7231F135; Tue, 11 Mar 2014 13:44:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1394545443!1245791!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14748 invoked from network); 11 Mar 2014 13:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 13:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNMyR-0005Ia-5z for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 13:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNMyR-00009l-3m for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 13:44:03 +0000 Message-Id: Date: Tue, 11 Mar 2014 13:44:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] sync Xen public headers to 4.4.0 level X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1394543238 -3600 # Node ID 56e74559c3746bfde7ff9455d4f8af11ae1c673d # Parent c319bf65ef0495756ee9cc340ba7cb2e3388027e sync Xen public headers to 4.4.0 level --- diff -r c319bf65ef04 -r 56e74559c374 include/xen/interface/domctl.h --- a/include/xen/interface/domctl.h Mon Feb 17 12:33:36 2014 +0100 +++ b/include/xen/interface/domctl.h Tue Mar 11 14:07:18 2014 +0100 @@ -907,6 +907,17 @@ struct xen_domctl_set_max_evtchn { typedef struct xen_domctl_set_max_evtchn xen_domctl_set_max_evtchn_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_max_evtchn_t); +/* + * ARM: Clean and invalidate caches associated with given region of + * guest memory. + */ +struct xen_domctl_cacheflush { + /* IN: page range to flush. */ + xen_pfn_t start_pfn, nr_pfns; +}; +typedef struct xen_domctl_cacheflush xen_domctl_cacheflush_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_cacheflush_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -976,6 +987,7 @@ struct xen_domctl { #define XEN_DOMCTL_setnodeaffinity 68 #define XEN_DOMCTL_getnodeaffinity 69 #define XEN_DOMCTL_set_max_evtchn 70 +#define XEN_DOMCTL_cacheflush 71 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1035,6 +1047,7 @@ struct xen_domctl { struct xen_domctl_set_max_evtchn set_max_evtchn; struct xen_domctl_gdbsx_memio gdbsx_guest_memio; struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; + struct xen_domctl_cacheflush cacheflush; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; uint8_t pad[128]; diff -r c319bf65ef04 -r 56e74559c374 include/xen/interface/io/blkif.h --- a/include/xen/interface/io/blkif.h Mon Feb 17 12:33:36 2014 +0100 +++ b/include/xen/interface/io/blkif.h Tue Mar 11 14:07:18 2014 +0100 @@ -175,7 +175,7 @@ * *------------------------- Backend Device Properties ------------------------- * - * discard-aligment + * discard-alignment * Values: * Default Value: 0 * Notes: 4, 5 @@ -194,6 +194,7 @@ * discard-secure * Values: 0/1 (boolean) * Default Value: 0 + * Notes: 10 * * A value of "1" indicates that the backend can process BLKIF_OP_DISCARD * requests with the BLKIF_DISCARD_SECURE flag set. @@ -323,9 +324,15 @@ * For full interoperability, block front and backends should publish * identical ring parameters, adjusted for unit differences, to the * XenStore nodes used in both schemes. - * (4) Devices that support discard functionality may internally allocate - * space (discardable extents) in units that are larger than the - * exported logical block size. + * (4) Devices that support discard functionality may internally allocate space + * (discardable extents) in units that are larger than the exported logical + * block size. If the backing device has such discardable extents the + * backend should provide both discard-granularity and discard-alignment. + * Providing just one of the two may be considered an error by the frontend. + * Backends supporting discard should include discard-granularity and + * discard-alignment even if it supports discarding individual sectors. + * Frontends should assume discard-alignment == 0 and discard-granularity + * == sector size if these keys are missing. * (5) The discard-alignment parameter allows a physical device to be * partitioned into virtual devices that do not necessarily begin or * end on a discardable extent boundary. @@ -344,6 +351,8 @@ * grants that can be persistently mapped in the frontend driver, but * due to the frontent driver implementation it should never be bigger * than RING_SIZE * BLKIF_MAX_SEGMENTS_PER_REQUEST. + *(10) The discard-secure property may be present and will be set to 1 if the + * backing device supports secure discard. */ /* @@ -478,13 +487,13 @@ * it's less than the number provided by the backend. The indirect_grefs field * in blkif_request_indirect should be filled by the frontend with the * grant references of the pages that are holding the indirect segments. - * This pages are filled with an array of blkif_request_segment_aligned - * that hold the information about the segments. The number of indirect - * pages to use is determined by the maximum number of segments - * an indirect request contains. Every indirect page can contain a maximum - * of 512 segments (PAGE_SIZE/sizeof(blkif_request_segment_aligned)), - * so to calculate the number of indirect pages to use we have to do - * ceil(indirect_segments/512). + * These pages are filled with an array of blkif_request_segment that hold the + * information about the segments. The number of indirect pages to use is + * determined by the number of segments an indirect request contains. Every + * indirect page can contain a maximum of + * (PAGE_SIZE / sizeof(struct blkif_request_segment)) segments, so to + * calculate the number of indirect pages to use we have to do + * ceil(indirect_segments / (PAGE_SIZE / sizeof(struct blkif_request_segment))). * * If a backend does not recognize BLKIF_OP_INDIRECT, it should *not* * create the "feature-max-indirect-segments" node! @@ -560,14 +569,6 @@ struct blkif_request_indirect { }; typedef struct blkif_request_indirect blkif_request_indirect_t; -struct blkif_request_segment_aligned { - grant_ref_t gref; /* reference to I/O buffer frame */ - /* @first_sect: first sector in frame to transfer (inclusive). */ - /* @last_sect: last sector in frame to transfer (inclusive). */ - uint8_t first_sect, last_sect; - uint16_t _pad; /* padding to make it 8 bytes, so it's cache-aligned */ -}; - struct blkif_response { uint64_t id; /* copied from request */ uint8_t operation; /* copied from request */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 13:44:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 13:44:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNMyW-0003N2-EN; Tue, 11 Mar 2014 13:44:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNMyU-0003Mk-GY for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 13:44:06 +0000 Received: from [85.158.139.211:6423] by server-17.bemta-5.messagelabs.com id D8/1F-09046-5231F135; Tue, 11 Mar 2014 13:44:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-206.messagelabs.com!1394545443!397097!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22176 invoked from network); 11 Mar 2014 13:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 13:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNMyR-0005Id-Gq for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 13:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNMyR-0000A0-Fl for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 13:44:03 +0000 Message-Id: Date: Tue, 11 Mar 2014 13:44:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] drivers/xen/*net*: use skb_is_gso() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1394544655 -3600 # Node ID 9d5980df7a806e7b3c2c3d864ab24d03c400890c # Parent 56e74559c3746bfde7ff9455d4f8af11ae1c673d drivers/xen/*net*: use skb_is_gso() Suggested-by: Paul Durrant Signed-off-by: Jan Beulich --- diff -r 56e74559c374 -r 9d5980df7a80 drivers/xen/netback/netback.c --- a/drivers/xen/netback/netback.c Tue Mar 11 14:07:18 2014 +0100 +++ b/drivers/xen/netback/netback.c Tue Mar 11 14:30:55 2014 +0100 @@ -322,7 +322,7 @@ int netif_be_start_xmit(struct sk_buff * } netif->rx_req_cons_peek += skb_shinfo(skb)->nr_frags + 1 + - !!skb_shinfo(skb)->gso_size; + !!skb_is_gso(skb); netif_get(netif); if (netbk_can_queue(dev) && netbk_queue_full(netif)) { diff -r 56e74559c374 -r 9d5980df7a80 drivers/xen/netfront/netfront.c --- a/drivers/xen/netfront/netfront.c Tue Mar 11 14:07:18 2014 +0100 +++ b/drivers/xen/netfront/netfront.c Tue Mar 11 14:30:55 2014 +0100 @@ -1019,7 +1019,7 @@ static int network_start_xmit(struct sk_ #endif #if HAVE_TSO - if (skb_shinfo(skb)->gso_size) { + if (skb_is_gso(skb)) { struct netif_extra_info *gso = (struct netif_extra_info *) RING_GET_REQUEST(&np->tx, ++i); diff -r 56e74559c374 -r 9d5980df7a80 drivers/xen/sfc_netfront/accel_vi.c --- a/drivers/xen/sfc_netfront/accel_vi.c Tue Mar 11 14:07:18 2014 +0100 +++ b/drivers/xen/sfc_netfront/accel_vi.c Tue Mar 11 14:30:55 2014 +0100 @@ -676,13 +676,11 @@ netfront_accel_vi_tx_post(netfront_accel VPRINTK("%s: %d bytes, gso %d\n", __FUNCTION__, skb->len, skb_shinfo(skb)->gso_size); - if (skb_shinfo(skb)->gso_size) { + if (skb_is_gso(skb)) return netfront_accel_enqueue_skb_tso(vnic, skb); - } - if (skb->len <= NETFRONT_ACCEL_TX_BUF_LENGTH) { + if (skb->len <= NETFRONT_ACCEL_TX_BUF_LENGTH) return netfront_accel_enqueue_skb_single(vnic, skb); - } return netfront_accel_enqueue_skb_multi(vnic, skb); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 13:44:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 13:44:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNMyW-0003N2-EN; Tue, 11 Mar 2014 13:44:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNMyU-0003Mk-GY for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 13:44:06 +0000 Received: from [85.158.139.211:6423] by server-17.bemta-5.messagelabs.com id D8/1F-09046-5231F135; Tue, 11 Mar 2014 13:44:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-206.messagelabs.com!1394545443!397097!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22176 invoked from network); 11 Mar 2014 13:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 13:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNMyR-0005Id-Gq for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 13:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNMyR-0000A0-Fl for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 13:44:03 +0000 Message-Id: Date: Tue, 11 Mar 2014 13:44:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] drivers/xen/*net*: use skb_is_gso() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1394544655 -3600 # Node ID 9d5980df7a806e7b3c2c3d864ab24d03c400890c # Parent 56e74559c3746bfde7ff9455d4f8af11ae1c673d drivers/xen/*net*: use skb_is_gso() Suggested-by: Paul Durrant Signed-off-by: Jan Beulich --- diff -r 56e74559c374 -r 9d5980df7a80 drivers/xen/netback/netback.c --- a/drivers/xen/netback/netback.c Tue Mar 11 14:07:18 2014 +0100 +++ b/drivers/xen/netback/netback.c Tue Mar 11 14:30:55 2014 +0100 @@ -322,7 +322,7 @@ int netif_be_start_xmit(struct sk_buff * } netif->rx_req_cons_peek += skb_shinfo(skb)->nr_frags + 1 + - !!skb_shinfo(skb)->gso_size; + !!skb_is_gso(skb); netif_get(netif); if (netbk_can_queue(dev) && netbk_queue_full(netif)) { diff -r 56e74559c374 -r 9d5980df7a80 drivers/xen/netfront/netfront.c --- a/drivers/xen/netfront/netfront.c Tue Mar 11 14:07:18 2014 +0100 +++ b/drivers/xen/netfront/netfront.c Tue Mar 11 14:30:55 2014 +0100 @@ -1019,7 +1019,7 @@ static int network_start_xmit(struct sk_ #endif #if HAVE_TSO - if (skb_shinfo(skb)->gso_size) { + if (skb_is_gso(skb)) { struct netif_extra_info *gso = (struct netif_extra_info *) RING_GET_REQUEST(&np->tx, ++i); diff -r 56e74559c374 -r 9d5980df7a80 drivers/xen/sfc_netfront/accel_vi.c --- a/drivers/xen/sfc_netfront/accel_vi.c Tue Mar 11 14:07:18 2014 +0100 +++ b/drivers/xen/sfc_netfront/accel_vi.c Tue Mar 11 14:30:55 2014 +0100 @@ -676,13 +676,11 @@ netfront_accel_vi_tx_post(netfront_accel VPRINTK("%s: %d bytes, gso %d\n", __FUNCTION__, skb->len, skb_shinfo(skb)->gso_size); - if (skb_shinfo(skb)->gso_size) { + if (skb_is_gso(skb)) return netfront_accel_enqueue_skb_tso(vnic, skb); - } - if (skb->len <= NETFRONT_ACCEL_TX_BUF_LENGTH) { + if (skb->len <= NETFRONT_ACCEL_TX_BUF_LENGTH) return netfront_accel_enqueue_skb_single(vnic, skb); - } return netfront_accel_enqueue_skb_multi(vnic, skb); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNui-0001LD-VV; Tue, 11 Mar 2014 14:44:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNui-0001L4-72 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:16 +0000 Received: from [85.158.137.68:34033] by server-9.bemta-3.messagelabs.com id 71/34-10184-F312F135; Tue, 11 Mar 2014 14:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1394549053!7020849!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 620 invoked from network); 11 Mar 2014 14:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNuf-0005w8-HM for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNuf-0001wN-Eg for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:13 +0000 Date: Tue, 11 Mar 2014 14:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: fix memory type merging in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b99113b9d5fac5149de8496f55afa00e285b1ff3 Author: Jan Beulich AuthorDate: Mon Mar 10 11:03:53 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:03:53 2014 +0100 x86/HVM: fix memory type merging in epte_get_entry_emt() Using the minimum numeric value of guest and host specified memory types is too simplistic - it works only correctly for a subset of types. It is in particular the WT/WP combination that needs conversion to UC if the two types conflict. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser --- xen/arch/x86/hvm/mtrr.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index e7c0fd9..b33bf34 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -719,5 +719,35 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); - return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); + + /* If both types match we're fine. */ + if ( likely(gmtrr_mtype == hmtrr_mtype) ) + return hmtrr_mtype; + + /* If either type is UC, we have to go with that one. */ + if ( gmtrr_mtype == MTRR_TYPE_UNCACHABLE || + hmtrr_mtype == MTRR_TYPE_UNCACHABLE ) + return MTRR_TYPE_UNCACHABLE; + + /* If either type is WB, we have to go with the other one. */ + if ( gmtrr_mtype == MTRR_TYPE_WRBACK ) + return hmtrr_mtype; + if ( hmtrr_mtype == MTRR_TYPE_WRBACK ) + return gmtrr_mtype; + + /* + * At this point we have disagreeing WC, WT, or WP types. The only + * combination that can be cleanly resolved is WT:WP. The ones involving + * WC need to be converted to UC, both due to the memory ordering + * differences and because WC disallows reads to be cached (WT and WP + * permit this), while WT and WP require writes to go straight to memory + * (WC can buffer them). + */ + if ( (gmtrr_mtype == MTRR_TYPE_WRTHROUGH && + hmtrr_mtype == MTRR_TYPE_WRPROT) || + (gmtrr_mtype == MTRR_TYPE_WRPROT && + hmtrr_mtype == MTRR_TYPE_WRTHROUGH) ) + return MTRR_TYPE_WRPROT; + + return MTRR_TYPE_UNCACHABLE; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNv4-0001Nf-4v; Tue, 11 Mar 2014 14:44:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNv2-0001NS-NM for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:37 +0000 Received: from [193.109.254.147:24510] by server-13.bemta-14.messagelabs.com id F9/E6-01226-4512F135; Tue, 11 Mar 2014 14:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1394549074!913690!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21836 invoked from network); 11 Mar 2014 14:44:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNuz-0005wE-UA for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNuz-0001x9-Se for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:33 +0000 Date: Tue, 11 Mar 2014 14:44:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: use manifest constants / enumerators for memory types X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9963a1aa033ce7716dd55659787ba99210066b24 Author: Jan Beulich AuthorDate: Mon Mar 10 11:05:51 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:05:51 2014 +0100 x86/HVM: use manifest constants / enumerators for memory types ... instead of literal numbers, thus making it possible for the reader to understand the code without having to look up the meaning of these numbers. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/hvm.c | 13 ++++++-- xen/arch/x86/hvm/mtrr.c | 74 ++++++++++++++++++++++++++------------------ xen/include/asm-x86/mtrr.h | 1 - 3 files changed, 54 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index ae24211..2fa5775 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -235,9 +235,16 @@ int hvm_set_guest_pat(struct vcpu *v, u64 guest_pat) uint8_t *value = (uint8_t *)&guest_pat; for ( i = 0; i < 8; i++ ) - if ( unlikely(!(value[i] == 0 || value[i] == 1 || - value[i] == 4 || value[i] == 5 || - value[i] == 6 || value[i] == 7)) ) { + switch ( value[i] ) + { + case PAT_TYPE_UC_MINUS: + case PAT_TYPE_UNCACHABLE: + case PAT_TYPE_WRBACK: + case PAT_TYPE_WRCOMB: + case PAT_TYPE_WRPROT: + case PAT_TYPE_WRTHROUGH: + break; + default: HVM_DBG_LOG(DBG_LEVEL_MSR, "invalid guest PAT: %"PRIx64"\n", guest_pat); return 0; diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index dd1561e..229bf1d 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -42,22 +42,28 @@ static const uint8_t pat_entry_2_pte_flags[8] = { /* Effective mm type lookup table, according to MTRR and PAT. */ static const uint8_t mm_type_tbl[MTRR_NUM_TYPES][PAT_TYPE_NUMS] = { -/********PAT(UC,WC,RS,RS,WT,WP,WB,UC-)*/ -/* RS means reserved type(2,3), and type is hardcoded here */ - /*MTRR(UC):(UC,WC,RS,RS,UC,UC,UC,UC)*/ - {0, 1, 2, 2, 0, 0, 0, 0}, - /*MTRR(WC):(UC,WC,RS,RS,UC,UC,WC,WC)*/ - {0, 1, 2, 2, 0, 0, 1, 1}, - /*MTRR(RS):(RS,RS,RS,RS,RS,RS,RS,RS)*/ - {2, 2, 2, 2, 2, 2, 2, 2}, - /*MTRR(RS):(RS,RS,RS,RS,RS,RS,RS,RS)*/ - {2, 2, 2, 2, 2, 2, 2, 2}, - /*MTRR(WT):(UC,WC,RS,RS,WT,WP,WT,UC)*/ - {0, 1, 2, 2, 4, 5, 4, 0}, - /*MTRR(WP):(UC,WC,RS,RS,WT,WP,WP,WC)*/ - {0, 1, 2, 2, 4, 5, 5, 1}, - /*MTRR(WB):(UC,WC,RS,RS,WT,WP,WB,UC)*/ - {0, 1, 2, 2, 4, 5, 6, 0} +#define RS MEMORY_NUM_TYPES +#define UC MTRR_TYPE_UNCACHABLE +#define WB MTRR_TYPE_WRBACK +#define WC MTRR_TYPE_WRCOMB +#define WP MTRR_TYPE_WRPROT +#define WT MTRR_TYPE_WRTHROUGH + +/* PAT(UC, WC, RS, RS, WT, WP, WB, UC-) */ +/* MTRR(UC) */ {UC, WC, RS, RS, UC, UC, UC, UC}, +/* MTRR(WC) */ {UC, WC, RS, RS, UC, UC, WC, WC}, +/* MTRR(RS) */ {RS, RS, RS, RS, RS, RS, RS, RS}, +/* MTRR(RS) */ {RS, RS, RS, RS, RS, RS, RS, RS}, +/* MTRR(WT) */ {UC, WC, RS, RS, WT, WP, WT, UC}, +/* MTRR(WP) */ {UC, WC, RS, RS, WT, WP, WP, WC}, +/* MTRR(WB) */ {UC, WC, RS, RS, WT, WP, WB, UC} + +#undef UC +#undef WC +#undef WT +#undef WP +#undef WB +#undef RS }; /* @@ -301,11 +307,12 @@ static uint8_t get_mtrr_type(struct mtrr_state *m, paddr_t pa) */ return overlap_mtrr_pos; - if ( overlap_mtrr & 0x1 ) + if ( overlap_mtrr & (1 << MTRR_TYPE_UNCACHABLE) ) /* Two or more match, one is UC. */ return MTRR_TYPE_UNCACHABLE; - if ( !(overlap_mtrr & 0xaf) ) + if ( !(overlap_mtrr & + ~((1 << MTRR_TYPE_WRTHROUGH) | (1 << MTRR_TYPE_WRBACK))) ) /* Two or more match, WT and WB. */ return MTRR_TYPE_WRTHROUGH; @@ -403,13 +410,26 @@ uint32_t get_pat_flags(struct vcpu *v, return pat_type_2_pte_flags(pat_entry_value); } +static inline bool_t valid_mtrr_type(uint8_t type) +{ + switch ( type ) + { + case MTRR_TYPE_UNCACHABLE: + case MTRR_TYPE_WRBACK: + case MTRR_TYPE_WRCOMB: + case MTRR_TYPE_WRPROT: + case MTRR_TYPE_WRTHROUGH: + return 1; + } + return 0; +} + bool_t mtrr_def_type_msr_set(struct mtrr_state *m, uint64_t msr_content) { uint8_t def_type = msr_content & 0xff; uint8_t enabled = (msr_content >> 10) & 0x3; - if ( unlikely(!(def_type == 0 || def_type == 1 || def_type == 4 || - def_type == 5 || def_type == 6)) ) + if ( unlikely(!valid_mtrr_type(def_type)) ) { HVM_DBG_LOG(DBG_LEVEL_MSR, "invalid MTRR def type:%x\n", def_type); return 0; @@ -436,15 +456,11 @@ bool_t mtrr_fix_range_msr_set(struct mtrr_state *m, uint32_t row, if ( fixed_range_base[row] != msr_content ) { uint8_t *range = (uint8_t*)&msr_content; - int32_t i, type; + unsigned int i; for ( i = 0; i < 8; i++ ) - { - type = range[i]; - if ( unlikely(!(type == 0 || type == 1 || - type == 4 || type == 5 || type == 6)) ) + if ( unlikely(!valid_mtrr_type(range[i])) ) return 0; - } fixed_range_base[row] = msr_content; } @@ -455,7 +471,7 @@ bool_t mtrr_fix_range_msr_set(struct mtrr_state *m, uint32_t row, bool_t mtrr_var_range_msr_set( struct domain *d, struct mtrr_state *m, uint32_t msr, uint64_t msr_content) { - uint32_t index, type, phys_addr, eax, ebx, ecx, edx; + uint32_t index, phys_addr, eax, ebx, ecx, edx; uint64_t msr_mask; uint64_t *var_range_base = (uint64_t*)m->var_ranges; @@ -463,9 +479,7 @@ bool_t mtrr_var_range_msr_set( if ( var_range_base[index] == msr_content ) return 1; - type = (uint8_t)msr_content; - if ( unlikely(!(type == 0 || type == 1 || - type == 4 || type == 5 || type == 6)) ) + if ( unlikely(!valid_mtrr_type((uint8_t)msr_content)) ) return 0; phys_addr = 36; diff --git a/xen/include/asm-x86/mtrr.h b/xen/include/asm-x86/mtrr.h index 6b4d632..6ef0e2d 100644 --- a/xen/include/asm-x86/mtrr.h +++ b/xen/include/asm-x86/mtrr.h @@ -20,7 +20,6 @@ enum { PAT_TYPE_UNCACHABLE=0, PAT_TYPE_WRCOMB=1, - PAT_TYPE_RESERVED=2, PAT_TYPE_WRTHROUGH=4, PAT_TYPE_WRPROT=5, PAT_TYPE_WRBACK=6, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNut-0001MV-23; Tue, 11 Mar 2014 14:44:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNus-0001MI-Ae for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:26 +0000 Received: from [193.109.254.147:60496] by server-2.bemta-14.messagelabs.com id 60/3B-01236-9412F135; Tue, 11 Mar 2014 14:44:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1394549063!896044!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21011 invoked from network); 11 Mar 2014 14:44:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:44:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNup-0005wB-OG for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNup-0001wj-M4 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:23 +0000 Date: Tue, 11 Mar 2014 14:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: consolidate passthrough handling in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3089a6d82bdf3112ccb1dd074ce34a8cbdc4ccd8 Author: Jan Beulich AuthorDate: Mon Mar 10 11:04:36 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:04:36 2014 +0100 x86/HVM: consolidate passthrough handling in epte_get_entry_emt() It is inconsistent to depend on iommu_enabled alone: For a guest without devices passed through to it, it is of no concern whether the IOMMU is enabled. There's one rather special case to take care of: VMX code marks the LAPIC access page as MMIO. The added assertion needs to take this into consideration, and the subsequent handling of the direct MMIO case was inconsistent too: That page would have been WB in the absence of an IOMMU, but UC in the presence of it, while in fact the cachabilty of this page is entirely unrelated to an IOMMU being in use. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser --- xen/arch/x86/hvm/mtrr.c | 10 ++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index b33bf34..dd1561e 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -698,14 +698,20 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, if ( hvm_get_mem_pinned_cacheattr(d, gfn, &type) ) return type; - if ( !iommu_enabled ) + if ( !iommu_enabled || + (rangeset_is_empty(d->iomem_caps) && + rangeset_is_empty(d->arch.ioport_caps) && + !has_arch_pdevs(d)) ) { + ASSERT(!direct_mmio || + mfn_x(mfn) == d->arch.hvm_domain.vmx.apic_access_mfn); *ipat = 1; return MTRR_TYPE_WRBACK; } if ( direct_mmio ) - return MTRR_TYPE_UNCACHABLE; + return mfn_x(mfn) != d->arch.hvm_domain.vmx.apic_access_mfn + ? MTRR_TYPE_UNCACHABLE : MTRR_TYPE_WRBACK; if ( iommu_snoop ) { diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 8395e86..94dc968 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2090,9 +2090,9 @@ static int vmx_alloc_vlapic_mapping(struct domain *d) if ( apic_va == NULL ) return -ENOMEM; share_xen_page_with_guest(virt_to_page(apic_va), d, XENSHARE_writable); + d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), _mfn(virt_to_mfn(apic_va))); - d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNui-0001LD-VV; Tue, 11 Mar 2014 14:44:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNui-0001L4-72 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:16 +0000 Received: from [85.158.137.68:34033] by server-9.bemta-3.messagelabs.com id 71/34-10184-F312F135; Tue, 11 Mar 2014 14:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1394549053!7020849!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 620 invoked from network); 11 Mar 2014 14:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNuf-0005w8-HM for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNuf-0001wN-Eg for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:13 +0000 Date: Tue, 11 Mar 2014 14:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: fix memory type merging in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b99113b9d5fac5149de8496f55afa00e285b1ff3 Author: Jan Beulich AuthorDate: Mon Mar 10 11:03:53 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:03:53 2014 +0100 x86/HVM: fix memory type merging in epte_get_entry_emt() Using the minimum numeric value of guest and host specified memory types is too simplistic - it works only correctly for a subset of types. It is in particular the WT/WP combination that needs conversion to UC if the two types conflict. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser --- xen/arch/x86/hvm/mtrr.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index e7c0fd9..b33bf34 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -719,5 +719,35 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); - return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); + + /* If both types match we're fine. */ + if ( likely(gmtrr_mtype == hmtrr_mtype) ) + return hmtrr_mtype; + + /* If either type is UC, we have to go with that one. */ + if ( gmtrr_mtype == MTRR_TYPE_UNCACHABLE || + hmtrr_mtype == MTRR_TYPE_UNCACHABLE ) + return MTRR_TYPE_UNCACHABLE; + + /* If either type is WB, we have to go with the other one. */ + if ( gmtrr_mtype == MTRR_TYPE_WRBACK ) + return hmtrr_mtype; + if ( hmtrr_mtype == MTRR_TYPE_WRBACK ) + return gmtrr_mtype; + + /* + * At this point we have disagreeing WC, WT, or WP types. The only + * combination that can be cleanly resolved is WT:WP. The ones involving + * WC need to be converted to UC, both due to the memory ordering + * differences and because WC disallows reads to be cached (WT and WP + * permit this), while WT and WP require writes to go straight to memory + * (WC can buffer them). + */ + if ( (gmtrr_mtype == MTRR_TYPE_WRTHROUGH && + hmtrr_mtype == MTRR_TYPE_WRPROT) || + (gmtrr_mtype == MTRR_TYPE_WRPROT && + hmtrr_mtype == MTRR_TYPE_WRTHROUGH) ) + return MTRR_TYPE_WRPROT; + + return MTRR_TYPE_UNCACHABLE; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNv4-0001Nf-4v; Tue, 11 Mar 2014 14:44:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNv2-0001NS-NM for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:37 +0000 Received: from [193.109.254.147:24510] by server-13.bemta-14.messagelabs.com id F9/E6-01226-4512F135; Tue, 11 Mar 2014 14:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1394549074!913690!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21836 invoked from network); 11 Mar 2014 14:44:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNuz-0005wE-UA for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNuz-0001x9-Se for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:33 +0000 Date: Tue, 11 Mar 2014 14:44:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: use manifest constants / enumerators for memory types X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9963a1aa033ce7716dd55659787ba99210066b24 Author: Jan Beulich AuthorDate: Mon Mar 10 11:05:51 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:05:51 2014 +0100 x86/HVM: use manifest constants / enumerators for memory types ... instead of literal numbers, thus making it possible for the reader to understand the code without having to look up the meaning of these numbers. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/hvm.c | 13 ++++++-- xen/arch/x86/hvm/mtrr.c | 74 ++++++++++++++++++++++++++------------------ xen/include/asm-x86/mtrr.h | 1 - 3 files changed, 54 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index ae24211..2fa5775 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -235,9 +235,16 @@ int hvm_set_guest_pat(struct vcpu *v, u64 guest_pat) uint8_t *value = (uint8_t *)&guest_pat; for ( i = 0; i < 8; i++ ) - if ( unlikely(!(value[i] == 0 || value[i] == 1 || - value[i] == 4 || value[i] == 5 || - value[i] == 6 || value[i] == 7)) ) { + switch ( value[i] ) + { + case PAT_TYPE_UC_MINUS: + case PAT_TYPE_UNCACHABLE: + case PAT_TYPE_WRBACK: + case PAT_TYPE_WRCOMB: + case PAT_TYPE_WRPROT: + case PAT_TYPE_WRTHROUGH: + break; + default: HVM_DBG_LOG(DBG_LEVEL_MSR, "invalid guest PAT: %"PRIx64"\n", guest_pat); return 0; diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index dd1561e..229bf1d 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -42,22 +42,28 @@ static const uint8_t pat_entry_2_pte_flags[8] = { /* Effective mm type lookup table, according to MTRR and PAT. */ static const uint8_t mm_type_tbl[MTRR_NUM_TYPES][PAT_TYPE_NUMS] = { -/********PAT(UC,WC,RS,RS,WT,WP,WB,UC-)*/ -/* RS means reserved type(2,3), and type is hardcoded here */ - /*MTRR(UC):(UC,WC,RS,RS,UC,UC,UC,UC)*/ - {0, 1, 2, 2, 0, 0, 0, 0}, - /*MTRR(WC):(UC,WC,RS,RS,UC,UC,WC,WC)*/ - {0, 1, 2, 2, 0, 0, 1, 1}, - /*MTRR(RS):(RS,RS,RS,RS,RS,RS,RS,RS)*/ - {2, 2, 2, 2, 2, 2, 2, 2}, - /*MTRR(RS):(RS,RS,RS,RS,RS,RS,RS,RS)*/ - {2, 2, 2, 2, 2, 2, 2, 2}, - /*MTRR(WT):(UC,WC,RS,RS,WT,WP,WT,UC)*/ - {0, 1, 2, 2, 4, 5, 4, 0}, - /*MTRR(WP):(UC,WC,RS,RS,WT,WP,WP,WC)*/ - {0, 1, 2, 2, 4, 5, 5, 1}, - /*MTRR(WB):(UC,WC,RS,RS,WT,WP,WB,UC)*/ - {0, 1, 2, 2, 4, 5, 6, 0} +#define RS MEMORY_NUM_TYPES +#define UC MTRR_TYPE_UNCACHABLE +#define WB MTRR_TYPE_WRBACK +#define WC MTRR_TYPE_WRCOMB +#define WP MTRR_TYPE_WRPROT +#define WT MTRR_TYPE_WRTHROUGH + +/* PAT(UC, WC, RS, RS, WT, WP, WB, UC-) */ +/* MTRR(UC) */ {UC, WC, RS, RS, UC, UC, UC, UC}, +/* MTRR(WC) */ {UC, WC, RS, RS, UC, UC, WC, WC}, +/* MTRR(RS) */ {RS, RS, RS, RS, RS, RS, RS, RS}, +/* MTRR(RS) */ {RS, RS, RS, RS, RS, RS, RS, RS}, +/* MTRR(WT) */ {UC, WC, RS, RS, WT, WP, WT, UC}, +/* MTRR(WP) */ {UC, WC, RS, RS, WT, WP, WP, WC}, +/* MTRR(WB) */ {UC, WC, RS, RS, WT, WP, WB, UC} + +#undef UC +#undef WC +#undef WT +#undef WP +#undef WB +#undef RS }; /* @@ -301,11 +307,12 @@ static uint8_t get_mtrr_type(struct mtrr_state *m, paddr_t pa) */ return overlap_mtrr_pos; - if ( overlap_mtrr & 0x1 ) + if ( overlap_mtrr & (1 << MTRR_TYPE_UNCACHABLE) ) /* Two or more match, one is UC. */ return MTRR_TYPE_UNCACHABLE; - if ( !(overlap_mtrr & 0xaf) ) + if ( !(overlap_mtrr & + ~((1 << MTRR_TYPE_WRTHROUGH) | (1 << MTRR_TYPE_WRBACK))) ) /* Two or more match, WT and WB. */ return MTRR_TYPE_WRTHROUGH; @@ -403,13 +410,26 @@ uint32_t get_pat_flags(struct vcpu *v, return pat_type_2_pte_flags(pat_entry_value); } +static inline bool_t valid_mtrr_type(uint8_t type) +{ + switch ( type ) + { + case MTRR_TYPE_UNCACHABLE: + case MTRR_TYPE_WRBACK: + case MTRR_TYPE_WRCOMB: + case MTRR_TYPE_WRPROT: + case MTRR_TYPE_WRTHROUGH: + return 1; + } + return 0; +} + bool_t mtrr_def_type_msr_set(struct mtrr_state *m, uint64_t msr_content) { uint8_t def_type = msr_content & 0xff; uint8_t enabled = (msr_content >> 10) & 0x3; - if ( unlikely(!(def_type == 0 || def_type == 1 || def_type == 4 || - def_type == 5 || def_type == 6)) ) + if ( unlikely(!valid_mtrr_type(def_type)) ) { HVM_DBG_LOG(DBG_LEVEL_MSR, "invalid MTRR def type:%x\n", def_type); return 0; @@ -436,15 +456,11 @@ bool_t mtrr_fix_range_msr_set(struct mtrr_state *m, uint32_t row, if ( fixed_range_base[row] != msr_content ) { uint8_t *range = (uint8_t*)&msr_content; - int32_t i, type; + unsigned int i; for ( i = 0; i < 8; i++ ) - { - type = range[i]; - if ( unlikely(!(type == 0 || type == 1 || - type == 4 || type == 5 || type == 6)) ) + if ( unlikely(!valid_mtrr_type(range[i])) ) return 0; - } fixed_range_base[row] = msr_content; } @@ -455,7 +471,7 @@ bool_t mtrr_fix_range_msr_set(struct mtrr_state *m, uint32_t row, bool_t mtrr_var_range_msr_set( struct domain *d, struct mtrr_state *m, uint32_t msr, uint64_t msr_content) { - uint32_t index, type, phys_addr, eax, ebx, ecx, edx; + uint32_t index, phys_addr, eax, ebx, ecx, edx; uint64_t msr_mask; uint64_t *var_range_base = (uint64_t*)m->var_ranges; @@ -463,9 +479,7 @@ bool_t mtrr_var_range_msr_set( if ( var_range_base[index] == msr_content ) return 1; - type = (uint8_t)msr_content; - if ( unlikely(!(type == 0 || type == 1 || - type == 4 || type == 5 || type == 6)) ) + if ( unlikely(!valid_mtrr_type((uint8_t)msr_content)) ) return 0; phys_addr = 36; diff --git a/xen/include/asm-x86/mtrr.h b/xen/include/asm-x86/mtrr.h index 6b4d632..6ef0e2d 100644 --- a/xen/include/asm-x86/mtrr.h +++ b/xen/include/asm-x86/mtrr.h @@ -20,7 +20,6 @@ enum { PAT_TYPE_UNCACHABLE=0, PAT_TYPE_WRCOMB=1, - PAT_TYPE_RESERVED=2, PAT_TYPE_WRTHROUGH=4, PAT_TYPE_WRPROT=5, PAT_TYPE_WRBACK=6, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNut-0001MV-23; Tue, 11 Mar 2014 14:44:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNus-0001MI-Ae for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:26 +0000 Received: from [193.109.254.147:60496] by server-2.bemta-14.messagelabs.com id 60/3B-01236-9412F135; Tue, 11 Mar 2014 14:44:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1394549063!896044!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21011 invoked from network); 11 Mar 2014 14:44:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:44:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNup-0005wB-OG for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNup-0001wj-M4 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:23 +0000 Date: Tue, 11 Mar 2014 14:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: consolidate passthrough handling in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3089a6d82bdf3112ccb1dd074ce34a8cbdc4ccd8 Author: Jan Beulich AuthorDate: Mon Mar 10 11:04:36 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:04:36 2014 +0100 x86/HVM: consolidate passthrough handling in epte_get_entry_emt() It is inconsistent to depend on iommu_enabled alone: For a guest without devices passed through to it, it is of no concern whether the IOMMU is enabled. There's one rather special case to take care of: VMX code marks the LAPIC access page as MMIO. The added assertion needs to take this into consideration, and the subsequent handling of the direct MMIO case was inconsistent too: That page would have been WB in the absence of an IOMMU, but UC in the presence of it, while in fact the cachabilty of this page is entirely unrelated to an IOMMU being in use. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser --- xen/arch/x86/hvm/mtrr.c | 10 ++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index b33bf34..dd1561e 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -698,14 +698,20 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, if ( hvm_get_mem_pinned_cacheattr(d, gfn, &type) ) return type; - if ( !iommu_enabled ) + if ( !iommu_enabled || + (rangeset_is_empty(d->iomem_caps) && + rangeset_is_empty(d->arch.ioport_caps) && + !has_arch_pdevs(d)) ) { + ASSERT(!direct_mmio || + mfn_x(mfn) == d->arch.hvm_domain.vmx.apic_access_mfn); *ipat = 1; return MTRR_TYPE_WRBACK; } if ( direct_mmio ) - return MTRR_TYPE_UNCACHABLE; + return mfn_x(mfn) != d->arch.hvm_domain.vmx.apic_access_mfn + ? MTRR_TYPE_UNCACHABLE : MTRR_TYPE_WRBACK; if ( iommu_snoop ) { diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 8395e86..94dc968 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2090,9 +2090,9 @@ static int vmx_alloc_vlapic_mapping(struct domain *d) if ( apic_va == NULL ) return -ENOMEM; share_xen_page_with_guest(virt_to_page(apic_va), d, XENSHARE_writable); + d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), _mfn(virt_to_mfn(apic_va))); - d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNuY-0001K2-Sn; Tue, 11 Mar 2014 14:44:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNuY-0001Jt-6t for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:06 +0000 Received: from [85.158.139.211:11213] by server-14.bemta-5.messagelabs.com id 00/C1-15696-5312F135; Tue, 11 Mar 2014 14:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1394549043!414718!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29173 invoked from network); 11 Mar 2014 14:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNuV-0005w5-Ap for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNuV-0001vx-84 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:03 +0000 Date: Tue, 11 Mar 2014 14:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: refine the judgment on IDENT_PT for EMT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cadfd7bca999c0a795dc27be72d43c92e8943a0b Author: Dongxiao Xu AuthorDate: Mon Mar 10 11:02:25 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:02:25 2014 +0100 x86/hvm: refine the judgment on IDENT_PT for EMT When trying to get the EPT EMT type, the judgment on HVM_PARAM_IDENT_PT is not correct which always returns WB type if the parameter is not set. Remove the related code. Signed-off-by: Dongxiao Xu We can't fully drop the dependency yet, but we should certainly avoid overriding cases already properly handled. The reason for this is that the guest setting up its MTRRs happens _after_ the EPT tables got already constructed, and no code is in place to propagate this to the EPT code. Without this check we're forcing the guest to run with all of its memory uncachable until something happens to re-write every single EPT entry. But of course this has to be just a temporary solution. In the same spirit we should defer the "very early" (when the guest is still being constructed and has no vCPU yet) override to the last possible point. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser --- xen/arch/x86/hvm/mtrr.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 9937f5a..e7c0fd9 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -689,13 +689,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, *ipat = 0; - if ( (current->domain != d) && - ((d->vcpu == NULL) || ((v = d->vcpu[0]) == NULL)) ) - return MTRR_TYPE_WRBACK; - - if ( !is_pvh_vcpu(v) && - !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) - return MTRR_TYPE_WRBACK; + if ( v->domain != d ) + v = d->vcpu ? d->vcpu[0] : NULL; if ( !mfn_valid(mfn_x(mfn)) ) return MTRR_TYPE_UNCACHABLE; @@ -718,7 +713,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, return MTRR_TYPE_WRBACK; } - gmtrr_mtype = is_hvm_vcpu(v) ? + gmtrr_mtype = is_hvm_domain(d) && v && + d->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ? get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : MTRR_TYPE_WRBACK; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNuY-0001K2-Sn; Tue, 11 Mar 2014 14:44:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNuY-0001Jt-6t for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:06 +0000 Received: from [85.158.139.211:11213] by server-14.bemta-5.messagelabs.com id 00/C1-15696-5312F135; Tue, 11 Mar 2014 14:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1394549043!414718!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29173 invoked from network); 11 Mar 2014 14:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNuV-0005w5-Ap for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNuV-0001vx-84 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:03 +0000 Date: Tue, 11 Mar 2014 14:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: refine the judgment on IDENT_PT for EMT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cadfd7bca999c0a795dc27be72d43c92e8943a0b Author: Dongxiao Xu AuthorDate: Mon Mar 10 11:02:25 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:02:25 2014 +0100 x86/hvm: refine the judgment on IDENT_PT for EMT When trying to get the EPT EMT type, the judgment on HVM_PARAM_IDENT_PT is not correct which always returns WB type if the parameter is not set. Remove the related code. Signed-off-by: Dongxiao Xu We can't fully drop the dependency yet, but we should certainly avoid overriding cases already properly handled. The reason for this is that the guest setting up its MTRRs happens _after_ the EPT tables got already constructed, and no code is in place to propagate this to the EPT code. Without this check we're forcing the guest to run with all of its memory uncachable until something happens to re-write every single EPT entry. But of course this has to be just a temporary solution. In the same spirit we should defer the "very early" (when the guest is still being constructed and has no vCPU yet) override to the last possible point. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser --- xen/arch/x86/hvm/mtrr.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 9937f5a..e7c0fd9 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -689,13 +689,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, *ipat = 0; - if ( (current->domain != d) && - ((d->vcpu == NULL) || ((v = d->vcpu[0]) == NULL)) ) - return MTRR_TYPE_WRBACK; - - if ( !is_pvh_vcpu(v) && - !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) - return MTRR_TYPE_WRBACK; + if ( v->domain != d ) + v = d->vcpu ? d->vcpu[0] : NULL; if ( !mfn_valid(mfn_x(mfn)) ) return MTRR_TYPE_UNCACHABLE; @@ -718,7 +713,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, return MTRR_TYPE_WRBACK; } - gmtrr_mtype = is_hvm_vcpu(v) ? + gmtrr_mtype = is_hvm_domain(d) && v && + d->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ? get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : MTRR_TYPE_WRBACK; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:44:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvE-0001R1-An; Tue, 11 Mar 2014 14:44:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvD-0001Qf-6d for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:47 +0000 Received: from [85.158.139.211:13171] by server-9.bemta-5.messagelabs.com id 8E/ED-04350-E512F135; Tue, 11 Mar 2014 14:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1394549084!408717!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26739 invoked from network); 11 Mar 2014 14:44:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:44:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvA-0005wT-9e for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNvA-0001y2-1S for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:44 +0000 Date: Tue, 11 Mar 2014 14:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: adjust data definitions in mtrr.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a14a2db700e930f96830d05e3ab3f886ac26c247 Author: Jan Beulich AuthorDate: Mon Mar 10 11:06:40 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:06:40 2014 +0100 x86/HVM: adjust data definitions in mtrr.c - use proper section attributes - use initializers where possible - clean up pat_type_2_pte_flags() Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/mtrr.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 229bf1d..1eb3b27 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -70,10 +70,14 @@ static const uint8_t mm_type_tbl[MTRR_NUM_TYPES][PAT_TYPE_NUMS] = { * Reverse lookup table, to find a pat type according to MTRR and effective * memory type. This table is dynamically generated. */ -static uint8_t mtrr_epat_tbl[MTRR_NUM_TYPES][MEMORY_NUM_TYPES]; +static uint8_t __read_mostly mtrr_epat_tbl[MTRR_NUM_TYPES][MEMORY_NUM_TYPES] = + { [0 ... MTRR_NUM_TYPES-1] = + { [0 ... MEMORY_NUM_TYPES-1] = INVALID_MEM_TYPE } + }; /* Lookup table for PAT entry of a given PAT value in host PAT. */ -static uint8_t pat_entry_tbl[PAT_TYPE_NUMS]; +static uint8_t __read_mostly pat_entry_tbl[PAT_TYPE_NUMS] = + { [0 ... PAT_TYPE_NUMS-1] = INVALID_MEM_TYPE }; static void get_mtrr_range(uint64_t base_msr, uint64_t mask_msr, uint64_t *base, uint64_t *end) @@ -149,23 +153,21 @@ bool_t is_var_mtrr_overlapped(struct mtrr_state *m) #define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg)) #define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1) -static int hvm_mtrr_pat_init(void) +static int __init hvm_mtrr_pat_init(void) { unsigned int i, j, phys_addr; - memset(&mtrr_epat_tbl, INVALID_MEM_TYPE, sizeof(mtrr_epat_tbl)); for ( i = 0; i < MTRR_NUM_TYPES; i++ ) { for ( j = 0; j < PAT_TYPE_NUMS; j++ ) { - int32_t tmp = mm_type_tbl[i][j]; - if ( (tmp >= 0) && (tmp < MEMORY_NUM_TYPES) ) + unsigned int tmp = mm_type_tbl[i][j]; + + if ( tmp < MEMORY_NUM_TYPES ) mtrr_epat_tbl[i][tmp] = j; } } - memset(&pat_entry_tbl, INVALID_MEM_TYPE, - PAT_TYPE_NUMS * sizeof(pat_entry_tbl[0])); for ( i = 0; i < PAT_TYPE_NUMS; i++ ) { for ( j = 0; j < PAT_TYPE_NUMS; j++ ) @@ -190,16 +192,16 @@ __initcall(hvm_mtrr_pat_init); uint8_t pat_type_2_pte_flags(uint8_t pat_type) { - int32_t pat_entry = pat_entry_tbl[pat_type]; + unsigned int pat_entry = pat_entry_tbl[pat_type]; - /* INVALID_MEM_TYPE, means doesn't find the pat_entry in host pat for - * a given pat_type. If host pat covers all the pat types, - * it can't happen. + /* + * INVALID_MEM_TYPE, means doesn't find the pat_entry in host PAT for a + * given pat_type. If host PAT covers all the PAT types, it can't happen. */ - if ( likely(pat_entry != INVALID_MEM_TYPE) ) - return pat_entry_2_pte_flags[pat_entry]; + if ( unlikely(pat_entry == INVALID_MEM_TYPE) ) + pat_entry = pat_entry_tbl[PAT_TYPE_UNCACHABLE]; - return pat_entry_2_pte_flags[pat_entry_tbl[PAT_TYPE_UNCACHABLE]]; + return pat_entry_2_pte_flags[pat_entry]; } int hvm_vcpu_cacheattr_init(struct vcpu *v) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:44:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvE-0001R1-An; Tue, 11 Mar 2014 14:44:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvD-0001Qf-6d for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:47 +0000 Received: from [85.158.139.211:13171] by server-9.bemta-5.messagelabs.com id 8E/ED-04350-E512F135; Tue, 11 Mar 2014 14:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1394549084!408717!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26739 invoked from network); 11 Mar 2014 14:44:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:44:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvA-0005wT-9e for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNvA-0001y2-1S for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:44 +0000 Date: Tue, 11 Mar 2014 14:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: adjust data definitions in mtrr.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a14a2db700e930f96830d05e3ab3f886ac26c247 Author: Jan Beulich AuthorDate: Mon Mar 10 11:06:40 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:06:40 2014 +0100 x86/HVM: adjust data definitions in mtrr.c - use proper section attributes - use initializers where possible - clean up pat_type_2_pte_flags() Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/mtrr.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 229bf1d..1eb3b27 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -70,10 +70,14 @@ static const uint8_t mm_type_tbl[MTRR_NUM_TYPES][PAT_TYPE_NUMS] = { * Reverse lookup table, to find a pat type according to MTRR and effective * memory type. This table is dynamically generated. */ -static uint8_t mtrr_epat_tbl[MTRR_NUM_TYPES][MEMORY_NUM_TYPES]; +static uint8_t __read_mostly mtrr_epat_tbl[MTRR_NUM_TYPES][MEMORY_NUM_TYPES] = + { [0 ... MTRR_NUM_TYPES-1] = + { [0 ... MEMORY_NUM_TYPES-1] = INVALID_MEM_TYPE } + }; /* Lookup table for PAT entry of a given PAT value in host PAT. */ -static uint8_t pat_entry_tbl[PAT_TYPE_NUMS]; +static uint8_t __read_mostly pat_entry_tbl[PAT_TYPE_NUMS] = + { [0 ... PAT_TYPE_NUMS-1] = INVALID_MEM_TYPE }; static void get_mtrr_range(uint64_t base_msr, uint64_t mask_msr, uint64_t *base, uint64_t *end) @@ -149,23 +153,21 @@ bool_t is_var_mtrr_overlapped(struct mtrr_state *m) #define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg)) #define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1) -static int hvm_mtrr_pat_init(void) +static int __init hvm_mtrr_pat_init(void) { unsigned int i, j, phys_addr; - memset(&mtrr_epat_tbl, INVALID_MEM_TYPE, sizeof(mtrr_epat_tbl)); for ( i = 0; i < MTRR_NUM_TYPES; i++ ) { for ( j = 0; j < PAT_TYPE_NUMS; j++ ) { - int32_t tmp = mm_type_tbl[i][j]; - if ( (tmp >= 0) && (tmp < MEMORY_NUM_TYPES) ) + unsigned int tmp = mm_type_tbl[i][j]; + + if ( tmp < MEMORY_NUM_TYPES ) mtrr_epat_tbl[i][tmp] = j; } } - memset(&pat_entry_tbl, INVALID_MEM_TYPE, - PAT_TYPE_NUMS * sizeof(pat_entry_tbl[0])); for ( i = 0; i < PAT_TYPE_NUMS; i++ ) { for ( j = 0; j < PAT_TYPE_NUMS; j++ ) @@ -190,16 +192,16 @@ __initcall(hvm_mtrr_pat_init); uint8_t pat_type_2_pte_flags(uint8_t pat_type) { - int32_t pat_entry = pat_entry_tbl[pat_type]; + unsigned int pat_entry = pat_entry_tbl[pat_type]; - /* INVALID_MEM_TYPE, means doesn't find the pat_entry in host pat for - * a given pat_type. If host pat covers all the pat types, - * it can't happen. + /* + * INVALID_MEM_TYPE, means doesn't find the pat_entry in host PAT for a + * given pat_type. If host PAT covers all the PAT types, it can't happen. */ - if ( likely(pat_entry != INVALID_MEM_TYPE) ) - return pat_entry_2_pte_flags[pat_entry]; + if ( unlikely(pat_entry == INVALID_MEM_TYPE) ) + pat_entry = pat_entry_tbl[PAT_TYPE_UNCACHABLE]; - return pat_entry_2_pte_flags[pat_entry_tbl[PAT_TYPE_UNCACHABLE]]; + return pat_entry_2_pte_flags[pat_entry]; } int hvm_vcpu_cacheattr_init(struct vcpu *v) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:45:05 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:45:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvO-0001Sx-Da; Tue, 11 Mar 2014 14:44:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvN-0001Sm-C3 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:57 +0000 Received: from [85.158.139.211:49547] by server-14.bemta-5.messagelabs.com id E3/B3-15696-8612F135; Tue, 11 Mar 2014 14:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1394549094!412404!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11393 invoked from network); 11 Mar 2014 14:44:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:44:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvK-0005wZ-Ff for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNvK-0001yP-DM for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:54 +0000 Date: Tue, 11 Mar 2014 14:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: identify which cpu the kexec image is being executed on X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4509ada6ba1f09cc8f4fa23e009e7e5a963b6086 Author: Andrew Cooper AuthorDate: Mon Mar 10 11:11:28 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:11:28 2014 +0100 kexec: identify which cpu the kexec image is being executed on A patch to this effect has been in XenServer for a little while, and has proved to be a useful debugging point for servers which have different behaviours depending when crashing on the non-bootstrap processor. Moving the printk() from kexec_panic() to one_cpu_only() means that it will only be printed for the cpu which wins the race along the kexec path. Signed-off-by: Andrew Cooper Acked-by: David Vrabel --- xen/common/kexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 481b0c2..23d964e 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -265,6 +265,8 @@ static int noinline one_cpu_only(void) } set_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags); + printk("Executing kexec image on cpu%u\n", cpu); + return 0; } @@ -340,8 +342,6 @@ void kexec_crash(void) if ( !test_bit(KEXEC_IMAGE_CRASH_BASE + pos, &kexec_flags) ) return; - printk("Executing crash image\n"); - kexecing = TRUE; if ( kexec_common_shutdown() != 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:45:05 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:45:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvO-0001Sx-Da; Tue, 11 Mar 2014 14:44:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvN-0001Sm-C3 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:57 +0000 Received: from [85.158.139.211:49547] by server-14.bemta-5.messagelabs.com id E3/B3-15696-8612F135; Tue, 11 Mar 2014 14:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1394549094!412404!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11393 invoked from network); 11 Mar 2014 14:44:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:44:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvK-0005wZ-Ff for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNvK-0001yP-DM for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:44:54 +0000 Date: Tue, 11 Mar 2014 14:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: identify which cpu the kexec image is being executed on X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4509ada6ba1f09cc8f4fa23e009e7e5a963b6086 Author: Andrew Cooper AuthorDate: Mon Mar 10 11:11:28 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:11:28 2014 +0100 kexec: identify which cpu the kexec image is being executed on A patch to this effect has been in XenServer for a little while, and has proved to be a useful debugging point for servers which have different behaviours depending when crashing on the non-bootstrap processor. Moving the printk() from kexec_panic() to one_cpu_only() means that it will only be printed for the cpu which wins the race along the kexec path. Signed-off-by: Andrew Cooper Acked-by: David Vrabel --- xen/common/kexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 481b0c2..23d964e 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -265,6 +265,8 @@ static int noinline one_cpu_only(void) } set_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags); + printk("Executing kexec image on cpu%u\n", cpu); + return 0; } @@ -340,8 +342,6 @@ void kexec_crash(void) if ( !test_bit(KEXEC_IMAGE_CRASH_BASE + pos, &kexec_flags) ) return; - printk("Executing crash image\n"); - kexecing = TRUE; if ( kexec_common_shutdown() != 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:45:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvZ-0001Uu-GK; Tue, 11 Mar 2014 14:45:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvX-0001Ua-KD for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:07 +0000 Received: from [85.158.139.211:54742] by server-2.bemta-5.messagelabs.com id 1E/F0-12074-2712F135; Tue, 11 Mar 2014 14:45:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1394549105!408833!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29269 invoked from network); 11 Mar 2014 14:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvU-0005xX-Mu for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNvU-0001z0-K7 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:04 +0000 Date: Tue, 11 Mar 2014 14:45:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MCE: mctelem_init() cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a9b87b3ccfdc7e2a6767e2ce7dcbe5c0b035acc2 Author: Jan Beulich AuthorDate: Mon Mar 10 11:12:30 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:12:30 2014 +0100 x86/MCE: mctelem_init() cleanup The function can be __init with its caller taking care of only calling it on the BSP. And with that all its static variables can be dropped. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Liu Jinsong --- xen/arch/x86/cpu/mcheck/mce.c | 8 +++++--- xen/arch/x86/cpu/mcheck/mctelem.c | 21 +++++---------------- xen/arch/x86/cpu/mcheck/mctelem.h | 2 +- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index af6f0be..a81952c 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -775,13 +775,15 @@ void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp) intpose_init(); - mctelem_init(sizeof(struct mc_info)); + if ( bsp ) + { + mctelem_init(sizeof(struct mc_info)); + register_cpu_notifier(&cpu_nfb); + } /* Turn on MCE now */ set_in_cr4(X86_CR4_MCE); - if ( bsp ) - register_cpu_notifier(&cpu_nfb); set_poll_bankmask(c); return; diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index ed8e8d2..b8da465 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -248,25 +248,14 @@ static void mctelem_processing_release(struct mctelem_ent *tep) } } -void mctelem_init(int reqdatasz) +void __init mctelem_init(unsigned int datasz) { - static int called = 0; - static int datasz = 0, realdatasz = 0; char *datarr; - int i; + unsigned int i; - BUG_ON(MC_URGENT != 0 || MC_NONURGENT != 1 || MC_NCLASSES != 2); - - /* Called from mcheck_init for all processors; initialize for the - * first call only (no race here since the boot cpu completes - * init before others start up). */ - if (++called == 1) { - realdatasz = reqdatasz; - datasz = (reqdatasz & ~0xf) + 0x10; /* 16 byte roundup */ - } else { - BUG_ON(reqdatasz != realdatasz); - return; - } + BUILD_BUG_ON(MC_URGENT != 0 || MC_NONURGENT != 1 || MC_NCLASSES != 2); + + datasz = (datasz & ~0xf) + 0x10; /* 16 byte roundup */ if ((mctctl.mctc_elems = xmalloc_array(struct mctelem_ent, MC_NENT)) == NULL || diff --git a/xen/arch/x86/cpu/mcheck/mctelem.h b/xen/arch/x86/cpu/mcheck/mctelem.h index e5514d9..4947b57 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.h +++ b/xen/arch/x86/cpu/mcheck/mctelem.h @@ -59,7 +59,7 @@ typedef enum mctelem_class { MC_NONURGENT } mctelem_class_t; -extern void mctelem_init(int); +extern void mctelem_init(unsigned int); extern mctelem_cookie_t mctelem_reserve(mctelem_class_t); extern void *mctelem_dataptr(mctelem_cookie_t); extern void mctelem_commit(mctelem_cookie_t); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:45:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvZ-0001Uu-GK; Tue, 11 Mar 2014 14:45:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvX-0001Ua-KD for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:07 +0000 Received: from [85.158.139.211:54742] by server-2.bemta-5.messagelabs.com id 1E/F0-12074-2712F135; Tue, 11 Mar 2014 14:45:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1394549105!408833!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29269 invoked from network); 11 Mar 2014 14:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvU-0005xX-Mu for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNvU-0001z0-K7 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:04 +0000 Date: Tue, 11 Mar 2014 14:45:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MCE: mctelem_init() cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a9b87b3ccfdc7e2a6767e2ce7dcbe5c0b035acc2 Author: Jan Beulich AuthorDate: Mon Mar 10 11:12:30 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:12:30 2014 +0100 x86/MCE: mctelem_init() cleanup The function can be __init with its caller taking care of only calling it on the BSP. And with that all its static variables can be dropped. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Liu Jinsong --- xen/arch/x86/cpu/mcheck/mce.c | 8 +++++--- xen/arch/x86/cpu/mcheck/mctelem.c | 21 +++++---------------- xen/arch/x86/cpu/mcheck/mctelem.h | 2 +- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index af6f0be..a81952c 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -775,13 +775,15 @@ void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp) intpose_init(); - mctelem_init(sizeof(struct mc_info)); + if ( bsp ) + { + mctelem_init(sizeof(struct mc_info)); + register_cpu_notifier(&cpu_nfb); + } /* Turn on MCE now */ set_in_cr4(X86_CR4_MCE); - if ( bsp ) - register_cpu_notifier(&cpu_nfb); set_poll_bankmask(c); return; diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index ed8e8d2..b8da465 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -248,25 +248,14 @@ static void mctelem_processing_release(struct mctelem_ent *tep) } } -void mctelem_init(int reqdatasz) +void __init mctelem_init(unsigned int datasz) { - static int called = 0; - static int datasz = 0, realdatasz = 0; char *datarr; - int i; + unsigned int i; - BUG_ON(MC_URGENT != 0 || MC_NONURGENT != 1 || MC_NCLASSES != 2); - - /* Called from mcheck_init for all processors; initialize for the - * first call only (no race here since the boot cpu completes - * init before others start up). */ - if (++called == 1) { - realdatasz = reqdatasz; - datasz = (reqdatasz & ~0xf) + 0x10; /* 16 byte roundup */ - } else { - BUG_ON(reqdatasz != realdatasz); - return; - } + BUILD_BUG_ON(MC_URGENT != 0 || MC_NONURGENT != 1 || MC_NCLASSES != 2); + + datasz = (datasz & ~0xf) + 0x10; /* 16 byte roundup */ if ((mctctl.mctc_elems = xmalloc_array(struct mctelem_ent, MC_NENT)) == NULL || diff --git a/xen/arch/x86/cpu/mcheck/mctelem.h b/xen/arch/x86/cpu/mcheck/mctelem.h index e5514d9..4947b57 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.h +++ b/xen/arch/x86/cpu/mcheck/mctelem.h @@ -59,7 +59,7 @@ typedef enum mctelem_class { MC_NONURGENT } mctelem_class_t; -extern void mctelem_init(int); +extern void mctelem_init(unsigned int); extern mctelem_cookie_t mctelem_reserve(mctelem_class_t); extern void *mctelem_dataptr(mctelem_cookie_t); extern void mctelem_commit(mctelem_cookie_t); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:45:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:45:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvi-0001XA-GZ; Tue, 11 Mar 2014 14:45:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvh-0001Wn-FI for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:17 +0000 Received: from [85.158.143.35:9791] by server-1.bemta-4.messagelabs.com id 36/A7-09853-C712F135; Tue, 11 Mar 2014 14:45:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1394549115!1247852!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12129 invoked from network); 11 Mar 2014 14:45:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNve-0005xg-T9 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNve-00023w-RL for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:14 +0000 Date: Tue, 11 Mar 2014 14:45:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mwait_idle: support Intel Atom Processor C2000 product family X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf15e5b64e262b5e44244f4ea605de25d6af1ea6 Author: Len Brown AuthorDate: Mon Mar 10 11:14:25 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:14:25 2014 +0100 x86/mwait_idle: support Intel Atom Processor C2000 product family Support the "Intel(R) Atom(TM) Processor C2000 Product Family", formerly code-named Avoton. It is based on the next generation Intel Atom processor architecture, formerly code-named Silvermont. Signed-off-by: Len Brown Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 85179f2..72a7abf 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -1,7 +1,7 @@ /* * mwait_idle.c - native hardware idle loop for modern processors * - * Copyright (c) 2010, Intel Corporation. + * Copyright (c) 2013, Intel Corporation. * Len Brown * * This program is free software; you can redistribute it and/or modify it @@ -301,6 +301,22 @@ static const struct cpuidle_state atom_cstates[] = { {} }; +static const struct cpuidle_state avn_cstates[] = { + { + .name = "C1-AVN", + .flags = MWAIT2flg(0x00), + .exit_latency = 2, + .target_residency = 2, + }, + { + .name = "C6-AVN", + .flags = MWAIT2flg(0x51) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 15, + .target_residency = 45, + }, + {} +}; + static void mwait_idle(void) { unsigned int cpu = smp_processor_id(); @@ -436,6 +452,11 @@ static const struct idle_cpu idle_cpu_hsw = { .disable_promotion_to_c1e = 1, }; +static const struct idle_cpu idle_cpu_avn = { + .state_table = avn_cstates, + .disable_promotion_to_c1e = 1, +}; + #define ICPU(model, cpu) { 6, model, &idle_cpu_##cpu } static struct intel_idle_id { @@ -459,6 +480,7 @@ static struct intel_idle_id { ICPU(0x3f, hsw), ICPU(0x45, hsw), ICPU(0x46, hsw), + ICPU(0x4d, avn), {} }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:45:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:45:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvi-0001XA-GZ; Tue, 11 Mar 2014 14:45:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvh-0001Wn-FI for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:17 +0000 Received: from [85.158.143.35:9791] by server-1.bemta-4.messagelabs.com id 36/A7-09853-C712F135; Tue, 11 Mar 2014 14:45:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1394549115!1247852!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12129 invoked from network); 11 Mar 2014 14:45:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNve-0005xg-T9 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNve-00023w-RL for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:14 +0000 Date: Tue, 11 Mar 2014 14:45:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mwait_idle: support Intel Atom Processor C2000 product family X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf15e5b64e262b5e44244f4ea605de25d6af1ea6 Author: Len Brown AuthorDate: Mon Mar 10 11:14:25 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:14:25 2014 +0100 x86/mwait_idle: support Intel Atom Processor C2000 product family Support the "Intel(R) Atom(TM) Processor C2000 Product Family", formerly code-named Avoton. It is based on the next generation Intel Atom processor architecture, formerly code-named Silvermont. Signed-off-by: Len Brown Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 85179f2..72a7abf 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -1,7 +1,7 @@ /* * mwait_idle.c - native hardware idle loop for modern processors * - * Copyright (c) 2010, Intel Corporation. + * Copyright (c) 2013, Intel Corporation. * Len Brown * * This program is free software; you can redistribute it and/or modify it @@ -301,6 +301,22 @@ static const struct cpuidle_state atom_cstates[] = { {} }; +static const struct cpuidle_state avn_cstates[] = { + { + .name = "C1-AVN", + .flags = MWAIT2flg(0x00), + .exit_latency = 2, + .target_residency = 2, + }, + { + .name = "C6-AVN", + .flags = MWAIT2flg(0x51) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 15, + .target_residency = 45, + }, + {} +}; + static void mwait_idle(void) { unsigned int cpu = smp_processor_id(); @@ -436,6 +452,11 @@ static const struct idle_cpu idle_cpu_hsw = { .disable_promotion_to_c1e = 1, }; +static const struct idle_cpu idle_cpu_avn = { + .state_table = avn_cstates, + .disable_promotion_to_c1e = 1, +}; + #define ICPU(model, cpu) { 6, model, &idle_cpu_##cpu } static struct intel_idle_id { @@ -459,6 +480,7 @@ static struct intel_idle_id { ICPU(0x3f, hsw), ICPU(0x45, hsw), ICPU(0x46, hsw), + ICPU(0x4d, avn), {} }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:45:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:45:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNw3-0001b2-2t; Tue, 11 Mar 2014 14:45:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNw1-0001ah-SJ for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:38 +0000 Received: from [85.158.143.35:19980] by server-1.bemta-4.messagelabs.com id 84/58-09853-1912F135; Tue, 11 Mar 2014 14:45:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1394549135!569366!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1548 invoked from network); 11 Mar 2014 14:45:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:45:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvz-0005xp-A6 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNvz-000294-8U for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:35 +0000 Date: Tue, 11 Mar 2014 14:45:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: always count s_time from Xen boot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3a379c35eff1674ab87f9fc7cb7c5608a8450f3 Author: Tim Deegan AuthorDate: Mon Mar 10 11:18:49 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:18:49 2014 +0100 x86/time: always count s_time from Xen boot Timestamped printks() can call NOW() before init_xen_time(). Set a baseline TSC as soon as we've calibrated the TSC rate, so that NOW() consistently counts from boot time. Signed-off-by: Tim Deegan Signed-off-by: Andrew Cooper --- xen/arch/x86/boot/head.S | 6 ++++++ xen/arch/x86/time.c | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index b12eefb..1777c17 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -136,6 +136,12 @@ __start: /* Check for availability of long mode. */ bt $29,%edx jnc bad_cpu + + /* Stash TSC to calculate a good approximation of time-since-boot */ + rdtsc + mov %eax,sym_phys(boot_tsc_stamp) + mov %edx,sym_phys(boot_tsc_stamp+4) + /* Initialise L2 boot-map page table entries (16MB). */ mov $sym_phys(l2_bootmap),%edx mov $PAGE_HYPERVISOR|_PAGE_PSE,%eax diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 000191b..4f4de22 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -84,6 +84,9 @@ static u16 pit_stamp16; static u32 pit_stamp32; static bool_t __read_mostly using_pit; +/* Boot timestamp, filled in head.S */ +u64 __initdata boot_tsc_stamp; + /* * 32-bit division of integer dividend and integer divisor yielding * 32-bit fractional quotient. @@ -1433,9 +1436,6 @@ int __init init_xen_time(void) open_softirq(TIME_CALIBRATE_SOFTIRQ, local_time_calibration); - /* System time (get_s_time()) starts ticking from now. */ - rdtscll(this_cpu(cpu_time).local_tsc_stamp); - /* NB. get_cmos_time() can take over one second to execute. */ do_settime(get_cmos_time(), 0, NOW()); @@ -1453,9 +1453,11 @@ int __init init_xen_time(void) /* Early init function. */ void __init early_time_init(void) { + struct cpu_time *t = &this_cpu(cpu_time); u64 tmp = init_pit_and_calibrate_tsc(); - set_time_scale(&this_cpu(cpu_time).tsc_scale, tmp); + set_time_scale(&t->tsc_scale, tmp); + t->local_tsc_stamp = boot_tsc_stamp; do_div(tmp, 1000); cpu_khz = (unsigned long)tmp; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:45:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:45:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNw3-0001b2-2t; Tue, 11 Mar 2014 14:45:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNw1-0001ah-SJ for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:38 +0000 Received: from [85.158.143.35:19980] by server-1.bemta-4.messagelabs.com id 84/58-09853-1912F135; Tue, 11 Mar 2014 14:45:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1394549135!569366!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1548 invoked from network); 11 Mar 2014 14:45:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:45:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvz-0005xp-A6 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNvz-000294-8U for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:35 +0000 Date: Tue, 11 Mar 2014 14:45:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: always count s_time from Xen boot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3a379c35eff1674ab87f9fc7cb7c5608a8450f3 Author: Tim Deegan AuthorDate: Mon Mar 10 11:18:49 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:18:49 2014 +0100 x86/time: always count s_time from Xen boot Timestamped printks() can call NOW() before init_xen_time(). Set a baseline TSC as soon as we've calibrated the TSC rate, so that NOW() consistently counts from boot time. Signed-off-by: Tim Deegan Signed-off-by: Andrew Cooper --- xen/arch/x86/boot/head.S | 6 ++++++ xen/arch/x86/time.c | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index b12eefb..1777c17 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -136,6 +136,12 @@ __start: /* Check for availability of long mode. */ bt $29,%edx jnc bad_cpu + + /* Stash TSC to calculate a good approximation of time-since-boot */ + rdtsc + mov %eax,sym_phys(boot_tsc_stamp) + mov %edx,sym_phys(boot_tsc_stamp+4) + /* Initialise L2 boot-map page table entries (16MB). */ mov $sym_phys(l2_bootmap),%edx mov $PAGE_HYPERVISOR|_PAGE_PSE,%eax diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 000191b..4f4de22 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -84,6 +84,9 @@ static u16 pit_stamp16; static u32 pit_stamp32; static bool_t __read_mostly using_pit; +/* Boot timestamp, filled in head.S */ +u64 __initdata boot_tsc_stamp; + /* * 32-bit division of integer dividend and integer divisor yielding * 32-bit fractional quotient. @@ -1433,9 +1436,6 @@ int __init init_xen_time(void) open_softirq(TIME_CALIBRATE_SOFTIRQ, local_time_calibration); - /* System time (get_s_time()) starts ticking from now. */ - rdtscll(this_cpu(cpu_time).local_tsc_stamp); - /* NB. get_cmos_time() can take over one second to execute. */ do_settime(get_cmos_time(), 0, NOW()); @@ -1453,9 +1453,11 @@ int __init init_xen_time(void) /* Early init function. */ void __init early_time_init(void) { + struct cpu_time *t = &this_cpu(cpu_time); u64 tmp = init_pit_and_calibrate_tsc(); - set_time_scale(&this_cpu(cpu_time).tsc_scale, tmp); + set_time_scale(&t->tsc_scale, tmp); + t->local_tsc_stamp = boot_tsc_stamp; do_div(tmp, 1000); cpu_khz = (unsigned long)tmp; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:45:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:45:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwD-0001dF-5g; Tue, 11 Mar 2014 14:45:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwB-0001cr-W8 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:48 +0000 Received: from [85.158.139.211:57961] by server-10.bemta-5.messagelabs.com id 3E/8B-27081-B912F135; Tue, 11 Mar 2014 14:45:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1394549145!411575!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14093 invoked from network); 11 Mar 2014 14:45:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:45:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNw9-0005xy-FT for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNw9-0002A9-Dq for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:45 +0000 Date: Tue, 11 Mar 2014 14:45:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fail domain creation if pci assignment fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a8b558624b12333400a5f0bfd22c42a9f62e1fe2 Author: George Dunlap AuthorDate: Tue Mar 4 13:38:18 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 12:01:06 2014 +0000 libxl: Fail domain creation if pci assignment fails Actually pay attention to the return value of libxl__device_pci_add. Signed-off-by: George Dunlap --- tools/libxl/libxl_create.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index a604cd8..53e7cb6 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1262,8 +1262,14 @@ static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, goto error_out; } - for (i = 0; i < d_config->num_pcidevs; i++) - libxl__device_pci_add(gc, domid, &d_config->pcidevs[i], 1); + for (i = 0; i < d_config->num_pcidevs; i++) { + ret = libxl__device_pci_add(gc, domid, &d_config->pcidevs[i], 1); + if (ret < 0) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "libxl_device_pci_add failed: %d", ret); + goto error_out; + } + } if (d_config->num_pcidevs > 0) { ret = libxl__create_pci_backend(gc, domid, d_config->pcidevs, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:45:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:45:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwD-0001dF-5g; Tue, 11 Mar 2014 14:45:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwB-0001cr-W8 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:48 +0000 Received: from [85.158.139.211:57961] by server-10.bemta-5.messagelabs.com id 3E/8B-27081-B912F135; Tue, 11 Mar 2014 14:45:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1394549145!411575!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14093 invoked from network); 11 Mar 2014 14:45:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:45:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNw9-0005xy-FT for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNw9-0002A9-Dq for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:45 +0000 Date: Tue, 11 Mar 2014 14:45:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fail domain creation if pci assignment fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a8b558624b12333400a5f0bfd22c42a9f62e1fe2 Author: George Dunlap AuthorDate: Tue Mar 4 13:38:18 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 12:01:06 2014 +0000 libxl: Fail domain creation if pci assignment fails Actually pay attention to the return value of libxl__device_pci_add. Signed-off-by: George Dunlap --- tools/libxl/libxl_create.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index a604cd8..53e7cb6 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1262,8 +1262,14 @@ static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, goto error_out; } - for (i = 0; i < d_config->num_pcidevs; i++) - libxl__device_pci_add(gc, domid, &d_config->pcidevs[i], 1); + for (i = 0; i < d_config->num_pcidevs; i++) { + ret = libxl__device_pci_add(gc, domid, &d_config->pcidevs[i], 1); + if (ret < 0) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "libxl_device_pci_add failed: %d", ret); + goto error_out; + } + } if (d_config->num_pcidevs > 0) { ret = libxl__create_pci_backend(gc, domid, d_config->pcidevs, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:45:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:45:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwN-0001fj-8S; Tue, 11 Mar 2014 14:45:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwM-0001fQ-5Q for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:58 +0000 Received: from [85.158.143.35:65417] by server-3.bemta-4.messagelabs.com id 30/D1-13602-5A12F135; Tue, 11 Mar 2014 14:45:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1394549155!1258387!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17873 invoked from network); 11 Mar 2014 14:45:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:45:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwJ-0005y5-NC for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNwJ-0002AW-LA for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:55 +0000 Date: Tue, 11 Mar 2014 14:45:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Add "seize" option to PCI devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3df28fac382d6d262049739bcf8e680ea34100c Author: George Dunlap AuthorDate: Tue Mar 4 13:38:19 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 12:03:59 2014 +0000 xl: Add "seize" option to PCI devices The "seize" option tells the toolstack to attempt to automatically unbind devices and re-bind them to the pciback driver. This should make creating VMs that habitually use pass-through (such as driver domain VMs and gaming VMs) easier to use and manage. [Whitespace error fixed by iwj.] Signed-off-by: George Dunlap --- docs/man/xl.cfg.pod.5 | 14 ++++++++++++++ tools/libxl/libxl_pci.c | 6 ++++++ tools/libxl/libxl_types.idl | 1 + tools/libxl/libxlu_pci.c | 2 ++ tools/libxl/xl_cmdimpl.c | 5 +++++ 5 files changed, 28 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index e15a49f..c02ad55 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -509,6 +509,15 @@ the PCI device regardless whether the guest uses INTx or MSI. Some device drivers, such as NVIDIA's, detect an inconsistency and do not function when this option is enabled. Therefore the default is false (0). +=item B + +Tells xl to automatically attempt to re-assign a device to +pciback if it is not already assigned. + +WARNING: If you set this option, xl will gladly re-assign a critical +system device, such as a network or a disk controller being used by +dom0 without confirmation. Please use with care. + =item B (HVM only) Specifies that the VM should be able to program the @@ -530,6 +539,11 @@ above. Changes the default value of 'msitranslate' for all PCI devices passed through to this VM. See L above. +=item B + +Changes the default value of 'seize' for all PCI devices passed +through to this VM. See L above. + =item B (HVM only) Changes the default value of 'power_mgmt' for all PCI diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 2e52470..44d0453 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1050,6 +1050,12 @@ int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcide rc = libxl__device_pci_setdefault(gc, pcidev); if (rc) goto out; + if (pcidev->seize && !pciback_dev_is_assigned(gc, pcidev)) { + rc = libxl__device_pci_assignable_add(gc, pcidev, 1); + if ( rc ) + goto out; + } + if (!libxl_pcidev_assignable(ctx, pcidev)) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "PCI device %x:%x:%x.%x is not assignable", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 649ce50..7d3a62b 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -444,6 +444,7 @@ libxl_device_pci = Struct("device_pci", [ ("msitranslate", bool), ("power_mgmt", bool), ("permissive", bool), + ("seize", bool), ]) libxl_device_vtpm = Struct("device_vtpm", [ diff --git a/tools/libxl/libxlu_pci.c b/tools/libxl/libxlu_pci.c index f5dee93..26fb143 100644 --- a/tools/libxl/libxlu_pci.c +++ b/tools/libxl/libxlu_pci.c @@ -141,6 +141,8 @@ int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pcidev, const char *str pcidev->power_mgmt = atoi(tok); }else if ( !strcmp(optkey, "permissive") ) { pcidev->permissive = atoi(tok); + }else if ( !strcmp(optkey, "seize") ) { + pcidev->seize = atoi(tok); }else{ XLU__PCI_ERR(cfg, "Unknown PCI BDF option: %s", optkey); } diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 4fc46eb..5f59bbc 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -737,6 +737,7 @@ static void parse_config_data(const char *config_source, int pci_power_mgmt = 0; int pci_msitranslate = 0; int pci_permissive = 0; + int pci_seize = 0; int i, e; libxl_domain_create_info *c_info = &d_config->c_info; @@ -1462,6 +1463,9 @@ skip_vfb: if (!xlu_cfg_get_long (config, "pci_permissive", &l, 0)) pci_permissive = l; + if (!xlu_cfg_get_long (config, "pci_seize", &l, 0)) + pci_seize = l; + /* To be reworked (automatically enabled) once the auto ballooning * after guest starts is done (with PCI devices passed in). */ if (c_info->type == LIBXL_DOMAIN_TYPE_PV) { @@ -1481,6 +1485,7 @@ skip_vfb: pcidev->msitranslate = pci_msitranslate; pcidev->power_mgmt = pci_power_mgmt; pcidev->permissive = pci_permissive; + pcidev->seize = pci_seize; if (!xlu_pci_parse_bdf(config, pcidev, buf)) d_config->num_pcidevs++; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:45:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:45:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwN-0001fj-8S; Tue, 11 Mar 2014 14:45:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwM-0001fQ-5Q for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:58 +0000 Received: from [85.158.143.35:65417] by server-3.bemta-4.messagelabs.com id 30/D1-13602-5A12F135; Tue, 11 Mar 2014 14:45:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1394549155!1258387!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17873 invoked from network); 11 Mar 2014 14:45:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:45:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwJ-0005y5-NC for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNwJ-0002AW-LA for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:55 +0000 Date: Tue, 11 Mar 2014 14:45:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Add "seize" option to PCI devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3df28fac382d6d262049739bcf8e680ea34100c Author: George Dunlap AuthorDate: Tue Mar 4 13:38:19 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 12:03:59 2014 +0000 xl: Add "seize" option to PCI devices The "seize" option tells the toolstack to attempt to automatically unbind devices and re-bind them to the pciback driver. This should make creating VMs that habitually use pass-through (such as driver domain VMs and gaming VMs) easier to use and manage. [Whitespace error fixed by iwj.] Signed-off-by: George Dunlap --- docs/man/xl.cfg.pod.5 | 14 ++++++++++++++ tools/libxl/libxl_pci.c | 6 ++++++ tools/libxl/libxl_types.idl | 1 + tools/libxl/libxlu_pci.c | 2 ++ tools/libxl/xl_cmdimpl.c | 5 +++++ 5 files changed, 28 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index e15a49f..c02ad55 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -509,6 +509,15 @@ the PCI device regardless whether the guest uses INTx or MSI. Some device drivers, such as NVIDIA's, detect an inconsistency and do not function when this option is enabled. Therefore the default is false (0). +=item B + +Tells xl to automatically attempt to re-assign a device to +pciback if it is not already assigned. + +WARNING: If you set this option, xl will gladly re-assign a critical +system device, such as a network or a disk controller being used by +dom0 without confirmation. Please use with care. + =item B (HVM only) Specifies that the VM should be able to program the @@ -530,6 +539,11 @@ above. Changes the default value of 'msitranslate' for all PCI devices passed through to this VM. See L above. +=item B + +Changes the default value of 'seize' for all PCI devices passed +through to this VM. See L above. + =item B (HVM only) Changes the default value of 'power_mgmt' for all PCI diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 2e52470..44d0453 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1050,6 +1050,12 @@ int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcide rc = libxl__device_pci_setdefault(gc, pcidev); if (rc) goto out; + if (pcidev->seize && !pciback_dev_is_assigned(gc, pcidev)) { + rc = libxl__device_pci_assignable_add(gc, pcidev, 1); + if ( rc ) + goto out; + } + if (!libxl_pcidev_assignable(ctx, pcidev)) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "PCI device %x:%x:%x.%x is not assignable", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 649ce50..7d3a62b 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -444,6 +444,7 @@ libxl_device_pci = Struct("device_pci", [ ("msitranslate", bool), ("power_mgmt", bool), ("permissive", bool), + ("seize", bool), ]) libxl_device_vtpm = Struct("device_vtpm", [ diff --git a/tools/libxl/libxlu_pci.c b/tools/libxl/libxlu_pci.c index f5dee93..26fb143 100644 --- a/tools/libxl/libxlu_pci.c +++ b/tools/libxl/libxlu_pci.c @@ -141,6 +141,8 @@ int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pcidev, const char *str pcidev->power_mgmt = atoi(tok); }else if ( !strcmp(optkey, "permissive") ) { pcidev->permissive = atoi(tok); + }else if ( !strcmp(optkey, "seize") ) { + pcidev->seize = atoi(tok); }else{ XLU__PCI_ERR(cfg, "Unknown PCI BDF option: %s", optkey); } diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 4fc46eb..5f59bbc 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -737,6 +737,7 @@ static void parse_config_data(const char *config_source, int pci_power_mgmt = 0; int pci_msitranslate = 0; int pci_permissive = 0; + int pci_seize = 0; int i, e; libxl_domain_create_info *c_info = &d_config->c_info; @@ -1462,6 +1463,9 @@ skip_vfb: if (!xlu_cfg_get_long (config, "pci_permissive", &l, 0)) pci_permissive = l; + if (!xlu_cfg_get_long (config, "pci_seize", &l, 0)) + pci_seize = l; + /* To be reworked (automatically enabled) once the auto ballooning * after guest starts is done (with PCI devices passed in). */ if (c_info->type == LIBXL_DOMAIN_TYPE_PV) { @@ -1481,6 +1485,7 @@ skip_vfb: pcidev->msitranslate = pci_msitranslate; pcidev->power_mgmt = pci_power_mgmt; pcidev->permissive = pci_permissive; + pcidev->seize = pci_seize; if (!xlu_pci_parse_bdf(config, pcidev, buf)) d_config->num_pcidevs++; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:46:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:46:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwY-0001ij-F7; Tue, 11 Mar 2014 14:46:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwW-0001iD-Hl for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:08 +0000 Received: from [193.109.254.147:15832] by server-16.bemta-14.messagelabs.com id A8/BB-21945-FA12F135; Tue, 11 Mar 2014 14:46:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1394549166!883596!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25093 invoked from network); 11 Mar 2014 14:46:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwT-0005yg-Sg for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNwT-0002B2-Ri for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:05 +0000 Date: Tue, 11 Mar 2014 14:46:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Add LIBXL_HAVE_DEVICE_PCI_SEIZE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6bd73977e226469a4c6b5ea15d2c45ec9747b2d5 Author: Ian Jackson AuthorDate: Mon Mar 10 12:09:22 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 12:09:22 2014 +0000 libxl: Add LIBXL_HAVE_DEVICE_PCI_SEIZE This was part of [PATCH v2 2/2] xl: Add "seize" option to PCI devices but I accidentally applied v1. Signed-off-by: George Dunlap Signed-off-by: Ian Jackson --- tools/libxl/libxl.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 06bbca6..4c9cd64 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -445,6 +445,16 @@ #define LIBXL_HAVE_NO_SUSPEND_RESUME 1 #endif +/* + * LIBXL_HAVE_DEVICE_PCI_SEIZE + * + * If this is defined, then the libxl_device_pci struct will contain + * the "seize" boolean field. If this field is set, libxl_pci_add will + * check to see if the device is currently assigned to pciback, and if not, + * it will attempt to do so (unbinding the device from the existing driver). + */ +#define LIBXL_HAVE_DEVICE_PCI_SEIZE 1 + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:46:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:46:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwY-0001ij-F7; Tue, 11 Mar 2014 14:46:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwW-0001iD-Hl for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:08 +0000 Received: from [193.109.254.147:15832] by server-16.bemta-14.messagelabs.com id A8/BB-21945-FA12F135; Tue, 11 Mar 2014 14:46:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1394549166!883596!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25093 invoked from network); 11 Mar 2014 14:46:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwT-0005yg-Sg for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNwT-0002B2-Ri for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:05 +0000 Date: Tue, 11 Mar 2014 14:46:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Add LIBXL_HAVE_DEVICE_PCI_SEIZE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6bd73977e226469a4c6b5ea15d2c45ec9747b2d5 Author: Ian Jackson AuthorDate: Mon Mar 10 12:09:22 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 12:09:22 2014 +0000 libxl: Add LIBXL_HAVE_DEVICE_PCI_SEIZE This was part of [PATCH v2 2/2] xl: Add "seize" option to PCI devices but I accidentally applied v1. Signed-off-by: George Dunlap Signed-off-by: Ian Jackson --- tools/libxl/libxl.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 06bbca6..4c9cd64 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -445,6 +445,16 @@ #define LIBXL_HAVE_NO_SUSPEND_RESUME 1 #endif +/* + * LIBXL_HAVE_DEVICE_PCI_SEIZE + * + * If this is defined, then the libxl_device_pci struct will contain + * the "seize" boolean field. If this field is set, libxl_pci_add will + * check to see if the device is currently assigned to pciback, and if not, + * it will attempt to do so (unbinding the device from the existing driver). + */ +#define LIBXL_HAVE_DEVICE_PCI_SEIZE 1 + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:46:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:46:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwj-0001lC-Iz; Tue, 11 Mar 2014 14:46:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwi-0001kj-04 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:20 +0000 Received: from [193.109.254.147:47947] by server-10.bemta-14.messagelabs.com id 42/A7-10711-9B12F135; Tue, 11 Mar 2014 14:46:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1394549176!883678!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27364 invoked from network); 11 Mar 2014 14:46:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwe-0005yp-1S for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNwe-0002BR-02 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:16 +0000 Date: Tue, 11 Mar 2014 14:46:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstored: add --master-domid to support domain builder X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 739c5ee78d438a0530002c5876333990ada99fd8 Author: Daniel De Graaf AuthorDate: Tue Mar 4 17:51:34 2014 -0500 Commit: Ian Jackson CommitDate: Mon Mar 10 12:13:50 2014 +0000 xenstored: add --master-domid to support domain builder When a domain builder stub domain is used, the initial xenstore connection to domain 0 may use a different domain ID as the endpoint; allow this domain ID to be specified on the command line. Signed-off-by: Daniel De Graaf Acked-by: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell --- tools/xenstore/xenstored_core.c | 5 +++++ tools/xenstore/xenstored_core.h | 3 +++ tools/xenstore/xenstored_domain.c | 2 +- tools/xenstore/xenstored_minios.c | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 2324e53..47f0722 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1795,6 +1795,7 @@ static struct option options[] = { { "entry-nb", 1, NULL, 'E' }, { "pid-file", 1, NULL, 'F' }, { "event", 1, NULL, 'e' }, + { "master-domid", 1, NULL, 'm' }, { "help", 0, NULL, 'H' }, { "no-fork", 0, NULL, 'N' }, { "priv-domid", 1, NULL, 'p' }, @@ -1810,6 +1811,7 @@ static struct option options[] = { { NULL, 0, NULL, 0 } }; extern void dump_conn(struct connection *conn); +int dom0_domid = 0; int dom0_event = 0; int priv_domid = 0; @@ -1871,6 +1873,9 @@ int main(int argc, char *argv[]) case 'e': dom0_event = strtol(optarg, NULL, 10); break; + case 'm': + dom0_domid = strtol(optarg, NULL, 10); + break; case 'p': priv_domid = strtol(optarg, NULL, 10); break; diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index cfbcf6f..dcf95b5 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -170,6 +170,7 @@ void trace(const char *fmt, ...); void dtrace_io(const struct connection *conn, const struct buffered_data *data, int out); extern int event_fd; +extern int dom0_domid; extern int dom0_event; extern int priv_domid; @@ -177,6 +178,8 @@ extern int priv_domid; void *xenbus_map(void); void unmap_xenbus(void *interface); +static inline int xenbus_master_domid(void) { return dom0_domid; } + /* Return the event channel used by xenbus. */ evtchn_port_t xenbus_evtchn(void); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index f24bd6b..f7bbb03 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -606,7 +606,7 @@ static int dom0_init(void) if (port == -1) return -1; - dom0 = new_domain(NULL, 0, port); + dom0 = new_domain(NULL, xenbus_master_domid(), port); if (dom0 == NULL) return -1; diff --git a/tools/xenstore/xenstored_minios.c b/tools/xenstore/xenstored_minios.c index 1c6f794..f9c921e 100644 --- a/tools/xenstore/xenstored_minios.c +++ b/tools/xenstore/xenstored_minios.c @@ -51,7 +51,7 @@ evtchn_port_t xenbus_evtchn(void) void *xenbus_map(void) { - return xc_gnttab_map_grant_ref(*xcg_handle, 0, + return xc_gnttab_map_grant_ref(*xcg_handle, xenbus_master_domid(), GNTTAB_RESERVED_XENSTORE, PROT_READ|PROT_WRITE); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:46:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:46:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwj-0001lC-Iz; Tue, 11 Mar 2014 14:46:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwi-0001kj-04 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:20 +0000 Received: from [193.109.254.147:47947] by server-10.bemta-14.messagelabs.com id 42/A7-10711-9B12F135; Tue, 11 Mar 2014 14:46:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1394549176!883678!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27364 invoked from network); 11 Mar 2014 14:46:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwe-0005yp-1S for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNwe-0002BR-02 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:16 +0000 Date: Tue, 11 Mar 2014 14:46:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstored: add --master-domid to support domain builder X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 739c5ee78d438a0530002c5876333990ada99fd8 Author: Daniel De Graaf AuthorDate: Tue Mar 4 17:51:34 2014 -0500 Commit: Ian Jackson CommitDate: Mon Mar 10 12:13:50 2014 +0000 xenstored: add --master-domid to support domain builder When a domain builder stub domain is used, the initial xenstore connection to domain 0 may use a different domain ID as the endpoint; allow this domain ID to be specified on the command line. Signed-off-by: Daniel De Graaf Acked-by: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell --- tools/xenstore/xenstored_core.c | 5 +++++ tools/xenstore/xenstored_core.h | 3 +++ tools/xenstore/xenstored_domain.c | 2 +- tools/xenstore/xenstored_minios.c | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 2324e53..47f0722 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1795,6 +1795,7 @@ static struct option options[] = { { "entry-nb", 1, NULL, 'E' }, { "pid-file", 1, NULL, 'F' }, { "event", 1, NULL, 'e' }, + { "master-domid", 1, NULL, 'm' }, { "help", 0, NULL, 'H' }, { "no-fork", 0, NULL, 'N' }, { "priv-domid", 1, NULL, 'p' }, @@ -1810,6 +1811,7 @@ static struct option options[] = { { NULL, 0, NULL, 0 } }; extern void dump_conn(struct connection *conn); +int dom0_domid = 0; int dom0_event = 0; int priv_domid = 0; @@ -1871,6 +1873,9 @@ int main(int argc, char *argv[]) case 'e': dom0_event = strtol(optarg, NULL, 10); break; + case 'm': + dom0_domid = strtol(optarg, NULL, 10); + break; case 'p': priv_domid = strtol(optarg, NULL, 10); break; diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index cfbcf6f..dcf95b5 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -170,6 +170,7 @@ void trace(const char *fmt, ...); void dtrace_io(const struct connection *conn, const struct buffered_data *data, int out); extern int event_fd; +extern int dom0_domid; extern int dom0_event; extern int priv_domid; @@ -177,6 +178,8 @@ extern int priv_domid; void *xenbus_map(void); void unmap_xenbus(void *interface); +static inline int xenbus_master_domid(void) { return dom0_domid; } + /* Return the event channel used by xenbus. */ evtchn_port_t xenbus_evtchn(void); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index f24bd6b..f7bbb03 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -606,7 +606,7 @@ static int dom0_init(void) if (port == -1) return -1; - dom0 = new_domain(NULL, 0, port); + dom0 = new_domain(NULL, xenbus_master_domid(), port); if (dom0 == NULL) return -1; diff --git a/tools/xenstore/xenstored_minios.c b/tools/xenstore/xenstored_minios.c index 1c6f794..f9c921e 100644 --- a/tools/xenstore/xenstored_minios.c +++ b/tools/xenstore/xenstored_minios.c @@ -51,7 +51,7 @@ evtchn_port_t xenbus_evtchn(void) void *xenbus_map(void) { - return xc_gnttab_map_grant_ref(*xcg_handle, 0, + return xc_gnttab_map_grant_ref(*xcg_handle, xenbus_master_domid(), GNTTAB_RESERVED_XENSTORE, PROT_READ|PROT_WRITE); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:46:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:46:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwq-0001mh-LY; Tue, 11 Mar 2014 14:46:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwp-0001mK-3V for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:27 +0000 Received: from [193.109.254.147:53990] by server-4.bemta-14.messagelabs.com id 98/D8-32066-2C12F135; Tue, 11 Mar 2014 14:46:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1394549184!915666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4303 invoked from network); 11 Mar 2014 14:46:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvp-0005xk-53 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNvp-00024I-1E for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:25 +0000 Date: Tue, 11 Mar 2014 14:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/schedule: remove noreturn from schedule_tail() function pointer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7fb8e8b4e58cdd0a4ac457fd25342b35b6851521 Author: Andrew Cooper AuthorDate: Mon Mar 10 11:18:05 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:18:05 2014 +0100 x86/schedule: remove noreturn from schedule_tail() function pointer XenServer has recently had a support case where this bugframe in context_switch() was hit, presumably from a corrupt function pointer as the vcpu pointer was fine. On balance, it is better to leave the bugframe around for peace of mind in exceptional circumstances, than to use the optimisations provided by noreturn. At any meaningful levels of optimisation, the noreturn causes the bugframe to be optimised out, meaning that any exceptional returns fall into unlikely branches, which will result in very weird behaviour. The unreachable() in BUG() does the useful part of noreturn for us, allowing the compiler not to mess about restoring stack frames etc, but causes a ud2 instruction to be present. Signed-off-by: Andrew Cooper --- xen/include/asm-x86/current.h | 10 +++++++++- xen/include/asm-x86/domain.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index 4d1f20e..2081015 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -67,7 +67,15 @@ static inline struct cpu_info *get_cpu_info(void) unreachable(); \ }) -#define schedule_tail(vcpu) (((vcpu)->arch.schedule_tail)(vcpu)) +/* + * Schedule tail *should* be a terminal function pointer, but leave a bugframe + * around just incase it returns, to save going back into the context + * switching code and leaving a far more subtle crash to diagnose. + */ +#define schedule_tail(vcpu) do { \ + (((vcpu)->arch.schedule_tail)(vcpu)); \ + BUG(); \ + } while (0) /* * Which VCPU's state is currently running on each CPU? diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 49f7c0c..4ff89f0 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -395,7 +395,7 @@ struct arch_vcpu unsigned long flags; /* TF_ */ - void noreturn (*schedule_tail) (struct vcpu *); + void (*schedule_tail) (struct vcpu *); void (*ctxt_switch_from) (struct vcpu *); void (*ctxt_switch_to) (struct vcpu *); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:46:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:46:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwq-0001mh-LY; Tue, 11 Mar 2014 14:46:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwp-0001mK-3V for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:27 +0000 Received: from [193.109.254.147:53990] by server-4.bemta-14.messagelabs.com id 98/D8-32066-2C12F135; Tue, 11 Mar 2014 14:46:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1394549184!915666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4303 invoked from network); 11 Mar 2014 14:46:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNvp-0005xk-53 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNvp-00024I-1E for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:45:25 +0000 Date: Tue, 11 Mar 2014 14:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/schedule: remove noreturn from schedule_tail() function pointer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7fb8e8b4e58cdd0a4ac457fd25342b35b6851521 Author: Andrew Cooper AuthorDate: Mon Mar 10 11:18:05 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 11:18:05 2014 +0100 x86/schedule: remove noreturn from schedule_tail() function pointer XenServer has recently had a support case where this bugframe in context_switch() was hit, presumably from a corrupt function pointer as the vcpu pointer was fine. On balance, it is better to leave the bugframe around for peace of mind in exceptional circumstances, than to use the optimisations provided by noreturn. At any meaningful levels of optimisation, the noreturn causes the bugframe to be optimised out, meaning that any exceptional returns fall into unlikely branches, which will result in very weird behaviour. The unreachable() in BUG() does the useful part of noreturn for us, allowing the compiler not to mess about restoring stack frames etc, but causes a ud2 instruction to be present. Signed-off-by: Andrew Cooper --- xen/include/asm-x86/current.h | 10 +++++++++- xen/include/asm-x86/domain.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index 4d1f20e..2081015 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -67,7 +67,15 @@ static inline struct cpu_info *get_cpu_info(void) unreachable(); \ }) -#define schedule_tail(vcpu) (((vcpu)->arch.schedule_tail)(vcpu)) +/* + * Schedule tail *should* be a terminal function pointer, but leave a bugframe + * around just incase it returns, to save going back into the context + * switching code and leaving a far more subtle crash to diagnose. + */ +#define schedule_tail(vcpu) do { \ + (((vcpu)->arch.schedule_tail)(vcpu)); \ + BUG(); \ + } while (0) /* * Which VCPU's state is currently running on each CPU? diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 49f7c0c..4ff89f0 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -395,7 +395,7 @@ struct arch_vcpu unsigned long flags; /* TF_ */ - void noreturn (*schedule_tail) (struct vcpu *); + void (*schedule_tail) (struct vcpu *); void (*ctxt_switch_from) (struct vcpu *); void (*ctxt_switch_to) (struct vcpu *); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:46:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:46:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNws-0001nY-Oo; Tue, 11 Mar 2014 14:46:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwq-0001mc-Q9 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:28 +0000 Received: from [85.158.137.68:5472] by server-4.bemta-3.messagelabs.com id 46/63-04858-4C12F135; Tue, 11 Mar 2014 14:46:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1394549186!5751266!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29296 invoked from network); 11 Mar 2014 14:46:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwo-0005yv-6e for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNwo-0002Bn-4L for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:26 +0000 Date: Tue, 11 Mar 2014 14:46:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xmalloc: handle correctly page allocation when align > size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ac2cba2901779f66bbfab298faa15c956e91393a Author: Julien Grall AuthorDate: Mon Mar 10 14:40:50 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 14:40:50 2014 +0100 xmalloc: handle correctly page allocation when align > size When align is superior to size, we need to retrieve the order from align during multiple page allocation. I guess it was the goal of the commit fb034f42 "xmalloc: make close-to-PAGE_SIZE allocations more efficient". Signed-off-by: Julien Grall Acked-by: Keir Fraser --- xen/common/xmalloc_tlsf.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c index d3bdfa7..a5769c9 100644 --- a/xen/common/xmalloc_tlsf.c +++ b/xen/common/xmalloc_tlsf.c @@ -527,11 +527,10 @@ static void xmalloc_pool_put(void *p) static void *xmalloc_whole_pages(unsigned long size, unsigned long align) { - unsigned int i, order = get_order_from_bytes(size); + unsigned int i, order; void *res, *p; - if ( align > size ) - get_order_from_bytes(align); + order = get_order_from_bytes(max(align, size)); res = alloc_xenheap_pages(order, 0); if ( res == NULL ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:46:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:46:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNws-0001nY-Oo; Tue, 11 Mar 2014 14:46:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwq-0001mc-Q9 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:28 +0000 Received: from [85.158.137.68:5472] by server-4.bemta-3.messagelabs.com id 46/63-04858-4C12F135; Tue, 11 Mar 2014 14:46:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1394549186!5751266!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29296 invoked from network); 11 Mar 2014 14:46:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwo-0005yv-6e for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNwo-0002Bn-4L for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:26 +0000 Date: Tue, 11 Mar 2014 14:46:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xmalloc: handle correctly page allocation when align > size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ac2cba2901779f66bbfab298faa15c956e91393a Author: Julien Grall AuthorDate: Mon Mar 10 14:40:50 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 10 14:40:50 2014 +0100 xmalloc: handle correctly page allocation when align > size When align is superior to size, we need to retrieve the order from align during multiple page allocation. I guess it was the goal of the commit fb034f42 "xmalloc: make close-to-PAGE_SIZE allocations more efficient". Signed-off-by: Julien Grall Acked-by: Keir Fraser --- xen/common/xmalloc_tlsf.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c index d3bdfa7..a5769c9 100644 --- a/xen/common/xmalloc_tlsf.c +++ b/xen/common/xmalloc_tlsf.c @@ -527,11 +527,10 @@ static void xmalloc_pool_put(void *p) static void *xmalloc_whole_pages(unsigned long size, unsigned long align) { - unsigned int i, order = get_order_from_bytes(size); + unsigned int i, order; void *res, *p; - if ( align > size ) - get_order_from_bytes(align); + order = get_order_from_bytes(max(align, size)); res = alloc_xenheap_pages(order, 0); if ( res == NULL ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:46:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:46:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNx2-0001rf-GC; Tue, 11 Mar 2014 14:46:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNx1-0001r6-B6 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:39 +0000 Received: from [85.158.139.211:17298] by server-11.bemta-5.messagelabs.com id A0/84-30804-EC12F135; Tue, 11 Mar 2014 14:46:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1394549196!407276!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11641 invoked from network); 11 Mar 2014 14:46:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwy-0005z7-CC for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNwy-0002CD-AX for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:36 +0000 Date: Tue, 11 Mar 2014 14:46:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Use --no-print-directory instead of grep for debball version X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b6f6150d2c0efec1cbf9fc6d48e95a4a16a9dc2 Author: George Dunlap AuthorDate: Mon Mar 10 12:46:55 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 16:20:50 2014 +0000 tools: Use --no-print-directory instead of grep for debball version Save a fork, and also avoid :) being interpreted as a smiley. Signed-off-by: George Dunlap Acked-by: Ian Jackson --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 4e48457..4c5d1b6 100644 --- a/Makefile +++ b/Makefile @@ -150,7 +150,7 @@ world: # to be a full featured policy compliant .deb package. .PHONY: debball debball: dist - fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion | grep -v :) + fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory) # clean doesn't do a kclean .PHONY: clean -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:46:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:46:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNx2-0001rf-GC; Tue, 11 Mar 2014 14:46:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNx1-0001r6-B6 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:39 +0000 Received: from [85.158.139.211:17298] by server-11.bemta-5.messagelabs.com id A0/84-30804-EC12F135; Tue, 11 Mar 2014 14:46:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1394549196!407276!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11641 invoked from network); 11 Mar 2014 14:46:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNwy-0005z7-CC for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNwy-0002CD-AX for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:36 +0000 Date: Tue, 11 Mar 2014 14:46:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Use --no-print-directory instead of grep for debball version X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b6f6150d2c0efec1cbf9fc6d48e95a4a16a9dc2 Author: George Dunlap AuthorDate: Mon Mar 10 12:46:55 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 16:20:50 2014 +0000 tools: Use --no-print-directory instead of grep for debball version Save a fork, and also avoid :) being interpreted as a smiley. Signed-off-by: George Dunlap Acked-by: Ian Jackson --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 4e48457..4c5d1b6 100644 --- a/Makefile +++ b/Makefile @@ -150,7 +150,7 @@ world: # to be a full featured policy compliant .deb package. .PHONY: debball debball: dist - fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion | grep -v :) + fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory) # clean doesn't do a kclean .PHONY: clean -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:46:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:46:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxC-0001vR-J7; Tue, 11 Mar 2014 14:46:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxB-0001uq-5T for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:49 +0000 Received: from [85.158.139.211:19157] by server-14.bemta-5.messagelabs.com id 25/08-15696-8D12F135; Tue, 11 Mar 2014 14:46:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1394549206!413695!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10813 invoked from network); 11 Mar 2014 14:46:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNx8-0005zG-HM for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNx8-0002D5-G4 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:46 +0000 Date: Tue, 11 Mar 2014 14:46:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: remove double inclusion of errno.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 269324ae07ed978366f64130b59f542afdf9c137 Author: Olaf Hering AuthorDate: Fri Mar 7 10:15:06 2014 +0100 Commit: Ian Jackson CommitDate: Mon Mar 10 16:50:17 2014 +0000 tools/libxc: remove double inclusion of errno.h xc_private.h includes errno.h already Signed-off-by: Olaf Hering Acked-by: Ian Jackson --- tools/libxc/xc_compression.c | 1 - tools/libxc/xc_flask.c | 1 - tools/libxc/xc_gnttab.c | 1 - tools/libxc/xc_minios.c | 1 - tools/libxc/xc_pm.c | 1 - tools/misc/xen-hptool.c | 1 - tools/misc/xen-mfndump.c | 1 - 7 files changed, 0 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_compression.c b/tools/libxc/xc_compression.c index 8f0b89d..d42e651 100644 --- a/tools/libxc/xc_compression.c +++ b/tools/libxc/xc_compression.c @@ -32,7 +32,6 @@ #include #include #include -#include #include "xc_private.h" #include "xenctrl.h" #include "xg_save_restore.h" diff --git a/tools/libxc/xc_flask.c b/tools/libxc/xc_flask.c index 4294a25..255e4b0 100644 --- a/tools/libxc/xc_flask.c +++ b/tools/libxc/xc_flask.c @@ -19,7 +19,6 @@ #include "xc_private.h" #include #include -#include #include #include #include diff --git a/tools/libxc/xc_gnttab.c b/tools/libxc/xc_gnttab.c index 79dab40..3b6058c 100644 --- a/tools/libxc/xc_gnttab.c +++ b/tools/libxc/xc_gnttab.c @@ -18,7 +18,6 @@ */ #include "xc_private.h" -#include int xc_gnttab_op(xc_interface *xch, int cmd, void * op, int op_size, int count) { diff --git a/tools/libxc/xc_minios.c b/tools/libxc/xc_minios.c index dec4d73..a48f0de 100644 --- a/tools/libxc/xc_minios.c +++ b/tools/libxc/xc_minios.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include diff --git a/tools/libxc/xc_pm.c b/tools/libxc/xc_pm.c index 0da2d89..f7ac40c 100644 --- a/tools/libxc/xc_pm.c +++ b/tools/libxc/xc_pm.c @@ -19,7 +19,6 @@ * */ -#include #include #include "xc_private.h" diff --git a/tools/misc/xen-hptool.c b/tools/misc/xen-hptool.c index 24c3e95..f8570f2 100644 --- a/tools/misc/xen-hptool.c +++ b/tools/misc/xen-hptool.c @@ -1,7 +1,6 @@ #include #include #include -#include #include #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) diff --git a/tools/misc/xen-mfndump.c b/tools/misc/xen-mfndump.c index dea9fa9..8064527 100644 --- a/tools/misc/xen-mfndump.c +++ b/tools/misc/xen-mfndump.c @@ -1,7 +1,6 @@ #include #include #include -#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:46:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:46:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxC-0001vR-J7; Tue, 11 Mar 2014 14:46:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxB-0001uq-5T for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:49 +0000 Received: from [85.158.139.211:19157] by server-14.bemta-5.messagelabs.com id 25/08-15696-8D12F135; Tue, 11 Mar 2014 14:46:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1394549206!413695!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10813 invoked from network); 11 Mar 2014 14:46:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNx8-0005zG-HM for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNx8-0002D5-G4 for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:46 +0000 Date: Tue, 11 Mar 2014 14:46:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: remove double inclusion of errno.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 269324ae07ed978366f64130b59f542afdf9c137 Author: Olaf Hering AuthorDate: Fri Mar 7 10:15:06 2014 +0100 Commit: Ian Jackson CommitDate: Mon Mar 10 16:50:17 2014 +0000 tools/libxc: remove double inclusion of errno.h xc_private.h includes errno.h already Signed-off-by: Olaf Hering Acked-by: Ian Jackson --- tools/libxc/xc_compression.c | 1 - tools/libxc/xc_flask.c | 1 - tools/libxc/xc_gnttab.c | 1 - tools/libxc/xc_minios.c | 1 - tools/libxc/xc_pm.c | 1 - tools/misc/xen-hptool.c | 1 - tools/misc/xen-mfndump.c | 1 - 7 files changed, 0 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_compression.c b/tools/libxc/xc_compression.c index 8f0b89d..d42e651 100644 --- a/tools/libxc/xc_compression.c +++ b/tools/libxc/xc_compression.c @@ -32,7 +32,6 @@ #include #include #include -#include #include "xc_private.h" #include "xenctrl.h" #include "xg_save_restore.h" diff --git a/tools/libxc/xc_flask.c b/tools/libxc/xc_flask.c index 4294a25..255e4b0 100644 --- a/tools/libxc/xc_flask.c +++ b/tools/libxc/xc_flask.c @@ -19,7 +19,6 @@ #include "xc_private.h" #include #include -#include #include #include #include diff --git a/tools/libxc/xc_gnttab.c b/tools/libxc/xc_gnttab.c index 79dab40..3b6058c 100644 --- a/tools/libxc/xc_gnttab.c +++ b/tools/libxc/xc_gnttab.c @@ -18,7 +18,6 @@ */ #include "xc_private.h" -#include int xc_gnttab_op(xc_interface *xch, int cmd, void * op, int op_size, int count) { diff --git a/tools/libxc/xc_minios.c b/tools/libxc/xc_minios.c index dec4d73..a48f0de 100644 --- a/tools/libxc/xc_minios.c +++ b/tools/libxc/xc_minios.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include diff --git a/tools/libxc/xc_pm.c b/tools/libxc/xc_pm.c index 0da2d89..f7ac40c 100644 --- a/tools/libxc/xc_pm.c +++ b/tools/libxc/xc_pm.c @@ -19,7 +19,6 @@ * */ -#include #include #include "xc_private.h" diff --git a/tools/misc/xen-hptool.c b/tools/misc/xen-hptool.c index 24c3e95..f8570f2 100644 --- a/tools/misc/xen-hptool.c +++ b/tools/misc/xen-hptool.c @@ -1,7 +1,6 @@ #include #include #include -#include #include #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) diff --git a/tools/misc/xen-mfndump.c b/tools/misc/xen-mfndump.c index dea9fa9..8064527 100644 --- a/tools/misc/xen-mfndump.c +++ b/tools/misc/xen-mfndump.c @@ -1,7 +1,6 @@ #include #include #include -#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:47:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:47:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxO-0001yb-Lu; Tue, 11 Mar 2014 14:47:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxM-0001yB-TB for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:01 +0000 Received: from [193.109.254.147:36155] by server-9.bemta-14.messagelabs.com id DD/0B-24895-4E12F135; Tue, 11 Mar 2014 14:47:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1394549216!913984!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11287 invoked from network); 11 Mar 2014 14:46:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxI-0005zM-Mo for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNxI-0002DR-KS for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:56 +0000 Date: Tue, 11 Mar 2014 14:46:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: assign positive values to errno X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a389b963fcd1051ea271c98380f47d4221c8491 Author: Olaf Hering AuthorDate: Fri Mar 7 10:15:07 2014 +0100 Commit: Ian Jackson CommitDate: Mon Mar 10 16:50:58 2014 +0000 tools/libxc: assign positive values to errno Signed-off-by: Olaf Hering Acked-by: Ian Jackson --- tools/libxc/xc_foreign_memory.c | 2 +- tools/libxc/xc_mem_paging.c | 2 +- tools/libxc/xc_minios.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_foreign_memory.c b/tools/libxc/xc_foreign_memory.c index 7dfc817..43abf01 100644 --- a/tools/libxc/xc_foreign_memory.c +++ b/tools/libxc/xc_foreign_memory.c @@ -27,7 +27,7 @@ void *xc_map_foreign_pages(xc_interface *xch, uint32_t dom, int prot, int i, *err; if (num < 0) { - errno = -EINVAL; + errno = EINVAL; return NULL; } diff --git a/tools/libxc/xc_mem_paging.c b/tools/libxc/xc_mem_paging.c index 269cbdd..8aa7d4d 100644 --- a/tools/libxc/xc_mem_paging.c +++ b/tools/libxc/xc_mem_paging.c @@ -76,7 +76,7 @@ int xc_mem_paging_load(xc_interface *xch, domid_t domain_id, { int rc, old_errno; - errno = -EINVAL; + errno = EINVAL; if ( !buffer ) return -1; diff --git a/tools/libxc/xc_minios.c b/tools/libxc/xc_minios.c index a48f0de..e621417 100644 --- a/tools/libxc/xc_minios.c +++ b/tools/libxc/xc_minios.c @@ -349,7 +349,7 @@ static int minios_evtchn_unbind(xc_evtchn *xce, xc_osdep_handle h, evtchn_port_t } } printf("Warning: couldn't find port %"PRId32" for xc handle %x\n", port, fd); - errno = -EINVAL; + errno = EINVAL; return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:47:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:47:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxO-0001yb-Lu; Tue, 11 Mar 2014 14:47:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxM-0001yB-TB for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:01 +0000 Received: from [193.109.254.147:36155] by server-9.bemta-14.messagelabs.com id DD/0B-24895-4E12F135; Tue, 11 Mar 2014 14:47:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1394549216!913984!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11287 invoked from network); 11 Mar 2014 14:46:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:46:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxI-0005zM-Mo for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNxI-0002DR-KS for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:46:56 +0000 Date: Tue, 11 Mar 2014 14:46:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: assign positive values to errno X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a389b963fcd1051ea271c98380f47d4221c8491 Author: Olaf Hering AuthorDate: Fri Mar 7 10:15:07 2014 +0100 Commit: Ian Jackson CommitDate: Mon Mar 10 16:50:58 2014 +0000 tools/libxc: assign positive values to errno Signed-off-by: Olaf Hering Acked-by: Ian Jackson --- tools/libxc/xc_foreign_memory.c | 2 +- tools/libxc/xc_mem_paging.c | 2 +- tools/libxc/xc_minios.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_foreign_memory.c b/tools/libxc/xc_foreign_memory.c index 7dfc817..43abf01 100644 --- a/tools/libxc/xc_foreign_memory.c +++ b/tools/libxc/xc_foreign_memory.c @@ -27,7 +27,7 @@ void *xc_map_foreign_pages(xc_interface *xch, uint32_t dom, int prot, int i, *err; if (num < 0) { - errno = -EINVAL; + errno = EINVAL; return NULL; } diff --git a/tools/libxc/xc_mem_paging.c b/tools/libxc/xc_mem_paging.c index 269cbdd..8aa7d4d 100644 --- a/tools/libxc/xc_mem_paging.c +++ b/tools/libxc/xc_mem_paging.c @@ -76,7 +76,7 @@ int xc_mem_paging_load(xc_interface *xch, domid_t domain_id, { int rc, old_errno; - errno = -EINVAL; + errno = EINVAL; if ( !buffer ) return -1; diff --git a/tools/libxc/xc_minios.c b/tools/libxc/xc_minios.c index a48f0de..e621417 100644 --- a/tools/libxc/xc_minios.c +++ b/tools/libxc/xc_minios.c @@ -349,7 +349,7 @@ static int minios_evtchn_unbind(xc_evtchn *xce, xc_osdep_handle h, evtchn_port_t } } printf("Warning: couldn't find port %"PRId32" for xc handle %x\n", port, fd); - errno = -EINVAL; + errno = EINVAL; return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:47:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:47:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxW-000210-P2; Tue, 11 Mar 2014 14:47:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxV-00020d-Kk for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:09 +0000 Received: from [85.158.137.68:38646] by server-14.bemta-3.messagelabs.com id 8C/42-08196-CE12F135; Tue, 11 Mar 2014 14:47:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1394549227!7063672!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15988 invoked from network); 11 Mar 2014 14:47:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:47:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxS-0005zt-Ry for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNxS-0002Dx-QU for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:06 +0000 Date: Tue, 11 Mar 2014 14:47:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/ocaml: Ingore more OCaml test binaries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0edbf9598706230a0e9e13861ad0153bda360c19 Author: Andrew Cooper AuthorDate: Tue Feb 25 18:46:14 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 17:00:03 2014 +0000 tools/ocaml: Ingore more OCaml test binaries Signed-off-by: Andrew Cooper CC: Ian Campbell Acked-by: Ian Jackson CC: David Scott Acked-by: David Scott --- .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index db3b083..eb210ca 100644 --- a/.gitignore +++ b/.gitignore @@ -390,6 +390,8 @@ tools/ocaml/xenstored/oxenstored tools/ocaml/test/xtl tools/ocaml/test/send_debug_keys tools/ocaml/test/list_domains +tools/ocaml/test/dmesg +tools/ocaml/test/raise_exception tools/debugger/kdd/kdd tools/firmware/etherboot/ipxe.tar.gz tools/firmware/etherboot/ipxe/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:47:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:47:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxW-000210-P2; Tue, 11 Mar 2014 14:47:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxV-00020d-Kk for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:09 +0000 Received: from [85.158.137.68:38646] by server-14.bemta-3.messagelabs.com id 8C/42-08196-CE12F135; Tue, 11 Mar 2014 14:47:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1394549227!7063672!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15988 invoked from network); 11 Mar 2014 14:47:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:47:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxS-0005zt-Ry for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNxS-0002Dx-QU for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:06 +0000 Date: Tue, 11 Mar 2014 14:47:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/ocaml: Ingore more OCaml test binaries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0edbf9598706230a0e9e13861ad0153bda360c19 Author: Andrew Cooper AuthorDate: Tue Feb 25 18:46:14 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 17:00:03 2014 +0000 tools/ocaml: Ingore more OCaml test binaries Signed-off-by: Andrew Cooper CC: Ian Campbell Acked-by: Ian Jackson CC: David Scott Acked-by: David Scott --- .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index db3b083..eb210ca 100644 --- a/.gitignore +++ b/.gitignore @@ -390,6 +390,8 @@ tools/ocaml/xenstored/oxenstored tools/ocaml/test/xtl tools/ocaml/test/send_debug_keys tools/ocaml/test/list_domains +tools/ocaml/test/dmesg +tools/ocaml/test/raise_exception tools/debugger/kdd/kdd tools/firmware/etherboot/ipxe.tar.gz tools/firmware/etherboot/ipxe/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:47:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:47:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxg-00023x-TS; Tue, 11 Mar 2014 14:47:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxf-00023e-Ql for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:19 +0000 Received: from [85.158.139.211:60020] by server-15.bemta-5.messagelabs.com id D3/43-11079-7F12F135; Tue, 11 Mar 2014 14:47:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1394549237!412942!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2144 invoked from network); 11 Mar 2014 14:47:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:47:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxd-000601-1o for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNxd-0002EM-0C for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:17 +0000 Date: Tue, 11 Mar 2014 14:47:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xcutils: Free xtl loggers after use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd2ef9d50d89c49e57d68318422b4ed2c2d426d5 Author: Andrew Cooper AuthorDate: Mon Mar 10 17:06:16 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 17:19:11 2014 +0000 tools/xcutils: Free xtl loggers after use While not much of a functional change, this prevents irritating warnings from valgrind when trying to analyse xc_domain_{save,restore}() themselves. Signed-off-by: Andrew Cooper CC: Ian Campbell Acked-by: Ian Jackson --- tools/xcutils/xc_restore.c | 1 + tools/xcutils/xc_save.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/xcutils/xc_restore.c b/tools/xcutils/xc_restore.c index 4ea261b..616bd42 100644 --- a/tools/xcutils/xc_restore.c +++ b/tools/xcutils/xc_restore.c @@ -67,6 +67,7 @@ main(int argc, char **argv) } xc_interface_close(xch); + xtl_logger_destroy(l); return ret; } diff --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c index e34bd2c..45ad0ce 100644 --- a/tools/xcutils/xc_save.c +++ b/tools/xcutils/xc_save.c @@ -222,6 +222,7 @@ main(int argc, char **argv) xc_evtchn_close(si.xce); xc_interface_close(si.xch); + xtl_logger_destroy(l); return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 11 14:47:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Mar 2014 14:47:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxg-00023x-TS; Tue, 11 Mar 2014 14:47:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxf-00023e-Ql for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:19 +0000 Received: from [85.158.139.211:60020] by server-15.bemta-5.messagelabs.com id D3/43-11079-7F12F135; Tue, 11 Mar 2014 14:47:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1394549237!412942!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2144 invoked from network); 11 Mar 2014 14:47:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2014 14:47:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNNxd-000601-1o for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WNNxd-0002EM-0C for xen-changelog@lists.xensource.com; Tue, 11 Mar 2014 14:47:17 +0000 Date: Tue, 11 Mar 2014 14:47:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xcutils: Free xtl loggers after use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd2ef9d50d89c49e57d68318422b4ed2c2d426d5 Author: Andrew Cooper AuthorDate: Mon Mar 10 17:06:16 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 10 17:19:11 2014 +0000 tools/xcutils: Free xtl loggers after use While not much of a functional change, this prevents irritating warnings from valgrind when trying to analyse xc_domain_{save,restore}() themselves. Signed-off-by: Andrew Cooper CC: Ian Campbell Acked-by: Ian Jackson --- tools/xcutils/xc_restore.c | 1 + tools/xcutils/xc_save.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/xcutils/xc_restore.c b/tools/xcutils/xc_restore.c index 4ea261b..616bd42 100644 --- a/tools/xcutils/xc_restore.c +++ b/tools/xcutils/xc_restore.c @@ -67,6 +67,7 @@ main(int argc, char **argv) } xc_interface_close(xch); + xtl_logger_destroy(l); return ret; } diff --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c index e34bd2c..45ad0ce 100644 --- a/tools/xcutils/xc_save.c +++ b/tools/xcutils/xc_save.c @@ -222,6 +222,7 @@ main(int argc, char **argv) xc_evtchn_close(si.xce); xc_interface_close(si.xch); + xtl_logger_destroy(l); return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 00:33:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 00:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOG3g-0003wj-CZ; Fri, 14 Mar 2014 00:33:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOG3e-0003wd-FR for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 00:33:06 +0000 Received: from [85.158.143.35:45989] by server-1.bemta-4.messagelabs.com id 77/CB-09853-14E42235; Fri, 14 Mar 2014 00:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1394757183!1992840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15606 invoked from network); 14 Mar 2014 00:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 00:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOG3b-0005oq-BQ for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 00:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOG3a-0004Fz-TY for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 00:33:03 +0000 Date: Fri, 14 Mar 2014 00:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Config.mk: switch QEMU_UPSTREAM_REVISION back to master X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8c2bc5d6796324aa93e2847fafb6fe1feeb11647 Author: Ian Jackson AuthorDate: Thu Mar 13 17:22:10 2014 +0000 Commit: Ian Jackson CommitDate: Thu Mar 13 17:22:10 2014 +0000 Config.mk: switch QEMU_UPSTREAM_REVISION back to master Signed-off-by: Ian Jackson --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index eb2c192..a7cb312 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.4-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0 +QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 00:33:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 00:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOG3g-0003wj-CZ; Fri, 14 Mar 2014 00:33:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOG3e-0003wd-FR for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 00:33:06 +0000 Received: from [85.158.143.35:45989] by server-1.bemta-4.messagelabs.com id 77/CB-09853-14E42235; Fri, 14 Mar 2014 00:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1394757183!1992840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15606 invoked from network); 14 Mar 2014 00:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 00:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOG3b-0005oq-BQ for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 00:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOG3a-0004Fz-TY for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 00:33:03 +0000 Date: Fri, 14 Mar 2014 00:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Config.mk: switch QEMU_UPSTREAM_REVISION back to master X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8c2bc5d6796324aa93e2847fafb6fe1feeb11647 Author: Ian Jackson AuthorDate: Thu Mar 13 17:22:10 2014 +0000 Commit: Ian Jackson CommitDate: Thu Mar 13 17:22:10 2014 +0000 Config.mk: switch QEMU_UPSTREAM_REVISION back to master Signed-off-by: Ian Jackson --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index eb2c192..a7cb312 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.4-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0 +QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:55:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4N-00036G-2s; Fri, 14 Mar 2014 21:55:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4M-000365-IX for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:10 +0000 Received: from [85.158.143.35:62219] by server-2.bemta-4.messagelabs.com id 78/30-06539-DBA73235; Fri, 14 Mar 2014 21:55:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1394834105!1529349!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30881 invoked from network); 14 Mar 2014 21:55:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4G-0000ac-Pl for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa4G-0002Dq-Ds for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:04 +0000 Date: Fri, 14 Mar 2014 21:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: preserve errno in ERROR and DRINTF macros X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1eac8d14ecf6c76a355b461dac208d53a6b15e3 Author: Olaf Hering AuthorDate: Tue Mar 11 10:30:49 2014 +0100 Commit: Ian Jackson CommitDate: Tue Mar 11 11:37:06 2014 +0000 tools/libxc: preserve errno in ERROR and DRINTF macros This simplifies a changes made in a follow-up patch. Signed-off-by: Olaf Hering Acked-by: Ian Jackson --- tools/libxc/xc_private.h | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index a610f0c..bd2eb86 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -119,13 +119,28 @@ void xc_report_progress_step(xc_interface *xch, /* anamorphic macros: struct xc_interface *xch must be in scope */ -#define IPRINTF(_f, _a...) xc_report(xch, xch->error_handler, XTL_INFO,0, _f , ## _a) -#define DPRINTF(_f, _a...) xc_report(xch, xch->error_handler, XTL_DETAIL,0, _f , ## _a) -#define DBGPRINTF(_f, _a...) xc_report(xch, xch->error_handler, XTL_DEBUG,0, _f , ## _a) - -#define ERROR(_m, _a...) xc_report_error(xch,XC_INTERNAL_ERROR,_m , ## _a ) -#define PERROR(_m, _a...) xc_report_error(xch,XC_INTERNAL_ERROR,_m \ - " (%d = %s)", ## _a , errno, xc_strerror(xch, errno)) +#define IPRINTF(_f, _a...) do { int IPRINTF_errno = errno; \ + xc_report(xch, xch->error_handler, XTL_INFO,0, _f , ## _a); \ + errno = IPRINTF_errno; \ + } while (0) +#define DPRINTF(_f, _a...) do { int DPRINTF_errno = errno; \ + xc_report(xch, xch->error_handler, XTL_DETAIL,0, _f , ## _a); \ + errno = DPRINTF_errno; \ + } while (0) +#define DBGPRINTF(_f, _a...) do { int DBGPRINTF_errno = errno; \ + xc_report(xch, xch->error_handler, XTL_DEBUG,0, _f , ## _a); \ + errno = DBGPRINTF_errno; \ + } while (0) + +#define ERROR(_m, _a...) do { int ERROR_errno = errno; \ + xc_report_error(xch,XC_INTERNAL_ERROR,_m , ## _a ); \ + errno = ERROR_errno; \ + } while (0) +#define PERROR(_m, _a...) do { int PERROR_errno = errno; \ + xc_report_error(xch,XC_INTERNAL_ERROR,_m " (%d = %s)", \ + ## _a , errno, xc_strerror(xch, errno)); \ + errno = PERROR_errno; \ + } while (0) /* * HYPERCALL ARGUMENT BUFFERS -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:55:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4N-00036G-2s; Fri, 14 Mar 2014 21:55:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4M-000365-IX for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:10 +0000 Received: from [85.158.143.35:62219] by server-2.bemta-4.messagelabs.com id 78/30-06539-DBA73235; Fri, 14 Mar 2014 21:55:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1394834105!1529349!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30881 invoked from network); 14 Mar 2014 21:55:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4G-0000ac-Pl for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa4G-0002Dq-Ds for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:04 +0000 Date: Fri, 14 Mar 2014 21:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: preserve errno in ERROR and DRINTF macros X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1eac8d14ecf6c76a355b461dac208d53a6b15e3 Author: Olaf Hering AuthorDate: Tue Mar 11 10:30:49 2014 +0100 Commit: Ian Jackson CommitDate: Tue Mar 11 11:37:06 2014 +0000 tools/libxc: preserve errno in ERROR and DRINTF macros This simplifies a changes made in a follow-up patch. Signed-off-by: Olaf Hering Acked-by: Ian Jackson --- tools/libxc/xc_private.h | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index a610f0c..bd2eb86 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -119,13 +119,28 @@ void xc_report_progress_step(xc_interface *xch, /* anamorphic macros: struct xc_interface *xch must be in scope */ -#define IPRINTF(_f, _a...) xc_report(xch, xch->error_handler, XTL_INFO,0, _f , ## _a) -#define DPRINTF(_f, _a...) xc_report(xch, xch->error_handler, XTL_DETAIL,0, _f , ## _a) -#define DBGPRINTF(_f, _a...) xc_report(xch, xch->error_handler, XTL_DEBUG,0, _f , ## _a) - -#define ERROR(_m, _a...) xc_report_error(xch,XC_INTERNAL_ERROR,_m , ## _a ) -#define PERROR(_m, _a...) xc_report_error(xch,XC_INTERNAL_ERROR,_m \ - " (%d = %s)", ## _a , errno, xc_strerror(xch, errno)) +#define IPRINTF(_f, _a...) do { int IPRINTF_errno = errno; \ + xc_report(xch, xch->error_handler, XTL_INFO,0, _f , ## _a); \ + errno = IPRINTF_errno; \ + } while (0) +#define DPRINTF(_f, _a...) do { int DPRINTF_errno = errno; \ + xc_report(xch, xch->error_handler, XTL_DETAIL,0, _f , ## _a); \ + errno = DPRINTF_errno; \ + } while (0) +#define DBGPRINTF(_f, _a...) do { int DBGPRINTF_errno = errno; \ + xc_report(xch, xch->error_handler, XTL_DEBUG,0, _f , ## _a); \ + errno = DBGPRINTF_errno; \ + } while (0) + +#define ERROR(_m, _a...) do { int ERROR_errno = errno; \ + xc_report_error(xch,XC_INTERNAL_ERROR,_m , ## _a ); \ + errno = ERROR_errno; \ + } while (0) +#define PERROR(_m, _a...) do { int PERROR_errno = errno; \ + xc_report_error(xch,XC_INTERNAL_ERROR,_m " (%d = %s)", \ + ## _a , errno, xc_strerror(xch, errno)); \ + errno = PERROR_errno; \ + } while (0) /* * HYPERCALL ARGUMENT BUFFERS -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:55:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:55:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4X-00037n-5m; Fri, 14 Mar 2014 21:55:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4V-00037R-UV for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:20 +0000 Received: from [85.158.139.211:3969] by server-9.bemta-5.messagelabs.com id 16/7C-04350-7CA73235; Fri, 14 Mar 2014 21:55:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1394834115!1137702!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19861 invoked from network); 14 Mar 2014 21:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4R-0000af-4P for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa4Q-0002EE-VQ for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:14 +0000 Date: Fri, 14 Mar 2014 21:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: pass errno to callers of xc_domain_save X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dda0b77d2caad8c3997e972cf96e40d0a67329ea Author: Olaf Hering AuthorDate: Tue Mar 11 10:30:50 2014 +0100 Commit: Ian Jackson CommitDate: Tue Mar 11 11:37:10 2014 +0000 tools/libxc: pass errno to callers of xc_domain_save Callers of xc_domain_save use errno to print diagnostics if the call fails. But xc_domain_save does not preserve the actual errno in case of a failure. This change preserves errno in all cases where code jumps to the label "out". In addition a new label "exit" is added to catch also code which used to do just "return 1". Now libxl_save_helper:complete can print the actual error string. Signed-off-by: Olaf Hering Acked-by: Ian Jackson --- tools/libxc/xc_domain_save.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 42c4752..9f96bb7 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "xc_private.h" #include "xc_bitops.h" @@ -150,6 +151,7 @@ static inline int outbuf_write(xc_interface *xch, struct outbuf* ob, void* buf, size_t len) { if ( len > ob->size - ob->pos ) { + errno = ERANGE; DBGPRINTF("outbuf_write: %zu > %zu@%zu\n", len, ob->size - ob->pos, ob->pos); return -1; } @@ -806,7 +808,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter xc_dominfo_t info; DECLARE_DOMCTL; - int rc = 1, frc, i, j, last_iter = 0, iter = 0; + int rc, frc, i, j, last_iter = 0, iter = 0; int live = (flags & XCFLAGS_LIVE); int debug = (flags & XCFLAGS_DEBUG); int superpages = !!hvm; @@ -899,7 +901,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter { ERROR("No switch_qemu_logdirty callback provided."); errno = EINVAL; - return 1; + goto exit; } outbuf_init(xch, &ob_pagebuf, OUTBUF_SIZE); @@ -914,13 +916,13 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter &ctx->max_mfn, &ctx->hvirt_start, &ctx->pt_levels, &dinfo->guest_width) ) { ERROR("Unable to get platform info."); - return 1; + goto exit; } if ( xc_domain_getinfo(xch, dom, 1, &info) != 1 ) { PERROR("Could not get domain info"); - return 1; + goto exit; } shared_info_frame = info.shared_info_frame; @@ -942,6 +944,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter if ( dinfo->p2m_size > ~XEN_DOMCTL_PFINFO_LTAB_MASK ) { + errno = E2BIG; ERROR("Cannot save this big a guest"); goto out; } @@ -1012,6 +1015,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter if ( !to_send || !to_fix || !to_skip ) { + errno = ENOMEM; ERROR("Couldn't allocate to_send array"); goto out; } @@ -1030,6 +1034,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter hvm_buf = malloc(hvm_buf_size); if ( !hvm_buf ) { + errno = ENOMEM; ERROR("Couldn't allocate memory"); goto out; } @@ -1598,6 +1603,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter if ( info.max_vcpu_id >= XC_SR_MAX_VCPUS ) { + errno = E2BIG; ERROR("Too many VCPUS in guest!"); goto out; } @@ -1830,7 +1836,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter } /* HVM guests are done now */ - rc = 0; + errno = 0; goto out; } @@ -1888,6 +1894,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter mfn = GET_FIELD(&ctxt, user_regs.edx); if ( !MFN_IS_IN_PSEUDOPHYS_MAP(mfn) ) { + errno = ERANGE; ERROR("Suspend record is not in range of pseudophys map"); goto out; } @@ -1910,6 +1917,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter mfn = GET_FIELD(&ctxt, gdt_frames[j]); if ( !MFN_IS_IN_PSEUDOPHYS_MAP(mfn) ) { + errno = ERANGE; ERROR("GDT frame is not in range of pseudophys map"); goto out; } @@ -1920,6 +1928,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter if ( !MFN_IS_IN_PSEUDOPHYS_MAP(UNFOLD_CR3( GET_FIELD(&ctxt, ctrlreg[3]))) ) { + errno = ERANGE; ERROR("PT base is not in range of pseudophys map"); goto out; } @@ -1931,6 +1940,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter { if ( !MFN_IS_IN_PSEUDOPHYS_MAP(UNFOLD_CR3(ctxt.x64.ctrlreg[1])) ) { + errno = ERANGE; ERROR("PT base is not in range of pseudophys map"); goto out; } @@ -2027,9 +2037,13 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter } /* Success! */ - rc = 0; + rc = errno = 0; + goto out_rc; out: + rc = errno; + assert(rc); + out_rc: completed = 1; if ( !rc && callbacks->postcopy ) @@ -2044,13 +2058,11 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter if (wrcompressed(io_fd) < 0) { ERROR("Error when writing compressed data, after postcopy\n"); - rc = 1; goto out; } /* Append the tailbuf data to the main outbuf */ if ( wrexact(io_fd, ob_tailbuf.buf, ob_tailbuf.pos) ) { - rc = 1; PERROR("Error when copying tailbuf into outbuf"); goto out; } @@ -2059,7 +2071,8 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter /* Flush last write and discard cache for file. */ if ( ob && outbuf_flush(xch, ob, io_fd) < 0 ) { PERROR("Error when flushing output buffer"); - rc = 1; + if (!rc) + rc = errno; } discard_file_cache(xch, io_fd, 1 /* flush */); @@ -2074,7 +2087,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter /* reset stats timer */ print_stats(xch, dom, 0, &time_stats, &shadow_stats, 0); - rc = 1; /* last_iter = 1; */ if ( suspend_and_state(callbacks->suspend, callbacks->data, xch, io_fd, dom, &info) ) @@ -2130,9 +2142,11 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter free(hvm_buf); outbuf_free(&ob_pagebuf); - DPRINTF("Save exit of domid %u with rc=%d\n", dom, rc); + errno = rc; +exit: + DPRINTF("Save exit of domid %u with errno=%d\n", dom, errno); - return !!rc; + return !!errno; } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:55:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:55:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4X-00037n-5m; Fri, 14 Mar 2014 21:55:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4V-00037R-UV for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:20 +0000 Received: from [85.158.139.211:3969] by server-9.bemta-5.messagelabs.com id 16/7C-04350-7CA73235; Fri, 14 Mar 2014 21:55:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1394834115!1137702!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19861 invoked from network); 14 Mar 2014 21:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4R-0000af-4P for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa4Q-0002EE-VQ for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:14 +0000 Date: Fri, 14 Mar 2014 21:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: pass errno to callers of xc_domain_save X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dda0b77d2caad8c3997e972cf96e40d0a67329ea Author: Olaf Hering AuthorDate: Tue Mar 11 10:30:50 2014 +0100 Commit: Ian Jackson CommitDate: Tue Mar 11 11:37:10 2014 +0000 tools/libxc: pass errno to callers of xc_domain_save Callers of xc_domain_save use errno to print diagnostics if the call fails. But xc_domain_save does not preserve the actual errno in case of a failure. This change preserves errno in all cases where code jumps to the label "out". In addition a new label "exit" is added to catch also code which used to do just "return 1". Now libxl_save_helper:complete can print the actual error string. Signed-off-by: Olaf Hering Acked-by: Ian Jackson --- tools/libxc/xc_domain_save.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 42c4752..9f96bb7 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "xc_private.h" #include "xc_bitops.h" @@ -150,6 +151,7 @@ static inline int outbuf_write(xc_interface *xch, struct outbuf* ob, void* buf, size_t len) { if ( len > ob->size - ob->pos ) { + errno = ERANGE; DBGPRINTF("outbuf_write: %zu > %zu@%zu\n", len, ob->size - ob->pos, ob->pos); return -1; } @@ -806,7 +808,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter xc_dominfo_t info; DECLARE_DOMCTL; - int rc = 1, frc, i, j, last_iter = 0, iter = 0; + int rc, frc, i, j, last_iter = 0, iter = 0; int live = (flags & XCFLAGS_LIVE); int debug = (flags & XCFLAGS_DEBUG); int superpages = !!hvm; @@ -899,7 +901,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter { ERROR("No switch_qemu_logdirty callback provided."); errno = EINVAL; - return 1; + goto exit; } outbuf_init(xch, &ob_pagebuf, OUTBUF_SIZE); @@ -914,13 +916,13 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter &ctx->max_mfn, &ctx->hvirt_start, &ctx->pt_levels, &dinfo->guest_width) ) { ERROR("Unable to get platform info."); - return 1; + goto exit; } if ( xc_domain_getinfo(xch, dom, 1, &info) != 1 ) { PERROR("Could not get domain info"); - return 1; + goto exit; } shared_info_frame = info.shared_info_frame; @@ -942,6 +944,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter if ( dinfo->p2m_size > ~XEN_DOMCTL_PFINFO_LTAB_MASK ) { + errno = E2BIG; ERROR("Cannot save this big a guest"); goto out; } @@ -1012,6 +1015,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter if ( !to_send || !to_fix || !to_skip ) { + errno = ENOMEM; ERROR("Couldn't allocate to_send array"); goto out; } @@ -1030,6 +1034,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter hvm_buf = malloc(hvm_buf_size); if ( !hvm_buf ) { + errno = ENOMEM; ERROR("Couldn't allocate memory"); goto out; } @@ -1598,6 +1603,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter if ( info.max_vcpu_id >= XC_SR_MAX_VCPUS ) { + errno = E2BIG; ERROR("Too many VCPUS in guest!"); goto out; } @@ -1830,7 +1836,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter } /* HVM guests are done now */ - rc = 0; + errno = 0; goto out; } @@ -1888,6 +1894,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter mfn = GET_FIELD(&ctxt, user_regs.edx); if ( !MFN_IS_IN_PSEUDOPHYS_MAP(mfn) ) { + errno = ERANGE; ERROR("Suspend record is not in range of pseudophys map"); goto out; } @@ -1910,6 +1917,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter mfn = GET_FIELD(&ctxt, gdt_frames[j]); if ( !MFN_IS_IN_PSEUDOPHYS_MAP(mfn) ) { + errno = ERANGE; ERROR("GDT frame is not in range of pseudophys map"); goto out; } @@ -1920,6 +1928,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter if ( !MFN_IS_IN_PSEUDOPHYS_MAP(UNFOLD_CR3( GET_FIELD(&ctxt, ctrlreg[3]))) ) { + errno = ERANGE; ERROR("PT base is not in range of pseudophys map"); goto out; } @@ -1931,6 +1940,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter { if ( !MFN_IS_IN_PSEUDOPHYS_MAP(UNFOLD_CR3(ctxt.x64.ctrlreg[1])) ) { + errno = ERANGE; ERROR("PT base is not in range of pseudophys map"); goto out; } @@ -2027,9 +2037,13 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter } /* Success! */ - rc = 0; + rc = errno = 0; + goto out_rc; out: + rc = errno; + assert(rc); + out_rc: completed = 1; if ( !rc && callbacks->postcopy ) @@ -2044,13 +2058,11 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter if (wrcompressed(io_fd) < 0) { ERROR("Error when writing compressed data, after postcopy\n"); - rc = 1; goto out; } /* Append the tailbuf data to the main outbuf */ if ( wrexact(io_fd, ob_tailbuf.buf, ob_tailbuf.pos) ) { - rc = 1; PERROR("Error when copying tailbuf into outbuf"); goto out; } @@ -2059,7 +2071,8 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter /* Flush last write and discard cache for file. */ if ( ob && outbuf_flush(xch, ob, io_fd) < 0 ) { PERROR("Error when flushing output buffer"); - rc = 1; + if (!rc) + rc = errno; } discard_file_cache(xch, io_fd, 1 /* flush */); @@ -2074,7 +2087,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter /* reset stats timer */ print_stats(xch, dom, 0, &time_stats, &shadow_stats, 0); - rc = 1; /* last_iter = 1; */ if ( suspend_and_state(callbacks->suspend, callbacks->data, xch, io_fd, dom, &info) ) @@ -2130,9 +2142,11 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter free(hvm_buf); outbuf_free(&ob_pagebuf); - DPRINTF("Save exit of domid %u with rc=%d\n", dom, rc); + errno = rc; +exit: + DPRINTF("Save exit of domid %u with errno=%d\n", dom, errno); - return !!rc; + return !!errno; } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:55:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:55:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4f-00039b-97; Fri, 14 Mar 2014 21:55:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4e-000398-1z for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:28 +0000 Received: from [193.109.254.147:8806] by server-8.bemta-14.messagelabs.com id 19/82-18529-FCA73235; Fri, 14 Mar 2014 21:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1394834125!1798346!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27837 invoked from network); 14 Mar 2014 21:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4b-0000ai-Bl for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa4b-0002Ea-A1 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:25 +0000 Date: Fri, 14 Mar 2014 21:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Add a "make rpmball" target X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b630217a570d13804642d25992762f59ab6ef7a1 Author: George Dunlap AuthorDate: Mon Mar 10 12:46:56 2014 +0000 Commit: Ian Jackson CommitDate: Tue Mar 11 11:42:04 2014 +0000 Add a "make rpmball" target Build a simplistic dummy package, similar to "make debball", for developers on rpm-based systems. [ Fixed some trailing whitespace -iwj ] Signed-off-by: George Dunlap CC: Ian Jackson CC: Ian Campbell CC: Dario Faggioli CC: Olaf Hering CC: Don Slutz CC: M A Young Tested-by: Don Slutz Acked-by: Ian Campbell --- Makefile | 7 +++++ tools/misc/mkrpm | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 4c5d1b6..91ca280 100644 --- a/Makefile +++ b/Makefile @@ -152,6 +152,13 @@ world: debball: dist fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory) +# Package a build in an rpmball file, that is inside a .rpm format +# container to allow for easy and clean removal. This is not intended +# to be a full featured policy compliant .rpm package. +.PHONY: rpmball +rpmball: dist + bash ./tools/misc/mkrpm $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory) + # clean doesn't do a kclean .PHONY: clean clean:: diff --git a/tools/misc/mkrpm b/tools/misc/mkrpm new file mode 100644 index 0000000..a9aa5e2 --- /dev/null +++ b/tools/misc/mkrpm @@ -0,0 +1,76 @@ +#!/bin/bash +# +# mkrpm: package the dist/install output of a Xen build in an .rpm +# +# Takes 2 arguments, the path to the dist directory and the version + +set -e + +if [[ -z "$1" || -z "$2" ]] ; then + echo "usage: $0 path-to-XEN_ROOT xen-version" + exit 1 +fi + +xenroot="$1" + +# rpmbuild doesn't like dashes in the version; break it down into +# version and release. Default to "0" if there isn't a release. +v=(${2/-/ }) +version=${v[0]} +release=${v[1]} + +[[ -n "$release" ]] || release="0" + +cd $xenroot + +# Prepare the directory to package +cd dist +rm -rf rpm + +# Fill in the rpm boilerplate +mkdir -p rpm/{BUILD,RPMS,SOURCES,SPECS,SRPMS} +cat >rpm/SPECS/xen.spec < Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:55:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4f-00039b-97; Fri, 14 Mar 2014 21:55:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4e-000398-1z for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:28 +0000 Received: from [193.109.254.147:8806] by server-8.bemta-14.messagelabs.com id 19/82-18529-FCA73235; Fri, 14 Mar 2014 21:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1394834125!1798346!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27837 invoked from network); 14 Mar 2014 21:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4b-0000ai-Bl for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa4b-0002Ea-A1 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:25 +0000 Date: Fri, 14 Mar 2014 21:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Add a "make rpmball" target X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b630217a570d13804642d25992762f59ab6ef7a1 Author: George Dunlap AuthorDate: Mon Mar 10 12:46:56 2014 +0000 Commit: Ian Jackson CommitDate: Tue Mar 11 11:42:04 2014 +0000 Add a "make rpmball" target Build a simplistic dummy package, similar to "make debball", for developers on rpm-based systems. [ Fixed some trailing whitespace -iwj ] Signed-off-by: George Dunlap CC: Ian Jackson CC: Ian Campbell CC: Dario Faggioli CC: Olaf Hering CC: Don Slutz CC: M A Young Tested-by: Don Slutz Acked-by: Ian Campbell --- Makefile | 7 +++++ tools/misc/mkrpm | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 4c5d1b6..91ca280 100644 --- a/Makefile +++ b/Makefile @@ -152,6 +152,13 @@ world: debball: dist fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory) +# Package a build in an rpmball file, that is inside a .rpm format +# container to allow for easy and clean removal. This is not intended +# to be a full featured policy compliant .rpm package. +.PHONY: rpmball +rpmball: dist + bash ./tools/misc/mkrpm $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory) + # clean doesn't do a kclean .PHONY: clean clean:: diff --git a/tools/misc/mkrpm b/tools/misc/mkrpm new file mode 100644 index 0000000..a9aa5e2 --- /dev/null +++ b/tools/misc/mkrpm @@ -0,0 +1,76 @@ +#!/bin/bash +# +# mkrpm: package the dist/install output of a Xen build in an .rpm +# +# Takes 2 arguments, the path to the dist directory and the version + +set -e + +if [[ -z "$1" || -z "$2" ]] ; then + echo "usage: $0 path-to-XEN_ROOT xen-version" + exit 1 +fi + +xenroot="$1" + +# rpmbuild doesn't like dashes in the version; break it down into +# version and release. Default to "0" if there isn't a release. +v=(${2/-/ }) +version=${v[0]} +release=${v[1]} + +[[ -n "$release" ]] || release="0" + +cd $xenroot + +# Prepare the directory to package +cd dist +rm -rf rpm + +# Fill in the rpm boilerplate +mkdir -p rpm/{BUILD,RPMS,SOURCES,SPECS,SRPMS} +cat >rpm/SPECS/xen.spec < Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:55:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4q-0003CX-D6; Fri, 14 Mar 2014 21:55:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4o-0003Bo-Mh for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:39 +0000 Received: from [193.109.254.147:59481] by server-1.bemta-14.messagelabs.com id 65/74-29588-ADA73235; Fri, 14 Mar 2014 21:55:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1394834135!1788884!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.5 required=7.0 tests=BODY_FWORD X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9331 invoked from network); 14 Mar 2014 21:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4l-0000ar-KW for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa4l-0002F0-FM for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:35 +0000 Date: Fri, 14 Mar 2014 21:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MTRR: consolidation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 999f631759383d121e0a96bf915505aa8d77aadd Author: Jan Beulich AuthorDate: Tue Mar 11 13:53:38 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 11 13:53:38 2014 +0100 x86/MTRR: consolidation - use a single set of manifest constants (the ones from msr-index.h) - drop unnecessary MSR index constants - get hvm_msr_{read,write}_intercept() in line with the rest of the MTRR emulation code regarding the number of emulated MTRRs - remove use of hardcoded numbers where expressions can be used (at once serving as documentation) - centrally check mtrr_state.have_fixed in get_fixed_ranges(), making unnecessary the cpu_has_mtrr check in mtrr_save_fixed_ranges Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/mtrr/generic.c | 77 +++++++++++++++++++-------------------- xen/arch/x86/cpu/mtrr/main.c | 2 +- xen/arch/x86/cpu/mtrr/mtrr.h | 18 --------- xen/arch/x86/hvm/hvm.c | 6 ++-- xen/arch/x86/hvm/mtrr.c | 22 ++++-------- xen/include/asm-x86/msr-index.h | 18 +-------- xen/include/asm-x86/mtrr.h | 8 ++++ 7 files changed, 59 insertions(+), 92 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c index aa5399b..bfb6675 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -11,15 +11,13 @@ #include #include "mtrr.h" -struct fixed_range_block { - int base_msr; /* start address of an MTRR block */ - int ranges; /* number of MTRRs in this block */ -}; - -static struct fixed_range_block fixed_range_blocks[] = { - { MTRRfix64K_00000_MSR, 1 }, /* one 64k MTRR */ - { MTRRfix16K_80000_MSR, 2 }, /* two 16k MTRRs */ - { MTRRfix4K_C0000_MSR, 8 }, /* eight 4k MTRRs */ +static const struct fixed_range_block { + uint32_t base_msr; /* start address of an MTRR block */ + unsigned int ranges; /* number of MTRRs in this block */ +} fixed_range_blocks[] = { + { MSR_MTRRfix64K_00000, (0x80000 - 0x00000) >> (16 + 3) }, + { MSR_MTRRfix16K_80000, (0xC0000 - 0x80000) >> (14 + 3) }, + { MSR_MTRRfix4K_C0000, (0x100000 - 0xC0000) >> (12 + 3) }, {} }; @@ -30,28 +28,30 @@ struct mtrr_state mtrr_state = {}; static void get_mtrr_var_range(unsigned int index, struct mtrr_var_range *vr) { - rdmsrl(MTRRphysBase_MSR(index), vr->base); - rdmsrl(MTRRphysMask_MSR(index), vr->mask); + rdmsrl(MSR_IA32_MTRR_PHYSBASE(index), vr->base); + rdmsrl(MSR_IA32_MTRR_PHYSMASK(index), vr->mask); } static void get_fixed_ranges(mtrr_type * frs) { uint64_t *p = (uint64_t *) frs; - int i; + const struct fixed_range_block *block; - rdmsrl(MTRRfix64K_00000_MSR, p[0]); + if (!mtrr_state.have_fixed) + return; - for (i = 0; i < 2; i++) - rdmsrl(MTRRfix16K_80000_MSR + i, p[1 + i]); - for (i = 0; i < 8; i++) - rdmsrl(MTRRfix4K_C0000_MSR + i, p[3 + i]); + for (block = fixed_range_blocks; block->ranges; ++block) { + unsigned int i; + + for (i = 0; i < block->ranges; ++i, ++p) + rdmsrl(block->base_msr + i, *p); + } } void mtrr_save_fixed_ranges(void *info) { - if (cpu_has_mtrr) - get_fixed_ranges(mtrr_state.fixed_ranges); + get_fixed_ranges(mtrr_state.fixed_ranges); } /* Grab all of the MTRR state for this CPU into *state */ @@ -69,20 +69,19 @@ void __init get_mtrr_state(void) } vrs = mtrr_state.var_ranges; - rdmsrl(MTRRcap_MSR, msr_content); + rdmsrl(MSR_MTRRcap, msr_content); mtrr_state.have_fixed = (msr_content >> 8) & 1; for (i = 0; i < num_var_ranges; i++) get_mtrr_var_range(i, &vrs[i]); - if (mtrr_state.have_fixed) - get_fixed_ranges(mtrr_state.fixed_ranges); + get_fixed_ranges(mtrr_state.fixed_ranges); - rdmsrl(MTRRdefType_MSR, msr_content); + rdmsrl(MSR_MTRRdefType, msr_content); mtrr_state.def_type = (msr_content & 0xff); mtrr_state.enabled = (msr_content & 0xc00) >> 10; /* Store mtrr_cap for HVM MTRR virtualisation. */ - rdmsrl(MTRRcap_MSR, mtrr_state.mtrr_cap); + rdmsrl(MSR_MTRRcap, mtrr_state.mtrr_cap); } /* Some BIOS's are fucked and don't set all MTRRs the same! */ @@ -163,8 +162,8 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base, { uint64_t _mask, _base; - rdmsrl(MTRRphysMask_MSR(reg), _mask); - if ((_mask & 0x800) == 0) { + rdmsrl(MSR_IA32_MTRR_PHYSMASK(reg), _mask); + if (!(_mask & MTRR_PHYSMASK_VALID)) { /* Invalid (i.e. free) range */ *base = 0; *size = 0; @@ -172,7 +171,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base, return; } - rdmsrl(MTRRphysBase_MSR(reg), _base); + rdmsrl(MSR_IA32_MTRR_PHYSBASE(reg), _base); /* Work out the shifted address mask. */ _mask = size_or_mask | (_mask >> PAGE_SHIFT); @@ -210,7 +209,7 @@ static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) uint64_t msr_content; int changed = FALSE; - rdmsrl(MTRRphysBase_MSR(index), msr_content); + rdmsrl(MSR_IA32_MTRR_PHYSBASE(index), msr_content); lo = (uint32_t)msr_content; hi = (uint32_t)(msr_content >> 32); base_lo = (uint32_t)vr->base; @@ -222,11 +221,11 @@ static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) base_hi &= size_and_mask >> (32 - PAGE_SHIFT); if ((base_lo != lo) || (base_hi != hi)) { - mtrr_wrmsr(MTRRphysBase_MSR(index), vr->base); + mtrr_wrmsr(MSR_IA32_MTRR_PHYSBASE(index), vr->base); changed = TRUE; } - rdmsrl(MTRRphysMask_MSR(index), msr_content); + rdmsrl(MSR_IA32_MTRR_PHYSMASK(index), msr_content); lo = (uint32_t)msr_content; hi = (uint32_t)(msr_content >> 32); mask_lo = (uint32_t)vr->mask; @@ -238,7 +237,7 @@ static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) mask_hi &= size_and_mask >> (32 - PAGE_SHIFT); if ((mask_lo != lo) || (mask_hi != hi)) { - mtrr_wrmsr(MTRRphysMask_MSR(index), vr->mask); + mtrr_wrmsr(MSR_IA32_MTRR_PHYSMASK(index), vr->mask); changed = TRUE; } return changed; @@ -311,10 +310,10 @@ static void prepare_set(void) flush_tlb_local(); /* Save MTRR state */ - rdmsrl(MTRRdefType_MSR, deftype); + rdmsrl(MSR_MTRRdefType, deftype); /* Disable MTRRs, and set the default type to uncached */ - mtrr_wrmsr(MTRRdefType_MSR, deftype & ~0xcff); + mtrr_wrmsr(MSR_MTRRdefType, deftype & ~0xcff); } static void post_set(void) @@ -323,7 +322,7 @@ static void post_set(void) flush_tlb_local(); /* Intel (P6) standard MTRRs */ - mtrr_wrmsr(MTRRdefType_MSR, deftype); + mtrr_wrmsr(MSR_MTRRdefType, deftype); /* Enable caches */ write_cr0(read_cr0() & 0xbfffffff); @@ -380,20 +379,20 @@ static void generic_set_mtrr(unsigned int reg, unsigned long base, if (size == 0) { /* The invalid bit is kept in the mask, so we simply clear the relevant mask register to disable a range. */ - mtrr_wrmsr(MTRRphysMask_MSR(reg), 0); + mtrr_wrmsr(MSR_IA32_MTRR_PHYSMASK(reg), 0); memset(vr, 0, sizeof(struct mtrr_var_range)); } else { uint32_t base_lo, base_hi, mask_lo, mask_hi; base_lo = base << PAGE_SHIFT | type; base_hi = (base & size_and_mask) >> (32 - PAGE_SHIFT); - mask_lo = -size << PAGE_SHIFT | 0x800; + mask_lo = (-size << PAGE_SHIFT) | MTRR_PHYSMASK_VALID; mask_hi = (-size & size_and_mask) >> (32 - PAGE_SHIFT); vr->base = ((uint64_t)base_hi << 32) | base_lo; vr->mask = ((uint64_t)mask_hi << 32) | mask_lo; - mtrr_wrmsr(MTRRphysBase_MSR(reg), vr->base); - mtrr_wrmsr(MTRRphysMask_MSR(reg), vr->mask); + mtrr_wrmsr(MSR_IA32_MTRR_PHYSBASE(reg), vr->base); + mtrr_wrmsr(MSR_IA32_MTRR_PHYSMASK(reg), vr->mask); } post_set(); @@ -438,7 +437,7 @@ int generic_validate_add_page(unsigned long base, unsigned long size, unsigned i static int generic_have_wrcomb(void) { unsigned long config; - rdmsrl(MTRRcap_MSR, config); + rdmsrl(MSR_MTRRcap, config); return (config & (1ULL << 10)); } diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c index f7fc0a6..f5d5317 100644 --- a/xen/arch/x86/cpu/mtrr/main.c +++ b/xen/arch/x86/cpu/mtrr/main.c @@ -91,7 +91,7 @@ static void __init set_num_var_ranges(void) unsigned long config = 0; if (use_intel()) { - rdmsrl(MTRRcap_MSR, config); + rdmsrl(MSR_MTRRcap, config); } else if (is_cpu(AMD)) config = 2; else if (is_cpu(CYRIX) || is_cpu(CENTAUR)) diff --git a/xen/arch/x86/cpu/mtrr/mtrr.h b/xen/arch/x86/cpu/mtrr/mtrr.h index a0ecdba..a9d6dcd 100644 --- a/xen/arch/x86/cpu/mtrr/mtrr.h +++ b/xen/arch/x86/cpu/mtrr/mtrr.h @@ -7,24 +7,6 @@ #define FALSE 0 #endif -#define MTRRcap_MSR 0x0fe -#define MTRRdefType_MSR 0x2ff - -#define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg)) -#define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1) - -#define MTRRfix64K_00000_MSR 0x250 -#define MTRRfix16K_80000_MSR 0x258 -#define MTRRfix16K_A0000_MSR 0x259 -#define MTRRfix4K_C0000_MSR 0x268 -#define MTRRfix4K_C8000_MSR 0x269 -#define MTRRfix4K_D0000_MSR 0x26a -#define MTRRfix4K_D8000_MSR 0x26b -#define MTRRfix4K_E0000_MSR 0x26c -#define MTRRfix4K_E8000_MSR 0x26d -#define MTRRfix4K_F0000_MSR 0x26e -#define MTRRfix4K_F8000_MSR 0x26f - #define MTRR_CHANGE_MASK_FIXED 0x01 #define MTRR_CHANGE_MASK_VARIABLE 0x02 #define MTRR_CHANGE_MASK_DEFTYPE 0x04 diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2fa5775..b4677d4 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3178,10 +3178,10 @@ int hvm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) index = msr - MSR_MTRRfix4K_C0000; *msr_content = fixed_range_base[index + 3]; break; - case MSR_IA32_MTRR_PHYSBASE0...MSR_IA32_MTRR_PHYSMASK7: + case MSR_IA32_MTRR_PHYSBASE(0)...MSR_IA32_MTRR_PHYSMASK(MTRR_VCNT-1): if ( !mtrr ) goto gp_fault; - index = msr - MSR_IA32_MTRR_PHYSBASE0; + index = msr - MSR_IA32_MTRR_PHYSBASE(0); *msr_content = var_range_base[index]; break; @@ -3305,7 +3305,7 @@ int hvm_msr_write_intercept(unsigned int msr, uint64_t msr_content) index, msr_content) ) goto gp_fault; break; - case MSR_IA32_MTRR_PHYSBASE0...MSR_IA32_MTRR_PHYSMASK7: + case MSR_IA32_MTRR_PHYSBASE(0)...MSR_IA32_MTRR_PHYSMASK(MTRR_VCNT-1): if ( !mtrr ) goto gp_fault; if ( !mtrr_var_range_msr_set(v->domain, &v->arch.hvm_vcpu.mtrr, diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 1eb3b27..6a358d5 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -88,7 +88,7 @@ static void get_mtrr_range(uint64_t base_msr, uint64_t mask_msr, uint32_t base_hi = (uint32_t)(base_msr >> 32); uint32_t size; - if ( (mask_lo & 0x800) == 0 ) + if ( !(mask_lo & MTRR_PHYSMASK_VALID) ) { /* Invalid (i.e. free) range */ *base = 0; @@ -143,16 +143,6 @@ bool_t is_var_mtrr_overlapped(struct mtrr_state *m) return 0; } -#define MTRR_PHYSMASK_VALID_BIT 11 -#define MTRR_PHYSMASK_SHIFT 12 - -#define MTRR_PHYSBASE_TYPE_MASK 0xff /* lowest 8 bits */ -#define MTRR_PHYSBASE_SHIFT 12 -#define MTRR_VCNT 8 - -#define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg)) -#define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1) - static int __init hvm_mtrr_pat_init(void) { unsigned int i, j, phys_addr; @@ -280,7 +270,7 @@ static uint8_t get_mtrr_type(struct mtrr_state *m, paddr_t pa) { phys_base = ((uint64_t*)m->var_ranges)[seg*2]; phys_mask = ((uint64_t*)m->var_ranges)[seg*2 + 1]; - if ( phys_mask & (1 << MTRR_PHYSMASK_VALID_BIT) ) + if ( phys_mask & MTRR_PHYSMASK_VALID ) { if ( ((uint64_t) pa & phys_mask) >> MTRR_PHYSMASK_SHIFT == (phys_base & phys_mask) >> MTRR_PHYSMASK_SHIFT ) @@ -477,7 +467,7 @@ bool_t mtrr_var_range_msr_set( uint64_t msr_mask; uint64_t *var_range_base = (uint64_t*)m->var_ranges; - index = msr - MSR_IA32_MTRR_PHYSBASE0; + index = msr - MSR_IA32_MTRR_PHYSBASE(0); if ( var_range_base[index] == msr_content ) return 1; @@ -683,9 +673,11 @@ static int hvm_load_mtrr_msr(struct domain *d, hvm_domain_context_t *h) for ( i = 0; i < MTRR_VCNT; i++ ) { mtrr_var_range_msr_set(d, mtrr_state, - MTRRphysBase_MSR(i), hw_mtrr.msr_mtrr_var[i*2]); + MSR_IA32_MTRR_PHYSBASE(i), + hw_mtrr.msr_mtrr_var[i * 2]); mtrr_var_range_msr_set(d, mtrr_state, - MTRRphysMask_MSR(i), hw_mtrr.msr_mtrr_var[i*2+1]); + MSR_IA32_MTRR_PHYSMASK(i), + hw_mtrr.msr_mtrr_var[i * 2 + 1]); } mtrr_def_type_msr_set(mtrr_state, hw_mtrr.msr_mtrr_def_type); diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 3269c43..ff86ed9 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -87,22 +87,8 @@ #define MSR_IA32_POWER_CTL 0x000001fc -#define MSR_IA32_MTRR_PHYSBASE0 0x00000200 -#define MSR_IA32_MTRR_PHYSMASK0 0x00000201 -#define MSR_IA32_MTRR_PHYSBASE1 0x00000202 -#define MSR_IA32_MTRR_PHYSMASK1 0x00000203 -#define MSR_IA32_MTRR_PHYSBASE2 0x00000204 -#define MSR_IA32_MTRR_PHYSMASK2 0x00000205 -#define MSR_IA32_MTRR_PHYSBASE3 0x00000206 -#define MSR_IA32_MTRR_PHYSMASK3 0x00000207 -#define MSR_IA32_MTRR_PHYSBASE4 0x00000208 -#define MSR_IA32_MTRR_PHYSMASK4 0x00000209 -#define MSR_IA32_MTRR_PHYSBASE5 0x0000020a -#define MSR_IA32_MTRR_PHYSMASK5 0x0000020b -#define MSR_IA32_MTRR_PHYSBASE6 0x0000020c -#define MSR_IA32_MTRR_PHYSMASK6 0x0000020d -#define MSR_IA32_MTRR_PHYSBASE7 0x0000020e -#define MSR_IA32_MTRR_PHYSMASK7 0x0000020f +#define MSR_IA32_MTRR_PHYSBASE(n) (0x00000200 + 2 * (n)) +#define MSR_IA32_MTRR_PHYSMASK(n) (0x00000201 + 2 * (n)) #define MSR_IA32_CR_PAT 0x00000277 #define MSR_IA32_CR_PAT_RESET 0x0007040600070406ULL diff --git a/xen/include/asm-x86/mtrr.h b/xen/include/asm-x86/mtrr.h index 6ef0e2d..c0afb4f 100644 --- a/xen/include/asm-x86/mtrr.h +++ b/xen/include/asm-x86/mtrr.h @@ -33,6 +33,14 @@ enum { an 8 bit field: */ typedef u8 mtrr_type; +#define MTRR_PHYSMASK_VALID_BIT 11 +#define MTRR_PHYSMASK_VALID (1 << MTRR_PHYSMASK_VALID_BIT) +#define MTRR_PHYSMASK_SHIFT 12 +#define MTRR_PHYSBASE_TYPE_MASK 0xff +#define MTRR_PHYSBASE_SHIFT 12 +/* Number of variable range MSR pairs we emulate for HVM guests: */ +#define MTRR_VCNT 8 + struct mtrr_var_range { uint64_t base; uint64_t mask; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:55:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:55:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4q-0003CX-D6; Fri, 14 Mar 2014 21:55:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4o-0003Bo-Mh for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:39 +0000 Received: from [193.109.254.147:59481] by server-1.bemta-14.messagelabs.com id 65/74-29588-ADA73235; Fri, 14 Mar 2014 21:55:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1394834135!1788884!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.5 required=7.0 tests=BODY_FWORD X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9331 invoked from network); 14 Mar 2014 21:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4l-0000ar-KW for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa4l-0002F0-FM for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:35 +0000 Date: Fri, 14 Mar 2014 21:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MTRR: consolidation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 999f631759383d121e0a96bf915505aa8d77aadd Author: Jan Beulich AuthorDate: Tue Mar 11 13:53:38 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 11 13:53:38 2014 +0100 x86/MTRR: consolidation - use a single set of manifest constants (the ones from msr-index.h) - drop unnecessary MSR index constants - get hvm_msr_{read,write}_intercept() in line with the rest of the MTRR emulation code regarding the number of emulated MTRRs - remove use of hardcoded numbers where expressions can be used (at once serving as documentation) - centrally check mtrr_state.have_fixed in get_fixed_ranges(), making unnecessary the cpu_has_mtrr check in mtrr_save_fixed_ranges Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/mtrr/generic.c | 77 +++++++++++++++++++-------------------- xen/arch/x86/cpu/mtrr/main.c | 2 +- xen/arch/x86/cpu/mtrr/mtrr.h | 18 --------- xen/arch/x86/hvm/hvm.c | 6 ++-- xen/arch/x86/hvm/mtrr.c | 22 ++++-------- xen/include/asm-x86/msr-index.h | 18 +-------- xen/include/asm-x86/mtrr.h | 8 ++++ 7 files changed, 59 insertions(+), 92 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c index aa5399b..bfb6675 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -11,15 +11,13 @@ #include #include "mtrr.h" -struct fixed_range_block { - int base_msr; /* start address of an MTRR block */ - int ranges; /* number of MTRRs in this block */ -}; - -static struct fixed_range_block fixed_range_blocks[] = { - { MTRRfix64K_00000_MSR, 1 }, /* one 64k MTRR */ - { MTRRfix16K_80000_MSR, 2 }, /* two 16k MTRRs */ - { MTRRfix4K_C0000_MSR, 8 }, /* eight 4k MTRRs */ +static const struct fixed_range_block { + uint32_t base_msr; /* start address of an MTRR block */ + unsigned int ranges; /* number of MTRRs in this block */ +} fixed_range_blocks[] = { + { MSR_MTRRfix64K_00000, (0x80000 - 0x00000) >> (16 + 3) }, + { MSR_MTRRfix16K_80000, (0xC0000 - 0x80000) >> (14 + 3) }, + { MSR_MTRRfix4K_C0000, (0x100000 - 0xC0000) >> (12 + 3) }, {} }; @@ -30,28 +28,30 @@ struct mtrr_state mtrr_state = {}; static void get_mtrr_var_range(unsigned int index, struct mtrr_var_range *vr) { - rdmsrl(MTRRphysBase_MSR(index), vr->base); - rdmsrl(MTRRphysMask_MSR(index), vr->mask); + rdmsrl(MSR_IA32_MTRR_PHYSBASE(index), vr->base); + rdmsrl(MSR_IA32_MTRR_PHYSMASK(index), vr->mask); } static void get_fixed_ranges(mtrr_type * frs) { uint64_t *p = (uint64_t *) frs; - int i; + const struct fixed_range_block *block; - rdmsrl(MTRRfix64K_00000_MSR, p[0]); + if (!mtrr_state.have_fixed) + return; - for (i = 0; i < 2; i++) - rdmsrl(MTRRfix16K_80000_MSR + i, p[1 + i]); - for (i = 0; i < 8; i++) - rdmsrl(MTRRfix4K_C0000_MSR + i, p[3 + i]); + for (block = fixed_range_blocks; block->ranges; ++block) { + unsigned int i; + + for (i = 0; i < block->ranges; ++i, ++p) + rdmsrl(block->base_msr + i, *p); + } } void mtrr_save_fixed_ranges(void *info) { - if (cpu_has_mtrr) - get_fixed_ranges(mtrr_state.fixed_ranges); + get_fixed_ranges(mtrr_state.fixed_ranges); } /* Grab all of the MTRR state for this CPU into *state */ @@ -69,20 +69,19 @@ void __init get_mtrr_state(void) } vrs = mtrr_state.var_ranges; - rdmsrl(MTRRcap_MSR, msr_content); + rdmsrl(MSR_MTRRcap, msr_content); mtrr_state.have_fixed = (msr_content >> 8) & 1; for (i = 0; i < num_var_ranges; i++) get_mtrr_var_range(i, &vrs[i]); - if (mtrr_state.have_fixed) - get_fixed_ranges(mtrr_state.fixed_ranges); + get_fixed_ranges(mtrr_state.fixed_ranges); - rdmsrl(MTRRdefType_MSR, msr_content); + rdmsrl(MSR_MTRRdefType, msr_content); mtrr_state.def_type = (msr_content & 0xff); mtrr_state.enabled = (msr_content & 0xc00) >> 10; /* Store mtrr_cap for HVM MTRR virtualisation. */ - rdmsrl(MTRRcap_MSR, mtrr_state.mtrr_cap); + rdmsrl(MSR_MTRRcap, mtrr_state.mtrr_cap); } /* Some BIOS's are fucked and don't set all MTRRs the same! */ @@ -163,8 +162,8 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base, { uint64_t _mask, _base; - rdmsrl(MTRRphysMask_MSR(reg), _mask); - if ((_mask & 0x800) == 0) { + rdmsrl(MSR_IA32_MTRR_PHYSMASK(reg), _mask); + if (!(_mask & MTRR_PHYSMASK_VALID)) { /* Invalid (i.e. free) range */ *base = 0; *size = 0; @@ -172,7 +171,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base, return; } - rdmsrl(MTRRphysBase_MSR(reg), _base); + rdmsrl(MSR_IA32_MTRR_PHYSBASE(reg), _base); /* Work out the shifted address mask. */ _mask = size_or_mask | (_mask >> PAGE_SHIFT); @@ -210,7 +209,7 @@ static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) uint64_t msr_content; int changed = FALSE; - rdmsrl(MTRRphysBase_MSR(index), msr_content); + rdmsrl(MSR_IA32_MTRR_PHYSBASE(index), msr_content); lo = (uint32_t)msr_content; hi = (uint32_t)(msr_content >> 32); base_lo = (uint32_t)vr->base; @@ -222,11 +221,11 @@ static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) base_hi &= size_and_mask >> (32 - PAGE_SHIFT); if ((base_lo != lo) || (base_hi != hi)) { - mtrr_wrmsr(MTRRphysBase_MSR(index), vr->base); + mtrr_wrmsr(MSR_IA32_MTRR_PHYSBASE(index), vr->base); changed = TRUE; } - rdmsrl(MTRRphysMask_MSR(index), msr_content); + rdmsrl(MSR_IA32_MTRR_PHYSMASK(index), msr_content); lo = (uint32_t)msr_content; hi = (uint32_t)(msr_content >> 32); mask_lo = (uint32_t)vr->mask; @@ -238,7 +237,7 @@ static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) mask_hi &= size_and_mask >> (32 - PAGE_SHIFT); if ((mask_lo != lo) || (mask_hi != hi)) { - mtrr_wrmsr(MTRRphysMask_MSR(index), vr->mask); + mtrr_wrmsr(MSR_IA32_MTRR_PHYSMASK(index), vr->mask); changed = TRUE; } return changed; @@ -311,10 +310,10 @@ static void prepare_set(void) flush_tlb_local(); /* Save MTRR state */ - rdmsrl(MTRRdefType_MSR, deftype); + rdmsrl(MSR_MTRRdefType, deftype); /* Disable MTRRs, and set the default type to uncached */ - mtrr_wrmsr(MTRRdefType_MSR, deftype & ~0xcff); + mtrr_wrmsr(MSR_MTRRdefType, deftype & ~0xcff); } static void post_set(void) @@ -323,7 +322,7 @@ static void post_set(void) flush_tlb_local(); /* Intel (P6) standard MTRRs */ - mtrr_wrmsr(MTRRdefType_MSR, deftype); + mtrr_wrmsr(MSR_MTRRdefType, deftype); /* Enable caches */ write_cr0(read_cr0() & 0xbfffffff); @@ -380,20 +379,20 @@ static void generic_set_mtrr(unsigned int reg, unsigned long base, if (size == 0) { /* The invalid bit is kept in the mask, so we simply clear the relevant mask register to disable a range. */ - mtrr_wrmsr(MTRRphysMask_MSR(reg), 0); + mtrr_wrmsr(MSR_IA32_MTRR_PHYSMASK(reg), 0); memset(vr, 0, sizeof(struct mtrr_var_range)); } else { uint32_t base_lo, base_hi, mask_lo, mask_hi; base_lo = base << PAGE_SHIFT | type; base_hi = (base & size_and_mask) >> (32 - PAGE_SHIFT); - mask_lo = -size << PAGE_SHIFT | 0x800; + mask_lo = (-size << PAGE_SHIFT) | MTRR_PHYSMASK_VALID; mask_hi = (-size & size_and_mask) >> (32 - PAGE_SHIFT); vr->base = ((uint64_t)base_hi << 32) | base_lo; vr->mask = ((uint64_t)mask_hi << 32) | mask_lo; - mtrr_wrmsr(MTRRphysBase_MSR(reg), vr->base); - mtrr_wrmsr(MTRRphysMask_MSR(reg), vr->mask); + mtrr_wrmsr(MSR_IA32_MTRR_PHYSBASE(reg), vr->base); + mtrr_wrmsr(MSR_IA32_MTRR_PHYSMASK(reg), vr->mask); } post_set(); @@ -438,7 +437,7 @@ int generic_validate_add_page(unsigned long base, unsigned long size, unsigned i static int generic_have_wrcomb(void) { unsigned long config; - rdmsrl(MTRRcap_MSR, config); + rdmsrl(MSR_MTRRcap, config); return (config & (1ULL << 10)); } diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c index f7fc0a6..f5d5317 100644 --- a/xen/arch/x86/cpu/mtrr/main.c +++ b/xen/arch/x86/cpu/mtrr/main.c @@ -91,7 +91,7 @@ static void __init set_num_var_ranges(void) unsigned long config = 0; if (use_intel()) { - rdmsrl(MTRRcap_MSR, config); + rdmsrl(MSR_MTRRcap, config); } else if (is_cpu(AMD)) config = 2; else if (is_cpu(CYRIX) || is_cpu(CENTAUR)) diff --git a/xen/arch/x86/cpu/mtrr/mtrr.h b/xen/arch/x86/cpu/mtrr/mtrr.h index a0ecdba..a9d6dcd 100644 --- a/xen/arch/x86/cpu/mtrr/mtrr.h +++ b/xen/arch/x86/cpu/mtrr/mtrr.h @@ -7,24 +7,6 @@ #define FALSE 0 #endif -#define MTRRcap_MSR 0x0fe -#define MTRRdefType_MSR 0x2ff - -#define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg)) -#define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1) - -#define MTRRfix64K_00000_MSR 0x250 -#define MTRRfix16K_80000_MSR 0x258 -#define MTRRfix16K_A0000_MSR 0x259 -#define MTRRfix4K_C0000_MSR 0x268 -#define MTRRfix4K_C8000_MSR 0x269 -#define MTRRfix4K_D0000_MSR 0x26a -#define MTRRfix4K_D8000_MSR 0x26b -#define MTRRfix4K_E0000_MSR 0x26c -#define MTRRfix4K_E8000_MSR 0x26d -#define MTRRfix4K_F0000_MSR 0x26e -#define MTRRfix4K_F8000_MSR 0x26f - #define MTRR_CHANGE_MASK_FIXED 0x01 #define MTRR_CHANGE_MASK_VARIABLE 0x02 #define MTRR_CHANGE_MASK_DEFTYPE 0x04 diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2fa5775..b4677d4 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3178,10 +3178,10 @@ int hvm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) index = msr - MSR_MTRRfix4K_C0000; *msr_content = fixed_range_base[index + 3]; break; - case MSR_IA32_MTRR_PHYSBASE0...MSR_IA32_MTRR_PHYSMASK7: + case MSR_IA32_MTRR_PHYSBASE(0)...MSR_IA32_MTRR_PHYSMASK(MTRR_VCNT-1): if ( !mtrr ) goto gp_fault; - index = msr - MSR_IA32_MTRR_PHYSBASE0; + index = msr - MSR_IA32_MTRR_PHYSBASE(0); *msr_content = var_range_base[index]; break; @@ -3305,7 +3305,7 @@ int hvm_msr_write_intercept(unsigned int msr, uint64_t msr_content) index, msr_content) ) goto gp_fault; break; - case MSR_IA32_MTRR_PHYSBASE0...MSR_IA32_MTRR_PHYSMASK7: + case MSR_IA32_MTRR_PHYSBASE(0)...MSR_IA32_MTRR_PHYSMASK(MTRR_VCNT-1): if ( !mtrr ) goto gp_fault; if ( !mtrr_var_range_msr_set(v->domain, &v->arch.hvm_vcpu.mtrr, diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 1eb3b27..6a358d5 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -88,7 +88,7 @@ static void get_mtrr_range(uint64_t base_msr, uint64_t mask_msr, uint32_t base_hi = (uint32_t)(base_msr >> 32); uint32_t size; - if ( (mask_lo & 0x800) == 0 ) + if ( !(mask_lo & MTRR_PHYSMASK_VALID) ) { /* Invalid (i.e. free) range */ *base = 0; @@ -143,16 +143,6 @@ bool_t is_var_mtrr_overlapped(struct mtrr_state *m) return 0; } -#define MTRR_PHYSMASK_VALID_BIT 11 -#define MTRR_PHYSMASK_SHIFT 12 - -#define MTRR_PHYSBASE_TYPE_MASK 0xff /* lowest 8 bits */ -#define MTRR_PHYSBASE_SHIFT 12 -#define MTRR_VCNT 8 - -#define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg)) -#define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1) - static int __init hvm_mtrr_pat_init(void) { unsigned int i, j, phys_addr; @@ -280,7 +270,7 @@ static uint8_t get_mtrr_type(struct mtrr_state *m, paddr_t pa) { phys_base = ((uint64_t*)m->var_ranges)[seg*2]; phys_mask = ((uint64_t*)m->var_ranges)[seg*2 + 1]; - if ( phys_mask & (1 << MTRR_PHYSMASK_VALID_BIT) ) + if ( phys_mask & MTRR_PHYSMASK_VALID ) { if ( ((uint64_t) pa & phys_mask) >> MTRR_PHYSMASK_SHIFT == (phys_base & phys_mask) >> MTRR_PHYSMASK_SHIFT ) @@ -477,7 +467,7 @@ bool_t mtrr_var_range_msr_set( uint64_t msr_mask; uint64_t *var_range_base = (uint64_t*)m->var_ranges; - index = msr - MSR_IA32_MTRR_PHYSBASE0; + index = msr - MSR_IA32_MTRR_PHYSBASE(0); if ( var_range_base[index] == msr_content ) return 1; @@ -683,9 +673,11 @@ static int hvm_load_mtrr_msr(struct domain *d, hvm_domain_context_t *h) for ( i = 0; i < MTRR_VCNT; i++ ) { mtrr_var_range_msr_set(d, mtrr_state, - MTRRphysBase_MSR(i), hw_mtrr.msr_mtrr_var[i*2]); + MSR_IA32_MTRR_PHYSBASE(i), + hw_mtrr.msr_mtrr_var[i * 2]); mtrr_var_range_msr_set(d, mtrr_state, - MTRRphysMask_MSR(i), hw_mtrr.msr_mtrr_var[i*2+1]); + MSR_IA32_MTRR_PHYSMASK(i), + hw_mtrr.msr_mtrr_var[i * 2 + 1]); } mtrr_def_type_msr_set(mtrr_state, hw_mtrr.msr_mtrr_def_type); diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 3269c43..ff86ed9 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -87,22 +87,8 @@ #define MSR_IA32_POWER_CTL 0x000001fc -#define MSR_IA32_MTRR_PHYSBASE0 0x00000200 -#define MSR_IA32_MTRR_PHYSMASK0 0x00000201 -#define MSR_IA32_MTRR_PHYSBASE1 0x00000202 -#define MSR_IA32_MTRR_PHYSMASK1 0x00000203 -#define MSR_IA32_MTRR_PHYSBASE2 0x00000204 -#define MSR_IA32_MTRR_PHYSMASK2 0x00000205 -#define MSR_IA32_MTRR_PHYSBASE3 0x00000206 -#define MSR_IA32_MTRR_PHYSMASK3 0x00000207 -#define MSR_IA32_MTRR_PHYSBASE4 0x00000208 -#define MSR_IA32_MTRR_PHYSMASK4 0x00000209 -#define MSR_IA32_MTRR_PHYSBASE5 0x0000020a -#define MSR_IA32_MTRR_PHYSMASK5 0x0000020b -#define MSR_IA32_MTRR_PHYSBASE6 0x0000020c -#define MSR_IA32_MTRR_PHYSMASK6 0x0000020d -#define MSR_IA32_MTRR_PHYSBASE7 0x0000020e -#define MSR_IA32_MTRR_PHYSMASK7 0x0000020f +#define MSR_IA32_MTRR_PHYSBASE(n) (0x00000200 + 2 * (n)) +#define MSR_IA32_MTRR_PHYSMASK(n) (0x00000201 + 2 * (n)) #define MSR_IA32_CR_PAT 0x00000277 #define MSR_IA32_CR_PAT_RESET 0x0007040600070406ULL diff --git a/xen/include/asm-x86/mtrr.h b/xen/include/asm-x86/mtrr.h index 6ef0e2d..c0afb4f 100644 --- a/xen/include/asm-x86/mtrr.h +++ b/xen/include/asm-x86/mtrr.h @@ -33,6 +33,14 @@ enum { an 8 bit field: */ typedef u8 mtrr_type; +#define MTRR_PHYSMASK_VALID_BIT 11 +#define MTRR_PHYSMASK_VALID (1 << MTRR_PHYSMASK_VALID_BIT) +#define MTRR_PHYSMASK_SHIFT 12 +#define MTRR_PHYSBASE_TYPE_MASK 0xff +#define MTRR_PHYSBASE_SHIFT 12 +/* Number of variable range MSR pairs we emulate for HVM guests: */ +#define MTRR_VCNT 8 + struct mtrr_var_range { uint64_t base; uint64_t mask; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:55:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:55:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4z-0003Ft-Ht; Fri, 14 Mar 2014 21:55:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4y-0003FQ-Jt for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:48 +0000 Received: from [85.158.139.211:51828] by server-11.bemta-5.messagelabs.com id 32/72-30804-3EA73235; Fri, 14 Mar 2014 21:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1394834146!1141083!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.5 required=7.0 tests=BODY_FWORD X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16301 invoked from network); 14 Mar 2014 21:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4v-0000ay-QC for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa4v-0002G5-P7 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:45 +0000 Date: Fri, 14 Mar 2014 21:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MTRR: optionally print boot time state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 819c084b29c7adcf0da9282c1a20f0dad9c18fed Author: Jan Beulich AuthorDate: Tue Mar 11 13:55:50 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 11 13:55:50 2014 +0100 x86/MTRR: optionally print boot time state ... helping diagnosing eventual issues. Taken from Linux, with quite a bit of cleanup. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- docs/misc/xen-command-line.markdown | 7 ++ xen/arch/x86/cpu/mtrr/generic.c | 104 +++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 0 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 15aa404..8261e1c 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -676,6 +676,13 @@ Specify if the MMConfig space should be enabled. Force Xen to (not) use PCI-MSI, even if ACPI FADT says otherwise. +### mtrr.show +> `= ` + +> Default: `false` + +Print boot time MTRR state (x86 only). + ### mwait-idle > `= ` diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c index bfb6675..493830b 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -84,11 +84,113 @@ void __init get_mtrr_state(void) rdmsrl(MSR_MTRRcap, mtrr_state.mtrr_cap); } +static bool_t __initdata mtrr_show; +boolean_param("mtrr.show", mtrr_show); + +static const char *__init mtrr_attrib_to_str(mtrr_type x) +{ + static const char __initconst strings[MTRR_NUM_TYPES][16] = + { + [0 ... MTRR_NUM_TYPES - 1] = "?", + [MTRR_TYPE_UNCACHABLE] = "uncachable", + [MTRR_TYPE_WRCOMB] = "write-combining", + [MTRR_TYPE_WRTHROUGH] = "write-through", + [MTRR_TYPE_WRPROT] = "write-protect", + [MTRR_TYPE_WRBACK] = "write-back", + }; + + return x < MTRR_NUM_TYPES ? strings[x] : "?"; +} + +static unsigned int __initdata last_fixed_start; +static unsigned int __initdata last_fixed_end; +static mtrr_type __initdata last_fixed_type; + +static void __init print_fixed_last(const char *level) +{ + if (!last_fixed_end) + return; + + printk("%s %05x-%05x %s\n", level, last_fixed_start, + last_fixed_end - 1, mtrr_attrib_to_str(last_fixed_type)); + + last_fixed_end = 0; +} + +static void __init update_fixed_last(unsigned int base, unsigned int end, + mtrr_type type) +{ + last_fixed_start = base; + last_fixed_end = end; + last_fixed_type = type; +} + +static void __init print_fixed(unsigned int base, unsigned int step, + const mtrr_type *types, const char *level) +{ + unsigned i; + + for (i = 0; i < 8; ++i, ++types, base += step) { + if (last_fixed_end == 0) { + update_fixed_last(base, base + step, *types); + continue; + } + if (last_fixed_end == base && last_fixed_type == *types) { + last_fixed_end = base + step; + continue; + } + /* new segments: gap or different type */ + print_fixed_last(level); + update_fixed_last(base, base + step, *types); + } +} + +static void __init print_mtrr_state(const char *level) +{ + unsigned int i; + int width; + + printk("%sMTRR default type: %s\n", level, + mtrr_attrib_to_str(mtrr_state.def_type)); + if (mtrr_state.have_fixed) { + const mtrr_type *fr = mtrr_state.fixed_ranges; + const struct fixed_range_block *block = fixed_range_blocks; + unsigned int base = 0, step = 0x10000; + + printk("%sMTRR fixed ranges %sabled:\n", level, + mtrr_state.enabled & 1 ? "en" : "dis"); + for (; block->ranges; ++block, step >>= 2) { + for (i = 0; i < block->ranges; ++i, fr += 8) { + print_fixed(base, step, fr, level); + base += 8 * step; + } + } + print_fixed_last(level); + } + printk("%sMTRR variable ranges %sabled:\n", level, + mtrr_state.enabled & 2 ? "en" : "dis"); + width = (paddr_bits - PAGE_SHIFT + 3) / 4; + + for (i = 0; i < num_var_ranges; ++i) { + if (mtrr_state.var_ranges[i].mask & MTRR_PHYSMASK_VALID) + printk("%s %u base %0*"PRIx64"000 mask %0*"PRIx64"000 %s\n", + level, i, + width, mtrr_state.var_ranges[i].base >> 12, + width, mtrr_state.var_ranges[i].mask >> 12, + mtrr_attrib_to_str(mtrr_state.var_ranges[i].base & + MTRR_PHYSBASE_TYPE_MASK)); + else + printk("%s %u disabled\n", level, i); + } +} + /* Some BIOS's are fucked and don't set all MTRRs the same! */ void __init mtrr_state_warn(void) { unsigned long mask = smp_changes_mask; + if (mtrr_show) + print_mtrr_state(mask ? KERN_WARNING : ""); if (!mask) return; if (mask & MTRR_CHANGE_MASK_FIXED) @@ -99,6 +201,8 @@ void __init mtrr_state_warn(void) printk(KERN_WARNING "mtrr: your CPUs had inconsistent MTRRdefType settings\n"); printk(KERN_INFO "mtrr: probably your BIOS does not setup all CPUs.\n"); printk(KERN_INFO "mtrr: corrected configuration.\n"); + if (!mtrr_show) + print_mtrr_state(KERN_INFO); } /* Doesn't attempt to pass an error out to MTRR users -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:55:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:55:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4z-0003Ft-Ht; Fri, 14 Mar 2014 21:55:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4y-0003FQ-Jt for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:48 +0000 Received: from [85.158.139.211:51828] by server-11.bemta-5.messagelabs.com id 32/72-30804-3EA73235; Fri, 14 Mar 2014 21:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1394834146!1141083!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.5 required=7.0 tests=BODY_FWORD X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16301 invoked from network); 14 Mar 2014 21:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa4v-0000ay-QC for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa4v-0002G5-P7 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:45 +0000 Date: Fri, 14 Mar 2014 21:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MTRR: optionally print boot time state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 819c084b29c7adcf0da9282c1a20f0dad9c18fed Author: Jan Beulich AuthorDate: Tue Mar 11 13:55:50 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 11 13:55:50 2014 +0100 x86/MTRR: optionally print boot time state ... helping diagnosing eventual issues. Taken from Linux, with quite a bit of cleanup. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- docs/misc/xen-command-line.markdown | 7 ++ xen/arch/x86/cpu/mtrr/generic.c | 104 +++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 0 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 15aa404..8261e1c 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -676,6 +676,13 @@ Specify if the MMConfig space should be enabled. Force Xen to (not) use PCI-MSI, even if ACPI FADT says otherwise. +### mtrr.show +> `= ` + +> Default: `false` + +Print boot time MTRR state (x86 only). + ### mwait-idle > `= ` diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c index bfb6675..493830b 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -84,11 +84,113 @@ void __init get_mtrr_state(void) rdmsrl(MSR_MTRRcap, mtrr_state.mtrr_cap); } +static bool_t __initdata mtrr_show; +boolean_param("mtrr.show", mtrr_show); + +static const char *__init mtrr_attrib_to_str(mtrr_type x) +{ + static const char __initconst strings[MTRR_NUM_TYPES][16] = + { + [0 ... MTRR_NUM_TYPES - 1] = "?", + [MTRR_TYPE_UNCACHABLE] = "uncachable", + [MTRR_TYPE_WRCOMB] = "write-combining", + [MTRR_TYPE_WRTHROUGH] = "write-through", + [MTRR_TYPE_WRPROT] = "write-protect", + [MTRR_TYPE_WRBACK] = "write-back", + }; + + return x < MTRR_NUM_TYPES ? strings[x] : "?"; +} + +static unsigned int __initdata last_fixed_start; +static unsigned int __initdata last_fixed_end; +static mtrr_type __initdata last_fixed_type; + +static void __init print_fixed_last(const char *level) +{ + if (!last_fixed_end) + return; + + printk("%s %05x-%05x %s\n", level, last_fixed_start, + last_fixed_end - 1, mtrr_attrib_to_str(last_fixed_type)); + + last_fixed_end = 0; +} + +static void __init update_fixed_last(unsigned int base, unsigned int end, + mtrr_type type) +{ + last_fixed_start = base; + last_fixed_end = end; + last_fixed_type = type; +} + +static void __init print_fixed(unsigned int base, unsigned int step, + const mtrr_type *types, const char *level) +{ + unsigned i; + + for (i = 0; i < 8; ++i, ++types, base += step) { + if (last_fixed_end == 0) { + update_fixed_last(base, base + step, *types); + continue; + } + if (last_fixed_end == base && last_fixed_type == *types) { + last_fixed_end = base + step; + continue; + } + /* new segments: gap or different type */ + print_fixed_last(level); + update_fixed_last(base, base + step, *types); + } +} + +static void __init print_mtrr_state(const char *level) +{ + unsigned int i; + int width; + + printk("%sMTRR default type: %s\n", level, + mtrr_attrib_to_str(mtrr_state.def_type)); + if (mtrr_state.have_fixed) { + const mtrr_type *fr = mtrr_state.fixed_ranges; + const struct fixed_range_block *block = fixed_range_blocks; + unsigned int base = 0, step = 0x10000; + + printk("%sMTRR fixed ranges %sabled:\n", level, + mtrr_state.enabled & 1 ? "en" : "dis"); + for (; block->ranges; ++block, step >>= 2) { + for (i = 0; i < block->ranges; ++i, fr += 8) { + print_fixed(base, step, fr, level); + base += 8 * step; + } + } + print_fixed_last(level); + } + printk("%sMTRR variable ranges %sabled:\n", level, + mtrr_state.enabled & 2 ? "en" : "dis"); + width = (paddr_bits - PAGE_SHIFT + 3) / 4; + + for (i = 0; i < num_var_ranges; ++i) { + if (mtrr_state.var_ranges[i].mask & MTRR_PHYSMASK_VALID) + printk("%s %u base %0*"PRIx64"000 mask %0*"PRIx64"000 %s\n", + level, i, + width, mtrr_state.var_ranges[i].base >> 12, + width, mtrr_state.var_ranges[i].mask >> 12, + mtrr_attrib_to_str(mtrr_state.var_ranges[i].base & + MTRR_PHYSBASE_TYPE_MASK)); + else + printk("%s %u disabled\n", level, i); + } +} + /* Some BIOS's are fucked and don't set all MTRRs the same! */ void __init mtrr_state_warn(void) { unsigned long mask = smp_changes_mask; + if (mtrr_show) + print_mtrr_state(mask ? KERN_WARNING : ""); if (!mask) return; if (mask & MTRR_CHANGE_MASK_FIXED) @@ -99,6 +201,8 @@ void __init mtrr_state_warn(void) printk(KERN_WARNING "mtrr: your CPUs had inconsistent MTRRdefType settings\n"); printk(KERN_INFO "mtrr: probably your BIOS does not setup all CPUs.\n"); printk(KERN_INFO "mtrr: corrected configuration.\n"); + if (!mtrr_show) + print_mtrr_state(KERN_INFO); } /* Doesn't attempt to pass an error out to MTRR users -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:56:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:56:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa59-0003Ip-Kq; Fri, 14 Mar 2014 21:55:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa58-0003II-Ew for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:58 +0000 Received: from [85.158.143.35:2294] by server-3.bemta-4.messagelabs.com id 4B/9E-13602-DEA73235; Fri, 14 Mar 2014 21:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1394834156!2211649!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28940 invoked from network); 14 Mar 2014 21:55:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:55:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa55-0000b3-VK for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa55-0002GR-U7 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:55 +0000 Date: Fri, 14 Mar 2014 21:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: call pit_init for pvh also X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c30c544b199f70eada597c7352cdcb44648f6dcd Author: Mukesh Rathor AuthorDate: Tue Mar 11 13:56:50 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 11 13:56:50 2014 +0100 pvh: call pit_init for pvh also During halt of a pvh guest, the guest may do speaker shutdown. This results in call to handle_speaker_io in xen. It will hang on the vpit spin lock because it has not been initialized. Since, pit_init is also called for both pv and hvm, the call is moved to a more generic place. Signed-off-by: Mukesh Rathor Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 9 +++++---- xen/arch/x86/hvm/hvm.c | 2 -- xen/arch/x86/hvm/i8254.c | 3 +-- xen/include/asm-x86/hvm/vpt.h | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index c42a079..0d563de 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -422,10 +422,6 @@ int vcpu_initialise(struct vcpu *v) /* PV guests by default have a 100Hz ticker. */ v->periodic_period = MILLISECS(10); - - /* PV guests get an emulated PIT too for video BIOSes to use. */ - if ( v->vcpu_id == 0 ) - pit_init(v, cpu_khz); } v->arch.schedule_tail = continue_nonidle_domain; @@ -579,6 +575,9 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) tsc_set_info(d, TSC_MODE_DEFAULT, 0UL, 0, 0); spin_lock_init(&d->arch.vtsc_lock); + /* PV/PVH guests get an emulated PIT too for video BIOSes to use. */ + pit_init(d, cpu_khz); + return 0; fail: @@ -1978,6 +1977,8 @@ int domain_relinquish_resources(struct domain *d) BUG(); } + pit_deinit(d); + if ( has_hvm_container_domain(d) ) hvm_domain_relinquish_resources(d); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b4677d4..9dd56f7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -650,7 +650,6 @@ void hvm_domain_relinquish_resources(struct domain *d) rtc_deinit(d); if ( d->vcpu != NULL && d->vcpu[0] != NULL ) { - pit_deinit(d); pmtimer_deinit(d); hpet_deinit(d); } @@ -1346,7 +1345,6 @@ int hvm_vcpu_initialise(struct vcpu *v) if ( v->vcpu_id == 0 ) { /* NB. All these really belong in hvm_domain_initialise(). */ - pit_init(v, cpu_khz); pmtimer_init(v); hpet_init(v); diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c index c0d6bc2..f7493b8 100644 --- a/xen/arch/x86/hvm/i8254.c +++ b/xen/arch/x86/hvm/i8254.c @@ -447,9 +447,8 @@ void pit_reset(struct domain *d) spin_unlock(&pit->lock); } -void pit_init(struct vcpu *v, unsigned long cpu_khz) +void pit_init(struct domain *d, unsigned long cpu_khz) { - struct domain *d = v->domain; PITState *pit = domain_vpit(d); spin_lock_init(&pit->lock); diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h index 7d62653..41159d8 100644 --- a/xen/include/asm-x86/hvm/vpt.h +++ b/xen/include/asm-x86/hvm/vpt.h @@ -176,7 +176,7 @@ void destroy_periodic_time(struct periodic_time *pt); int pv_pit_handler(int port, int data, int write); void pit_reset(struct domain *d); -void pit_init(struct vcpu *v, unsigned long cpu_khz); +void pit_init(struct domain *d, unsigned long cpu_khz); void pit_stop_channel0_irq(PITState * pit); void pit_deinit(struct domain *d); void rtc_init(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:56:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:56:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa59-0003Ip-Kq; Fri, 14 Mar 2014 21:55:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa58-0003II-Ew for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:58 +0000 Received: from [85.158.143.35:2294] by server-3.bemta-4.messagelabs.com id 4B/9E-13602-DEA73235; Fri, 14 Mar 2014 21:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1394834156!2211649!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28940 invoked from network); 14 Mar 2014 21:55:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:55:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa55-0000b3-VK for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa55-0002GR-U7 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:55:55 +0000 Date: Fri, 14 Mar 2014 21:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: call pit_init for pvh also X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c30c544b199f70eada597c7352cdcb44648f6dcd Author: Mukesh Rathor AuthorDate: Tue Mar 11 13:56:50 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 11 13:56:50 2014 +0100 pvh: call pit_init for pvh also During halt of a pvh guest, the guest may do speaker shutdown. This results in call to handle_speaker_io in xen. It will hang on the vpit spin lock because it has not been initialized. Since, pit_init is also called for both pv and hvm, the call is moved to a more generic place. Signed-off-by: Mukesh Rathor Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 9 +++++---- xen/arch/x86/hvm/hvm.c | 2 -- xen/arch/x86/hvm/i8254.c | 3 +-- xen/include/asm-x86/hvm/vpt.h | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index c42a079..0d563de 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -422,10 +422,6 @@ int vcpu_initialise(struct vcpu *v) /* PV guests by default have a 100Hz ticker. */ v->periodic_period = MILLISECS(10); - - /* PV guests get an emulated PIT too for video BIOSes to use. */ - if ( v->vcpu_id == 0 ) - pit_init(v, cpu_khz); } v->arch.schedule_tail = continue_nonidle_domain; @@ -579,6 +575,9 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) tsc_set_info(d, TSC_MODE_DEFAULT, 0UL, 0, 0); spin_lock_init(&d->arch.vtsc_lock); + /* PV/PVH guests get an emulated PIT too for video BIOSes to use. */ + pit_init(d, cpu_khz); + return 0; fail: @@ -1978,6 +1977,8 @@ int domain_relinquish_resources(struct domain *d) BUG(); } + pit_deinit(d); + if ( has_hvm_container_domain(d) ) hvm_domain_relinquish_resources(d); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b4677d4..9dd56f7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -650,7 +650,6 @@ void hvm_domain_relinquish_resources(struct domain *d) rtc_deinit(d); if ( d->vcpu != NULL && d->vcpu[0] != NULL ) { - pit_deinit(d); pmtimer_deinit(d); hpet_deinit(d); } @@ -1346,7 +1345,6 @@ int hvm_vcpu_initialise(struct vcpu *v) if ( v->vcpu_id == 0 ) { /* NB. All these really belong in hvm_domain_initialise(). */ - pit_init(v, cpu_khz); pmtimer_init(v); hpet_init(v); diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c index c0d6bc2..f7493b8 100644 --- a/xen/arch/x86/hvm/i8254.c +++ b/xen/arch/x86/hvm/i8254.c @@ -447,9 +447,8 @@ void pit_reset(struct domain *d) spin_unlock(&pit->lock); } -void pit_init(struct vcpu *v, unsigned long cpu_khz) +void pit_init(struct domain *d, unsigned long cpu_khz) { - struct domain *d = v->domain; PITState *pit = domain_vpit(d); spin_lock_init(&pit->lock); diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h index 7d62653..41159d8 100644 --- a/xen/include/asm-x86/hvm/vpt.h +++ b/xen/include/asm-x86/hvm/vpt.h @@ -176,7 +176,7 @@ void destroy_periodic_time(struct periodic_time *pt); int pv_pit_handler(int port, int data, int write); void pit_reset(struct domain *d); -void pit_init(struct vcpu *v, unsigned long cpu_khz); +void pit_init(struct domain *d, unsigned long cpu_khz); void pit_stop_channel0_irq(PITState * pit); void pit_deinit(struct domain *d); void rtc_init(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:56:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:56:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5J-0003Ly-Ri; Fri, 14 Mar 2014 21:56:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5I-0003LQ-Jb for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:08 +0000 Received: from [85.158.143.35:2584] by server-2.bemta-4.messagelabs.com id 3E/70-06539-7FA73235; Fri, 14 Mar 2014 21:56:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1394834166!2227249!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13548 invoked from network); 14 Mar 2014 21:56:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:56:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5G-0000bb-7T for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa5G-0002H1-3C for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:06 +0000 Date: Fri, 14 Mar 2014 21:56:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix typo in comment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d9fa12c46046fcf1ac80fa1527e432ea2a71538 Author: Ian Campbell AuthorDate: Tue Feb 18 10:49:03 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 13:20:10 2014 +0000 libxl: fix typo in comment Signed-off-by: Ian Campbell --- tools/libxl/libxl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 4c9cd64..b2c3015 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -51,7 +51,7 @@ * In the event that a change is required which cannot be made * backwards compatible in this manner a #define of the form * LIBXL_HAVE_ will always be added in order to make it - * possible to write applciations which build against any version of + * possible to write applications which build against any version of * libxl. Such changes are expected to be exceptional and used as a * last resort. The barrier for backporting such a change to a stable * branch will be very high. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:56:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:56:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5J-0003Ly-Ri; Fri, 14 Mar 2014 21:56:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5I-0003LQ-Jb for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:08 +0000 Received: from [85.158.143.35:2584] by server-2.bemta-4.messagelabs.com id 3E/70-06539-7FA73235; Fri, 14 Mar 2014 21:56:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1394834166!2227249!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13548 invoked from network); 14 Mar 2014 21:56:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:56:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5G-0000bb-7T for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa5G-0002H1-3C for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:06 +0000 Date: Fri, 14 Mar 2014 21:56:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix typo in comment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d9fa12c46046fcf1ac80fa1527e432ea2a71538 Author: Ian Campbell AuthorDate: Tue Feb 18 10:49:03 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 13:20:10 2014 +0000 libxl: fix typo in comment Signed-off-by: Ian Campbell --- tools/libxl/libxl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 4c9cd64..b2c3015 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -51,7 +51,7 @@ * In the event that a change is required which cannot be made * backwards compatible in this manner a #define of the form * LIBXL_HAVE_ will always be added in order to make it - * possible to write applciations which build against any version of + * possible to write applications which build against any version of * libxl. Such changes are expected to be exceptional and used as a * last resort. The barrier for backporting such a change to a stable * branch will be very high. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:56:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5e-0003Qo-3B; Fri, 14 Mar 2014 21:56:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5d-0003QV-1l for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:29 +0000 Received: from [193.109.254.147:29431] by server-10.bemta-14.messagelabs.com id EB/B1-10711-C0B73235; Fri, 14 Mar 2014 21:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1394834186!1826987!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1698 invoked from network); 14 Mar 2014 21:56:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5a-0000ce-Jd for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa5a-0002IB-He for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:26 +0000 Date: Fri, 14 Mar 2014 21:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: remove ia64 from kexec_and_kdump.txt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3c37fe7daf8a258b9b3ae2d097f019b0cb8f09cc Author: Olaf Hering AuthorDate: Thu Mar 6 17:13:46 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 13:34:40 2014 +0000 docs: remove ia64 from kexec_and_kdump.txt Signed-off-by: Olaf Hering Acked-by: David Vrabel Acked-by: Ian Jackson Acked-by: Ian Campbell --- docs/misc/kexec_and_kdump.txt | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/misc/kexec_and_kdump.txt b/docs/misc/kexec_and_kdump.txt index 9ec3fcc..2f93771 100644 --- a/docs/misc/kexec_and_kdump.txt +++ b/docs/misc/kexec_and_kdump.txt @@ -137,10 +137,9 @@ command line parameter to the Xen hypervisor. It has two forms: e.g. crashkernel=128M@256M Regardless of which of the two forms of the crashkernel command line you - use, the crash kernel region should appear in /proc/iomem on x86 or - /proc/iomem_machine on ia64. If it doesn't then either the crashkernel - parameter is missing, or for some reason the region couldn't be placed - - for instance because it is too large. + use, the crash kernel region should appear in /proc/iomem on x86. If it + doesn't then either the crashkernel parameter is missing, or for some + reason the region couldn't be placed - for instance because it is too large. # cat /proc/iomem ... @@ -179,8 +178,6 @@ On x86 systems the crash kernel may be either - Relocatability is controlled by the CONFIG_RELOCATABLE kernel compile configuration parameter. This option may not be available depending on the kernel version -On ia64 - Either a vmlinuz or vmlinux.gz image may be used 2. Execute -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:56:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5V-0003Oh-Uw; Fri, 14 Mar 2014 21:56:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5U-0003Nw-83 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:20 +0000 Received: from [85.158.137.68:17450] by server-6.bemta-3.messagelabs.com id 99/52-00470-30B73235; Fri, 14 Mar 2014 21:56:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1394834176!742194!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26941 invoked from network); 14 Mar 2014 21:56:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5Q-0000cS-D5 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa5Q-0002Hb-BY for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:16 +0000 Date: Fri, 14 Mar 2014 21:56:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: remove duplicate #includes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96a4cfade3d7d8634129b0cc94dd945d3de3a806 Author: Matthew Daley AuthorDate: Thu Dec 5 21:37:38 2013 +1300 Commit: Ian Campbell CommitDate: Wed Mar 12 13:26:15 2014 +0000 tools: remove duplicate #includes (From first party code; ie. not including tdb) Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/console/client/main.c | 1 - tools/libxc/xc_flask.c | 1 - tools/xcutils/xc_save.c | 1 - tools/xenstore/xenstored_domain.c | 1 - 4 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index 3242008..eb6a1a9 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #ifdef __sun__ #include diff --git a/tools/libxc/xc_flask.c b/tools/libxc/xc_flask.c index 255e4b0..bb117f7 100644 --- a/tools/libxc/xc_flask.c +++ b/tools/libxc/xc_flask.c @@ -27,7 +27,6 @@ #include #include #include -#include #define OCON_ISID 0 /* initial SIDs */ #define OCON_PIRQ 1 /* physical irqs */ diff --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c index 45ad0ce..ecf5444 100644 --- a/tools/xcutils/xc_save.c +++ b/tools/xcutils/xc_save.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index f7bbb03..6d0394d 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -22,7 +22,6 @@ #include #include #include -#include #include "utils.h" #include "talloc.h" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:56:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa60-0003VM-8W; Fri, 14 Mar 2014 21:56:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5y-0003V8-Sf for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:51 +0000 Received: from [85.158.139.211:55111] by server-17.bemta-5.messagelabs.com id 23/7A-09046-22B73235; Fri, 14 Mar 2014 21:56:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1394834207!1152320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31729 invoked from network); 14 Mar 2014 21:56:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:56:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5u-0000cn-Ts for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa5u-0002JY-Sh for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:46 +0000 Date: Fri, 14 Mar 2014 21:56:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: remove ia64 from stubdom X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8842e4869e5ed75c8b0313ae17459114e30a425b Author: Olaf Hering AuthorDate: Thu Mar 6 17:13:49 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 13:37:20 2014 +0000 stubdom: remove ia64 from stubdom Signed-off-by: Olaf Hering Acked-by: Ian Jackson Acked-by: Ian Campbell --- stubdom/Makefile | 3 --- stubdom/newlib.patch | 22 ---------------------- 2 files changed, 0 insertions(+), 25 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 19f2228..b1822b7 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -23,9 +23,6 @@ TARGET_CFLAGS=-mno-red-zone NEWLIB_CFLAGS+=-D_I386MACH_ALLOW_HW_INTERRUPTS STUBDOM_SUPPORTED=1 endif -ifeq ($(GNU_TARGET_ARCH), ia64) -TARGET_CFLAGS=-mconstant-gp -endif CROSS_ROOT=cross-root-$(GNU_TARGET_ARCH) CROSS_PREFIX=$(CURDIR)/$(CROSS_ROOT) diff --git a/stubdom/newlib.patch b/stubdom/newlib.patch index 733dc13..ee9b6f2 100644 --- a/stubdom/newlib.patch +++ b/stubdom/newlib.patch @@ -81,28 +81,6 @@ diff -u -p -r1.10 stdint.h Define the basic ia64 jump buffer -Index: newlib/libc/include/machine/setjmp.h -=================================================================== -RCS file: /cvs/src/src/newlib/libc/include/machine/setjmp.h,v -retrieving revision 1.34 -diff -u -p -r1.34 setjmp.h ---- newlib/libc/include/machine/setjmp.h 7 Nov 2007 21:42:24 -0000 1.34 -+++ newlib/libc/include/machine/setjmp.h 11 Jan 2008 18:10:43 -0000 -@@ -72,6 +72,11 @@ _BEGIN_STD_C - #define _JBLEN 8 - #endif - -+#ifdef __ia64__ -+#define _JBTYPE long -+#define _JBLEN 70 -+#endif -+ - #ifdef __i960__ - #define _JBLEN 35 - #endif - -In mini-os we use a dynamic reentrency buffer. - Index: newlib/libc/include/sys/config.h =================================================================== RCS file: /cvs/src/src/newlib/libc/include/sys/config.h,v -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:56:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5e-0003Qo-3B; Fri, 14 Mar 2014 21:56:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5d-0003QV-1l for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:29 +0000 Received: from [193.109.254.147:29431] by server-10.bemta-14.messagelabs.com id EB/B1-10711-C0B73235; Fri, 14 Mar 2014 21:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1394834186!1826987!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1698 invoked from network); 14 Mar 2014 21:56:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5a-0000ce-Jd for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa5a-0002IB-He for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:26 +0000 Date: Fri, 14 Mar 2014 21:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: remove ia64 from kexec_and_kdump.txt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3c37fe7daf8a258b9b3ae2d097f019b0cb8f09cc Author: Olaf Hering AuthorDate: Thu Mar 6 17:13:46 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 13:34:40 2014 +0000 docs: remove ia64 from kexec_and_kdump.txt Signed-off-by: Olaf Hering Acked-by: David Vrabel Acked-by: Ian Jackson Acked-by: Ian Campbell --- docs/misc/kexec_and_kdump.txt | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/misc/kexec_and_kdump.txt b/docs/misc/kexec_and_kdump.txt index 9ec3fcc..2f93771 100644 --- a/docs/misc/kexec_and_kdump.txt +++ b/docs/misc/kexec_and_kdump.txt @@ -137,10 +137,9 @@ command line parameter to the Xen hypervisor. It has two forms: e.g. crashkernel=128M@256M Regardless of which of the two forms of the crashkernel command line you - use, the crash kernel region should appear in /proc/iomem on x86 or - /proc/iomem_machine on ia64. If it doesn't then either the crashkernel - parameter is missing, or for some reason the region couldn't be placed - - for instance because it is too large. + use, the crash kernel region should appear in /proc/iomem on x86. If it + doesn't then either the crashkernel parameter is missing, or for some + reason the region couldn't be placed - for instance because it is too large. # cat /proc/iomem ... @@ -179,8 +178,6 @@ On x86 systems the crash kernel may be either - Relocatability is controlled by the CONFIG_RELOCATABLE kernel compile configuration parameter. This option may not be available depending on the kernel version -On ia64 - Either a vmlinuz or vmlinux.gz image may be used 2. Execute -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:56:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa60-0003VM-8W; Fri, 14 Mar 2014 21:56:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5y-0003V8-Sf for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:51 +0000 Received: from [85.158.139.211:55111] by server-17.bemta-5.messagelabs.com id 23/7A-09046-22B73235; Fri, 14 Mar 2014 21:56:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1394834207!1152320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31729 invoked from network); 14 Mar 2014 21:56:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:56:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5u-0000cn-Ts for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa5u-0002JY-Sh for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:46 +0000 Date: Fri, 14 Mar 2014 21:56:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: remove ia64 from stubdom X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8842e4869e5ed75c8b0313ae17459114e30a425b Author: Olaf Hering AuthorDate: Thu Mar 6 17:13:49 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 13:37:20 2014 +0000 stubdom: remove ia64 from stubdom Signed-off-by: Olaf Hering Acked-by: Ian Jackson Acked-by: Ian Campbell --- stubdom/Makefile | 3 --- stubdom/newlib.patch | 22 ---------------------- 2 files changed, 0 insertions(+), 25 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 19f2228..b1822b7 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -23,9 +23,6 @@ TARGET_CFLAGS=-mno-red-zone NEWLIB_CFLAGS+=-D_I386MACH_ALLOW_HW_INTERRUPTS STUBDOM_SUPPORTED=1 endif -ifeq ($(GNU_TARGET_ARCH), ia64) -TARGET_CFLAGS=-mconstant-gp -endif CROSS_ROOT=cross-root-$(GNU_TARGET_ARCH) CROSS_PREFIX=$(CURDIR)/$(CROSS_ROOT) diff --git a/stubdom/newlib.patch b/stubdom/newlib.patch index 733dc13..ee9b6f2 100644 --- a/stubdom/newlib.patch +++ b/stubdom/newlib.patch @@ -81,28 +81,6 @@ diff -u -p -r1.10 stdint.h Define the basic ia64 jump buffer -Index: newlib/libc/include/machine/setjmp.h -=================================================================== -RCS file: /cvs/src/src/newlib/libc/include/machine/setjmp.h,v -retrieving revision 1.34 -diff -u -p -r1.34 setjmp.h ---- newlib/libc/include/machine/setjmp.h 7 Nov 2007 21:42:24 -0000 1.34 -+++ newlib/libc/include/machine/setjmp.h 11 Jan 2008 18:10:43 -0000 -@@ -72,6 +72,11 @@ _BEGIN_STD_C - #define _JBLEN 8 - #endif - -+#ifdef __ia64__ -+#define _JBTYPE long -+#define _JBLEN 70 -+#endif -+ - #ifdef __i960__ - #define _JBLEN 35 - #endif - -In mini-os we use a dynamic reentrency buffer. - Index: newlib/libc/include/sys/config.h =================================================================== RCS file: /cvs/src/src/newlib/libc/include/sys/config.h,v -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:56:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5V-0003Oh-Uw; Fri, 14 Mar 2014 21:56:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5U-0003Nw-83 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:20 +0000 Received: from [85.158.137.68:17450] by server-6.bemta-3.messagelabs.com id 99/52-00470-30B73235; Fri, 14 Mar 2014 21:56:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1394834176!742194!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26941 invoked from network); 14 Mar 2014 21:56:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5Q-0000cS-D5 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa5Q-0002Hb-BY for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:16 +0000 Date: Fri, 14 Mar 2014 21:56:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: remove duplicate #includes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96a4cfade3d7d8634129b0cc94dd945d3de3a806 Author: Matthew Daley AuthorDate: Thu Dec 5 21:37:38 2013 +1300 Commit: Ian Campbell CommitDate: Wed Mar 12 13:26:15 2014 +0000 tools: remove duplicate #includes (From first party code; ie. not including tdb) Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/console/client/main.c | 1 - tools/libxc/xc_flask.c | 1 - tools/xcutils/xc_save.c | 1 - tools/xenstore/xenstored_domain.c | 1 - 4 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index 3242008..eb6a1a9 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #ifdef __sun__ #include diff --git a/tools/libxc/xc_flask.c b/tools/libxc/xc_flask.c index 255e4b0..bb117f7 100644 --- a/tools/libxc/xc_flask.c +++ b/tools/libxc/xc_flask.c @@ -27,7 +27,6 @@ #include #include #include -#include #define OCON_ISID 0 /* initial SIDs */ #define OCON_PIRQ 1 /* physical irqs */ diff --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c index 45ad0ce..ecf5444 100644 --- a/tools/xcutils/xc_save.c +++ b/tools/xcutils/xc_save.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index f7bbb03..6d0394d 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -22,7 +22,6 @@ #include #include #include -#include #include "utils.h" #include "talloc.h" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:56:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5p-0003TG-5o; Fri, 14 Mar 2014 21:56:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5n-0003Sk-9T for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:39 +0000 Received: from [85.158.143.35:52841] by server-1.bemta-4.messagelabs.com id D0/F7-09853-61B73235; Fri, 14 Mar 2014 21:56:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1394834197!2239325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15106 invoked from network); 14 Mar 2014 21:56:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5k-0000ck-PF for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa5k-0002JC-Nu for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:36 +0000 Date: Fri, 14 Mar 2014 21:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: remove ia64 from tmem-internals.html X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e54ce303aa1f5b1af2db4d73076387ffb884d2ab Author: Olaf Hering AuthorDate: Thu Mar 6 17:13:48 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 13:37:20 2014 +0000 docs: remove ia64 from tmem-internals.html Signed-off-by: Olaf Hering Acked-by: Ian Jackson Acked-by: Ian Campbell --- docs/misc/tmem-internals.html | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/docs/misc/tmem-internals.html b/docs/misc/tmem-internals.html index ccc34c3..2d8635d 100644 --- a/docs/misc/tmem-internals.html +++ b/docs/misc/tmem-internals.html @@ -728,13 +728,6 @@ However, the Xen heap is limited in size on 32-bit Xen so tmem did not work very well. There are still 32-bit ifdefs in some places in the code, but things may have bit-rotted so using tmem on a 32-bit Xen is not recommended. -

-IA-64 implementation. -The vast majority of the tmem -implementation is architecture-independent. -For tmem to run on Xen/ia64, it is believed that only one or two -routines needs to be written.(See the -#ifdef __ia64__ at cli_mfn_to_va().)

Known Issues

-- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:56:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5p-0003TG-5o; Fri, 14 Mar 2014 21:56:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5n-0003Sk-9T for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:39 +0000 Received: from [85.158.143.35:52841] by server-1.bemta-4.messagelabs.com id D0/F7-09853-61B73235; Fri, 14 Mar 2014 21:56:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1394834197!2239325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15106 invoked from network); 14 Mar 2014 21:56:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa5k-0000ck-PF for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa5k-0002JC-Nu for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:36 +0000 Date: Fri, 14 Mar 2014 21:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: remove ia64 from tmem-internals.html X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e54ce303aa1f5b1af2db4d73076387ffb884d2ab Author: Olaf Hering AuthorDate: Thu Mar 6 17:13:48 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 13:37:20 2014 +0000 docs: remove ia64 from tmem-internals.html Signed-off-by: Olaf Hering Acked-by: Ian Jackson Acked-by: Ian Campbell --- docs/misc/tmem-internals.html | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/docs/misc/tmem-internals.html b/docs/misc/tmem-internals.html index ccc34c3..2d8635d 100644 --- a/docs/misc/tmem-internals.html +++ b/docs/misc/tmem-internals.html @@ -728,13 +728,6 @@ However, the Xen heap is limited in size on 32-bit Xen so tmem did not work very well. There are still 32-bit ifdefs in some places in the code, but things may have bit-rotted so using tmem on a 32-bit Xen is not recommended. -

-IA-64 implementation. -The vast majority of the tmem -implementation is architecture-independent. -For tmem to run on Xen/ia64, it is believed that only one or two -routines needs to be written.(See the -#ifdef __ia64__ at cli_mfn_to_va().)

Known Issues

-- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:57:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:57:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa69-0003Ym-D0; Fri, 14 Mar 2014 21:57:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa67-0003Y2-H9 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:59 +0000 Received: from [85.158.143.35:53792] by server-1.bemta-4.messagelabs.com id 09/08-09853-A2B73235; Fri, 14 Mar 2014 21:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1394834217!2239361!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16064 invoked from network); 14 Mar 2014 21:56:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:56:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa65-0000cq-3X for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa65-0002Ju-2c for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:57 +0000 Date: Fri, 14 Mar 2014 21:56:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: remove ia64 from xg_private.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee114aeade942593734452cf1e0ec795da004544 Author: Olaf Hering AuthorDate: Thu Mar 6 17:13:50 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 13:37:20 2014 +0000 libxc: remove ia64 from xg_private.h Signed-off-by: Olaf Hering Acked-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/xg_private.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/libxc/xg_private.h b/tools/libxc/xg_private.h index 5ff2124..f5755fd 100644 --- a/tools/libxc/xg_private.h +++ b/tools/libxc/xg_private.h @@ -120,10 +120,6 @@ typedef uint64_t l4_pgentry_64_t; #define PAGE_SIZE_X86 (1UL << PAGE_SHIFT_X86) #define PAGE_MASK_X86 (~(PAGE_SIZE_X86-1)) -#define PAGE_SHIFT_IA64 14 -#define PAGE_SIZE_IA64 (1UL << PAGE_SHIFT_IA64) -#define PAGE_MASK_IA64 (~(PAGE_SIZE_IA64-1)) - #define ROUNDUP(_x,_w) (((unsigned long)(_x)+(1UL<<(_w))-1) & ~((1UL<<(_w))-1)) #define NRPAGES(x) (ROUNDUP(x, PAGE_SHIFT) >> PAGE_SHIFT) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:57:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:57:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa69-0003Ym-D0; Fri, 14 Mar 2014 21:57:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa67-0003Y2-H9 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:59 +0000 Received: from [85.158.143.35:53792] by server-1.bemta-4.messagelabs.com id 09/08-09853-A2B73235; Fri, 14 Mar 2014 21:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1394834217!2239361!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16064 invoked from network); 14 Mar 2014 21:56:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:56:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa65-0000cq-3X for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa65-0002Ju-2c for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:56:57 +0000 Date: Fri, 14 Mar 2014 21:56:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: remove ia64 from xg_private.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee114aeade942593734452cf1e0ec795da004544 Author: Olaf Hering AuthorDate: Thu Mar 6 17:13:50 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 13:37:20 2014 +0000 libxc: remove ia64 from xg_private.h Signed-off-by: Olaf Hering Acked-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/xg_private.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/libxc/xg_private.h b/tools/libxc/xg_private.h index 5ff2124..f5755fd 100644 --- a/tools/libxc/xg_private.h +++ b/tools/libxc/xg_private.h @@ -120,10 +120,6 @@ typedef uint64_t l4_pgentry_64_t; #define PAGE_SIZE_X86 (1UL << PAGE_SHIFT_X86) #define PAGE_MASK_X86 (~(PAGE_SIZE_X86-1)) -#define PAGE_SHIFT_IA64 14 -#define PAGE_SIZE_IA64 (1UL << PAGE_SHIFT_IA64) -#define PAGE_MASK_IA64 (~(PAGE_SIZE_IA64-1)) - #define ROUNDUP(_x,_w) (((unsigned long)(_x)+(1UL<<(_w))-1) & ~((1UL<<(_w))-1)) #define NRPAGES(x) (ROUNDUP(x, PAGE_SHIFT) >> PAGE_SHIFT) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:57:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:57:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6J-0003bu-Gk; Fri, 14 Mar 2014 21:57:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6H-0003bL-PW for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:09 +0000 Received: from [193.109.254.147:30708] by server-13.bemta-14.messagelabs.com id 80/9E-01226-53B73235; Fri, 14 Mar 2014 21:57:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1394834227!1811678!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7324 invoked from network); 14 Mar 2014 21:57:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:57:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6F-0000db-9Q for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa6F-0002KQ-7J for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:07 +0000 Date: Fri, 14 Mar 2014 21:57:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pygrub: remote ia64 from pygrub X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fdb0ebcfefbf6912ddd31f490ac723cfb1bc209a Author: Olaf Hering AuthorDate: Thu Mar 6 17:13:51 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 13:37:20 2014 +0000 pygrub: remote ia64 from pygrub Signed-off-by: Olaf Hering Acked-by: Ian Jackson Acked-by: Ian Campbell --- tools/pygrub/src/pygrub | 35 +++++++++++------------------------ 1 files changed, 11 insertions(+), 24 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index ee4e741..54fecee 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -360,11 +360,7 @@ class Grub: curline = len(img.lines) - 1 if self.isdone: - # Fix to allow pygrub command-line editing in Lilo bootloader (used by IA64) - if platform.machine() == 'ia64': - origimg.reset(img.lines, img.path) - else: - origimg.reset(img.lines) + origimg.reset(img.lines) def edit_line(self, line): self.screen.erase() @@ -416,25 +412,16 @@ class Grub: if not os.access(fn, os.R_OK): raise RuntimeError, "Unable to access %s" %(fn,) - if platform.machine() == 'ia64': - cfg_list = map(lambda x: (x,grub.LiloConf.LiloConfigFile), - # common distributions - ["/efi/debian/elilo.conf", "/efi/gentoo/elilo.conf", - "/efi/redflag/elilo.conf", "/efi/redhat/elilo.conf", - "/efi/SuSE/elilo.conf",] + - # fallbacks - ["/efi/boot/elilo.conf", "/elilo.conf",]) - else: - cfg_list = map(lambda x: (x,grub.GrubConf.Grub2ConfigFile), - ["/boot/grub/grub.cfg", "/grub/grub.cfg", - "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ - map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), - ["/boot/isolinux/isolinux.cfg", - "/boot/extlinux/extlinux.conf", - "/boot/extlinux.conf"]) + \ - map(lambda x: (x,grub.GrubConf.GrubConfigFile), - ["/boot/grub/menu.lst", "/boot/grub/grub.conf", - "/grub/menu.lst", "/grub/grub.conf"]) + cfg_list = map(lambda x: (x,grub.GrubConf.Grub2ConfigFile), + ["/boot/grub/grub.cfg", "/grub/grub.cfg", + "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ + map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), + ["/boot/isolinux/isolinux.cfg", + "/boot/extlinux/extlinux.conf", + "/boot/extlinux.conf"]) + \ + map(lambda x: (x,grub.GrubConf.GrubConfigFile), + ["/boot/grub/menu.lst", "/boot/grub/grub.conf", + "/grub/menu.lst", "/grub/grub.conf"]) if not fs: # set the config file and parse it -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:57:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:57:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6J-0003bu-Gk; Fri, 14 Mar 2014 21:57:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6H-0003bL-PW for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:09 +0000 Received: from [193.109.254.147:30708] by server-13.bemta-14.messagelabs.com id 80/9E-01226-53B73235; Fri, 14 Mar 2014 21:57:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1394834227!1811678!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7324 invoked from network); 14 Mar 2014 21:57:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:57:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6F-0000db-9Q for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa6F-0002KQ-7J for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:07 +0000 Date: Fri, 14 Mar 2014 21:57:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pygrub: remote ia64 from pygrub X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fdb0ebcfefbf6912ddd31f490ac723cfb1bc209a Author: Olaf Hering AuthorDate: Thu Mar 6 17:13:51 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 13:37:20 2014 +0000 pygrub: remote ia64 from pygrub Signed-off-by: Olaf Hering Acked-by: Ian Jackson Acked-by: Ian Campbell --- tools/pygrub/src/pygrub | 35 +++++++++++------------------------ 1 files changed, 11 insertions(+), 24 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index ee4e741..54fecee 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -360,11 +360,7 @@ class Grub: curline = len(img.lines) - 1 if self.isdone: - # Fix to allow pygrub command-line editing in Lilo bootloader (used by IA64) - if platform.machine() == 'ia64': - origimg.reset(img.lines, img.path) - else: - origimg.reset(img.lines) + origimg.reset(img.lines) def edit_line(self, line): self.screen.erase() @@ -416,25 +412,16 @@ class Grub: if not os.access(fn, os.R_OK): raise RuntimeError, "Unable to access %s" %(fn,) - if platform.machine() == 'ia64': - cfg_list = map(lambda x: (x,grub.LiloConf.LiloConfigFile), - # common distributions - ["/efi/debian/elilo.conf", "/efi/gentoo/elilo.conf", - "/efi/redflag/elilo.conf", "/efi/redhat/elilo.conf", - "/efi/SuSE/elilo.conf",] + - # fallbacks - ["/efi/boot/elilo.conf", "/elilo.conf",]) - else: - cfg_list = map(lambda x: (x,grub.GrubConf.Grub2ConfigFile), - ["/boot/grub/grub.cfg", "/grub/grub.cfg", - "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ - map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), - ["/boot/isolinux/isolinux.cfg", - "/boot/extlinux/extlinux.conf", - "/boot/extlinux.conf"]) + \ - map(lambda x: (x,grub.GrubConf.GrubConfigFile), - ["/boot/grub/menu.lst", "/boot/grub/grub.conf", - "/grub/menu.lst", "/grub/grub.conf"]) + cfg_list = map(lambda x: (x,grub.GrubConf.Grub2ConfigFile), + ["/boot/grub/grub.cfg", "/grub/grub.cfg", + "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ + map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), + ["/boot/isolinux/isolinux.cfg", + "/boot/extlinux/extlinux.conf", + "/boot/extlinux.conf"]) + \ + map(lambda x: (x,grub.GrubConf.GrubConfigFile), + ["/boot/grub/menu.lst", "/boot/grub/grub.conf", + "/grub/menu.lst", "/grub/grub.conf"]) if not fs: # set the config file and parse it -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:57:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:57:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6U-0003ej-JY; Fri, 14 Mar 2014 21:57:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6S-0003e4-Cr for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:20 +0000 Received: from [85.158.143.35:5144] by server-3.bemta-4.messagelabs.com id 1E/0F-13602-F3B73235; Fri, 14 Mar 2014 21:57:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1394834237!2193073!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8241 invoked from network); 14 Mar 2014 21:57:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:57:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6P-0000dh-Fo for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa6P-0002Ko-EF for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:17 +0000 Date: Fri, 14 Mar 2014 21:57:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xend: remove ia64 from xend sources X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a64586d20aa43169746978baa65a9cda8513131f Author: Olaf Hering AuthorDate: Thu Mar 6 17:13:52 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 13:37:21 2014 +0000 xend: remove ia64 from xend sources Signed-off-by: Olaf Hering Acked-by: Ian Jackson Acked-by: Ian Campbell --- tools/python/xen/xend/XendNode.py | 10 ------ tools/python/xen/xend/arch.py | 1 - tools/python/xen/xend/image.py | 56 -------------------------------- tools/python/xen/xend/server/pciif.py | 2 +- tools/xm-test/lib/XmTestLib/arch.py | 14 ++------ tools/xm-test/lib/XmTestReport/arch.py | 4 -- 6 files changed, 4 insertions(+), 83 deletions(-) diff --git a/tools/python/xen/xend/XendNode.py b/tools/python/xen/xend/XendNode.py index f16932c..a26383b 100644 --- a/tools/python/xen/xend/XendNode.py +++ b/tools/python/xen/xend/XendNode.py @@ -132,16 +132,6 @@ class XendNode: 'stepping' : cpuinfo[number]['stepping'], 'flags' : cpuinfo[number]['flags'], }) - elif arch.type == "ia64": - self.cpus[u].update( - { 'host' : self.uuid, - 'features' : cpu_features, - 'speed' : int(float(cpuinfo[number]['cpu MHz'])), - 'vendor' : cpuinfo[number]['vendor'], - 'modelname': cpuinfo[number]['family'], - 'stepping' : cpuinfo[number]['model'], - 'flags' : cpuinfo[number]['features'], - }) else: self.cpus[u].update( { 'host' : self.uuid, diff --git a/tools/python/xen/xend/arch.py b/tools/python/xen/xend/arch.py index 6d789d9..2af55e8 100644 --- a/tools/python/xen/xend/arch.py +++ b/tools/python/xen/xend/arch.py @@ -27,6 +27,5 @@ _types = { "x86_64": "x86", "amd64": "x86", "i86pc": "x86", - "ia64": "ia64", } type = _types.get(os.uname()[4], "unknown") diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index 832c168..54334ae 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -729,8 +729,6 @@ class LinuxImageHandler(ImageHandler): log.debug("features = %s", self.vm.getFeatures()) log.debug("flags = %d", self.flags) log.debug("superpages = %d", self.superpages) - if arch.type == "ia64": - log.debug("vhpt = %d", self.vhpt) return xc.linux_build(domid = self.vm.getDomid(), memsize = mem_mb, @@ -982,56 +980,6 @@ class HVMImageHandler(ImageHandler): return rc -class IA64_HVM_ImageHandler(HVMImageHandler): - - def configure(self, vmConfig): - HVMImageHandler.configure(self, vmConfig) - self.vhpt = int(vmConfig['platform'].get('vhpt', 0)) - self.vramsize = int(vmConfig['platform'].get('videoram',4)) * 1024 - - def buildDomain(self): - xc.nvram_init(self.vm.getName(), self.vm.getDomid()) - xc.hvm_set_param(self.vm.getDomid(), HVM_PARAM_VHPT_SIZE, self.vhpt) - if self.guest_os_type is not None: - xc.set_os_type(self.guest_os_type.lower(), self.vm.getDomid()) - return HVMImageHandler.buildDomain(self) - - def getRequiredAvailableMemory(self, mem_kb): - page_kb = 16 - # ROM size for guest firmware, io page, xenstore page - # buffer io page, buffer pio page and memmap info page - extra_pages = 1024 + 5 - mem_kb += extra_pages * page_kb - mem_kb += self.vramsize - return mem_kb - - def getRequiredInitialReservation(self): - return self.vm.getMemoryTarget() - - def getRequiredShadowMemory(self, shadow_mem_kb, maxmem_kb): - # Explicit shadow memory is not a concept - return 0 - - def getDeviceModelArgs(self, restore = False): - args = HVMImageHandler.getDeviceModelArgs(self, restore) - args = args + ([ "-m", "%s" % - (self.getRequiredInitialReservation() / 1024) ]) - return args - - def setCpuid(self): - # Guest CPUID configuration is not implemented yet. - return - -class IA64_Linux_ImageHandler(LinuxImageHandler): - - def configure(self, vmConfig): - LinuxImageHandler.configure(self, vmConfig) - self.vhpt = int(vmConfig['platform'].get('vhpt', 0)) - - def setCpuid(self): - # Guest CPUID configuration is not implemented yet. - return - class X86_HVM_ImageHandler(HVMImageHandler): def configure(self, vmConfig): @@ -1079,10 +1027,6 @@ class X86_Linux_ImageHandler(LinuxImageHandler): return rc _handlers = { - "ia64": { - "linux": IA64_Linux_ImageHandler, - "hvm": IA64_HVM_ImageHandler, - }, "x86": { "linux": X86_Linux_ImageHandler, "hvm": X86_HVM_ImageHandler, diff --git a/tools/python/xen/xend/server/pciif.py b/tools/python/xen/xend/server/pciif.py index 27c1b75..165953f 100644 --- a/tools/python/xen/xend/server/pciif.py +++ b/tools/python/xen/xend/server/pciif.py @@ -412,7 +412,7 @@ class PciController(DevController): ' the same guest with %s' raise VmError(err_msg % (f, dev.name)) elif dev.dev_type == DEV_TYPE_PCI: - if dev.bus == 0 or arch.type == "ia64": + if dev.bus == 0: if not dev.pci_af_flr: # We cope with this case by using the Dstate transition # method or some vendor specific methods for now. diff --git a/tools/xm-test/lib/XmTestLib/arch.py b/tools/xm-test/lib/XmTestLib/arch.py index d505cc0..f3d8455 100644 --- a/tools/xm-test/lib/XmTestLib/arch.py +++ b/tools/xm-test/lib/XmTestLib/arch.py @@ -39,16 +39,13 @@ def getRdPath(): return rdpath -# Begin: Intel ia32 and ia64 as well as AMD 32-bit and 64-bit processors +# Begin: Intel as well as AMD 32-bit and 64-bit processors def ia_checkBuffer(buffer): return def ia_minSafeMem(): return 32 -def ia64_minSafeMem(): - return 128 - def ia_getDeviceModel(): """Get the path to the device model based on the architecture reported in uname""" @@ -85,7 +82,7 @@ ia_HVMDefaults = {"memory" : 64, "serial" : "pty", "device_model" : ia_getDeviceModel(), } -# End : Intel ia32 and ia64 as well as AMD 32-bit and 64-bit processors +# End : Intel as well as AMD 32-bit and 64-bit processors """Convert from uname specification to a more general platform.""" _uname_to_arch_map = { @@ -94,12 +91,11 @@ _uname_to_arch_map = { "i586" : "x86", "i686" : "x86", "x86_64": "x86_64", - "ia64" : "ia64", } # Lookup current platform. _arch = _uname_to_arch_map.get(os.uname()[4], "Unknown") -if _arch == "x86" or _arch == "x86_64" or _arch == "ia64": +if _arch == "x86" or _arch == "x86_64": minSafeMem = ia_minSafeMem getDefaultKernel = ia_getDefaultKernel checkBuffer = ia_checkBuffer @@ -118,9 +114,5 @@ if _arch == "x86" or _arch == "x86_64" or _arch == "ia64": else: configDefaults['extra'] = clause - if _arch == "ia64": - minSafeMem = ia64_minSafeMem - configDefaults['memory'] = ia64_minSafeMem() - else: raise ValueError, "Unknown architecture!" diff --git a/tools/xm-test/lib/XmTestReport/arch.py b/tools/xm-test/lib/XmTestReport/arch.py index 920526d..b1f4bc8 100644 --- a/tools/xm-test/lib/XmTestReport/arch.py +++ b/tools/xm-test/lib/XmTestReport/arch.py @@ -29,7 +29,6 @@ _uname_to_arch_map = { "i586" : "x86", "i686" : "x86", "x86_64": "x86_64", - "ia64" : "ia64", } _arch = _uname_to_arch_map.get(os.uname()[4], "Unknown") @@ -39,8 +38,5 @@ if _arch == "x86": elif _arch == "x86_64": cpuValues = {"model_name" : "Unknown", "flags" : "Unknown"} -elif _arch == "ia64": - cpuValues = {"arch" : "Unknown", - "features" : "Unknown"} else: raise ValueError, "Unknown architecture!" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:57:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:57:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6U-0003ej-JY; Fri, 14 Mar 2014 21:57:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6S-0003e4-Cr for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:20 +0000 Received: from [85.158.143.35:5144] by server-3.bemta-4.messagelabs.com id 1E/0F-13602-F3B73235; Fri, 14 Mar 2014 21:57:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1394834237!2193073!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8241 invoked from network); 14 Mar 2014 21:57:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:57:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6P-0000dh-Fo for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa6P-0002Ko-EF for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:17 +0000 Date: Fri, 14 Mar 2014 21:57:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xend: remove ia64 from xend sources X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a64586d20aa43169746978baa65a9cda8513131f Author: Olaf Hering AuthorDate: Thu Mar 6 17:13:52 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 13:37:21 2014 +0000 xend: remove ia64 from xend sources Signed-off-by: Olaf Hering Acked-by: Ian Jackson Acked-by: Ian Campbell --- tools/python/xen/xend/XendNode.py | 10 ------ tools/python/xen/xend/arch.py | 1 - tools/python/xen/xend/image.py | 56 -------------------------------- tools/python/xen/xend/server/pciif.py | 2 +- tools/xm-test/lib/XmTestLib/arch.py | 14 ++------ tools/xm-test/lib/XmTestReport/arch.py | 4 -- 6 files changed, 4 insertions(+), 83 deletions(-) diff --git a/tools/python/xen/xend/XendNode.py b/tools/python/xen/xend/XendNode.py index f16932c..a26383b 100644 --- a/tools/python/xen/xend/XendNode.py +++ b/tools/python/xen/xend/XendNode.py @@ -132,16 +132,6 @@ class XendNode: 'stepping' : cpuinfo[number]['stepping'], 'flags' : cpuinfo[number]['flags'], }) - elif arch.type == "ia64": - self.cpus[u].update( - { 'host' : self.uuid, - 'features' : cpu_features, - 'speed' : int(float(cpuinfo[number]['cpu MHz'])), - 'vendor' : cpuinfo[number]['vendor'], - 'modelname': cpuinfo[number]['family'], - 'stepping' : cpuinfo[number]['model'], - 'flags' : cpuinfo[number]['features'], - }) else: self.cpus[u].update( { 'host' : self.uuid, diff --git a/tools/python/xen/xend/arch.py b/tools/python/xen/xend/arch.py index 6d789d9..2af55e8 100644 --- a/tools/python/xen/xend/arch.py +++ b/tools/python/xen/xend/arch.py @@ -27,6 +27,5 @@ _types = { "x86_64": "x86", "amd64": "x86", "i86pc": "x86", - "ia64": "ia64", } type = _types.get(os.uname()[4], "unknown") diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index 832c168..54334ae 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -729,8 +729,6 @@ class LinuxImageHandler(ImageHandler): log.debug("features = %s", self.vm.getFeatures()) log.debug("flags = %d", self.flags) log.debug("superpages = %d", self.superpages) - if arch.type == "ia64": - log.debug("vhpt = %d", self.vhpt) return xc.linux_build(domid = self.vm.getDomid(), memsize = mem_mb, @@ -982,56 +980,6 @@ class HVMImageHandler(ImageHandler): return rc -class IA64_HVM_ImageHandler(HVMImageHandler): - - def configure(self, vmConfig): - HVMImageHandler.configure(self, vmConfig) - self.vhpt = int(vmConfig['platform'].get('vhpt', 0)) - self.vramsize = int(vmConfig['platform'].get('videoram',4)) * 1024 - - def buildDomain(self): - xc.nvram_init(self.vm.getName(), self.vm.getDomid()) - xc.hvm_set_param(self.vm.getDomid(), HVM_PARAM_VHPT_SIZE, self.vhpt) - if self.guest_os_type is not None: - xc.set_os_type(self.guest_os_type.lower(), self.vm.getDomid()) - return HVMImageHandler.buildDomain(self) - - def getRequiredAvailableMemory(self, mem_kb): - page_kb = 16 - # ROM size for guest firmware, io page, xenstore page - # buffer io page, buffer pio page and memmap info page - extra_pages = 1024 + 5 - mem_kb += extra_pages * page_kb - mem_kb += self.vramsize - return mem_kb - - def getRequiredInitialReservation(self): - return self.vm.getMemoryTarget() - - def getRequiredShadowMemory(self, shadow_mem_kb, maxmem_kb): - # Explicit shadow memory is not a concept - return 0 - - def getDeviceModelArgs(self, restore = False): - args = HVMImageHandler.getDeviceModelArgs(self, restore) - args = args + ([ "-m", "%s" % - (self.getRequiredInitialReservation() / 1024) ]) - return args - - def setCpuid(self): - # Guest CPUID configuration is not implemented yet. - return - -class IA64_Linux_ImageHandler(LinuxImageHandler): - - def configure(self, vmConfig): - LinuxImageHandler.configure(self, vmConfig) - self.vhpt = int(vmConfig['platform'].get('vhpt', 0)) - - def setCpuid(self): - # Guest CPUID configuration is not implemented yet. - return - class X86_HVM_ImageHandler(HVMImageHandler): def configure(self, vmConfig): @@ -1079,10 +1027,6 @@ class X86_Linux_ImageHandler(LinuxImageHandler): return rc _handlers = { - "ia64": { - "linux": IA64_Linux_ImageHandler, - "hvm": IA64_HVM_ImageHandler, - }, "x86": { "linux": X86_Linux_ImageHandler, "hvm": X86_HVM_ImageHandler, diff --git a/tools/python/xen/xend/server/pciif.py b/tools/python/xen/xend/server/pciif.py index 27c1b75..165953f 100644 --- a/tools/python/xen/xend/server/pciif.py +++ b/tools/python/xen/xend/server/pciif.py @@ -412,7 +412,7 @@ class PciController(DevController): ' the same guest with %s' raise VmError(err_msg % (f, dev.name)) elif dev.dev_type == DEV_TYPE_PCI: - if dev.bus == 0 or arch.type == "ia64": + if dev.bus == 0: if not dev.pci_af_flr: # We cope with this case by using the Dstate transition # method or some vendor specific methods for now. diff --git a/tools/xm-test/lib/XmTestLib/arch.py b/tools/xm-test/lib/XmTestLib/arch.py index d505cc0..f3d8455 100644 --- a/tools/xm-test/lib/XmTestLib/arch.py +++ b/tools/xm-test/lib/XmTestLib/arch.py @@ -39,16 +39,13 @@ def getRdPath(): return rdpath -# Begin: Intel ia32 and ia64 as well as AMD 32-bit and 64-bit processors +# Begin: Intel as well as AMD 32-bit and 64-bit processors def ia_checkBuffer(buffer): return def ia_minSafeMem(): return 32 -def ia64_minSafeMem(): - return 128 - def ia_getDeviceModel(): """Get the path to the device model based on the architecture reported in uname""" @@ -85,7 +82,7 @@ ia_HVMDefaults = {"memory" : 64, "serial" : "pty", "device_model" : ia_getDeviceModel(), } -# End : Intel ia32 and ia64 as well as AMD 32-bit and 64-bit processors +# End : Intel as well as AMD 32-bit and 64-bit processors """Convert from uname specification to a more general platform.""" _uname_to_arch_map = { @@ -94,12 +91,11 @@ _uname_to_arch_map = { "i586" : "x86", "i686" : "x86", "x86_64": "x86_64", - "ia64" : "ia64", } # Lookup current platform. _arch = _uname_to_arch_map.get(os.uname()[4], "Unknown") -if _arch == "x86" or _arch == "x86_64" or _arch == "ia64": +if _arch == "x86" or _arch == "x86_64": minSafeMem = ia_minSafeMem getDefaultKernel = ia_getDefaultKernel checkBuffer = ia_checkBuffer @@ -118,9 +114,5 @@ if _arch == "x86" or _arch == "x86_64" or _arch == "ia64": else: configDefaults['extra'] = clause - if _arch == "ia64": - minSafeMem = ia64_minSafeMem - configDefaults['memory'] = ia64_minSafeMem() - else: raise ValueError, "Unknown architecture!" diff --git a/tools/xm-test/lib/XmTestReport/arch.py b/tools/xm-test/lib/XmTestReport/arch.py index 920526d..b1f4bc8 100644 --- a/tools/xm-test/lib/XmTestReport/arch.py +++ b/tools/xm-test/lib/XmTestReport/arch.py @@ -29,7 +29,6 @@ _uname_to_arch_map = { "i586" : "x86", "i686" : "x86", "x86_64": "x86_64", - "ia64" : "ia64", } _arch = _uname_to_arch_map.get(os.uname()[4], "Unknown") @@ -39,8 +38,5 @@ if _arch == "x86": elif _arch == "x86_64": cpuValues = {"model_name" : "Unknown", "flags" : "Unknown"} -elif _arch == "ia64": - cpuValues = {"arch" : "Unknown", - "features" : "Unknown"} else: raise ValueError, "Unknown architecture!" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:57:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:57:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6c-0003gY-NN; Fri, 14 Mar 2014 21:57:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6c-0003gN-71 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:30 +0000 Received: from [193.109.254.147:31288] by server-5.bemta-14.messagelabs.com id 72/EA-16688-94B73235; Fri, 14 Mar 2014 21:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1394834247!1811385!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18806 invoked from network); 14 Mar 2014 21:57:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:57:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6Z-0000dn-KU for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa6Z-0002LD-JW for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:27 +0000 Date: Fri, 14 Mar 2014 21:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: pass a struct pending_irq* as parameter to gic helper functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 635422bf756effeeb11fd8162a9b0ab4f92239eb Author: Stefano Stabellini AuthorDate: Tue Dec 17 16:16:37 2013 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 13:39:36 2014 +0000 xen/arm: pass a struct pending_irq* as parameter to gic helper functions gic_add_to_lr_pending and gic_set_lr should take a struct pending_irq* as parameter instead of the virtual_irq number and the priority separately and doing yet another irq_to_pending lookup. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 074624e..a607da3 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -614,11 +614,10 @@ int __init setup_dt_irq(const struct dt_irq *irq, struct irqaction *new) return rc; } -static inline void gic_set_lr(int lr, unsigned int virtual_irq, - unsigned int state, unsigned int priority) +static inline void gic_set_lr(int lr, struct pending_irq *p, + unsigned int state) { int maintenance_int = GICH_LR_MAINTENANCE_IRQ; - struct pending_irq *p = irq_to_pending(current, virtual_irq); BUG_ON(lr >= nr_lrs); BUG_ON(lr < 0); @@ -626,24 +625,23 @@ static inline void gic_set_lr(int lr, unsigned int virtual_irq, GICH[GICH_LR + lr] = state | maintenance_int | - ((priority >> 3) << GICH_LR_PRIORITY_SHIFT) | - ((virtual_irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); + ((p->priority >> 3) << GICH_LR_PRIORITY_SHIFT) | + ((p->irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); set_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); clear_bit(GIC_IRQ_GUEST_PENDING, &p->status); } -static inline void gic_add_to_lr_pending(struct vcpu *v, unsigned int irq, - unsigned int priority) +static inline void gic_add_to_lr_pending(struct vcpu *v, struct pending_irq *n) { - struct pending_irq *iter, *n = irq_to_pending(v, irq); + struct pending_irq *iter; if ( !list_empty(&n->lr_queue) ) return; list_for_each_entry ( iter, &v->arch.vgic.lr_pending, lr_queue ) { - if ( iter->priority > priority ) + if ( iter->priority > n->priority ) { list_add_tail(&n->lr_queue, &iter->lr_queue); return; @@ -676,12 +674,12 @@ void gic_set_guest_irq(struct vcpu *v, unsigned int virtual_irq, i = find_first_zero_bit(&this_cpu(lr_mask), nr_lrs); if (i < nr_lrs) { set_bit(i, &this_cpu(lr_mask)); - gic_set_lr(i, virtual_irq, state, priority); + gic_set_lr(i, irq_to_pending(v, virtual_irq), state); goto out; } } - gic_add_to_lr_pending(v, virtual_irq, priority); + gic_add_to_lr_pending(v, irq_to_pending(v, virtual_irq)); out: spin_unlock_irqrestore(&gic.lock, flags); @@ -700,7 +698,7 @@ static void gic_restore_pending_irqs(struct vcpu *v) if ( i >= nr_lrs ) return; spin_lock_irqsave(&gic.lock, flags); - gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); + gic_set_lr(i, p, GICH_LR_PENDING); list_del_init(&p->lr_queue); set_bit(i, &this_cpu(lr_mask)); spin_unlock_irqrestore(&gic.lock, flags); @@ -940,14 +938,14 @@ static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *r test_bit(GIC_IRQ_GUEST_ENABLED, &p->status)) { inflight = 1; - gic_add_to_lr_pending(v, virq, p->priority); + gic_add_to_lr_pending(v, p); } clear_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); if ( !list_empty(&v->arch.vgic.lr_pending) ) { p2 = list_entry(v->arch.vgic.lr_pending.next, typeof(*p2), lr_queue); - gic_set_lr(i, p2->irq, GICH_LR_PENDING, p2->priority); + gic_set_lr(i, p2, GICH_LR_PENDING); list_del_init(&p2->lr_queue); set_bit(i, &this_cpu(lr_mask)); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:57:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:57:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6c-0003gY-NN; Fri, 14 Mar 2014 21:57:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6c-0003gN-71 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:30 +0000 Received: from [193.109.254.147:31288] by server-5.bemta-14.messagelabs.com id 72/EA-16688-94B73235; Fri, 14 Mar 2014 21:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1394834247!1811385!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18806 invoked from network); 14 Mar 2014 21:57:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:57:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6Z-0000dn-KU for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa6Z-0002LD-JW for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:27 +0000 Date: Fri, 14 Mar 2014 21:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: pass a struct pending_irq* as parameter to gic helper functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 635422bf756effeeb11fd8162a9b0ab4f92239eb Author: Stefano Stabellini AuthorDate: Tue Dec 17 16:16:37 2013 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 13:39:36 2014 +0000 xen/arm: pass a struct pending_irq* as parameter to gic helper functions gic_add_to_lr_pending and gic_set_lr should take a struct pending_irq* as parameter instead of the virtual_irq number and the priority separately and doing yet another irq_to_pending lookup. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 074624e..a607da3 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -614,11 +614,10 @@ int __init setup_dt_irq(const struct dt_irq *irq, struct irqaction *new) return rc; } -static inline void gic_set_lr(int lr, unsigned int virtual_irq, - unsigned int state, unsigned int priority) +static inline void gic_set_lr(int lr, struct pending_irq *p, + unsigned int state) { int maintenance_int = GICH_LR_MAINTENANCE_IRQ; - struct pending_irq *p = irq_to_pending(current, virtual_irq); BUG_ON(lr >= nr_lrs); BUG_ON(lr < 0); @@ -626,24 +625,23 @@ static inline void gic_set_lr(int lr, unsigned int virtual_irq, GICH[GICH_LR + lr] = state | maintenance_int | - ((priority >> 3) << GICH_LR_PRIORITY_SHIFT) | - ((virtual_irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); + ((p->priority >> 3) << GICH_LR_PRIORITY_SHIFT) | + ((p->irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); set_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); clear_bit(GIC_IRQ_GUEST_PENDING, &p->status); } -static inline void gic_add_to_lr_pending(struct vcpu *v, unsigned int irq, - unsigned int priority) +static inline void gic_add_to_lr_pending(struct vcpu *v, struct pending_irq *n) { - struct pending_irq *iter, *n = irq_to_pending(v, irq); + struct pending_irq *iter; if ( !list_empty(&n->lr_queue) ) return; list_for_each_entry ( iter, &v->arch.vgic.lr_pending, lr_queue ) { - if ( iter->priority > priority ) + if ( iter->priority > n->priority ) { list_add_tail(&n->lr_queue, &iter->lr_queue); return; @@ -676,12 +674,12 @@ void gic_set_guest_irq(struct vcpu *v, unsigned int virtual_irq, i = find_first_zero_bit(&this_cpu(lr_mask), nr_lrs); if (i < nr_lrs) { set_bit(i, &this_cpu(lr_mask)); - gic_set_lr(i, virtual_irq, state, priority); + gic_set_lr(i, irq_to_pending(v, virtual_irq), state); goto out; } } - gic_add_to_lr_pending(v, virtual_irq, priority); + gic_add_to_lr_pending(v, irq_to_pending(v, virtual_irq)); out: spin_unlock_irqrestore(&gic.lock, flags); @@ -700,7 +698,7 @@ static void gic_restore_pending_irqs(struct vcpu *v) if ( i >= nr_lrs ) return; spin_lock_irqsave(&gic.lock, flags); - gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); + gic_set_lr(i, p, GICH_LR_PENDING); list_del_init(&p->lr_queue); set_bit(i, &this_cpu(lr_mask)); spin_unlock_irqrestore(&gic.lock, flags); @@ -940,14 +938,14 @@ static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *r test_bit(GIC_IRQ_GUEST_ENABLED, &p->status)) { inflight = 1; - gic_add_to_lr_pending(v, virq, p->priority); + gic_add_to_lr_pending(v, p); } clear_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); if ( !list_empty(&v->arch.vgic.lr_pending) ) { p2 = list_entry(v->arch.vgic.lr_pending.next, typeof(*p2), lr_queue); - gic_set_lr(i, p2->irq, GICH_LR_PENDING, p2->priority); + gic_set_lr(i, p2, GICH_LR_PENDING); list_del_init(&p2->lr_queue); set_bit(i, &this_cpu(lr_mask)); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:57:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:57:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6n-0003k4-QE; Fri, 14 Mar 2014 21:57:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6m-0003jL-N2 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:40 +0000 Received: from [85.158.143.35:55535] by server-1.bemta-4.messagelabs.com id DE/48-09853-45B73235; Fri, 14 Mar 2014 21:57:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1394834258!2218732!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27286 invoked from network); 14 Mar 2014 21:57:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6j-0000dt-Qr for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa6j-0002MP-OZ for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:37 +0000 Date: Fri, 14 Mar 2014 21:57:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm{32, 64}: fix section shift when mapping 2MB block in boot page table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d600fcea4995d3c842c1f11831dc54f1c58d4dd9 Author: Chen Baozi AuthorDate: Mon Feb 17 00:09:26 2014 +0800 Commit: Ian Campbell CommitDate: Wed Mar 12 13:45:17 2014 +0000 xen/arm{32, 64}: fix section shift when mapping 2MB block in boot page table Section shift for level-2 page table should be #21 rather than #20. Besides, since there are {FIRST,SECOND,THIRD}_SHIFT macros defined in asm/page.h, use these macros instead of hard-coded shift value. Signed-off-by: Chen Baozi Acked-by: Ian Campbell --- xen/arch/arm/arm32/head.S | 20 ++++++++++---------- xen/arch/arm/arm64/head.S | 26 +++++++++++++------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 96230ac..0110807 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -291,14 +291,14 @@ cpu_init_done: ldr r4, =boot_second add r4, r4, r10 /* r1 := paddr (boot_second) */ - lsr r2, r9, #20 /* Base address for 2MB mapping */ - lsl r2, r2, #20 + lsr r2, r9, #SECOND_SHIFT /* Base address for 2MB mapping */ + lsl r2, r2, #SECOND_SHIFT orr r2, r2, #PT_UPPER(MEM) /* r2:r3 := section map */ orr r2, r2, #PT_LOWER(MEM) /* ... map of vaddr(start) in boot_second */ ldr r1, =start - lsr r1, #18 /* Slot for vaddr(start) */ + lsr r1, #(SECOND_SHIFT - 3) /* Slot for vaddr(start) */ strd r2, r3, [r4, r1] /* Map vaddr(start) */ /* ... map of paddr(start) in boot_second */ @@ -307,7 +307,7 @@ cpu_init_done: * then the mapping was done in * boot_pgtable above */ - mov r1, r9, lsr #18 /* Slot for paddr(start) */ + mov r1, r9, lsr #(SECOND_SHIFT - 3) /* Slot for paddr(start) */ strd r2, r3, [r4, r1] /* Map Xen there */ 1: @@ -339,8 +339,8 @@ paging: /* Add UART to the fixmap table */ ldr r1, =xen_fixmap /* r1 := vaddr (xen_fixmap) */ mov r3, #0 - lsr r2, r11, #12 - lsl r2, r2, #12 /* 4K aligned paddr of UART */ + lsr r2, r11, #THIRD_SHIFT + lsl r2, r2, #THIRD_SHIFT /* 4K aligned paddr of UART */ orr r2, r2, #PT_UPPER(DEV_L3) orr r2, r2, #PT_LOWER(DEV_L3) /* r2:r3 := 4K dev map including UART */ strd r2, r3, [r1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ @@ -353,7 +353,7 @@ paging: orr r2, r2, #PT_UPPER(PT) orr r2, r2, #PT_LOWER(PT) /* r2:r3 := table map of xen_fixmap */ ldr r4, =FIXMAP_ADDR(0) - mov r4, r4, lsr #18 /* r4 := Slot for FIXMAP(0) */ + mov r4, r4, lsr #(SECOND_SHIFT - 3) /* r4 := Slot for FIXMAP(0) */ strd r2, r3, [r1, r4] /* Map it in the fixmap's slot */ /* Use a virtual address to access the UART. */ @@ -365,12 +365,12 @@ paging: ldr r1, =boot_second mov r3, #0x0 - lsr r2, r8, #21 - lsl r2, r2, #21 /* r2: 2MB-aligned paddr of DTB */ + lsr r2, r8, #SECOND_SHIFT + lsl r2, r2, #SECOND_SHIFT /* r2: 2MB-aligned paddr of DTB */ orr r2, r2, #PT_UPPER(MEM) orr r2, r2, #PT_LOWER(MEM) /* r2:r3 := 2MB RAM incl. DTB */ ldr r4, =BOOT_FDT_VIRT_START - mov r4, r4, lsr #18 /* Slot for BOOT_FDT_VIRT_START */ + mov r4, r4, lsr #(SECOND_SHIFT - 3) /* Slot for BOOT_FDT_VIRT_START */ strd r2, r3, [r1, r4] /* Map it in the early fdt slot */ dsb 1: diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 31afdd0..6f80db2 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -289,11 +289,11 @@ skip_bss: str x2, [x4, #0] /* Map it in slot 0 */ /* ... map of paddr(start) in boot_first */ - lsr x2, x19, #30 /* x2 := Offset of base paddr in boot_first */ + lsr x2, x19, #FIRST_SHIFT /* x2 := Offset of base paddr in boot_first */ and x1, x2, 0x1ff /* x1 := Slot to use */ cbz x1, 1f /* It's in slot 0, map in boot_second */ - lsl x2, x2, #30 /* Base address for 1GB mapping */ + lsl x2, x2, #FIRST_SHIFT /* Base address for 1GB mapping */ mov x3, #PT_MEM /* x2 := Section map */ orr x2, x2, x3 lsl x1, x1, #3 /* x1 := Slot offset */ @@ -303,23 +303,23 @@ skip_bss: ldr x4, =boot_second add x4, x4, x20 /* x4 := paddr (boot_second) */ - lsr x2, x19, #20 /* Base address for 2MB mapping */ - lsl x2, x2, #20 + lsr x2, x19, #SECOND_SHIFT /* Base address for 2MB mapping */ + lsl x2, x2, #SECOND_SHIFT mov x3, #PT_MEM /* x2 := Section map */ orr x2, x2, x3 /* ... map of vaddr(start) in boot_second */ ldr x1, =start - lsr x1, x1, #18 /* Slot for vaddr(start) */ + lsr x1, x1, #(SECOND_SHIFT - 3) /* Slot for vaddr(start) */ str x2, [x4, x1] /* Map vaddr(start) */ /* ... map of paddr(start) in boot_second */ - lsr x1, x19, #30 /* Base paddr */ + lsr x1, x19, #FIRST_SHIFT /* Base paddr */ cbnz x1, 1f /* If paddr(start) is not in slot 0 * then the mapping was done in * boot_pgtable or boot_first above */ - lsr x1, x19, #18 /* Slot for paddr(start) */ + lsr x1, x19, #(SECOND_SHIFT - 3) /* Slot for paddr(start) */ str x2, [x4, x1] /* Map Xen there */ 1: @@ -351,8 +351,8 @@ paging: /* Add UART to the fixmap table */ ldr x1, =xen_fixmap add x1, x1, x20 /* x1 := paddr (xen_fixmap) */ - lsr x2, x23, #12 - lsl x2, x2, #12 /* 4K aligned paddr of UART */ + lsr x2, x23, #THIRD_SHIFT + lsl x2, x2, #THIRD_SHIFT /* 4K aligned paddr of UART */ mov x3, #PT_DEV_L3 orr x2, x2, x3 /* x2 := 4K dev map including UART */ str x2, [x1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ @@ -365,7 +365,7 @@ paging: mov x3, #PT_PT orr x2, x2, x3 /* x2 := table map of xen_fixmap */ ldr x1, =FIXMAP_ADDR(0) - lsr x1, x1, #18 /* x1 := Slot for FIXMAP(0) */ + lsr x1, x1, #(SECOND_SHIFT - 3) /* x1 := Slot for FIXMAP(0) */ str x2, [x4, x1] /* Map it in the fixmap's slot */ /* Use a virtual address to access the UART. */ @@ -375,12 +375,12 @@ paging: /* Map the DTB in the boot misc slot */ cbnz x22, 1f /* Only on boot CPU */ - lsr x2, x21, #21 - lsl x2, x2, #21 /* x2 := 2MB-aligned paddr of DTB */ + lsr x2, x21, #SECOND_SHIFT + lsl x2, x2, #SECOND_SHIFT /* x2 := 2MB-aligned paddr of DTB */ mov x3, #PT_MEM /* x2 := 2MB RAM incl. DTB */ orr x2, x2, x3 ldr x1, =BOOT_FDT_VIRT_START - lsr x1, x1, #18 /* x4 := Slot for BOOT_FDT_VIRT_START */ + lsr x1, x1, #(SECOND_SHIFT - 3) /* x4 := Slot for BOOT_FDT_VIRT_START */ str x2, [x4, x1] /* Map it in the early fdt slot */ dsb sy 1: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:57:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:57:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6n-0003k4-QE; Fri, 14 Mar 2014 21:57:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6m-0003jL-N2 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:40 +0000 Received: from [85.158.143.35:55535] by server-1.bemta-4.messagelabs.com id DE/48-09853-45B73235; Fri, 14 Mar 2014 21:57:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1394834258!2218732!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27286 invoked from network); 14 Mar 2014 21:57:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6j-0000dt-Qr for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa6j-0002MP-OZ for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:37 +0000 Date: Fri, 14 Mar 2014 21:57:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm{32, 64}: fix section shift when mapping 2MB block in boot page table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d600fcea4995d3c842c1f11831dc54f1c58d4dd9 Author: Chen Baozi AuthorDate: Mon Feb 17 00:09:26 2014 +0800 Commit: Ian Campbell CommitDate: Wed Mar 12 13:45:17 2014 +0000 xen/arm{32, 64}: fix section shift when mapping 2MB block in boot page table Section shift for level-2 page table should be #21 rather than #20. Besides, since there are {FIRST,SECOND,THIRD}_SHIFT macros defined in asm/page.h, use these macros instead of hard-coded shift value. Signed-off-by: Chen Baozi Acked-by: Ian Campbell --- xen/arch/arm/arm32/head.S | 20 ++++++++++---------- xen/arch/arm/arm64/head.S | 26 +++++++++++++------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 96230ac..0110807 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -291,14 +291,14 @@ cpu_init_done: ldr r4, =boot_second add r4, r4, r10 /* r1 := paddr (boot_second) */ - lsr r2, r9, #20 /* Base address for 2MB mapping */ - lsl r2, r2, #20 + lsr r2, r9, #SECOND_SHIFT /* Base address for 2MB mapping */ + lsl r2, r2, #SECOND_SHIFT orr r2, r2, #PT_UPPER(MEM) /* r2:r3 := section map */ orr r2, r2, #PT_LOWER(MEM) /* ... map of vaddr(start) in boot_second */ ldr r1, =start - lsr r1, #18 /* Slot for vaddr(start) */ + lsr r1, #(SECOND_SHIFT - 3) /* Slot for vaddr(start) */ strd r2, r3, [r4, r1] /* Map vaddr(start) */ /* ... map of paddr(start) in boot_second */ @@ -307,7 +307,7 @@ cpu_init_done: * then the mapping was done in * boot_pgtable above */ - mov r1, r9, lsr #18 /* Slot for paddr(start) */ + mov r1, r9, lsr #(SECOND_SHIFT - 3) /* Slot for paddr(start) */ strd r2, r3, [r4, r1] /* Map Xen there */ 1: @@ -339,8 +339,8 @@ paging: /* Add UART to the fixmap table */ ldr r1, =xen_fixmap /* r1 := vaddr (xen_fixmap) */ mov r3, #0 - lsr r2, r11, #12 - lsl r2, r2, #12 /* 4K aligned paddr of UART */ + lsr r2, r11, #THIRD_SHIFT + lsl r2, r2, #THIRD_SHIFT /* 4K aligned paddr of UART */ orr r2, r2, #PT_UPPER(DEV_L3) orr r2, r2, #PT_LOWER(DEV_L3) /* r2:r3 := 4K dev map including UART */ strd r2, r3, [r1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ @@ -353,7 +353,7 @@ paging: orr r2, r2, #PT_UPPER(PT) orr r2, r2, #PT_LOWER(PT) /* r2:r3 := table map of xen_fixmap */ ldr r4, =FIXMAP_ADDR(0) - mov r4, r4, lsr #18 /* r4 := Slot for FIXMAP(0) */ + mov r4, r4, lsr #(SECOND_SHIFT - 3) /* r4 := Slot for FIXMAP(0) */ strd r2, r3, [r1, r4] /* Map it in the fixmap's slot */ /* Use a virtual address to access the UART. */ @@ -365,12 +365,12 @@ paging: ldr r1, =boot_second mov r3, #0x0 - lsr r2, r8, #21 - lsl r2, r2, #21 /* r2: 2MB-aligned paddr of DTB */ + lsr r2, r8, #SECOND_SHIFT + lsl r2, r2, #SECOND_SHIFT /* r2: 2MB-aligned paddr of DTB */ orr r2, r2, #PT_UPPER(MEM) orr r2, r2, #PT_LOWER(MEM) /* r2:r3 := 2MB RAM incl. DTB */ ldr r4, =BOOT_FDT_VIRT_START - mov r4, r4, lsr #18 /* Slot for BOOT_FDT_VIRT_START */ + mov r4, r4, lsr #(SECOND_SHIFT - 3) /* Slot for BOOT_FDT_VIRT_START */ strd r2, r3, [r1, r4] /* Map it in the early fdt slot */ dsb 1: diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 31afdd0..6f80db2 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -289,11 +289,11 @@ skip_bss: str x2, [x4, #0] /* Map it in slot 0 */ /* ... map of paddr(start) in boot_first */ - lsr x2, x19, #30 /* x2 := Offset of base paddr in boot_first */ + lsr x2, x19, #FIRST_SHIFT /* x2 := Offset of base paddr in boot_first */ and x1, x2, 0x1ff /* x1 := Slot to use */ cbz x1, 1f /* It's in slot 0, map in boot_second */ - lsl x2, x2, #30 /* Base address for 1GB mapping */ + lsl x2, x2, #FIRST_SHIFT /* Base address for 1GB mapping */ mov x3, #PT_MEM /* x2 := Section map */ orr x2, x2, x3 lsl x1, x1, #3 /* x1 := Slot offset */ @@ -303,23 +303,23 @@ skip_bss: ldr x4, =boot_second add x4, x4, x20 /* x4 := paddr (boot_second) */ - lsr x2, x19, #20 /* Base address for 2MB mapping */ - lsl x2, x2, #20 + lsr x2, x19, #SECOND_SHIFT /* Base address for 2MB mapping */ + lsl x2, x2, #SECOND_SHIFT mov x3, #PT_MEM /* x2 := Section map */ orr x2, x2, x3 /* ... map of vaddr(start) in boot_second */ ldr x1, =start - lsr x1, x1, #18 /* Slot for vaddr(start) */ + lsr x1, x1, #(SECOND_SHIFT - 3) /* Slot for vaddr(start) */ str x2, [x4, x1] /* Map vaddr(start) */ /* ... map of paddr(start) in boot_second */ - lsr x1, x19, #30 /* Base paddr */ + lsr x1, x19, #FIRST_SHIFT /* Base paddr */ cbnz x1, 1f /* If paddr(start) is not in slot 0 * then the mapping was done in * boot_pgtable or boot_first above */ - lsr x1, x19, #18 /* Slot for paddr(start) */ + lsr x1, x19, #(SECOND_SHIFT - 3) /* Slot for paddr(start) */ str x2, [x4, x1] /* Map Xen there */ 1: @@ -351,8 +351,8 @@ paging: /* Add UART to the fixmap table */ ldr x1, =xen_fixmap add x1, x1, x20 /* x1 := paddr (xen_fixmap) */ - lsr x2, x23, #12 - lsl x2, x2, #12 /* 4K aligned paddr of UART */ + lsr x2, x23, #THIRD_SHIFT + lsl x2, x2, #THIRD_SHIFT /* 4K aligned paddr of UART */ mov x3, #PT_DEV_L3 orr x2, x2, x3 /* x2 := 4K dev map including UART */ str x2, [x1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ @@ -365,7 +365,7 @@ paging: mov x3, #PT_PT orr x2, x2, x3 /* x2 := table map of xen_fixmap */ ldr x1, =FIXMAP_ADDR(0) - lsr x1, x1, #18 /* x1 := Slot for FIXMAP(0) */ + lsr x1, x1, #(SECOND_SHIFT - 3) /* x1 := Slot for FIXMAP(0) */ str x2, [x4, x1] /* Map it in the fixmap's slot */ /* Use a virtual address to access the UART. */ @@ -375,12 +375,12 @@ paging: /* Map the DTB in the boot misc slot */ cbnz x22, 1f /* Only on boot CPU */ - lsr x2, x21, #21 - lsl x2, x2, #21 /* x2 := 2MB-aligned paddr of DTB */ + lsr x2, x21, #SECOND_SHIFT + lsl x2, x2, #SECOND_SHIFT /* x2 := 2MB-aligned paddr of DTB */ mov x3, #PT_MEM /* x2 := 2MB RAM incl. DTB */ orr x2, x2, x3 ldr x1, =BOOT_FDT_VIRT_START - lsr x1, x1, #18 /* x4 := Slot for BOOT_FDT_VIRT_START */ + lsr x1, x1, #(SECOND_SHIFT - 3) /* x4 := Slot for BOOT_FDT_VIRT_START */ str x2, [x4, x1] /* Map it in the early fdt slot */ dsb sy 1: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:57:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:57:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6y-0003mq-Vq; Fri, 14 Mar 2014 21:57:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6x-0003md-UR for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:52 +0000 Received: from [85.158.137.68:32538] by server-3.bemta-3.messagelabs.com id CF/96-05289-F5B73235; Fri, 14 Mar 2014 21:57:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1394834268!699189!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8428 invoked from network); 14 Mar 2014 21:57:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:57:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6u-0000dz-0A for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa6t-0002Ml-VT for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:47 +0000 Date: Fri, 14 Mar 2014 21:57:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: setup_dt_irq: don't enable the IRQ if the creation has failed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2cf484cee084be71b1f63e718d76af7555a6ab14 Author: Julien Grall AuthorDate: Fri Jan 24 16:43:36 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 13:48:33 2014 +0000 xen/arm: setup_dt_irq: don't enable the IRQ if the creation has failed For now __setup_dt_irq can only fail if the action is already set. If in the future, the function is updated we don't want to enable the IRQ. Assuming the function can fail with action = NULL, when Xen will receive the IRQ it will segfault because do_IRQ doesn't check if action is NULL. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index a607da3..d028e30 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -608,8 +608,8 @@ int __init setup_dt_irq(const struct dt_irq *irq, struct irqaction *new) rc = __setup_irq(desc, irq->irq, new); spin_unlock_irqrestore(&desc->lock, flags); - desc->handler->startup(desc); - + if ( !rc ) + desc->handler->startup(desc); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:57:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:57:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6y-0003mq-Vq; Fri, 14 Mar 2014 21:57:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6x-0003md-UR for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:52 +0000 Received: from [85.158.137.68:32538] by server-3.bemta-3.messagelabs.com id CF/96-05289-F5B73235; Fri, 14 Mar 2014 21:57:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1394834268!699189!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8428 invoked from network); 14 Mar 2014 21:57:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:57:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa6u-0000dz-0A for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa6t-0002Ml-VT for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:47 +0000 Date: Fri, 14 Mar 2014 21:57:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: setup_dt_irq: don't enable the IRQ if the creation has failed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2cf484cee084be71b1f63e718d76af7555a6ab14 Author: Julien Grall AuthorDate: Fri Jan 24 16:43:36 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 13:48:33 2014 +0000 xen/arm: setup_dt_irq: don't enable the IRQ if the creation has failed For now __setup_dt_irq can only fail if the action is already set. If in the future, the function is updated we don't want to enable the IRQ. Assuming the function can fail with action = NULL, when Xen will receive the IRQ it will segfault because do_IRQ doesn't check if action is NULL. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index a607da3..d028e30 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -608,8 +608,8 @@ int __init setup_dt_irq(const struct dt_irq *irq, struct irqaction *new) rc = __setup_irq(desc, irq->irq, new); spin_unlock_irqrestore(&desc->lock, flags); - desc->handler->startup(desc); - + if ( !rc ) + desc->handler->startup(desc); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:58:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:58:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa78-0003pR-2d; Fri, 14 Mar 2014 21:58:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa77-0003p7-7o for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:01 +0000 Received: from [85.158.139.211:57315] by server-17.bemta-5.messagelabs.com id 01/FA-09046-86B73235; Fri, 14 Mar 2014 21:58:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1394834278!1153423!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9855 invoked from network); 14 Mar 2014 21:57:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:57:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa74-0000e5-4r for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa74-0002N7-3r for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:58 +0000 Date: Fri, 14 Mar 2014 21:57:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/pygrub: grub2/grub.cfg from RHEL 7 has new commands in menuentry X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd03048708af072374963d6d0721cc6d4c5f52cf Author: Joby Poriyath AuthorDate: Tue Feb 4 18:10:35 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 13:51:29 2014 +0000 xen/pygrub: grub2/grub.cfg from RHEL 7 has new commands in menuentry menuentry in grub2/grub.cfg uses linux16 and initrd16 commands instead of linux and initrd. Due to this RHEL 7 (beta) guest failed to boot after the installation. In addition to this, RHEL 7 menu entries have two different single-quote delimited strings on the same line, and the greedy grouping for menuentry parsing gets both strings, and the options inbetween. Signed-off-by: Joby Poriyath Reviewed-by: Andrew Cooper Acked-by: Ian Campbell Cc: george.dunlap@citrix.com --- tools/pygrub/examples/rhel-7-beta.grub2 | 118 +++++++++++++++++++++++++++++++ tools/pygrub/src/GrubConf.py | 4 +- 2 files changed, 121 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/examples/rhel-7-beta.grub2 b/tools/pygrub/examples/rhel-7-beta.grub2 new file mode 100644 index 0000000..88f0f99 --- /dev/null +++ b/tools/pygrub/examples/rhel-7-beta.grub2 @@ -0,0 +1,118 @@ +# +# DO NOT EDIT THIS FILE +# +# It is automatically generated by grub2-mkconfig using templates +# from /etc/grub.d and settings from /etc/default/grub +# + +### BEGIN /etc/grub.d/00_header ### +set pager=1 + +if [ -s $prefix/grubenv ]; then + load_env +fi +if [ "${next_entry}" ] ; then + set default="${next_entry}" + set next_entry= + save_env next_entry + set boot_once=true +else + set default="${saved_entry}" +fi + +if [ x"${feature_menuentry_id}" = xy ]; then + menuentry_id_option="--id" +else + menuentry_id_option="" +fi + +export menuentry_id_option + +if [ "${prev_saved_entry}" ]; then + set saved_entry="${prev_saved_entry}" + save_env saved_entry + set prev_saved_entry= + save_env prev_saved_entry + set boot_once=true +fi + +function savedefault { + if [ -z "${boot_once}" ]; then + saved_entry="${chosen}" + save_env saved_entry + fi +} + +function load_video { + if [ x$feature_all_video_module = xy ]; then + insmod all_video + else + insmod efi_gop + insmod efi_uga + insmod ieee1275_fb + insmod vbe + insmod vga + insmod video_bochs + insmod video_cirrus + fi +} + +terminal_output console +set timeout=5 +### END /etc/grub.d/00_header ### + +### BEGIN /etc/grub.d/10_linux ### +menuentry 'Red Hat Enterprise Linux Everything, with Linux 3.10.0-54.0.1.el7.x86_64' --class red --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-3.10.0-54.0.1.el7.x86_64-advanced-d23b8b49-4cfe-4900-8ef1-ec80bc633163' { + load_video + set gfxpayload=keep + insmod gzio + insmod part_msdos + insmod xfs + set root='hd0,msdos1' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 89ffef78-82b3-457c-bc57-42cccc373851 + else + search --no-floppy --fs-uuid --set=root 89ffef78-82b3-457c-bc57-42cccc373851 + fi + linux16 /vmlinuz-3.10.0-54.0.1.el7.x86_64 root=/dev/mapper/rhel-root ro rd.lvm.lv=rhel/swap vconsole.keymap=uk crashkernel=auto rd.lvm.lv=rhel/root vconsole.font=latarcyrheb-sun16 LANG=en_GB.UTF-8 + initrd16 /initramfs-3.10.0-54.0.1.el7.x86_64.img +} +menuentry 'Red Hat Enterprise Linux Everything, with Linux 0-rescue-af34f0b8cf364cdbbe6d093f8228a37f' --class red --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-0-rescue-af34f0b8cf364cdbbe6d093f8228a37f-advanced-d23b8b49-4cfe-4900-8ef1-ec80bc633163' { + load_video + insmod gzio + insmod part_msdos + insmod xfs + set root='hd0,msdos1' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 89ffef78-82b3-457c-bc57-42cccc373851 + else + search --no-floppy --fs-uuid --set=root 89ffef78-82b3-457c-bc57-42cccc373851 + fi + linux16 /vmlinuz-0-rescue-af34f0b8cf364cdbbe6d093f8228a37f root=/dev/mapper/rhel-root ro rd.lvm.lv=rhel/swap vconsole.keymap=uk crashkernel=auto rd.lvm.lv=rhel/root vconsole.font=latarcyrheb-sun16 + initrd16 /initramfs-0-rescue-af34f0b8cf364cdbbe6d093f8228a37f.img +} + +### END /etc/grub.d/10_linux ### + +### BEGIN /etc/grub.d/20_linux_xen ### +### END /etc/grub.d/20_linux_xen ### + +### BEGIN /etc/grub.d/20_ppc_terminfo ### +### END /etc/grub.d/20_ppc_terminfo ### + +### BEGIN /etc/grub.d/30_os-prober ### +### END /etc/grub.d/30_os-prober ### + +### BEGIN /etc/grub.d/40_custom ### +# This file provides an easy way to add custom menu entries. Simply type the +# menu entries you want to add after this comment. Be careful not to change +# the 'exec tail' line above. +### END /etc/grub.d/40_custom ### + +### BEGIN /etc/grub.d/41_custom ### +if [ -f ${config_directory}/custom.cfg ]; then + source ${config_directory}/custom.cfg +elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then + source $prefix/custom.cfg; +fi +### END /etc/grub.d/41_custom ### diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index cb853c9..974cded 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -348,7 +348,9 @@ class Grub2Image(_GrubImage): commands = {'set:root': 'root', 'linux': 'kernel', + 'linux16': 'kernel', 'initrd': 'initrd', + 'initrd16': 'initrd', 'echo': None, 'insmod': None, 'search': None} @@ -394,7 +396,7 @@ class Grub2ConfigFile(_GrubConfigFile): continue # new image - title_match = re.match('^menuentry ["\'](.*)["\'] (.*){', l) + title_match = re.match('^menuentry ["\'](.*?)["\'] (.*){', l) if title_match: if img is not None: raise RuntimeError, "syntax error: cannot nest menuentry (%d %s)" % (len(img),img) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:58:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:58:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa78-0003pR-2d; Fri, 14 Mar 2014 21:58:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa77-0003p7-7o for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:01 +0000 Received: from [85.158.139.211:57315] by server-17.bemta-5.messagelabs.com id 01/FA-09046-86B73235; Fri, 14 Mar 2014 21:58:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1394834278!1153423!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9855 invoked from network); 14 Mar 2014 21:57:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:57:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa74-0000e5-4r for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa74-0002N7-3r for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:57:58 +0000 Date: Fri, 14 Mar 2014 21:57:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/pygrub: grub2/grub.cfg from RHEL 7 has new commands in menuentry X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd03048708af072374963d6d0721cc6d4c5f52cf Author: Joby Poriyath AuthorDate: Tue Feb 4 18:10:35 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 13:51:29 2014 +0000 xen/pygrub: grub2/grub.cfg from RHEL 7 has new commands in menuentry menuentry in grub2/grub.cfg uses linux16 and initrd16 commands instead of linux and initrd. Due to this RHEL 7 (beta) guest failed to boot after the installation. In addition to this, RHEL 7 menu entries have two different single-quote delimited strings on the same line, and the greedy grouping for menuentry parsing gets both strings, and the options inbetween. Signed-off-by: Joby Poriyath Reviewed-by: Andrew Cooper Acked-by: Ian Campbell Cc: george.dunlap@citrix.com --- tools/pygrub/examples/rhel-7-beta.grub2 | 118 +++++++++++++++++++++++++++++++ tools/pygrub/src/GrubConf.py | 4 +- 2 files changed, 121 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/examples/rhel-7-beta.grub2 b/tools/pygrub/examples/rhel-7-beta.grub2 new file mode 100644 index 0000000..88f0f99 --- /dev/null +++ b/tools/pygrub/examples/rhel-7-beta.grub2 @@ -0,0 +1,118 @@ +# +# DO NOT EDIT THIS FILE +# +# It is automatically generated by grub2-mkconfig using templates +# from /etc/grub.d and settings from /etc/default/grub +# + +### BEGIN /etc/grub.d/00_header ### +set pager=1 + +if [ -s $prefix/grubenv ]; then + load_env +fi +if [ "${next_entry}" ] ; then + set default="${next_entry}" + set next_entry= + save_env next_entry + set boot_once=true +else + set default="${saved_entry}" +fi + +if [ x"${feature_menuentry_id}" = xy ]; then + menuentry_id_option="--id" +else + menuentry_id_option="" +fi + +export menuentry_id_option + +if [ "${prev_saved_entry}" ]; then + set saved_entry="${prev_saved_entry}" + save_env saved_entry + set prev_saved_entry= + save_env prev_saved_entry + set boot_once=true +fi + +function savedefault { + if [ -z "${boot_once}" ]; then + saved_entry="${chosen}" + save_env saved_entry + fi +} + +function load_video { + if [ x$feature_all_video_module = xy ]; then + insmod all_video + else + insmod efi_gop + insmod efi_uga + insmod ieee1275_fb + insmod vbe + insmod vga + insmod video_bochs + insmod video_cirrus + fi +} + +terminal_output console +set timeout=5 +### END /etc/grub.d/00_header ### + +### BEGIN /etc/grub.d/10_linux ### +menuentry 'Red Hat Enterprise Linux Everything, with Linux 3.10.0-54.0.1.el7.x86_64' --class red --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-3.10.0-54.0.1.el7.x86_64-advanced-d23b8b49-4cfe-4900-8ef1-ec80bc633163' { + load_video + set gfxpayload=keep + insmod gzio + insmod part_msdos + insmod xfs + set root='hd0,msdos1' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 89ffef78-82b3-457c-bc57-42cccc373851 + else + search --no-floppy --fs-uuid --set=root 89ffef78-82b3-457c-bc57-42cccc373851 + fi + linux16 /vmlinuz-3.10.0-54.0.1.el7.x86_64 root=/dev/mapper/rhel-root ro rd.lvm.lv=rhel/swap vconsole.keymap=uk crashkernel=auto rd.lvm.lv=rhel/root vconsole.font=latarcyrheb-sun16 LANG=en_GB.UTF-8 + initrd16 /initramfs-3.10.0-54.0.1.el7.x86_64.img +} +menuentry 'Red Hat Enterprise Linux Everything, with Linux 0-rescue-af34f0b8cf364cdbbe6d093f8228a37f' --class red --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-0-rescue-af34f0b8cf364cdbbe6d093f8228a37f-advanced-d23b8b49-4cfe-4900-8ef1-ec80bc633163' { + load_video + insmod gzio + insmod part_msdos + insmod xfs + set root='hd0,msdos1' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 89ffef78-82b3-457c-bc57-42cccc373851 + else + search --no-floppy --fs-uuid --set=root 89ffef78-82b3-457c-bc57-42cccc373851 + fi + linux16 /vmlinuz-0-rescue-af34f0b8cf364cdbbe6d093f8228a37f root=/dev/mapper/rhel-root ro rd.lvm.lv=rhel/swap vconsole.keymap=uk crashkernel=auto rd.lvm.lv=rhel/root vconsole.font=latarcyrheb-sun16 + initrd16 /initramfs-0-rescue-af34f0b8cf364cdbbe6d093f8228a37f.img +} + +### END /etc/grub.d/10_linux ### + +### BEGIN /etc/grub.d/20_linux_xen ### +### END /etc/grub.d/20_linux_xen ### + +### BEGIN /etc/grub.d/20_ppc_terminfo ### +### END /etc/grub.d/20_ppc_terminfo ### + +### BEGIN /etc/grub.d/30_os-prober ### +### END /etc/grub.d/30_os-prober ### + +### BEGIN /etc/grub.d/40_custom ### +# This file provides an easy way to add custom menu entries. Simply type the +# menu entries you want to add after this comment. Be careful not to change +# the 'exec tail' line above. +### END /etc/grub.d/40_custom ### + +### BEGIN /etc/grub.d/41_custom ### +if [ -f ${config_directory}/custom.cfg ]; then + source ${config_directory}/custom.cfg +elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then + source $prefix/custom.cfg; +fi +### END /etc/grub.d/41_custom ### diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index cb853c9..974cded 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -348,7 +348,9 @@ class Grub2Image(_GrubImage): commands = {'set:root': 'root', 'linux': 'kernel', + 'linux16': 'kernel', 'initrd': 'initrd', + 'initrd16': 'initrd', 'echo': None, 'insmod': None, 'search': None} @@ -394,7 +396,7 @@ class Grub2ConfigFile(_GrubConfigFile): continue # new image - title_match = re.match('^menuentry ["\'](.*)["\'] (.*){', l) + title_match = re.match('^menuentry ["\'](.*?)["\'] (.*){', l) if title_match: if img is not None: raise RuntimeError, "syntax error: cannot nest menuentry (%d %s)" % (len(img),img) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:58:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:58:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7K-0003sk-5c; Fri, 14 Mar 2014 21:58:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7I-0003rv-EM for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:12 +0000 Received: from [85.158.143.35:58761] by server-2.bemta-4.messagelabs.com id 29/21-06539-37B73235; Fri, 14 Mar 2014 21:58:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1394834288!2211842!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1061 invoked from network); 14 Mar 2014 21:58:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:58:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7E-0000ee-DF for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa7E-0002Nd-9p for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:08 +0000 Date: Fri, 14 Mar 2014 21:58:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: rerun autogen.sh after version change X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f02481057e22b919e126c3b6d92855e2e04ac3b9 Author: Ian Campbell AuthorDate: Wed Mar 12 13:59:12 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 14:03:06 2014 +0000 tools: rerun autogen.sh after version change 94ad20b737bb "README, xen/Makefile: Branching for 4.5" changed the version. Signed-off-by: Ian Campbell --- configure | 18 +++++++++--------- docs/configure | 18 +++++++++--------- stubdom/configure | 18 +++++++++--------- tools/configure | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 95133be..c2c724a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.5. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.4' -PACKAGE_STRING='Xen Hypervisor 4.4' +PACKAGE_VERSION='4.5' +PACKAGE_STRING='Xen Hypervisor 4.5' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1197,7 +1197,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor 4.4 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor 4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1262,7 +1262,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor 4.4:";; + short | recursive ) echo "Configuration of Xen Hypervisor 4.5:";; esac cat <<\_ACEOF @@ -1340,7 +1340,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor configure 4.4 +Xen Hypervisor configure 4.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1357,7 +1357,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor $as_me 4.4, which was +It was created by Xen Hypervisor $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2635,7 +2635,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor $as_me 4.4, which was +This file was extended by Xen Hypervisor $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2689,7 +2689,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor config.status 4.4 +Xen Hypervisor config.status 4.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/docs/configure b/docs/configure index d67b532..926da30 100755 --- a/docs/configure +++ b/docs/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.5. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Documentation' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.4' -PACKAGE_STRING='Xen Hypervisor Documentation 4.4' +PACKAGE_VERSION='4.5' +PACKAGE_STRING='Xen Hypervisor Documentation 4.5' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1184,7 +1184,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Documentation 4.4 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Documentation 4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1245,7 +1245,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.4:";; + short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.5:";; esac cat <<\_ACEOF @@ -1324,7 +1324,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Documentation configure 4.4 +Xen Hypervisor Documentation configure 4.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1341,7 +1341,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Documentation $as_me 4.4, which was +It was created by Xen Hypervisor Documentation $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2570,7 +2570,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Documentation $as_me 4.4, which was +This file was extended by Xen Hypervisor Documentation $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2624,7 +2624,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Documentation config.status 4.4 +Xen Hypervisor Documentation config.status 4.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/stubdom/configure b/stubdom/configure index 5b0ce0e..9981f5a 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.5. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Stub Domains' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.4' -PACKAGE_STRING='Xen Hypervisor Stub Domains 4.4' +PACKAGE_VERSION='4.5' +PACKAGE_STRING='Xen Hypervisor Stub Domains 4.5' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Stub Domains 4.4 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Stub Domains 4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1315,7 +1315,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.4:";; + short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.5:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Stub Domains configure 4.4 +Xen Hypervisor Stub Domains configure 4.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1480,7 +1480,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Stub Domains $as_me 4.4, which was +It was created by Xen Hypervisor Stub Domains $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4178,7 +4178,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Stub Domains $as_me 4.4, which was +This file was extended by Xen Hypervisor Stub Domains $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4232,7 +4232,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Stub Domains config.status 4.4 +Xen Hypervisor Stub Domains config.status 4.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/tools/configure b/tools/configure index 3f2eecf..9d5a458 100755 --- a/tools/configure +++ b/tools/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.5. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Tools' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.4' -PACKAGE_STRING='Xen Hypervisor Tools 4.4' +PACKAGE_VERSION='4.5' +PACKAGE_STRING='Xen Hypervisor Tools 4.5' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1341,7 +1341,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Tools 4.4 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Tools 4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1406,7 +1406,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.4:";; + short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.5:";; esac cat <<\_ACEOF @@ -1548,7 +1548,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Tools configure 4.4 +Xen Hypervisor Tools configure 4.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1850,7 +1850,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Tools $as_me 4.4, which was +It was created by Xen Hypervisor Tools $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8532,7 +8532,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Tools $as_me 4.4, which was +This file was extended by Xen Hypervisor Tools $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8595,7 +8595,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Tools config.status 4.4 +Xen Hypervisor Tools config.status 4.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:58:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:58:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7K-0003sk-5c; Fri, 14 Mar 2014 21:58:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7I-0003rv-EM for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:12 +0000 Received: from [85.158.143.35:58761] by server-2.bemta-4.messagelabs.com id 29/21-06539-37B73235; Fri, 14 Mar 2014 21:58:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1394834288!2211842!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1061 invoked from network); 14 Mar 2014 21:58:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:58:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7E-0000ee-DF for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa7E-0002Nd-9p for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:08 +0000 Date: Fri, 14 Mar 2014 21:58:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: rerun autogen.sh after version change X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f02481057e22b919e126c3b6d92855e2e04ac3b9 Author: Ian Campbell AuthorDate: Wed Mar 12 13:59:12 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 14:03:06 2014 +0000 tools: rerun autogen.sh after version change 94ad20b737bb "README, xen/Makefile: Branching for 4.5" changed the version. Signed-off-by: Ian Campbell --- configure | 18 +++++++++--------- docs/configure | 18 +++++++++--------- stubdom/configure | 18 +++++++++--------- tools/configure | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 95133be..c2c724a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.5. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.4' -PACKAGE_STRING='Xen Hypervisor 4.4' +PACKAGE_VERSION='4.5' +PACKAGE_STRING='Xen Hypervisor 4.5' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1197,7 +1197,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor 4.4 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor 4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1262,7 +1262,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor 4.4:";; + short | recursive ) echo "Configuration of Xen Hypervisor 4.5:";; esac cat <<\_ACEOF @@ -1340,7 +1340,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor configure 4.4 +Xen Hypervisor configure 4.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1357,7 +1357,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor $as_me 4.4, which was +It was created by Xen Hypervisor $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2635,7 +2635,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor $as_me 4.4, which was +This file was extended by Xen Hypervisor $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2689,7 +2689,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor config.status 4.4 +Xen Hypervisor config.status 4.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/docs/configure b/docs/configure index d67b532..926da30 100755 --- a/docs/configure +++ b/docs/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.5. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Documentation' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.4' -PACKAGE_STRING='Xen Hypervisor Documentation 4.4' +PACKAGE_VERSION='4.5' +PACKAGE_STRING='Xen Hypervisor Documentation 4.5' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1184,7 +1184,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Documentation 4.4 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Documentation 4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1245,7 +1245,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.4:";; + short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.5:";; esac cat <<\_ACEOF @@ -1324,7 +1324,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Documentation configure 4.4 +Xen Hypervisor Documentation configure 4.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1341,7 +1341,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Documentation $as_me 4.4, which was +It was created by Xen Hypervisor Documentation $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2570,7 +2570,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Documentation $as_me 4.4, which was +This file was extended by Xen Hypervisor Documentation $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2624,7 +2624,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Documentation config.status 4.4 +Xen Hypervisor Documentation config.status 4.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/stubdom/configure b/stubdom/configure index 5b0ce0e..9981f5a 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.5. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Stub Domains' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.4' -PACKAGE_STRING='Xen Hypervisor Stub Domains 4.4' +PACKAGE_VERSION='4.5' +PACKAGE_STRING='Xen Hypervisor Stub Domains 4.5' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Stub Domains 4.4 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Stub Domains 4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1315,7 +1315,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.4:";; + short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.5:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Stub Domains configure 4.4 +Xen Hypervisor Stub Domains configure 4.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1480,7 +1480,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Stub Domains $as_me 4.4, which was +It was created by Xen Hypervisor Stub Domains $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4178,7 +4178,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Stub Domains $as_me 4.4, which was +This file was extended by Xen Hypervisor Stub Domains $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4232,7 +4232,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Stub Domains config.status 4.4 +Xen Hypervisor Stub Domains config.status 4.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/tools/configure b/tools/configure index 3f2eecf..9d5a458 100755 --- a/tools/configure +++ b/tools/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.5. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Tools' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.4' -PACKAGE_STRING='Xen Hypervisor Tools 4.4' +PACKAGE_VERSION='4.5' +PACKAGE_STRING='Xen Hypervisor Tools 4.5' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1341,7 +1341,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Tools 4.4 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Tools 4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1406,7 +1406,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.4:";; + short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.5:";; esac cat <<\_ACEOF @@ -1548,7 +1548,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Tools configure 4.4 +Xen Hypervisor Tools configure 4.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1850,7 +1850,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Tools $as_me 4.4, which was +It was created by Xen Hypervisor Tools $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8532,7 +8532,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Tools $as_me 4.4, which was +This file was extended by Xen Hypervisor Tools $as_me 4.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8595,7 +8595,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Tools config.status 4.4 +Xen Hypervisor Tools config.status 4.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:58:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:58:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7T-0003vK-8Z; Fri, 14 Mar 2014 21:58:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7S-0003uu-0U for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:22 +0000 Received: from [85.158.139.211:61898] by server-6.bemta-5.messagelabs.com id CB/DA-19576-D7B73235; Fri, 14 Mar 2014 21:58:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1394834298!1148872!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32225 invoked from network); 14 Mar 2014 21:58:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:58:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7O-0000ek-Il for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa7O-0002O1-Hj for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:18 +0000 Date: Fri, 14 Mar 2014 21:58:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: require OCaml version 3.09.3 or greater X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0285584778707881920==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0285584778707881920== Content-Type: text/plain commit a37c389930936c3a9b1215c385fdd22854836871 Author: Roger Pau Monne AuthorDate: Tue Feb 11 11:38:24 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 14:03:25 2014 +0000 tools: require OCaml version 3.09.3 or greater Signed-off-by: Roger Pau Monné Tested-by: Don Slutz Acked-by: Ian Campbell Cc: Ian Jackson --- m4/ax_compare_version.m4 | 179 ++++++++++++++++++++++++++++++++++++++++++++++ tools/configure | 174 ++++++++++++++++++++++++++++++++++++++++++++ tools/configure.ac | 7 ++ 3 files changed, 360 insertions(+), 0 deletions(-) diff --git a/m4/ax_compare_version.m4 b/m4/ax_compare_version.m4 new file mode 100644 index 0000000..26f4dec --- /dev/null +++ b/m4/ax_compare_version.m4 @@ -0,0 +1,179 @@ +# Fetched from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_compare_version.m4 +# Commit ID: 27948f49ca30e4222bb7cdd55182bd7341ac50c5 +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +dnl ######################################################################### +AC_DEFUN([AX_COMPARE_VERSION], [ + AC_REQUIRE([AC_PROG_AWK]) + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + AS_VAR_PUSHDEF([A],[ax_compare_version_A]) + A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + AS_VAR_PUSHDEF([B],[ax_compare_version_B]) + B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary + dnl # then the first line is used to determine if the condition is true. + dnl # The sed right after the echo is to remove any indented white space. + m4_case(m4_tolower($2), + [lt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [gt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [le],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ], + [ge],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ],[ + dnl Split the operator from the subversion count if present. + m4_bmatch(m4_substr($2,2), + [0],[ + # A count of zero means use the length of the shorter version. + # Determine the number of characters in A and B. + ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` + ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` + + # Set A to no more than B's length and B to no more than A's length. + A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` + B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` + ], + [[0-9]+],[ + # A count greater than zero means use only that many subversions + A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + ], + [.+],[ + AC_WARNING( + [illegal OP numeric parameter: $2]) + ],[]) + + # Pad zeros at end of numbers to make same length. + ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" + B="$B`echo $A | sed 's/./0/g'`" + A="$ax_compare_version_tmp_A" + + # Check for equality or inequality as necessary. + m4_case(m4_tolower(m4_substr($2,0,2)), + [eq],[ + test "x$A" = "x$B" && ax_compare_version=true + ], + [ne],[ + test "x$A" != "x$B" && ax_compare_version=true + ],[ + AC_WARNING([illegal OP parameter: $2]) + ]) + ]) + + AS_VAR_POPDEF([A])dnl + AS_VAR_POPDEF([B])dnl + + dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. + if test "$ax_compare_version" = "true" ; then + m4_ifvaln([$4],[$4],[:])dnl + m4_ifvaln([$5],[else $5])dnl + fi +]) dnl AX_COMPARE_VERSION diff --git a/tools/configure b/tools/configure index 9d5a458..e974c5d 100755 --- a/tools/configure +++ b/tools/configure @@ -648,6 +648,7 @@ CPP pyconfig PYTHONPATH CHECKPOLICY +AWK OCAMLFIND OCAMLBUILD OCAMLDOC @@ -3450,6 +3451,92 @@ esac +# Fetched from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_compare_version.m4 +# Commit ID: 27948f49ca30e4222bb7cdd55182bd7341ac50c5 +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + + # Enable/disable options @@ -4709,6 +4796,48 @@ then fi fi +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + if test "x$ocamltools" = "xy"; then : # checking for ocamlc @@ -5813,6 +5942,50 @@ fi fi ocamltools="n" +else + + + + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + + ax_compare_version_A=`echo "$OCAMLVERSION" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ + -e 's/Z\([0-9]\)Z/Z0\1Z/g' \ + -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \ + -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \ + -e 's/[^0-9]//g'` + + + ax_compare_version_B=`echo "3.09.3" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ + -e 's/Z\([0-9]\)Z/Z0\1Z/g' \ + -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \ + -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \ + -e 's/[^0-9]//g'` + + + ax_compare_version=`echo "x$ax_compare_version_A +x$ax_compare_version_B" | sed 's/^ *//' | sort -r | sed "s/x${ax_compare_version_A}/false/;s/x${ax_compare_version_B}/true/;1q"` + + + + if test "$ax_compare_version" = "true" ; then + + if test "x$enable_ocamltools" = "xyes"; then : + + as_fn_error $? "Your version of OCaml: $OCAMLVERSION is not supported" "$LINENO" 5 +fi + ocamltools="n" + + fi + + fi fi @@ -8606,6 +8779,7 @@ gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +AWK='$AWK' test -n "\$AWK" || AWK=awk _ACEOF diff --git a/tools/configure.ac b/tools/configure.ac index 5083c7b..884d63d 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -46,6 +46,7 @@ m4_include([../m4/pthread.m4]) m4_include([../m4/ptyfuncs.m4]) m4_include([../m4/extfs.m4]) m4_include([../m4/fetcher.m4]) +m4_include([../m4/ax_compare_version.m4]) # Enable/disable options AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) @@ -161,6 +162,12 @@ AS_IF([test "x$ocamltools" = "xy"], [ AS_IF([test "x$enable_ocamltools" = "xyes"], [ AC_MSG_ERROR([Ocaml tools enabled, but unable to find Ocaml])]) ocamltools="n" + ], [ + AX_COMPARE_VERSION([$OCAMLVERSION], [lt], [3.09.3], [ + AS_IF([test "x$enable_ocamltools" = "xyes"], [ + AC_MSG_ERROR([Your version of OCaml: $OCAMLVERSION is not supported])]) + ocamltools="n" + ]) ]) ]) AS_IF([test "x$xsmpolicy" = "xy"], [ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0285584778707881920== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============0285584778707881920==-- From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:58:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:58:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7T-0003vK-8Z; Fri, 14 Mar 2014 21:58:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7S-0003uu-0U for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:22 +0000 Received: from [85.158.139.211:61898] by server-6.bemta-5.messagelabs.com id CB/DA-19576-D7B73235; Fri, 14 Mar 2014 21:58:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1394834298!1148872!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32225 invoked from network); 14 Mar 2014 21:58:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:58:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7O-0000ek-Il for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa7O-0002O1-Hj for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:18 +0000 Date: Fri, 14 Mar 2014 21:58:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: require OCaml version 3.09.3 or greater X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0285584778707881920==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0285584778707881920== Content-Type: text/plain commit a37c389930936c3a9b1215c385fdd22854836871 Author: Roger Pau Monne AuthorDate: Tue Feb 11 11:38:24 2014 +0100 Commit: Ian Campbell CommitDate: Wed Mar 12 14:03:25 2014 +0000 tools: require OCaml version 3.09.3 or greater Signed-off-by: Roger Pau Monné Tested-by: Don Slutz Acked-by: Ian Campbell Cc: Ian Jackson --- m4/ax_compare_version.m4 | 179 ++++++++++++++++++++++++++++++++++++++++++++++ tools/configure | 174 ++++++++++++++++++++++++++++++++++++++++++++ tools/configure.ac | 7 ++ 3 files changed, 360 insertions(+), 0 deletions(-) diff --git a/m4/ax_compare_version.m4 b/m4/ax_compare_version.m4 new file mode 100644 index 0000000..26f4dec --- /dev/null +++ b/m4/ax_compare_version.m4 @@ -0,0 +1,179 @@ +# Fetched from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_compare_version.m4 +# Commit ID: 27948f49ca30e4222bb7cdd55182bd7341ac50c5 +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +dnl ######################################################################### +AC_DEFUN([AX_COMPARE_VERSION], [ + AC_REQUIRE([AC_PROG_AWK]) + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + AS_VAR_PUSHDEF([A],[ax_compare_version_A]) + A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + AS_VAR_PUSHDEF([B],[ax_compare_version_B]) + B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary + dnl # then the first line is used to determine if the condition is true. + dnl # The sed right after the echo is to remove any indented white space. + m4_case(m4_tolower($2), + [lt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [gt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [le],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ], + [ge],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ],[ + dnl Split the operator from the subversion count if present. + m4_bmatch(m4_substr($2,2), + [0],[ + # A count of zero means use the length of the shorter version. + # Determine the number of characters in A and B. + ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` + ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` + + # Set A to no more than B's length and B to no more than A's length. + A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` + B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` + ], + [[0-9]+],[ + # A count greater than zero means use only that many subversions + A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + ], + [.+],[ + AC_WARNING( + [illegal OP numeric parameter: $2]) + ],[]) + + # Pad zeros at end of numbers to make same length. + ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" + B="$B`echo $A | sed 's/./0/g'`" + A="$ax_compare_version_tmp_A" + + # Check for equality or inequality as necessary. + m4_case(m4_tolower(m4_substr($2,0,2)), + [eq],[ + test "x$A" = "x$B" && ax_compare_version=true + ], + [ne],[ + test "x$A" != "x$B" && ax_compare_version=true + ],[ + AC_WARNING([illegal OP parameter: $2]) + ]) + ]) + + AS_VAR_POPDEF([A])dnl + AS_VAR_POPDEF([B])dnl + + dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. + if test "$ax_compare_version" = "true" ; then + m4_ifvaln([$4],[$4],[:])dnl + m4_ifvaln([$5],[else $5])dnl + fi +]) dnl AX_COMPARE_VERSION diff --git a/tools/configure b/tools/configure index 9d5a458..e974c5d 100755 --- a/tools/configure +++ b/tools/configure @@ -648,6 +648,7 @@ CPP pyconfig PYTHONPATH CHECKPOLICY +AWK OCAMLFIND OCAMLBUILD OCAMLDOC @@ -3450,6 +3451,92 @@ esac +# Fetched from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_compare_version.m4 +# Commit ID: 27948f49ca30e4222bb7cdd55182bd7341ac50c5 +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + + # Enable/disable options @@ -4709,6 +4796,48 @@ then fi fi +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + if test "x$ocamltools" = "xy"; then : # checking for ocamlc @@ -5813,6 +5942,50 @@ fi fi ocamltools="n" +else + + + + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + + ax_compare_version_A=`echo "$OCAMLVERSION" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ + -e 's/Z\([0-9]\)Z/Z0\1Z/g' \ + -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \ + -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \ + -e 's/[^0-9]//g'` + + + ax_compare_version_B=`echo "3.09.3" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ + -e 's/Z\([0-9]\)Z/Z0\1Z/g' \ + -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \ + -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \ + -e 's/[^0-9]//g'` + + + ax_compare_version=`echo "x$ax_compare_version_A +x$ax_compare_version_B" | sed 's/^ *//' | sort -r | sed "s/x${ax_compare_version_A}/false/;s/x${ax_compare_version_B}/true/;1q"` + + + + if test "$ax_compare_version" = "true" ; then + + if test "x$enable_ocamltools" = "xyes"; then : + + as_fn_error $? "Your version of OCaml: $OCAMLVERSION is not supported" "$LINENO" 5 +fi + ocamltools="n" + + fi + + fi fi @@ -8606,6 +8779,7 @@ gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +AWK='$AWK' test -n "\$AWK" || AWK=awk _ACEOF diff --git a/tools/configure.ac b/tools/configure.ac index 5083c7b..884d63d 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -46,6 +46,7 @@ m4_include([../m4/pthread.m4]) m4_include([../m4/ptyfuncs.m4]) m4_include([../m4/extfs.m4]) m4_include([../m4/fetcher.m4]) +m4_include([../m4/ax_compare_version.m4]) # Enable/disable options AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) @@ -161,6 +162,12 @@ AS_IF([test "x$ocamltools" = "xy"], [ AS_IF([test "x$enable_ocamltools" = "xyes"], [ AC_MSG_ERROR([Ocaml tools enabled, but unable to find Ocaml])]) ocamltools="n" + ], [ + AX_COMPARE_VERSION([$OCAMLVERSION], [lt], [3.09.3], [ + AS_IF([test "x$enable_ocamltools" = "xyes"], [ + AC_MSG_ERROR([Your version of OCaml: $OCAMLVERSION is not supported])]) + ocamltools="n" + ]) ]) ]) AS_IF([test "x$xsmpolicy" = "xy"], [ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0285584778707881920== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============0285584778707881920==-- From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:58:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:58:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7c-0003xm-Dv; Fri, 14 Mar 2014 21:58:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7b-0003xM-38 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:31 +0000 Received: from [85.158.143.35:9785] by server-2.bemta-4.messagelabs.com id 6C/41-06539-68B73235; Fri, 14 Mar 2014 21:58:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1394834308!2211878!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10491 invoked from network); 14 Mar 2014 21:58:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:58:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7Y-0000eq-Nq for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa7Y-0002OP-Mt for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:28 +0000 Date: Fri, 14 Mar 2014 21:58:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: honor more top level vfb options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c11995ff37caf438d3e93d843e5078452ad1b298 Author: Wei Liu AuthorDate: Tue Jan 28 15:38:01 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 14:09:35 2014 +0000 xl: honor more top level vfb options Now that SDL and keymap options for VFB can also be specified in top level options. Documentation is also updated. This fixes bug #31 and further possible problems. Signed-off-by: Wei Liu Cc: Olaf Hering Acked-by: Ian Campbell Cc: Ian Jackson --- docs/man/xl.cfg.pod.5 | 4 ++-- tools/libxl/xl_cmdimpl.c | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index c02ad55..d5ed82d 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -389,8 +389,8 @@ This options does not control the emulated graphics card presented to an HVM guest. See L below for how to configure the emulated device. If L options are used in a PV guest configuration, xl will pick up B, B, -B, B and B to construct paravirtual -framebuffer device for the guest. +B, B, B, B, B and +B to construct paravirtual framebuffer device for the guest. Each B is a comma-separated list of C settings, from the following list: diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5f59bbc..6a1e2ac 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -721,6 +721,15 @@ static void parse_top_level_vnc_options(XLU_Config *config, xlu_cfg_get_defbool(config, "vncunused", &vnc->findunused, 0); } +static void parse_top_level_sdl_options(XLU_Config *config, + libxl_sdl_info *sdl) +{ + xlu_cfg_get_defbool(config, "sdl", &sdl->enable, 0); + xlu_cfg_get_defbool(config, "opengl", &sdl->opengl, 0); + xlu_cfg_replace_string (config, "display", &sdl->display, 0); + xlu_cfg_replace_string (config, "xauthority", &sdl->xauthority, 0); +} + static void parse_config_data(const char *config_source, const char *config_data, int config_len, @@ -1662,9 +1671,13 @@ skip_vfb: libxl_device_vkb_init); parse_top_level_vnc_options(config, &vfb->vnc); + parse_top_level_sdl_options(config, &vfb->sdl); + xlu_cfg_replace_string (config, "keymap", &vfb->keymap, 0); } - } else + } else { parse_top_level_vnc_options(config, &b_info->u.hvm.vnc); + parse_top_level_sdl_options(config, &b_info->u.hvm.sdl); + } if (c_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (!xlu_cfg_get_string (config, "vga", &buf, 0)) { @@ -1681,8 +1694,6 @@ skip_vfb: LIBXL_VGA_INTERFACE_TYPE_CIRRUS; xlu_cfg_replace_string (config, "keymap", &b_info->u.hvm.keymap, 0); - xlu_cfg_get_defbool(config, "sdl", &b_info->u.hvm.sdl.enable, 0); - xlu_cfg_get_defbool(config, "opengl", &b_info->u.hvm.sdl.opengl, 0); xlu_cfg_get_defbool (config, "spice", &b_info->u.hvm.spice.enable, 0); if (!xlu_cfg_get_long (config, "spiceport", &l, 0)) b_info->u.hvm.spice.port = l; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:58:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:58:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7c-0003xm-Dv; Fri, 14 Mar 2014 21:58:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7b-0003xM-38 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:31 +0000 Received: from [85.158.143.35:9785] by server-2.bemta-4.messagelabs.com id 6C/41-06539-68B73235; Fri, 14 Mar 2014 21:58:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1394834308!2211878!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10491 invoked from network); 14 Mar 2014 21:58:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:58:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7Y-0000eq-Nq for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa7Y-0002OP-Mt for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:28 +0000 Date: Fri, 14 Mar 2014 21:58:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: honor more top level vfb options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c11995ff37caf438d3e93d843e5078452ad1b298 Author: Wei Liu AuthorDate: Tue Jan 28 15:38:01 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 14:09:35 2014 +0000 xl: honor more top level vfb options Now that SDL and keymap options for VFB can also be specified in top level options. Documentation is also updated. This fixes bug #31 and further possible problems. Signed-off-by: Wei Liu Cc: Olaf Hering Acked-by: Ian Campbell Cc: Ian Jackson --- docs/man/xl.cfg.pod.5 | 4 ++-- tools/libxl/xl_cmdimpl.c | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index c02ad55..d5ed82d 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -389,8 +389,8 @@ This options does not control the emulated graphics card presented to an HVM guest. See L below for how to configure the emulated device. If L options are used in a PV guest configuration, xl will pick up B, B, -B, B and B to construct paravirtual -framebuffer device for the guest. +B, B, B, B, B and +B to construct paravirtual framebuffer device for the guest. Each B is a comma-separated list of C settings, from the following list: diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5f59bbc..6a1e2ac 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -721,6 +721,15 @@ static void parse_top_level_vnc_options(XLU_Config *config, xlu_cfg_get_defbool(config, "vncunused", &vnc->findunused, 0); } +static void parse_top_level_sdl_options(XLU_Config *config, + libxl_sdl_info *sdl) +{ + xlu_cfg_get_defbool(config, "sdl", &sdl->enable, 0); + xlu_cfg_get_defbool(config, "opengl", &sdl->opengl, 0); + xlu_cfg_replace_string (config, "display", &sdl->display, 0); + xlu_cfg_replace_string (config, "xauthority", &sdl->xauthority, 0); +} + static void parse_config_data(const char *config_source, const char *config_data, int config_len, @@ -1662,9 +1671,13 @@ skip_vfb: libxl_device_vkb_init); parse_top_level_vnc_options(config, &vfb->vnc); + parse_top_level_sdl_options(config, &vfb->sdl); + xlu_cfg_replace_string (config, "keymap", &vfb->keymap, 0); } - } else + } else { parse_top_level_vnc_options(config, &b_info->u.hvm.vnc); + parse_top_level_sdl_options(config, &b_info->u.hvm.sdl); + } if (c_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (!xlu_cfg_get_string (config, "vga", &buf, 0)) { @@ -1681,8 +1694,6 @@ skip_vfb: LIBXL_VGA_INTERFACE_TYPE_CIRRUS; xlu_cfg_replace_string (config, "keymap", &b_info->u.hvm.keymap, 0); - xlu_cfg_get_defbool(config, "sdl", &b_info->u.hvm.sdl.enable, 0); - xlu_cfg_get_defbool(config, "opengl", &b_info->u.hvm.sdl.opengl, 0); xlu_cfg_get_defbool (config, "spice", &b_info->u.hvm.spice.enable, 0); if (!xlu_cfg_get_long (config, "spiceport", &l, 0)) b_info->u.hvm.spice.port = l; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:58:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:58:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7m-000416-Gy; Fri, 14 Mar 2014 21:58:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7l-00040W-Dz for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:41 +0000 Received: from [85.158.143.35:59889] by server-3.bemta-4.messagelabs.com id CC/9F-13602-09B73235; Fri, 14 Mar 2014 21:58:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1394834319!2217659!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 800 invoked from network); 14 Mar 2014 21:58:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:58:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7i-0000ew-TU for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa7i-0002PN-Rq for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:38 +0000 Date: Fri, 14 Mar 2014 21:58:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix error path in libxl_device_events_handler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c566ab68af7da089ae2b0ff664d02a93a0647584 Author: Ian Jackson AuthorDate: Wed Feb 19 14:03:29 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 14:11:31 2014 +0000 libxl: Fix error path in libxl_device_events_handler libxl_device_events_handler would fail to call AO_ABORT if it failed; instead it would simply return rc. (This leaves the egc etc. from the now-abolished stack frame potentially live, and leaves the ctx locked.) In xl, this is of no consequence, because xl will immediately exit in this situation. This is very likely to be true in any other callers (of which we don't know of any, anyway). Coverity-ID: 1181840 Signed-off-by: Ian Jackson Acked-by: Ian Campbell CC: coverity@xenproject.org --- tools/libxl/libxl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 730f6e1..2d29ad2 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3881,7 +3881,8 @@ int libxl_device_events_handler(libxl_ctx *ctx, out: GC_FREE; - return rc ? : AO_INPROGRESS; + if (rc) return AO_ABORT(rc); + return AO_INPROGRESS; } /******************************************************************************/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:58:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:58:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7m-000416-Gy; Fri, 14 Mar 2014 21:58:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7l-00040W-Dz for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:41 +0000 Received: from [85.158.143.35:59889] by server-3.bemta-4.messagelabs.com id CC/9F-13602-09B73235; Fri, 14 Mar 2014 21:58:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1394834319!2217659!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 800 invoked from network); 14 Mar 2014 21:58:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:58:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7i-0000ew-TU for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa7i-0002PN-Rq for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:38 +0000 Date: Fri, 14 Mar 2014 21:58:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix error path in libxl_device_events_handler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c566ab68af7da089ae2b0ff664d02a93a0647584 Author: Ian Jackson AuthorDate: Wed Feb 19 14:03:29 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 14:11:31 2014 +0000 libxl: Fix error path in libxl_device_events_handler libxl_device_events_handler would fail to call AO_ABORT if it failed; instead it would simply return rc. (This leaves the egc etc. from the now-abolished stack frame potentially live, and leaves the ctx locked.) In xl, this is of no consequence, because xl will immediately exit in this situation. This is very likely to be true in any other callers (of which we don't know of any, anyway). Coverity-ID: 1181840 Signed-off-by: Ian Jackson Acked-by: Ian Campbell CC: coverity@xenproject.org --- tools/libxl/libxl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 730f6e1..2d29ad2 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3881,7 +3881,8 @@ int libxl_device_events_handler(libxl_ctx *ctx, out: GC_FREE; - return rc ? : AO_INPROGRESS; + if (rc) return AO_ABORT(rc); + return AO_INPROGRESS; } /******************************************************************************/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:58:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:58:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7w-00044R-Jq; Fri, 14 Mar 2014 21:58:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7v-000442-Ie for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:51 +0000 Received: from [85.158.143.35:60293] by server-2.bemta-4.messagelabs.com id 11/71-06539-A9B73235; Fri, 14 Mar 2014 21:58:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1394834329!2212040!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12001 invoked from network); 14 Mar 2014 21:58:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:58:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7t-0000f2-24 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa7t-0002Pj-17 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:49 +0000 Date: Fri, 14 Mar 2014 21:58:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Comment error handling in dolog X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 015d6ed025e25ff19236a2a8533324006339baf5 Author: Ian Jackson AuthorDate: Wed Feb 19 14:03:30 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 14:11:41 2014 +0000 xl: Comment error handling in dolog Coverity-ID: 1087116 Signed-off-by: Ian Jackson Acked-by: Ian Campbell CC: coverity@xenproject.org --- tools/libxl/xl_cmdimpl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 6a1e2ac..5a92c3b 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -352,6 +352,8 @@ static void dolog(const char *file, int line, const char *func, char *fmt, ...) rc = vasprintf(&s, fmt, ap); va_end(ap); if (rc >= 0) + /* we ignore write errors since we have no way to report them; + * the alternative would be to abort the whole program */ libxl_write_exactly(NULL, logfile, s, rc, NULL, NULL); free(s); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:58:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:58:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7w-00044R-Jq; Fri, 14 Mar 2014 21:58:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7v-000442-Ie for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:51 +0000 Received: from [85.158.143.35:60293] by server-2.bemta-4.messagelabs.com id 11/71-06539-A9B73235; Fri, 14 Mar 2014 21:58:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1394834329!2212040!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12001 invoked from network); 14 Mar 2014 21:58:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:58:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa7t-0000f2-24 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa7t-0002Pj-17 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:49 +0000 Date: Fri, 14 Mar 2014 21:58:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Comment error handling in dolog X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 015d6ed025e25ff19236a2a8533324006339baf5 Author: Ian Jackson AuthorDate: Wed Feb 19 14:03:30 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 14:11:41 2014 +0000 xl: Comment error handling in dolog Coverity-ID: 1087116 Signed-off-by: Ian Jackson Acked-by: Ian Campbell CC: coverity@xenproject.org --- tools/libxl/xl_cmdimpl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 6a1e2ac..5a92c3b 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -352,6 +352,8 @@ static void dolog(const char *file, int line, const char *func, char *fmt, ...) rc = vasprintf(&s, fmt, ap); va_end(ap); if (rc >= 0) + /* we ignore write errors since we have no way to report them; + * the alternative would be to abort the whole program */ libxl_write_exactly(NULL, logfile, s, rc, NULL, NULL); free(s); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:59:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:59:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa87-00047a-Mg; Fri, 14 Mar 2014 21:59:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa85-000479-Ny for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:01 +0000 Received: from [193.109.254.147:43831] by server-9.bemta-14.messagelabs.com id 8D/CB-24895-5AB73235; Fri, 14 Mar 2014 21:59:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1394834339!1789177!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18173 invoked from network); 14 Mar 2014 21:59:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:59:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa83-0000f8-7S for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa83-0002Q5-6S for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:59 +0000 Date: Fri, 14 Mar 2014 21:58:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] coverity: Store the modelling file in the source tree. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25e3f24b6d621f45b6f5d0d8a20ac215c838fc8f Author: Andrew Cooper AuthorDate: Wed Feb 19 17:00:48 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 14:14:59 2014 +0000 coverity: Store the modelling file in the source tree. Signed-off-by: Andrew Cooper CC: Coverity Team Acked-by: Ian Campbell --- misc/coverity/model.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 131 insertions(+), 0 deletions(-) diff --git a/misc/coverity/model.c b/misc/coverity/model.c new file mode 100644 index 0000000..fac2ecb --- /dev/null +++ b/misc/coverity/model.c @@ -0,0 +1,131 @@ +/* Coverity Scan model + * + * This is a modelling file for Coverity Scan. Modelling helps to avoid false + * positives. + * + * - A model file can't import any header files. + * - Therefore only some built-in primitives like int, char and void are + * available but not NULL etc. + * - Modelling doesn't need full structs and typedefs. Rudimentary structs + * and similar types are sufficient. + * - An uninitialised local pointer is not an error. It signifies that the + * variable could be either NULL or have some data. + * + * Coverity Scan doesn't pick up modifications automatically. The model file + * must be uploaded by an admin in the analysis. + * + * The Xen Coverity Scan modelling file used the cpython modelling file as a + * reference to get started (suggested by Coverty Scan themselves as a good + * example), but all content is Xen specific. + * + * Copyright (c) 2013-2014 Citrix Systems Ltd; All Right Reserved + * + * Based on: + * http://hg.python.org/cpython/file/tip/Misc/coverity_model.c + * Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + * 2011, 2012, 2013 Python Software Foundation; All Rights Reserved + * + */ + +/* + * Useful references: + * https://scan.coverity.com/models + */ + +/* Definitions */ +#define NULL (void *)0 +#define PAGE_SIZE 4096UL +#define PAGE_MASK (~(PAGE_SIZE-1)) + +#define assert(cond) /* empty */ + +struct page_info {}; +struct pthread_mutex_t {}; + +struct libxl__ctx +{ + struct pthread_mutex_t lock; +}; +typedef struct libxl__ctx libxl_ctx; + +/* + * Xen malloc. Behaves exactly like regular malloc(), except it also contains + * an alignment parameter. + * + * TODO: work out how to correctly model bad alignments as errors. + */ +void *_xmalloc(unsigned long size, unsigned long align) +{ + int has_memory; + + __coverity_negative_sink__(size); + __coverity_negative_sink__(align); + + if ( has_memory ) + return __coverity_alloc__(size); + else + return NULL; +} + +/* + * Xen free. Frees a pointer allocated by _xmalloc(). + */ +void xfree(void *va) +{ + __coverity_free__(va); +} + + +/* + * map_domain_page() takes an existing domain page and possibly maps it into + * the Xen pagetables, to allow for direct access. Model this as a memory + * allocation of exactly 1 page. + * + * map_domain_page() never fails. (It will BUG() before returning NULL) + * + * TODO: work out how to correctly model the behaviour that this function will + * only ever return page aligned pointers. + */ +void *map_domain_page(unsigned long mfn) +{ + return __coverity_alloc__(PAGE_SIZE); +} + +/* + * unmap_domain_page() will unmap a page. Model it as a free(). + */ +void unmap_domain_page(const void *va) +{ + __coverity_free__(va); +} + +/* + * Coverity appears not to understand that errx() unconditionally exits. + */ +void errx(int, const char*, ...) +{ + __coverity_panic__(); +} + +/* + * Coverity doesn't appear to be certain that the libxl ctx->lock is recursive. + */ +void libxl__ctx_lock(libxl_ctx *ctx) +{ + __coverity_recursive_lock_acquire__(&ctx->lock); +} + +void libxl__ctx_unlock(libxl_ctx *ctx) +{ + __coverity_recursive_lock_release__(&ctx->lock); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:59:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:59:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa87-00047a-Mg; Fri, 14 Mar 2014 21:59:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa85-000479-Ny for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:01 +0000 Received: from [193.109.254.147:43831] by server-9.bemta-14.messagelabs.com id 8D/CB-24895-5AB73235; Fri, 14 Mar 2014 21:59:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1394834339!1789177!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18173 invoked from network); 14 Mar 2014 21:59:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:59:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa83-0000f8-7S for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa83-0002Q5-6S for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:58:59 +0000 Date: Fri, 14 Mar 2014 21:58:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] coverity: Store the modelling file in the source tree. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25e3f24b6d621f45b6f5d0d8a20ac215c838fc8f Author: Andrew Cooper AuthorDate: Wed Feb 19 17:00:48 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 14:14:59 2014 +0000 coverity: Store the modelling file in the source tree. Signed-off-by: Andrew Cooper CC: Coverity Team Acked-by: Ian Campbell --- misc/coverity/model.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 131 insertions(+), 0 deletions(-) diff --git a/misc/coverity/model.c b/misc/coverity/model.c new file mode 100644 index 0000000..fac2ecb --- /dev/null +++ b/misc/coverity/model.c @@ -0,0 +1,131 @@ +/* Coverity Scan model + * + * This is a modelling file for Coverity Scan. Modelling helps to avoid false + * positives. + * + * - A model file can't import any header files. + * - Therefore only some built-in primitives like int, char and void are + * available but not NULL etc. + * - Modelling doesn't need full structs and typedefs. Rudimentary structs + * and similar types are sufficient. + * - An uninitialised local pointer is not an error. It signifies that the + * variable could be either NULL or have some data. + * + * Coverity Scan doesn't pick up modifications automatically. The model file + * must be uploaded by an admin in the analysis. + * + * The Xen Coverity Scan modelling file used the cpython modelling file as a + * reference to get started (suggested by Coverty Scan themselves as a good + * example), but all content is Xen specific. + * + * Copyright (c) 2013-2014 Citrix Systems Ltd; All Right Reserved + * + * Based on: + * http://hg.python.org/cpython/file/tip/Misc/coverity_model.c + * Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + * 2011, 2012, 2013 Python Software Foundation; All Rights Reserved + * + */ + +/* + * Useful references: + * https://scan.coverity.com/models + */ + +/* Definitions */ +#define NULL (void *)0 +#define PAGE_SIZE 4096UL +#define PAGE_MASK (~(PAGE_SIZE-1)) + +#define assert(cond) /* empty */ + +struct page_info {}; +struct pthread_mutex_t {}; + +struct libxl__ctx +{ + struct pthread_mutex_t lock; +}; +typedef struct libxl__ctx libxl_ctx; + +/* + * Xen malloc. Behaves exactly like regular malloc(), except it also contains + * an alignment parameter. + * + * TODO: work out how to correctly model bad alignments as errors. + */ +void *_xmalloc(unsigned long size, unsigned long align) +{ + int has_memory; + + __coverity_negative_sink__(size); + __coverity_negative_sink__(align); + + if ( has_memory ) + return __coverity_alloc__(size); + else + return NULL; +} + +/* + * Xen free. Frees a pointer allocated by _xmalloc(). + */ +void xfree(void *va) +{ + __coverity_free__(va); +} + + +/* + * map_domain_page() takes an existing domain page and possibly maps it into + * the Xen pagetables, to allow for direct access. Model this as a memory + * allocation of exactly 1 page. + * + * map_domain_page() never fails. (It will BUG() before returning NULL) + * + * TODO: work out how to correctly model the behaviour that this function will + * only ever return page aligned pointers. + */ +void *map_domain_page(unsigned long mfn) +{ + return __coverity_alloc__(PAGE_SIZE); +} + +/* + * unmap_domain_page() will unmap a page. Model it as a free(). + */ +void unmap_domain_page(const void *va) +{ + __coverity_free__(va); +} + +/* + * Coverity appears not to understand that errx() unconditionally exits. + */ +void errx(int, const char*, ...) +{ + __coverity_panic__(); +} + +/* + * Coverity doesn't appear to be certain that the libxl ctx->lock is recursive. + */ +void libxl__ctx_lock(libxl_ctx *ctx) +{ + __coverity_recursive_lock_acquire__(&ctx->lock); +} + +void libxl__ctx_unlock(libxl_ctx *ctx) +{ + __coverity_recursive_lock_release__(&ctx->lock); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:59:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:59:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8H-00049S-QM; Fri, 14 Mar 2014 21:59:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8G-00049A-6K for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:12 +0000 Received: from [85.158.137.68:2981] by server-17.bemta-3.messagelabs.com id 73/18-22741-FAB73235; Fri, 14 Mar 2014 21:59:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1394834349!744454!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12513 invoked from network); 14 Mar 2014 21:59:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:59:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8D-0000fh-D0 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa8D-0002Qd-B9 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:09 +0000 Date: Fri, 14 Mar 2014 21:59:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Don't read off the end of tinfo[] X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 81b03050485708698ce2245d9abefce07aafb704 Author: Andrew Cooper AuthorDate: Tue Feb 18 15:59:05 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 14:23:23 2014 +0000 tools/libxl: Don't read off the end of tinfo[] It is very common for BIOSes to advertise more cpus than are actually present on the system, and mark some of them as offline. This is what Xen does to allow for later CPU hotplug, and what BIOSes common to multiple different systems do to to save fully rewriting the MADT in memory. An excerpt from `xl info` might look like: ... nr_cpus : 2 max_cpu_id : 3 ... Which shows 4 CPUs in the MADT, but only 2 online (as this particular box is the dual-core rather than the quad-core SKU of its particular brand) Because of the way Xen exposes this information, a libxl_cputopology array is bounded by 'nr_cpus', while cpu bitmaps are bounded by 'max_cpu_id + 1'. The current libxl code has two places which erroneously assume that a libxl_cputopology array is as long as the number of bits found in a cpu bitmap, and valgrind complains: ==14961== Invalid read of size 4 ==14961== at 0x407AB7F: libxl__get_numa_candidate (libxl_numa.c:230) ==14961== by 0x407030B: libxl__build_pre (libxl_dom.c:167) ==14961== by 0x406246F: libxl__domain_build (libxl_create.c:371) ... ==14961== Address 0x4324788 is 8 bytes after a block of size 24 alloc'd ==14961== at 0x402669D: calloc (in/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so) ==14961== by 0x4075BB9: libxl__zalloc (libxl_internal.c:83) ==14961== by 0x4052F87: libxl_get_cpu_topology (libxl.c:4408) ==14961== by 0x407A899: libxl__get_numa_candidate (libxl_numa.c:342) ... Signed-off-by: Andrew Cooper Reviewed-by: Dario Faggioli Acked-by: Ian Campbell CC: Ian Jackson --- tools/libxl/libxl_numa.c | 5 ++++- tools/libxl/libxl_utils.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_numa.c b/tools/libxl/libxl_numa.c index 20c99ac..4fac664 100644 --- a/tools/libxl/libxl_numa.c +++ b/tools/libxl/libxl_numa.c @@ -180,6 +180,7 @@ static int nodemap_to_nr_vcpus(libxl__gc *gc, int vcpus_on_node[], /* Number of vcpus able to run on the cpus of the various nodes * (reported by filling the array vcpus_on_node[]). */ static int nr_vcpus_on_nodes(libxl__gc *gc, libxl_cputopology *tinfo, + size_t tinfo_elements, const libxl_bitmap *suitable_cpumap, int vcpus_on_node[]) { @@ -222,6 +223,8 @@ static int nr_vcpus_on_nodes(libxl__gc *gc, libxl_cputopology *tinfo, */ libxl_bitmap_set_none(&nodes_counted); libxl_for_each_set_bit(k, vinfo[j].cpumap) { + if (k >= tinfo_elements) + break; int node = tinfo[k].node; if (libxl_bitmap_test(suitable_cpumap, k) && @@ -364,7 +367,7 @@ int libxl__get_numa_candidate(libxl__gc *gc, * all we have to do later is summing up the right elements of the * vcpus_on_node array. */ - rc = nr_vcpus_on_nodes(gc, tinfo, suitable_cpumap, vcpus_on_node); + rc = nr_vcpus_on_nodes(gc, tinfo, nr_cpus, suitable_cpumap, vcpus_on_node); if (rc) goto out; diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index c9cef66..1f334f2 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -762,8 +762,11 @@ int libxl_cpumap_to_nodemap(libxl_ctx *ctx, } libxl_bitmap_set_none(nodemap); - libxl_for_each_set_bit(i, *cpumap) + libxl_for_each_set_bit(i, *cpumap) { + if (i >= nr_cpus) + break; libxl_bitmap_set(nodemap, tinfo[i].node); + } out: libxl_cputopology_list_free(tinfo, nr_cpus); return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:59:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:59:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8H-00049S-QM; Fri, 14 Mar 2014 21:59:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8G-00049A-6K for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:12 +0000 Received: from [85.158.137.68:2981] by server-17.bemta-3.messagelabs.com id 73/18-22741-FAB73235; Fri, 14 Mar 2014 21:59:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1394834349!744454!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12513 invoked from network); 14 Mar 2014 21:59:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:59:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8D-0000fh-D0 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa8D-0002Qd-B9 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:09 +0000 Date: Fri, 14 Mar 2014 21:59:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Don't read off the end of tinfo[] X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 81b03050485708698ce2245d9abefce07aafb704 Author: Andrew Cooper AuthorDate: Tue Feb 18 15:59:05 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 12 14:23:23 2014 +0000 tools/libxl: Don't read off the end of tinfo[] It is very common for BIOSes to advertise more cpus than are actually present on the system, and mark some of them as offline. This is what Xen does to allow for later CPU hotplug, and what BIOSes common to multiple different systems do to to save fully rewriting the MADT in memory. An excerpt from `xl info` might look like: ... nr_cpus : 2 max_cpu_id : 3 ... Which shows 4 CPUs in the MADT, but only 2 online (as this particular box is the dual-core rather than the quad-core SKU of its particular brand) Because of the way Xen exposes this information, a libxl_cputopology array is bounded by 'nr_cpus', while cpu bitmaps are bounded by 'max_cpu_id + 1'. The current libxl code has two places which erroneously assume that a libxl_cputopology array is as long as the number of bits found in a cpu bitmap, and valgrind complains: ==14961== Invalid read of size 4 ==14961== at 0x407AB7F: libxl__get_numa_candidate (libxl_numa.c:230) ==14961== by 0x407030B: libxl__build_pre (libxl_dom.c:167) ==14961== by 0x406246F: libxl__domain_build (libxl_create.c:371) ... ==14961== Address 0x4324788 is 8 bytes after a block of size 24 alloc'd ==14961== at 0x402669D: calloc (in/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so) ==14961== by 0x4075BB9: libxl__zalloc (libxl_internal.c:83) ==14961== by 0x4052F87: libxl_get_cpu_topology (libxl.c:4408) ==14961== by 0x407A899: libxl__get_numa_candidate (libxl_numa.c:342) ... Signed-off-by: Andrew Cooper Reviewed-by: Dario Faggioli Acked-by: Ian Campbell CC: Ian Jackson --- tools/libxl/libxl_numa.c | 5 ++++- tools/libxl/libxl_utils.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_numa.c b/tools/libxl/libxl_numa.c index 20c99ac..4fac664 100644 --- a/tools/libxl/libxl_numa.c +++ b/tools/libxl/libxl_numa.c @@ -180,6 +180,7 @@ static int nodemap_to_nr_vcpus(libxl__gc *gc, int vcpus_on_node[], /* Number of vcpus able to run on the cpus of the various nodes * (reported by filling the array vcpus_on_node[]). */ static int nr_vcpus_on_nodes(libxl__gc *gc, libxl_cputopology *tinfo, + size_t tinfo_elements, const libxl_bitmap *suitable_cpumap, int vcpus_on_node[]) { @@ -222,6 +223,8 @@ static int nr_vcpus_on_nodes(libxl__gc *gc, libxl_cputopology *tinfo, */ libxl_bitmap_set_none(&nodes_counted); libxl_for_each_set_bit(k, vinfo[j].cpumap) { + if (k >= tinfo_elements) + break; int node = tinfo[k].node; if (libxl_bitmap_test(suitable_cpumap, k) && @@ -364,7 +367,7 @@ int libxl__get_numa_candidate(libxl__gc *gc, * all we have to do later is summing up the right elements of the * vcpus_on_node array. */ - rc = nr_vcpus_on_nodes(gc, tinfo, suitable_cpumap, vcpus_on_node); + rc = nr_vcpus_on_nodes(gc, tinfo, nr_cpus, suitable_cpumap, vcpus_on_node); if (rc) goto out; diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index c9cef66..1f334f2 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -762,8 +762,11 @@ int libxl_cpumap_to_nodemap(libxl_ctx *ctx, } libxl_bitmap_set_none(nodemap); - libxl_for_each_set_bit(i, *cpumap) + libxl_for_each_set_bit(i, *cpumap) { + if (i >= nr_cpus) + break; libxl_bitmap_set(nodemap, tinfo[i].node); + } out: libxl_cputopology_list_free(tinfo, nr_cpus); return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:59:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:59:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8R-0004B0-T8; Fri, 14 Mar 2014 21:59:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8Q-0004An-JN for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:22 +0000 Received: from [85.158.137.68:3317] by server-8.bemta-3.messagelabs.com id ED/60-21547-9BB73235; Fri, 14 Mar 2014 21:59:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1394834359!741382!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19456 invoked from network); 14 Mar 2014 21:59:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:59:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8N-0000fn-Ik for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa8N-0002Qz-Ho for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:19 +0000 Date: Fri, 14 Mar 2014 21:59:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] serial: Skip over PCIe device which have no quirks (fix AMT regression). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a8fdb9d5471b9bf1b5fcf444e00fa01a32b4435 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Mar 5 14:38:33 2014 -0500 Commit: Keir Fraser CommitDate: Thu Mar 13 10:21:23 2014 +0000 serial: Skip over PCIe device which have no quirks (fix AMT regression). The "ns16550: Add support for UART present in Broadcom TruManage capable NetXtreme chips" implies that only devices that are have an MMIO BAR and are in the quirks table should be processed. Even the comment at the end says so: If we have an io_base, then we succeeded in the lookup But the code was checking for the !io_base - which is to say if the io_base was 0 then we would skip scanning. But io_base always has a value - it is set by 'ns16550_init' to a default value - so it would never hit the 'continue' path. This means that if we have an communication device followed by a serial AMT device we would pick the communication device instead of the AMT device. See: 00:16.0 Communication controller: Intel Corporation Cougar Point HECI Controller #1 (rev 04) Subsystem: Intel Corporation Device 2008 Flags: bus master, fast devsel, latency 0, IRQ 11 Memory at fb12a000 (64-bit, non-prefetchable) [size=16] 00:16.3 Serial controller: Intel Corporation Cougar Point KT Controller (rev 04) (prog-if 02 [16550]) Subsystem: Intel Corporation Device 2008 Flags: bus master, 66MHz, fast devsel, latency 0, IRQ 17 I/O ports at f0e0 [size=8] Memory at fb129000 (32-bit, non-prefetchable) [size=4K] pci 0000:00:16.0: [8086:1c3a] type 00 class 0x078000 pci 0000:00:16.3: [8086:1c3d] type 00 class 0x070002 And Xen picks 00:16.0 as its console when using 'com1=115200,8n1,amt'. This patch fixes it and allows us to use AMT again by zeroing out io_base to zero. If the scan did not work, the io_base is set back to a default value (the 'pci_uart_config' does that already at its end). Tested-by: Aravind Gopalakrishnan CC: Suravee Suthikulpanit CC: Thomas Lendacky CC: Keir Fraser Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich --- xen/drivers/char/ns16550.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 53e49a1..2fded08 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -616,6 +616,7 @@ pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) unsigned int b, d, f, nextf, i; u16 vendor, device; + uart->io_base = 0; /* NB. Start at bus 1 to avoid AMT: a plug-in card cannot be on bus 0. */ for ( b = skip_amt ? 1 : 0; b < 0x100; b++ ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:59:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:59:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8R-0004B0-T8; Fri, 14 Mar 2014 21:59:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8Q-0004An-JN for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:22 +0000 Received: from [85.158.137.68:3317] by server-8.bemta-3.messagelabs.com id ED/60-21547-9BB73235; Fri, 14 Mar 2014 21:59:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1394834359!741382!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19456 invoked from network); 14 Mar 2014 21:59:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:59:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8N-0000fn-Ik for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa8N-0002Qz-Ho for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:19 +0000 Date: Fri, 14 Mar 2014 21:59:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] serial: Skip over PCIe device which have no quirks (fix AMT regression). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a8fdb9d5471b9bf1b5fcf444e00fa01a32b4435 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Mar 5 14:38:33 2014 -0500 Commit: Keir Fraser CommitDate: Thu Mar 13 10:21:23 2014 +0000 serial: Skip over PCIe device which have no quirks (fix AMT regression). The "ns16550: Add support for UART present in Broadcom TruManage capable NetXtreme chips" implies that only devices that are have an MMIO BAR and are in the quirks table should be processed. Even the comment at the end says so: If we have an io_base, then we succeeded in the lookup But the code was checking for the !io_base - which is to say if the io_base was 0 then we would skip scanning. But io_base always has a value - it is set by 'ns16550_init' to a default value - so it would never hit the 'continue' path. This means that if we have an communication device followed by a serial AMT device we would pick the communication device instead of the AMT device. See: 00:16.0 Communication controller: Intel Corporation Cougar Point HECI Controller #1 (rev 04) Subsystem: Intel Corporation Device 2008 Flags: bus master, fast devsel, latency 0, IRQ 11 Memory at fb12a000 (64-bit, non-prefetchable) [size=16] 00:16.3 Serial controller: Intel Corporation Cougar Point KT Controller (rev 04) (prog-if 02 [16550]) Subsystem: Intel Corporation Device 2008 Flags: bus master, 66MHz, fast devsel, latency 0, IRQ 17 I/O ports at f0e0 [size=8] Memory at fb129000 (32-bit, non-prefetchable) [size=4K] pci 0000:00:16.0: [8086:1c3a] type 00 class 0x078000 pci 0000:00:16.3: [8086:1c3d] type 00 class 0x070002 And Xen picks 00:16.0 as its console when using 'com1=115200,8n1,amt'. This patch fixes it and allows us to use AMT again by zeroing out io_base to zero. If the scan did not work, the io_base is set back to a default value (the 'pci_uart_config' does that already at its end). Tested-by: Aravind Gopalakrishnan CC: Suravee Suthikulpanit CC: Thomas Lendacky CC: Keir Fraser Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich --- xen/drivers/char/ns16550.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 53e49a1..2fded08 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -616,6 +616,7 @@ pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) unsigned int b, d, f, nextf, i; u16 vendor, device; + uart->io_base = 0; /* NB. Start at bus 1 to avoid AMT: a plug-in card cannot be on bus 0. */ for ( b = skip_amt ? 1 : 0; b < 0x100; b++ ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:59:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:59:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8d-0004Dg-1V; Fri, 14 Mar 2014 21:59:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8a-0004D2-N7 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:33 +0000 Received: from [85.158.137.68:51728] by server-3.bemta-3.messagelabs.com id 76/37-05289-3CB73235; Fri, 14 Mar 2014 21:59:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1394834369!728351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21065 invoked from network); 14 Mar 2014 21:59:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:59:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8X-0000ft-Oy for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa8X-0002RM-NC for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:29 +0000 Date: Fri, 14 Mar 2014 21:59:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] serial: Fix COM1 assumption if pci_uart_config did not find the AMT card. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 85c6f4f3803e0a0f5c57899c0bfd03b2e154ac3b Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 7 10:45:04 2014 -0500 Commit: Keir Fraser CommitDate: Thu Mar 13 10:21:24 2014 +0000 serial: Fix COM1 assumption if pci_uart_config did not find the AMT card. The io_base by default is set to be 0x3f8 for COM1 and 0x2f8 for COM2 in __setup_xen. Then we call 'ns16550_init' which copies those in the appropriate uart, which then calls 'ns16550_parse_port_config' to deal with parameter parsing. If the 'amt' parameter has been specified we further call 'pci_uart_config code' which scans the PCI bus. If it does not find the AMT device it would overwrite the io_base with 0x3f8 regardless whether this is COM1 or COM2 - but only if 'amt' parameter had been specified. The overwrite is a way to set it back to the failsafe defaults - except for COM2 it is bogus. Note again - if an AMT card is found, this over-write will not happen. This in theory (as I don't have a machine with two COM ports readily available) means that if the user specified 'com2=9600,8n1,amt' and the device did not have an AMT serial device, instead of using 0x2f8 for the io_base it ends up using 0x3f8 - and we don't get the output on COM2. If the user had done 'com2=9600,8n1' we would never get in this path so this bug would never manifest itself (because we don't end up scanning for the AMT device). We also unconditionally reset the IRQ value - so we would never get the proper interrupt when falling back to the legacy 0x3f8 and 0x2f8 COM ports. That is OK - as we would end up using the polling mode - while not the best - it still would work. Lastly the clock_hz is also set to the default one (UART_CLOCK_HZ, which is the same for legacy COM1 and COM2 ports)- that is strictly not a bug, but it is redundant and not needed. This bug was introduced with the original AMT support and I cannot recall why it was done that way - it is a bug. Fix it by saving the original io_base before starting the scan of the PCI bus. If we don't find an serial PCI device (because we did not exit out of the loop using return) then assign the original io_base value back. Signed-off-by: Konrad Rzeszutek Wilk [v1: Also remove the irq override spotted by Jan] [v2: Add more details to the commit description] Reviewed-by: Jan Beulich --- xen/drivers/char/ns16550.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 2fded08..d5fe689 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -612,10 +612,11 @@ static int __init pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) { uint32_t bar, bar_64 = 0, len, len_64; - u64 size, mask; + u64 size, mask, orig_base; unsigned int b, d, f, nextf, i; u16 vendor, device; + orig_base = uart->io_base; uart->io_base = 0; /* NB. Start at bus 1 to avoid AMT: a plug-in card cannot be on bus 0. */ for ( b = skip_amt ? 1 : 0; b < 0x100; b++ ) @@ -747,9 +748,8 @@ pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) if ( !skip_amt ) return -1; - uart->io_base = 0x3f8; - uart->irq = 0; - uart->clock_hz = UART_CLOCK_HZ; + /* No AMT found, fallback to the defaults. */ + uart->io_base = orig_base; return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:59:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:59:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8d-0004Dg-1V; Fri, 14 Mar 2014 21:59:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8a-0004D2-N7 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:33 +0000 Received: from [85.158.137.68:51728] by server-3.bemta-3.messagelabs.com id 76/37-05289-3CB73235; Fri, 14 Mar 2014 21:59:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1394834369!728351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21065 invoked from network); 14 Mar 2014 21:59:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:59:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8X-0000ft-Oy for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa8X-0002RM-NC for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:29 +0000 Date: Fri, 14 Mar 2014 21:59:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] serial: Fix COM1 assumption if pci_uart_config did not find the AMT card. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 85c6f4f3803e0a0f5c57899c0bfd03b2e154ac3b Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 7 10:45:04 2014 -0500 Commit: Keir Fraser CommitDate: Thu Mar 13 10:21:24 2014 +0000 serial: Fix COM1 assumption if pci_uart_config did not find the AMT card. The io_base by default is set to be 0x3f8 for COM1 and 0x2f8 for COM2 in __setup_xen. Then we call 'ns16550_init' which copies those in the appropriate uart, which then calls 'ns16550_parse_port_config' to deal with parameter parsing. If the 'amt' parameter has been specified we further call 'pci_uart_config code' which scans the PCI bus. If it does not find the AMT device it would overwrite the io_base with 0x3f8 regardless whether this is COM1 or COM2 - but only if 'amt' parameter had been specified. The overwrite is a way to set it back to the failsafe defaults - except for COM2 it is bogus. Note again - if an AMT card is found, this over-write will not happen. This in theory (as I don't have a machine with two COM ports readily available) means that if the user specified 'com2=9600,8n1,amt' and the device did not have an AMT serial device, instead of using 0x2f8 for the io_base it ends up using 0x3f8 - and we don't get the output on COM2. If the user had done 'com2=9600,8n1' we would never get in this path so this bug would never manifest itself (because we don't end up scanning for the AMT device). We also unconditionally reset the IRQ value - so we would never get the proper interrupt when falling back to the legacy 0x3f8 and 0x2f8 COM ports. That is OK - as we would end up using the polling mode - while not the best - it still would work. Lastly the clock_hz is also set to the default one (UART_CLOCK_HZ, which is the same for legacy COM1 and COM2 ports)- that is strictly not a bug, but it is redundant and not needed. This bug was introduced with the original AMT support and I cannot recall why it was done that way - it is a bug. Fix it by saving the original io_base before starting the scan of the PCI bus. If we don't find an serial PCI device (because we did not exit out of the loop using return) then assign the original io_base value back. Signed-off-by: Konrad Rzeszutek Wilk [v1: Also remove the irq override spotted by Jan] [v2: Add more details to the commit description] Reviewed-by: Jan Beulich --- xen/drivers/char/ns16550.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 2fded08..d5fe689 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -612,10 +612,11 @@ static int __init pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) { uint32_t bar, bar_64 = 0, len, len_64; - u64 size, mask; + u64 size, mask, orig_base; unsigned int b, d, f, nextf, i; u16 vendor, device; + orig_base = uart->io_base; uart->io_base = 0; /* NB. Start at bus 1 to avoid AMT: a plug-in card cannot be on bus 0. */ for ( b = skip_amt ? 1 : 0; b < 0x100; b++ ) @@ -747,9 +748,8 @@ pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) if ( !skip_amt ) return -1; - uart->io_base = 0x3f8; - uart->irq = 0; - uart->clock_hz = UART_CLOCK_HZ; + /* No AMT found, fallback to the defaults. */ + uart->io_base = orig_base; return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:59:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:59:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8m-0004Fj-4J; Fri, 14 Mar 2014 21:59:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8k-0004FQ-G4 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:42 +0000 Received: from [85.158.143.35:20213] by server-1.bemta-4.messagelabs.com id 6C/19-09853-DCB73235; Fri, 14 Mar 2014 21:59:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1394834380!2193303!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23500 invoked from network); 14 Mar 2014 21:59:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:59:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8h-0000fz-UW for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa8h-0002SU-Ss for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:39 +0000 Date: Fri, 14 Mar 2014 21:59:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] serial: Support OXPCIe952 aka Oxford Semiconductor Ltd Device c138 (1415:c138) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 70e46c9c141ce3b0a49b6b8007938ea415e4af80 Author: Konrad Rzeszutek Wilk AuthorDate: Sat Mar 1 15:08:07 2014 -0500 Commit: Keir Fraser CommitDate: Thu Mar 13 10:21:24 2014 +0000 serial: Support OXPCIe952 aka Oxford Semiconductor Ltd Device c138 (1415:c138) Because they are PCIe and machine nowadys have those instead of PCI, and they are inexpensive. Tested with 1415:c138. Should also work on 0xc11f, 0xc11b models of that chip. Also on OXPCIe200 1 Native UART 1415: 0xc40b, 0xc40f, 0xc41b, 0xc41f, 0xc42b, 0xc42f, 0xc43b, 0xc43f, 0xc44b, 0xc44f, 0xc45b 0xc45f, 0xc46b, 0xc46f, 0xc47b, 0xc47f, 0xc48b, 0xc48f, 0xc49b 0xc49f, 0xc4ab, 0xc4af, 0xc4bb, 0xc4bf, 0xc4cb, 0xc4cf but since I don't have any of those cards this patch does not enable it. Signed-off-by: Konrad Rzeszutek Wilk [v1: Init for ARM and add offset to virt addr] [v2: Remove the offset usage] Tested-by: Aravind Gopalakrishnan Reviewed-by: Jan Beulich --- xen/drivers/char/ns16550.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index d5fe689..72da46d 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -89,6 +89,9 @@ struct ns16550_config_mmio { unsigned int fifo_size; u8 lsr_mask; unsigned int max_bars; + unsigned int base_baud; + unsigned int uart_offset; + unsigned int first_offset; }; @@ -111,6 +114,19 @@ static struct ns16550_config_mmio __initdata uart_config[] = .lsr_mask = (UART_LSR_THRE | UART_LSR_TEMT), .max_bars = 1, }, + /* OXPCIe952 1 Native UART */ + { + .vendor_id = 0x1415, + .dev_id = 0xc138, + .base_baud = 4000000, + .uart_offset = 0x200, + .first_offset = 0x1000, + .reg_width = 1, + .reg_shift = 0, + .fifo_size = 16, + .lsr_mask = UART_LSR_THRE, + .max_bars = 1, /* It can do more, but we would need more custom code.*/ + } }; #endif @@ -703,6 +719,10 @@ pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) uart->lsr_mask = uart_config[i].lsr_mask; uart->io_base = ((u64)bar_64 << 32) | (bar & PCI_BASE_ADDRESS_MEM_MASK); + uart->io_base += uart_config[i].first_offset; + uart->io_base += bar_idx * uart_config[i].uart_offset; + if ( uart_config[i].base_baud ) + uart->clock_hz = uart_config[i].base_baud * 16; /* Set device and MMIO region read only to Dom0 */ uart->enable_ro = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:59:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:59:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8m-0004Fj-4J; Fri, 14 Mar 2014 21:59:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8k-0004FQ-G4 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:42 +0000 Received: from [85.158.143.35:20213] by server-1.bemta-4.messagelabs.com id 6C/19-09853-DCB73235; Fri, 14 Mar 2014 21:59:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1394834380!2193303!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23500 invoked from network); 14 Mar 2014 21:59:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:59:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8h-0000fz-UW for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa8h-0002SU-Ss for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:39 +0000 Date: Fri, 14 Mar 2014 21:59:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] serial: Support OXPCIe952 aka Oxford Semiconductor Ltd Device c138 (1415:c138) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 70e46c9c141ce3b0a49b6b8007938ea415e4af80 Author: Konrad Rzeszutek Wilk AuthorDate: Sat Mar 1 15:08:07 2014 -0500 Commit: Keir Fraser CommitDate: Thu Mar 13 10:21:24 2014 +0000 serial: Support OXPCIe952 aka Oxford Semiconductor Ltd Device c138 (1415:c138) Because they are PCIe and machine nowadys have those instead of PCI, and they are inexpensive. Tested with 1415:c138. Should also work on 0xc11f, 0xc11b models of that chip. Also on OXPCIe200 1 Native UART 1415: 0xc40b, 0xc40f, 0xc41b, 0xc41f, 0xc42b, 0xc42f, 0xc43b, 0xc43f, 0xc44b, 0xc44f, 0xc45b 0xc45f, 0xc46b, 0xc46f, 0xc47b, 0xc47f, 0xc48b, 0xc48f, 0xc49b 0xc49f, 0xc4ab, 0xc4af, 0xc4bb, 0xc4bf, 0xc4cb, 0xc4cf but since I don't have any of those cards this patch does not enable it. Signed-off-by: Konrad Rzeszutek Wilk [v1: Init for ARM and add offset to virt addr] [v2: Remove the offset usage] Tested-by: Aravind Gopalakrishnan Reviewed-by: Jan Beulich --- xen/drivers/char/ns16550.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index d5fe689..72da46d 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -89,6 +89,9 @@ struct ns16550_config_mmio { unsigned int fifo_size; u8 lsr_mask; unsigned int max_bars; + unsigned int base_baud; + unsigned int uart_offset; + unsigned int first_offset; }; @@ -111,6 +114,19 @@ static struct ns16550_config_mmio __initdata uart_config[] = .lsr_mask = (UART_LSR_THRE | UART_LSR_TEMT), .max_bars = 1, }, + /* OXPCIe952 1 Native UART */ + { + .vendor_id = 0x1415, + .dev_id = 0xc138, + .base_baud = 4000000, + .uart_offset = 0x200, + .first_offset = 0x1000, + .reg_width = 1, + .reg_shift = 0, + .fifo_size = 16, + .lsr_mask = UART_LSR_THRE, + .max_bars = 1, /* It can do more, but we would need more custom code.*/ + } }; #endif @@ -703,6 +719,10 @@ pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) uart->lsr_mask = uart_config[i].lsr_mask; uart->io_base = ((u64)bar_64 << 32) | (bar & PCI_BASE_ADDRESS_MEM_MASK); + uart->io_base += uart_config[i].first_offset; + uart->io_base += bar_idx * uart_config[i].uart_offset; + if ( uart_config[i].base_baud ) + uart->clock_hz = uart_config[i].base_baud * 16; /* Set device and MMIO region read only to Dom0 */ uart->enable_ro = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:59:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:59:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8w-0004Hz-7O; Fri, 14 Mar 2014 21:59:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8u-0004Hk-OK for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:53 +0000 Received: from [85.158.139.211:64746] by server-8.bemta-5.messagelabs.com id 45/70-11310-7DB73235; Fri, 14 Mar 2014 21:59:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1394834390!1157588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16620 invoked from network); 14 Mar 2014 21:59:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:59:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8s-0000g5-3A for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa8s-0002St-2E for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:50 +0000 Date: Fri, 14 Mar 2014 21:59:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] serial: Seperate the PCI device ids and parameters (v1) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ab1e4a9325a0835818b002a45505be37e644787 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 7 12:44:30 2014 -0500 Commit: Keir Fraser CommitDate: Thu Mar 13 10:21:24 2014 +0000 serial: Seperate the PCI device ids and parameters (v1) This will allow us to re-use the parameters for multiple PCI devices. No functional change. Signed-off-by: Konrad Rzeszutek Wilk [v1: s/nr/idx/ of the enum, use __initconst and const by Jan's review] Reviewed-by: Jan Beulich --- xen/drivers/char/ns16550.c | 67 +++++++++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 23 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 72da46d..66d10f7 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -80,10 +80,14 @@ static struct ns16550 { #endif } ns16550_com[2] = { { 0 } }; -/* Defining uart config options for MMIO devices */ struct ns16550_config_mmio { u16 vendor_id; u16 dev_id; + unsigned int param; +}; + +/* Defining uart config options for MMIO devices */ +struct ns16550_config_param { unsigned int reg_shift; unsigned int reg_width; unsigned int fifo_size; @@ -96,28 +100,27 @@ struct ns16550_config_mmio { #ifdef HAS_PCI +enum { + param_default = 0, + param_trumanage, + param_oxford, +}; /* * Create lookup tables for specific MMIO devices.. * It is assumed that if the device found is MMIO, * then you have indexed it here. Else, the driver * does nothing. */ -static struct ns16550_config_mmio __initdata uart_config[] = -{ - /* Broadcom TruManage device */ - { - .vendor_id = 0x14e4, - .dev_id = 0x160a, +static const struct ns16550_config_param __initconst uart_param[] = { + [param_default] = { }, /* Ignored. */ + [param_trumanage] = { .reg_shift = 2, .reg_width = 1, .fifo_size = 16, .lsr_mask = (UART_LSR_THRE | UART_LSR_TEMT), .max_bars = 1, }, - /* OXPCIe952 1 Native UART */ - { - .vendor_id = 0x1415, - .dev_id = 0xc138, + [param_oxford] = { .base_baud = 4000000, .uart_offset = 0x200, .first_offset = 0x1000, @@ -128,6 +131,21 @@ static struct ns16550_config_mmio __initdata uart_config[] = .max_bars = 1, /* It can do more, but we would need more custom code.*/ } }; +static const struct ns16550_config_mmio __initconst uart_config[] = +{ + /* Broadcom TruManage device */ + { + .vendor_id = 0x14e4, + .dev_id = 0x160a, + .param = param_trumanage, + }, + /* OXPCIe952 1 Native UART */ + { + .vendor_id = 0x1415, + .dev_id = 0xc138, + .param = param_oxford, + } +}; #endif static void ns16550_delayed_resume(void *data); @@ -692,37 +710,40 @@ pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) size &= -size; - /* Check for quirks in uart_config lookup table */ + /* Check for params in uart_config lookup table */ for ( i = 0; i < ARRAY_SIZE(uart_config); i++) { + unsigned int p; + if ( uart_config[i].vendor_id != vendor ) continue; if ( uart_config[i].dev_id != device ) continue; + p = uart_config[i].param; /* * Force length of mmio region to be at least * 8 bytes times (1 << reg_shift) */ - if ( size < (0x8 * (1 << uart_config[i].reg_shift)) ) + if ( size < (0x8 * (1 << uart_param[p].reg_shift)) ) continue; - if ( bar_idx >= uart_config[i].max_bars ) + if ( bar_idx >= uart_param[p].max_bars ) continue; - if ( uart_config[i].fifo_size ) - uart->fifo_size = uart_config[i].fifo_size; + if ( uart_param[p].fifo_size ) + uart->fifo_size = uart_param[p].fifo_size; - uart->reg_shift = uart_config[i].reg_shift; - uart->reg_width = uart_config[i].reg_width; - uart->lsr_mask = uart_config[i].lsr_mask; + uart->reg_shift = uart_param[p].reg_shift; + uart->reg_width = uart_param[p].reg_width; + uart->lsr_mask = uart_param[p].lsr_mask; uart->io_base = ((u64)bar_64 << 32) | (bar & PCI_BASE_ADDRESS_MEM_MASK); - uart->io_base += uart_config[i].first_offset; - uart->io_base += bar_idx * uart_config[i].uart_offset; - if ( uart_config[i].base_baud ) - uart->clock_hz = uart_config[i].base_baud * 16; + uart->io_base += uart_param[p].first_offset; + uart->io_base += bar_idx * uart_param[p].uart_offset; + if ( uart_param[p].base_baud ) + uart->clock_hz = uart_param[p].base_baud * 16; /* Set device and MMIO region read only to Dom0 */ uart->enable_ro = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 21:59:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 21:59:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8w-0004Hz-7O; Fri, 14 Mar 2014 21:59:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8u-0004Hk-OK for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:53 +0000 Received: from [85.158.139.211:64746] by server-8.bemta-5.messagelabs.com id 45/70-11310-7DB73235; Fri, 14 Mar 2014 21:59:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1394834390!1157588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16620 invoked from network); 14 Mar 2014 21:59:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 21:59:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa8s-0000g5-3A for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa8s-0002St-2E for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 21:59:50 +0000 Date: Fri, 14 Mar 2014 21:59:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] serial: Seperate the PCI device ids and parameters (v1) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ab1e4a9325a0835818b002a45505be37e644787 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 7 12:44:30 2014 -0500 Commit: Keir Fraser CommitDate: Thu Mar 13 10:21:24 2014 +0000 serial: Seperate the PCI device ids and parameters (v1) This will allow us to re-use the parameters for multiple PCI devices. No functional change. Signed-off-by: Konrad Rzeszutek Wilk [v1: s/nr/idx/ of the enum, use __initconst and const by Jan's review] Reviewed-by: Jan Beulich --- xen/drivers/char/ns16550.c | 67 +++++++++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 23 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 72da46d..66d10f7 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -80,10 +80,14 @@ static struct ns16550 { #endif } ns16550_com[2] = { { 0 } }; -/* Defining uart config options for MMIO devices */ struct ns16550_config_mmio { u16 vendor_id; u16 dev_id; + unsigned int param; +}; + +/* Defining uart config options for MMIO devices */ +struct ns16550_config_param { unsigned int reg_shift; unsigned int reg_width; unsigned int fifo_size; @@ -96,28 +100,27 @@ struct ns16550_config_mmio { #ifdef HAS_PCI +enum { + param_default = 0, + param_trumanage, + param_oxford, +}; /* * Create lookup tables for specific MMIO devices.. * It is assumed that if the device found is MMIO, * then you have indexed it here. Else, the driver * does nothing. */ -static struct ns16550_config_mmio __initdata uart_config[] = -{ - /* Broadcom TruManage device */ - { - .vendor_id = 0x14e4, - .dev_id = 0x160a, +static const struct ns16550_config_param __initconst uart_param[] = { + [param_default] = { }, /* Ignored. */ + [param_trumanage] = { .reg_shift = 2, .reg_width = 1, .fifo_size = 16, .lsr_mask = (UART_LSR_THRE | UART_LSR_TEMT), .max_bars = 1, }, - /* OXPCIe952 1 Native UART */ - { - .vendor_id = 0x1415, - .dev_id = 0xc138, + [param_oxford] = { .base_baud = 4000000, .uart_offset = 0x200, .first_offset = 0x1000, @@ -128,6 +131,21 @@ static struct ns16550_config_mmio __initdata uart_config[] = .max_bars = 1, /* It can do more, but we would need more custom code.*/ } }; +static const struct ns16550_config_mmio __initconst uart_config[] = +{ + /* Broadcom TruManage device */ + { + .vendor_id = 0x14e4, + .dev_id = 0x160a, + .param = param_trumanage, + }, + /* OXPCIe952 1 Native UART */ + { + .vendor_id = 0x1415, + .dev_id = 0xc138, + .param = param_oxford, + } +}; #endif static void ns16550_delayed_resume(void *data); @@ -692,37 +710,40 @@ pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) size &= -size; - /* Check for quirks in uart_config lookup table */ + /* Check for params in uart_config lookup table */ for ( i = 0; i < ARRAY_SIZE(uart_config); i++) { + unsigned int p; + if ( uart_config[i].vendor_id != vendor ) continue; if ( uart_config[i].dev_id != device ) continue; + p = uart_config[i].param; /* * Force length of mmio region to be at least * 8 bytes times (1 << reg_shift) */ - if ( size < (0x8 * (1 << uart_config[i].reg_shift)) ) + if ( size < (0x8 * (1 << uart_param[p].reg_shift)) ) continue; - if ( bar_idx >= uart_config[i].max_bars ) + if ( bar_idx >= uart_param[p].max_bars ) continue; - if ( uart_config[i].fifo_size ) - uart->fifo_size = uart_config[i].fifo_size; + if ( uart_param[p].fifo_size ) + uart->fifo_size = uart_param[p].fifo_size; - uart->reg_shift = uart_config[i].reg_shift; - uart->reg_width = uart_config[i].reg_width; - uart->lsr_mask = uart_config[i].lsr_mask; + uart->reg_shift = uart_param[p].reg_shift; + uart->reg_width = uart_param[p].reg_width; + uart->lsr_mask = uart_param[p].lsr_mask; uart->io_base = ((u64)bar_64 << 32) | (bar & PCI_BASE_ADDRESS_MEM_MASK); - uart->io_base += uart_config[i].first_offset; - uart->io_base += bar_idx * uart_config[i].uart_offset; - if ( uart_config[i].base_baud ) - uart->clock_hz = uart_config[i].base_baud * 16; + uart->io_base += uart_param[p].first_offset; + uart->io_base += bar_idx * uart_param[p].uart_offset; + if ( uart_param[p].base_baud ) + uart->clock_hz = uart_param[p].base_baud * 16; /* Set device and MMIO region read only to Dom0 */ uart->enable_ro = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:00:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:00:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa96-0004MO-Bw; Fri, 14 Mar 2014 22:00:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa94-0004Ke-NW for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:03 +0000 Received: from [193.109.254.147:51871] by server-12.bemta-14.messagelabs.com id D1/FE-17220-2EB73235; Fri, 14 Mar 2014 22:00:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1394834400!1817157!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19644 invoked from network); 14 Mar 2014 22:00:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:00:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa92-0000gB-8x for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa92-0002TO-7J for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:00 +0000 Date: Fri, 14 Mar 2014 22:00:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pci: Use #defines for PCI vendors. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f5e19b4eece8b6a47fd254845fe9dd392fc5c72 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Mar 10 12:53:52 2014 -0400 Commit: Keir Fraser CommitDate: Thu Mar 13 10:21:24 2014 +0000 pci: Use #defines for PCI vendors. Instead of having hard-coded values. We only do PCI vendors as Jan requested and put all PCI device vendors in one new file. Signed-off-by: Konrad Rzeszutek Wilk [v1: Sorted them based on their numerical values per Jan's review] Suggested-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/oprofile/op_model_athlon.c | 4 ++-- xen/arch/x86/x86_64/mmconf-fam10h.c | 1 + xen/arch/x86/x86_64/mmconfig-shared.c | 1 + xen/arch/x86/x86_64/mmconfig.h | 4 ---- xen/drivers/char/ns16550.c | 5 +++-- xen/include/xen/pci_ids.h | 9 +++++++++ 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/oprofile/op_model_athlon.c b/xen/arch/x86/oprofile/op_model_athlon.c index ad84768..204343d 100644 --- a/xen/arch/x86/oprofile/op_model_athlon.c +++ b/xen/arch/x86/oprofile/op_model_athlon.c @@ -20,7 +20,8 @@ #include #include #include - +#include + #include "op_x86_model.h" #include "op_counter.h" @@ -445,7 +446,6 @@ static inline void __init init_ibs_nmi_per_cpu(void *arg) apic_write(reg, APIC_EILVT_MSG_NMI << 8); } -#define PCI_VENDOR_ID_AMD 0x1022 #define PCI_DEVICE_ID_AMD_10H_NB_MISC 0x1203 #define IBSCTL 0x1cc static int __init init_ibs_nmi(void) diff --git a/xen/arch/x86/x86_64/mmconf-fam10h.c b/xen/arch/x86/x86_64/mmconf-fam10h.c index 1373acb..65260f6 100644 --- a/xen/arch/x86/x86_64/mmconf-fam10h.c +++ b/xen/arch/x86/x86_64/mmconf-fam10h.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/x86_64/mmconfig-shared.c b/xen/arch/x86/x86_64/mmconfig-shared.c index 7589b64..742bc18 100644 --- a/xen/arch/x86/x86_64/mmconfig-shared.c +++ b/xen/arch/x86/x86_64/mmconfig-shared.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/x86_64/mmconfig.h b/xen/arch/x86/x86_64/mmconfig.h index 36e0448..c447e5a 100644 --- a/xen/arch/x86/x86_64/mmconfig.h +++ b/xen/arch/x86/x86_64/mmconfig.h @@ -17,7 +17,6 @@ * Author: Allen Kay - adapted from linux */ -#define PCI_VENDOR_ID_INTEL 0x8086 #define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590 #define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770 @@ -29,11 +28,8 @@ #define PCI_PROBE_MASK 0x000f #define PCI_PROBE_NOEARLY 0x0010 -#define PCI_VENDOR_ID_AMD 0x1022 #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 -#define PCI_VENDOR_ID_NVIDIA 0x10de - extern unsigned int pci_probe; /* diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 66d10f7..fd66238 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -19,6 +19,7 @@ #ifdef HAS_PCI #include #include +#include #endif #include #include @@ -135,13 +136,13 @@ static const struct ns16550_config_mmio __initconst uart_config[] = { /* Broadcom TruManage device */ { - .vendor_id = 0x14e4, + .vendor_id = PCI_VENDOR_ID_BROADCOM, .dev_id = 0x160a, .param = param_trumanage, }, /* OXPCIe952 1 Native UART */ { - .vendor_id = 0x1415, + .vendor_id = PCI_VENDOR_ID_OXSEMI, .dev_id = 0xc138, .param = param_oxford, } diff --git a/xen/include/xen/pci_ids.h b/xen/include/xen/pci_ids.h new file mode 100644 index 0000000..f5b1d94 --- /dev/null +++ b/xen/include/xen/pci_ids.h @@ -0,0 +1,9 @@ +#define PCI_VENDOR_ID_AMD 0x1022 + +#define PCI_VENDOR_ID_NVIDIA 0x10de + +#define PCI_VENDOR_ID_OXSEMI 0x1415 + +#define PCI_VENDOR_ID_BROADCOM 0x14e4 + +#define PCI_VENDOR_ID_INTEL 0x8086 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:00:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:00:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa96-0004MO-Bw; Fri, 14 Mar 2014 22:00:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa94-0004Ke-NW for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:03 +0000 Received: from [193.109.254.147:51871] by server-12.bemta-14.messagelabs.com id D1/FE-17220-2EB73235; Fri, 14 Mar 2014 22:00:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1394834400!1817157!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19644 invoked from network); 14 Mar 2014 22:00:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:00:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa92-0000gB-8x for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa92-0002TO-7J for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:00 +0000 Date: Fri, 14 Mar 2014 22:00:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pci: Use #defines for PCI vendors. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f5e19b4eece8b6a47fd254845fe9dd392fc5c72 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Mar 10 12:53:52 2014 -0400 Commit: Keir Fraser CommitDate: Thu Mar 13 10:21:24 2014 +0000 pci: Use #defines for PCI vendors. Instead of having hard-coded values. We only do PCI vendors as Jan requested and put all PCI device vendors in one new file. Signed-off-by: Konrad Rzeszutek Wilk [v1: Sorted them based on their numerical values per Jan's review] Suggested-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/oprofile/op_model_athlon.c | 4 ++-- xen/arch/x86/x86_64/mmconf-fam10h.c | 1 + xen/arch/x86/x86_64/mmconfig-shared.c | 1 + xen/arch/x86/x86_64/mmconfig.h | 4 ---- xen/drivers/char/ns16550.c | 5 +++-- xen/include/xen/pci_ids.h | 9 +++++++++ 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/oprofile/op_model_athlon.c b/xen/arch/x86/oprofile/op_model_athlon.c index ad84768..204343d 100644 --- a/xen/arch/x86/oprofile/op_model_athlon.c +++ b/xen/arch/x86/oprofile/op_model_athlon.c @@ -20,7 +20,8 @@ #include #include #include - +#include + #include "op_x86_model.h" #include "op_counter.h" @@ -445,7 +446,6 @@ static inline void __init init_ibs_nmi_per_cpu(void *arg) apic_write(reg, APIC_EILVT_MSG_NMI << 8); } -#define PCI_VENDOR_ID_AMD 0x1022 #define PCI_DEVICE_ID_AMD_10H_NB_MISC 0x1203 #define IBSCTL 0x1cc static int __init init_ibs_nmi(void) diff --git a/xen/arch/x86/x86_64/mmconf-fam10h.c b/xen/arch/x86/x86_64/mmconf-fam10h.c index 1373acb..65260f6 100644 --- a/xen/arch/x86/x86_64/mmconf-fam10h.c +++ b/xen/arch/x86/x86_64/mmconf-fam10h.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/x86_64/mmconfig-shared.c b/xen/arch/x86/x86_64/mmconfig-shared.c index 7589b64..742bc18 100644 --- a/xen/arch/x86/x86_64/mmconfig-shared.c +++ b/xen/arch/x86/x86_64/mmconfig-shared.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/x86_64/mmconfig.h b/xen/arch/x86/x86_64/mmconfig.h index 36e0448..c447e5a 100644 --- a/xen/arch/x86/x86_64/mmconfig.h +++ b/xen/arch/x86/x86_64/mmconfig.h @@ -17,7 +17,6 @@ * Author: Allen Kay - adapted from linux */ -#define PCI_VENDOR_ID_INTEL 0x8086 #define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590 #define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770 @@ -29,11 +28,8 @@ #define PCI_PROBE_MASK 0x000f #define PCI_PROBE_NOEARLY 0x0010 -#define PCI_VENDOR_ID_AMD 0x1022 #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 -#define PCI_VENDOR_ID_NVIDIA 0x10de - extern unsigned int pci_probe; /* diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 66d10f7..fd66238 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -19,6 +19,7 @@ #ifdef HAS_PCI #include #include +#include #endif #include #include @@ -135,13 +136,13 @@ static const struct ns16550_config_mmio __initconst uart_config[] = { /* Broadcom TruManage device */ { - .vendor_id = 0x14e4, + .vendor_id = PCI_VENDOR_ID_BROADCOM, .dev_id = 0x160a, .param = param_trumanage, }, /* OXPCIe952 1 Native UART */ { - .vendor_id = 0x1415, + .vendor_id = PCI_VENDOR_ID_OXSEMI, .dev_id = 0xc138, .param = param_oxford, } diff --git a/xen/include/xen/pci_ids.h b/xen/include/xen/pci_ids.h new file mode 100644 index 0000000..f5b1d94 --- /dev/null +++ b/xen/include/xen/pci_ids.h @@ -0,0 +1,9 @@ +#define PCI_VENDOR_ID_AMD 0x1022 + +#define PCI_VENDOR_ID_NVIDIA 0x10de + +#define PCI_VENDOR_ID_OXSEMI 0x1415 + +#define PCI_VENDOR_ID_BROADCOM 0x14e4 + +#define PCI_VENDOR_ID_INTEL 0x8086 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:00:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:00:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9G-0004Pg-Jy; Fri, 14 Mar 2014 22:00:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9E-0004P6-Uw for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:13 +0000 Received: from [193.109.254.147:39554] by server-6.bemta-14.messagelabs.com id A8/38-03396-CEB73235; Fri, 14 Mar 2014 22:00:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1394834410!1102856!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11411 invoked from network); 14 Mar 2014 22:00:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:00:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9C-0000j5-HE for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa9C-0002V1-Cb for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:10 +0000 Date: Fri, 14 Mar 2014 22:00:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] serial: Expand the PCI serial quirks for OXPCIe200 and OXPCIe952 1 Native UART X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e0f51c60487d74495aaba03728040050b6d885d Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 7 12:59:39 2014 -0500 Commit: Keir Fraser CommitDate: Thu Mar 13 10:21:24 2014 +0000 serial: Expand the PCI serial quirks for OXPCIe200 and OXPCIe952 1 Native UART This covers all of the OXPCIe952 1 Native UART and OXPCIe200 1 Native UART chipsets. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich --- xen/drivers/char/ns16550.c | 174 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 174 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index fd66238..429d786 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -143,8 +143,182 @@ static const struct ns16550_config_mmio __initconst uart_config[] = /* OXPCIe952 1 Native UART */ { .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc11b, + .param = param_oxford, + }, + /* OXPCIe952 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc11f, + .param = param_oxford, + }, + /* OXPCIe952 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, .dev_id = 0xc138, .param = param_oxford, + }, + /* OXPCIe952 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc13d, + .param = param_oxford, + }, + /* OXPCIe952 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc40b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc40f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc41b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc41f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc42b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc42f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc43b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc43f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc44b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc44f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc45b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc45f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc46b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc46f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc47b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc47f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc48b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc48f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc49b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc49f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc4ab, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc4af, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc4bb, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc4bf, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc4cb, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc4cf, + .param = param_oxford, } }; #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:00:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:00:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9G-0004Pg-Jy; Fri, 14 Mar 2014 22:00:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9E-0004P6-Uw for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:13 +0000 Received: from [193.109.254.147:39554] by server-6.bemta-14.messagelabs.com id A8/38-03396-CEB73235; Fri, 14 Mar 2014 22:00:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1394834410!1102856!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11411 invoked from network); 14 Mar 2014 22:00:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:00:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9C-0000j5-HE for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa9C-0002V1-Cb for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:10 +0000 Date: Fri, 14 Mar 2014 22:00:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] serial: Expand the PCI serial quirks for OXPCIe200 and OXPCIe952 1 Native UART X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e0f51c60487d74495aaba03728040050b6d885d Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 7 12:59:39 2014 -0500 Commit: Keir Fraser CommitDate: Thu Mar 13 10:21:24 2014 +0000 serial: Expand the PCI serial quirks for OXPCIe200 and OXPCIe952 1 Native UART This covers all of the OXPCIe952 1 Native UART and OXPCIe200 1 Native UART chipsets. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich --- xen/drivers/char/ns16550.c | 174 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 174 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index fd66238..429d786 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -143,8 +143,182 @@ static const struct ns16550_config_mmio __initconst uart_config[] = /* OXPCIe952 1 Native UART */ { .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc11b, + .param = param_oxford, + }, + /* OXPCIe952 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc11f, + .param = param_oxford, + }, + /* OXPCIe952 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, .dev_id = 0xc138, .param = param_oxford, + }, + /* OXPCIe952 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc13d, + .param = param_oxford, + }, + /* OXPCIe952 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc40b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc40f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc41b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc41f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc42b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc42f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc43b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc43f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc44b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc44f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc45b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc45f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc46b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc46f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc47b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc47f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc48b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc48f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc49b, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc49f, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc4ab, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc4af, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc4bb, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc4bf, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc4cb, + .param = param_oxford, + }, + /* OXPCIe200 1 Native UART */ + { + .vendor_id = PCI_VENDOR_ID_OXSEMI, + .dev_id = 0xc4cf, + .param = param_oxford, } }; #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:00:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:00:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9T-0004Tc-Te; Fri, 14 Mar 2014 22:00:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9S-0004TD-T2 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:26 +0000 Received: from [193.109.254.147:34645] by server-10.bemta-14.messagelabs.com id 8B/23-10711-AFB73235; Fri, 14 Mar 2014 22:00:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1394834420!1817176!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22949 invoked from network); 14 Mar 2014 22:00:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:00:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9M-0000jB-OF for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa9M-0002Vc-NC for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:20 +0000 Date: Fri, 14 Mar 2014 22:00:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xen-mceinj: Fix depency for the install rule X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad9e9aef8146fad6f5f75c2f4a7910dc956c1e65 Author: Andrew Cooper AuthorDate: Tue Feb 25 10:54:14 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 13 10:50:55 2014 +0000 tools/xen-mceinj: Fix depency for the install rule Signed-off-by: Andrew Cooper Acked-by: Liu Jinsong Acked-by: Ian Campbell CC: Ian Jackson --- tools/tests/mce-test/tools/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile index 8a23b83..5ee001f 100644 --- a/tools/tests/mce-test/tools/Makefile +++ b/tools/tests/mce-test/tools/Makefile @@ -10,7 +10,7 @@ CFLAGS += $(CFLAGS_xeninclude) .PHONY: all all: xen-mceinj -install: +install: xen-mceinj $(INSTALL_PROG) xen-mceinj $(DESTDIR)$(SBINDIR) .PHONY: clean -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:00:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:00:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9T-0004Tc-Te; Fri, 14 Mar 2014 22:00:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9S-0004TD-T2 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:26 +0000 Received: from [193.109.254.147:34645] by server-10.bemta-14.messagelabs.com id 8B/23-10711-AFB73235; Fri, 14 Mar 2014 22:00:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1394834420!1817176!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22949 invoked from network); 14 Mar 2014 22:00:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:00:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9M-0000jB-OF for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa9M-0002Vc-NC for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:20 +0000 Date: Fri, 14 Mar 2014 22:00:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xen-mceinj: Fix depency for the install rule X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad9e9aef8146fad6f5f75c2f4a7910dc956c1e65 Author: Andrew Cooper AuthorDate: Tue Feb 25 10:54:14 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 13 10:50:55 2014 +0000 tools/xen-mceinj: Fix depency for the install rule Signed-off-by: Andrew Cooper Acked-by: Liu Jinsong Acked-by: Ian Campbell CC: Ian Jackson --- tools/tests/mce-test/tools/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile index 8a23b83..5ee001f 100644 --- a/tools/tests/mce-test/tools/Makefile +++ b/tools/tests/mce-test/tools/Makefile @@ -10,7 +10,7 @@ CFLAGS += $(CFLAGS_xeninclude) .PHONY: all all: xen-mceinj -install: +install: xen-mceinj $(INSTALL_PROG) xen-mceinj $(DESTDIR)$(SBINDIR) .PHONY: clean -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:00:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:00:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9c-0004WR-07; Fri, 14 Mar 2014 22:00:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9a-0004Vu-IH for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:34 +0000 Received: from [85.158.137.68:11613] by server-7.bemta-3.messagelabs.com id B2/61-04151-10C73235; Fri, 14 Mar 2014 22:00:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1394834432!729690!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18105 invoked from network); 14 Mar 2014 22:00:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:00:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9X-0000jH-RV for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa9W-0002W4-SS for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:31 +0000 Date: Fri, 14 Mar 2014 22:00:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: prevent building with CONFIG_EARLY_PRINTK if not a debug build X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5940d3d095661f541a843e5d4c5f9363c18cd63c Author: Ian Campbell AuthorDate: Wed Mar 5 01:02:29 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 13 10:56:25 2014 +0000 xen: arm: prevent building with CONFIG_EARLY_PRINTK if not a debug build early printk on ARM is tied to debug being enabled, so error out instead of silently and unexpectedly building without early printk when asked. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/Rules.mk | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index aaa203e..aa2e79f 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -99,4 +99,12 @@ CFLAGS-$(EARLY_PRINTK) += -DEARLY_PRINTK_INC=\"debug-$(EARLY_PRINTK_INC).inc\" CFLAGS-$(EARLY_PRINTK) += -DEARLY_PRINTK_BAUD=$(EARLY_PRINTK_BAUD) CFLAGS-$(EARLY_PRINTK) += -DEARLY_UART_BASE_ADDRESS=$(EARLY_UART_BASE_ADDRESS) CFLAGS-$(EARLY_PRINTK) += -DEARLY_UART_REG_SHIFT=$(EARLY_UART_REG_SHIFT) + +else # !debug + +ifneq ($(CONFIG_EARLY_PRINTK),) +# Early printk is dependant on a debug build. +$(error CONFIG_EARLY_PRINTK enabled for non-debug build) +endif + endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:00:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:00:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9c-0004WR-07; Fri, 14 Mar 2014 22:00:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9a-0004Vu-IH for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:34 +0000 Received: from [85.158.137.68:11613] by server-7.bemta-3.messagelabs.com id B2/61-04151-10C73235; Fri, 14 Mar 2014 22:00:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1394834432!729690!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18105 invoked from network); 14 Mar 2014 22:00:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:00:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9X-0000jH-RV for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa9W-0002W4-SS for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:31 +0000 Date: Fri, 14 Mar 2014 22:00:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: prevent building with CONFIG_EARLY_PRINTK if not a debug build X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5940d3d095661f541a843e5d4c5f9363c18cd63c Author: Ian Campbell AuthorDate: Wed Mar 5 01:02:29 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 13 10:56:25 2014 +0000 xen: arm: prevent building with CONFIG_EARLY_PRINTK if not a debug build early printk on ARM is tied to debug being enabled, so error out instead of silently and unexpectedly building without early printk when asked. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/Rules.mk | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index aaa203e..aa2e79f 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -99,4 +99,12 @@ CFLAGS-$(EARLY_PRINTK) += -DEARLY_PRINTK_INC=\"debug-$(EARLY_PRINTK_INC).inc\" CFLAGS-$(EARLY_PRINTK) += -DEARLY_PRINTK_BAUD=$(EARLY_PRINTK_BAUD) CFLAGS-$(EARLY_PRINTK) += -DEARLY_UART_BASE_ADDRESS=$(EARLY_UART_BASE_ADDRESS) CFLAGS-$(EARLY_PRINTK) += -DEARLY_UART_REG_SHIFT=$(EARLY_UART_REG_SHIFT) + +else # !debug + +ifneq ($(CONFIG_EARLY_PRINTK),) +# Early printk is dependant on a debug build. +$(error CONFIG_EARLY_PRINTK enabled for non-debug build) +endif + endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:00:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:00:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9n-0004aB-36; Fri, 14 Mar 2014 22:00:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9l-0004Za-EM for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:45 +0000 Received: from [85.158.143.35:7306] by server-3.bemta-4.messagelabs.com id EA/60-13602-C0C73235; Fri, 14 Mar 2014 22:00:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1394834442!2193453!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27579 invoked from network); 14 Mar 2014 22:00:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:00:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9i-0000jN-5N for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa9h-0002X6-Ur for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:41 +0000 Date: Fri, 14 Mar 2014 22:00:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correctly write release target in smp_spin_table_cpu_up X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5f979614eae087042f0283fa03186e97e5e04f70 Author: Ian Campbell AuthorDate: Tue Jan 14 16:55:04 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 13 10:59:11 2014 +0000 xen: arm: correctly write release target in smp_spin_table_cpu_up flush_xen_data_tlb_range_va() is clearly bogus since it flushes the tlb, not the data cache. Perhaps what was meant was flush_xen_dcache(), but the address was mapped with ioremap_nocache and hence isn't cached in the first place. Accesses should be via writeq though, so do that. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm64/smpboot.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/smpboot.c b/xen/arch/arm/arm64/smpboot.c index 1287c72..9146476 100644 --- a/xen/arch/arm/arm64/smpboot.c +++ b/xen/arch/arm/arm64/smpboot.c @@ -32,8 +32,7 @@ static int __init smp_spin_table_cpu_up(int cpu) return -EFAULT; } - release[0] = __pa(init_secondary); - flush_xen_data_tlb_range_va((vaddr_t)release, sizeof(*release)); + writeq(__pa(init_secondary), release); iounmap(release); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:00:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:00:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9n-0004aB-36; Fri, 14 Mar 2014 22:00:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9l-0004Za-EM for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:45 +0000 Received: from [85.158.143.35:7306] by server-3.bemta-4.messagelabs.com id EA/60-13602-C0C73235; Fri, 14 Mar 2014 22:00:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1394834442!2193453!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27579 invoked from network); 14 Mar 2014 22:00:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:00:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9i-0000jN-5N for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa9h-0002X6-Ur for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:41 +0000 Date: Fri, 14 Mar 2014 22:00:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correctly write release target in smp_spin_table_cpu_up X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5f979614eae087042f0283fa03186e97e5e04f70 Author: Ian Campbell AuthorDate: Tue Jan 14 16:55:04 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 13 10:59:11 2014 +0000 xen: arm: correctly write release target in smp_spin_table_cpu_up flush_xen_data_tlb_range_va() is clearly bogus since it flushes the tlb, not the data cache. Perhaps what was meant was flush_xen_dcache(), but the address was mapped with ioremap_nocache and hence isn't cached in the first place. Accesses should be via writeq though, so do that. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm64/smpboot.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/smpboot.c b/xen/arch/arm/arm64/smpboot.c index 1287c72..9146476 100644 --- a/xen/arch/arm/arm64/smpboot.c +++ b/xen/arch/arm/arm64/smpboot.c @@ -32,8 +32,7 @@ static int __init smp_spin_table_cpu_up(int cpu) return -EFAULT; } - release[0] = __pa(init_secondary); - flush_xen_data_tlb_range_va((vaddr_t)release, sizeof(*release)); + writeq(__pa(init_secondary), release); iounmap(release); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:00:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:00:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9w-0004dD-7A; Fri, 14 Mar 2014 22:00:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9u-0004cd-T7 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:55 +0000 Received: from [85.158.139.211:9666] by server-9.bemta-5.messagelabs.com id 58/FE-04350-61C73235; Fri, 14 Mar 2014 22:00:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1394834452!1145320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17613 invoked from network); 14 Mar 2014 22:00:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:00:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9s-0000jT-Bv for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa9s-0002XS-AL for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:52 +0000 Date: Fri, 14 Mar 2014 22:00:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Hold the atfork lock while closing carefd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a0c3a62ea4ad6c6bcbf80122b070f3ff3fe7dae Author: Ian Jackson AuthorDate: Mon Feb 24 14:19:14 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 13 12:50:07 2014 +0000 libxl: Hold the atfork lock while closing carefd This avoids the process being forked while a carefd is recorded in the list but the actual fd has been closed. If that happened, a subsequent libxl_postfork_child_noexec would attempt to close the fd again. If we are lucky that results in a harmless warning; but if we are unlucky the fd number has been reused and we close an unrelated fd. This race has not been observed anywhere as far as we are aware. Signed-off-by: Ian Jackson Acked-by: Ian Campbell CC: George Dunlap --- tools/libxl/libxl_fork.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 8421296..fa15095 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -184,9 +184,9 @@ void libxl_postfork_child_noexec(libxl_ctx *ctx) int libxl__carefd_close(libxl__carefd *cf) { if (!cf) return 0; + atfork_lock(); int r = cf->fd < 0 ? 0 : close(cf->fd); int esave = errno; - atfork_lock(); LIBXL_LIST_REMOVE(cf, entry); atfork_unlock(); free(cf); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:00:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:00:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9w-0004dD-7A; Fri, 14 Mar 2014 22:00:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9u-0004cd-T7 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:55 +0000 Received: from [85.158.139.211:9666] by server-9.bemta-5.messagelabs.com id 58/FE-04350-61C73235; Fri, 14 Mar 2014 22:00:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1394834452!1145320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17613 invoked from network); 14 Mar 2014 22:00:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:00:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOa9s-0000jT-Bv for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOa9s-0002XS-AL for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:00:52 +0000 Date: Fri, 14 Mar 2014 22:00:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Hold the atfork lock while closing carefd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a0c3a62ea4ad6c6bcbf80122b070f3ff3fe7dae Author: Ian Jackson AuthorDate: Mon Feb 24 14:19:14 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 13 12:50:07 2014 +0000 libxl: Hold the atfork lock while closing carefd This avoids the process being forked while a carefd is recorded in the list but the actual fd has been closed. If that happened, a subsequent libxl_postfork_child_noexec would attempt to close the fd again. If we are lucky that results in a harmless warning; but if we are unlucky the fd number has been reused and we close an unrelated fd. This race has not been observed anywhere as far as we are aware. Signed-off-by: Ian Jackson Acked-by: Ian Campbell CC: George Dunlap --- tools/libxl/libxl_fork.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 8421296..fa15095 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -184,9 +184,9 @@ void libxl_postfork_child_noexec(libxl_ctx *ctx) int libxl__carefd_close(libxl__carefd *cf) { if (!cf) return 0; + atfork_lock(); int r = cf->fd < 0 ? 0 : close(cf->fd); int esave = errno; - atfork_lock(); LIBXL_LIST_REMOVE(cf, entry); atfork_unlock(); free(cf); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:01:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:01:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaA7-0004h9-9v; Fri, 14 Mar 2014 22:01:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaA5-0004gP-4a for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:05 +0000 Received: from [193.109.254.147:60951] by server-9.bemta-14.messagelabs.com id 09/AC-24895-02C73235; Fri, 14 Mar 2014 22:01:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1394834462!1798908!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23997 invoked from network); 14 Mar 2014 22:01:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:01:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaA2-0000k1-Lu for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaA2-0002Xy-G6 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:02 +0000 Date: Fri, 14 Mar 2014 22:01:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix carefd lock leak in save callout X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7eb73add5de5839f160b902dd894d3aecc10ba0c Author: Ian Jackson AuthorDate: Mon Feb 24 14:19:15 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 13 12:50:18 2014 +0000 libxl: Fix carefd lock leak in save callout If libxl_pipe fails we leave the carefd locked, which translates to the atfork lock remaining held. This would probably cause the process to deadlock shortly afterwards. Of course libxl_pipe is very unlikely to fail unless things are already going very badly. This bug has not been observed anywhere as far as we are aware. Signed-off-by: Ian Jackson Acked-by: Ian Campbell CC: George Dunlap --- tools/libxl/libxl_save_callout.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c index 6e45b2f..e3bda8f 100644 --- a/tools/libxl/libxl_save_callout.c +++ b/tools/libxl/libxl_save_callout.c @@ -185,7 +185,11 @@ static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, for (childfd=0; childfd<2; childfd++) { /* Setting up the pipe for the child's fd childfd */ int fds[2]; - if (libxl_pipe(CTX,fds)) { rc = ERROR_FAIL; goto out; } + if (libxl_pipe(CTX,fds)) { + rc = ERROR_FAIL; + libxl__carefd_unlock(); + goto out; + } int childs_end = childfd==0 ? 0 /*read*/ : 1 /*write*/; int our_end = childfd==0 ? 1 /*write*/ : 0 /*read*/; childs_pipes[childfd] = libxl__carefd_record(CTX, fds[childs_end]); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:01:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:01:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaA7-0004h9-9v; Fri, 14 Mar 2014 22:01:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaA5-0004gP-4a for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:05 +0000 Received: from [193.109.254.147:60951] by server-9.bemta-14.messagelabs.com id 09/AC-24895-02C73235; Fri, 14 Mar 2014 22:01:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1394834462!1798908!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23997 invoked from network); 14 Mar 2014 22:01:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:01:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaA2-0000k1-Lu for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaA2-0002Xy-G6 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:02 +0000 Date: Fri, 14 Mar 2014 22:01:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix carefd lock leak in save callout X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7eb73add5de5839f160b902dd894d3aecc10ba0c Author: Ian Jackson AuthorDate: Mon Feb 24 14:19:15 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 13 12:50:18 2014 +0000 libxl: Fix carefd lock leak in save callout If libxl_pipe fails we leave the carefd locked, which translates to the atfork lock remaining held. This would probably cause the process to deadlock shortly afterwards. Of course libxl_pipe is very unlikely to fail unless things are already going very badly. This bug has not been observed anywhere as far as we are aware. Signed-off-by: Ian Jackson Acked-by: Ian Campbell CC: George Dunlap --- tools/libxl/libxl_save_callout.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c index 6e45b2f..e3bda8f 100644 --- a/tools/libxl/libxl_save_callout.c +++ b/tools/libxl/libxl_save_callout.c @@ -185,7 +185,11 @@ static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, for (childfd=0; childfd<2; childfd++) { /* Setting up the pipe for the child's fd childfd */ int fds[2]; - if (libxl_pipe(CTX,fds)) { rc = ERROR_FAIL; goto out; } + if (libxl_pipe(CTX,fds)) { + rc = ERROR_FAIL; + libxl__carefd_unlock(); + goto out; + } int childs_end = childfd==0 ? 0 /*read*/ : 1 /*write*/; int our_end = childfd==0 ? 1 /*write*/ : 0 /*read*/; childs_pipes[childfd] = libxl__carefd_record(CTX, fds[childs_end]); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:01:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:01:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAI-0004js-Cl; Fri, 14 Mar 2014 22:01:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAG-0004jR-VU for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:17 +0000 Received: from [85.158.143.35:10592] by server-1.bemta-4.messagelabs.com id 94/D9-09853-B2C73235; Fri, 14 Mar 2014 22:01:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1394834474!1529974!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15377 invoked from network); 14 Mar 2014 22:01:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:01:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAD-0000k7-Qt for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaAD-0002ZF-HE for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:13 +0000 Date: Fri, 14 Mar 2014 22:01:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix pirq path for pvh X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bea8ee1a5ff2bbe04fcc6297db45fac178a5abc9 Author: Mukesh Rathor AuthorDate: Thu Mar 13 14:24:19 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:24:19 2014 +0100 x86: fix pirq path for pvh Just like hvm, pirq eoi shared page is not there for pvh. pvh should not touch any pv_domain fields. Signed-off-by: Mukesh Rathor --- xen/arch/x86/irq.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index db70077..88444be 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1068,13 +1068,13 @@ bool_t cpu_has_pending_apic_eoi(void) static inline void set_pirq_eoi(struct domain *d, unsigned int irq) { - if ( !is_hvm_domain(d) && d->arch.pv_domain.pirq_eoi_map ) + if ( is_pv_domain(d) && d->arch.pv_domain.pirq_eoi_map ) set_bit(irq, d->arch.pv_domain.pirq_eoi_map); } static inline void clear_pirq_eoi(struct domain *d, unsigned int irq) { - if ( !is_hvm_domain(d) && d->arch.pv_domain.pirq_eoi_map ) + if ( is_pv_domain(d) && d->arch.pv_domain.pirq_eoi_map ) clear_bit(irq, d->arch.pv_domain.pirq_eoi_map); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:01:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:01:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAI-0004js-Cl; Fri, 14 Mar 2014 22:01:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAG-0004jR-VU for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:17 +0000 Received: from [85.158.143.35:10592] by server-1.bemta-4.messagelabs.com id 94/D9-09853-B2C73235; Fri, 14 Mar 2014 22:01:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1394834474!1529974!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15377 invoked from network); 14 Mar 2014 22:01:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:01:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAD-0000k7-Qt for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaAD-0002ZF-HE for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:13 +0000 Date: Fri, 14 Mar 2014 22:01:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix pirq path for pvh X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bea8ee1a5ff2bbe04fcc6297db45fac178a5abc9 Author: Mukesh Rathor AuthorDate: Thu Mar 13 14:24:19 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:24:19 2014 +0100 x86: fix pirq path for pvh Just like hvm, pirq eoi shared page is not there for pvh. pvh should not touch any pv_domain fields. Signed-off-by: Mukesh Rathor --- xen/arch/x86/irq.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index db70077..88444be 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1068,13 +1068,13 @@ bool_t cpu_has_pending_apic_eoi(void) static inline void set_pirq_eoi(struct domain *d, unsigned int irq) { - if ( !is_hvm_domain(d) && d->arch.pv_domain.pirq_eoi_map ) + if ( is_pv_domain(d) && d->arch.pv_domain.pirq_eoi_map ) set_bit(irq, d->arch.pv_domain.pirq_eoi_map); } static inline void clear_pirq_eoi(struct domain *d, unsigned int irq) { - if ( !is_hvm_domain(d) && d->arch.pv_domain.pirq_eoi_map ) + if ( is_pv_domain(d) && d->arch.pv_domain.pirq_eoi_map ) clear_bit(irq, d->arch.pv_domain.pirq_eoi_map); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:01:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:01:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAS-0004mj-Fg; Fri, 14 Mar 2014 22:01:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAQ-0004mB-JB for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:26 +0000 Received: from [85.158.139.211:16779] by server-14.bemta-5.messagelabs.com id 51/54-15696-53C73235; Fri, 14 Mar 2014 22:01:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1394834484!1145419!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18353 invoked from network); 14 Mar 2014 22:01:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:01:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAO-0000kD-0S for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaAN-0002Zf-VN for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:23 +0000 Date: Fri, 14 Mar 2014 22:01:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common: make hypercall preemption checks consistent X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8c0eed2cc8d8a2ccccdffe4c386b625b672dc12a Author: Jan Beulich AuthorDate: Thu Mar 13 14:26:35 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:26:35 2014 +0100 common: make hypercall preemption checks consistent - never preempt on the first iteration (ensure forward progress) - do cheap checks first Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan Acked-by: Keir Fraser --- xen/common/memory.c | 9 +++++---- xen/common/multicall.c | 2 +- xen/drivers/char/console.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 9d0d32e..4d6ffee 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -63,7 +63,7 @@ static void increase_reservation(struct memop_args *a) for ( i = a->nr_done; i < a->nr_extents; i++ ) { - if ( hypercall_preempt_check() ) + if ( i != a->nr_done && hypercall_preempt_check() ) { a->preempted = 1; goto out; @@ -109,7 +109,7 @@ static void populate_physmap(struct memop_args *a) for ( i = a->nr_done; i < a->nr_extents; i++ ) { - if ( hypercall_preempt_check() ) + if ( i != a->nr_done && hypercall_preempt_check() ) { a->preempted = 1; goto out; @@ -268,7 +268,7 @@ static void decrease_reservation(struct memop_args *a) for ( i = a->nr_done; i < a->nr_extents; i++ ) { - if ( hypercall_preempt_check() && i != a->nr_done ) + if ( i != a->nr_done && hypercall_preempt_check() ) { a->preempted = 1; goto out; @@ -398,7 +398,8 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) i < (exch.in.nr_extents >> in_chunk_order); i++ ) { - if ( hypercall_preempt_check() ) + if ( i != (exch.nr_exchanged >> in_chunk_order) && + hypercall_preempt_check() ) { exch.nr_exchanged = i << in_chunk_order; rcu_unlock_domain(d); diff --git a/xen/common/multicall.c b/xen/common/multicall.c index 2afba98..e66c798 100644 --- a/xen/common/multicall.c +++ b/xen/common/multicall.c @@ -52,7 +52,7 @@ do_multicall( for ( i = 0; !rc && i < nr_calls; i++ ) { - if ( hypercall_preempt_check() ) + if ( i && hypercall_preempt_check() ) goto preempted; if ( unlikely(__copy_from_guest(&mcs->call, call_list, 1)) ) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 7d4383c..beda79f 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -375,12 +375,12 @@ static DECLARE_SOFTIRQ_TASKLET(notify_dom0_con_ring_tasklet, static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, int count) { char kbuf[128]; - int kcount; + int kcount = 0; struct domain *cd = current->domain; while ( count > 0 ) { - if ( hypercall_preempt_check() ) + if ( kcount && hypercall_preempt_check() ) return hypercall_create_continuation( __HYPERVISOR_console_io, "iih", CONSOLEIO_write, count, buffer); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:01:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:01:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAS-0004mj-Fg; Fri, 14 Mar 2014 22:01:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAQ-0004mB-JB for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:26 +0000 Received: from [85.158.139.211:16779] by server-14.bemta-5.messagelabs.com id 51/54-15696-53C73235; Fri, 14 Mar 2014 22:01:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1394834484!1145419!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18353 invoked from network); 14 Mar 2014 22:01:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:01:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAO-0000kD-0S for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaAN-0002Zf-VN for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:23 +0000 Date: Fri, 14 Mar 2014 22:01:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common: make hypercall preemption checks consistent X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8c0eed2cc8d8a2ccccdffe4c386b625b672dc12a Author: Jan Beulich AuthorDate: Thu Mar 13 14:26:35 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:26:35 2014 +0100 common: make hypercall preemption checks consistent - never preempt on the first iteration (ensure forward progress) - do cheap checks first Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan Acked-by: Keir Fraser --- xen/common/memory.c | 9 +++++---- xen/common/multicall.c | 2 +- xen/drivers/char/console.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 9d0d32e..4d6ffee 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -63,7 +63,7 @@ static void increase_reservation(struct memop_args *a) for ( i = a->nr_done; i < a->nr_extents; i++ ) { - if ( hypercall_preempt_check() ) + if ( i != a->nr_done && hypercall_preempt_check() ) { a->preempted = 1; goto out; @@ -109,7 +109,7 @@ static void populate_physmap(struct memop_args *a) for ( i = a->nr_done; i < a->nr_extents; i++ ) { - if ( hypercall_preempt_check() ) + if ( i != a->nr_done && hypercall_preempt_check() ) { a->preempted = 1; goto out; @@ -268,7 +268,7 @@ static void decrease_reservation(struct memop_args *a) for ( i = a->nr_done; i < a->nr_extents; i++ ) { - if ( hypercall_preempt_check() && i != a->nr_done ) + if ( i != a->nr_done && hypercall_preempt_check() ) { a->preempted = 1; goto out; @@ -398,7 +398,8 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) i < (exch.in.nr_extents >> in_chunk_order); i++ ) { - if ( hypercall_preempt_check() ) + if ( i != (exch.nr_exchanged >> in_chunk_order) && + hypercall_preempt_check() ) { exch.nr_exchanged = i << in_chunk_order; rcu_unlock_domain(d); diff --git a/xen/common/multicall.c b/xen/common/multicall.c index 2afba98..e66c798 100644 --- a/xen/common/multicall.c +++ b/xen/common/multicall.c @@ -52,7 +52,7 @@ do_multicall( for ( i = 0; !rc && i < nr_calls; i++ ) { - if ( hypercall_preempt_check() ) + if ( i && hypercall_preempt_check() ) goto preempted; if ( unlikely(__copy_from_guest(&mcs->call, call_list, 1)) ) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 7d4383c..beda79f 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -375,12 +375,12 @@ static DECLARE_SOFTIRQ_TASKLET(notify_dom0_con_ring_tasklet, static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, int count) { char kbuf[128]; - int kcount; + int kcount = 0; struct domain *cd = current->domain; while ( count > 0 ) { - if ( hypercall_preempt_check() ) + if ( kcount && hypercall_preempt_check() ) return hypercall_create_continuation( __HYPERVISOR_console_io, "iih", CONSOLEIO_write, count, buffer); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:01:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:01:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAc-0004pb-IR; Fri, 14 Mar 2014 22:01:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAb-0004p6-4a for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:37 +0000 Received: from [85.158.137.68:19829] by server-16.bemta-3.messagelabs.com id 5F/3B-13481-04C73235; Fri, 14 Mar 2014 22:01:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1394834494!747100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21834 invoked from network); 14 Mar 2014 22:01:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:01:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAY-0000kG-6V for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaAY-0002a7-5S for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:34 +0000 Date: Fri, 14 Mar 2014 22:01:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make hypercall preemption checks consistent X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd7bfce0395ace266159760e35dc49f7af3b90ce Author: Jan Beulich AuthorDate: Thu Mar 13 14:27:51 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:27:51 2014 +0100 x86: make hypercall preemption checks consistent - never preempt on the first iteration (ensure forward progress) - never preempt on the last iteration (pointless/wasteful) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan Acked-by: Keir Fraser --- xen/arch/x86/mm.c | 4 ++-- xen/arch/x86/mm/hap/hap.c | 4 +++- xen/arch/x86/mm/p2m-pod.c | 6 ++++-- xen/arch/x86/mm/shadow/common.c | 4 +++- xen/arch/x86/traps.c | 14 +++++++------- xen/arch/x86/x86_64/compat/traps.c | 14 +++++++------- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 172c68c..fdc5ed3 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2934,7 +2934,7 @@ long do_mmuext_op( for ( i = 0; i < count; i++ ) { - if ( curr->arch.old_guest_table || hypercall_preempt_check() ) + if ( curr->arch.old_guest_table || (i && hypercall_preempt_check()) ) { rc = -EAGAIN; break; @@ -3481,7 +3481,7 @@ long do_mmu_update( for ( i = 0; i < count; i++ ) { - if ( curr->arch.old_guest_table || hypercall_preempt_check() ) + if ( curr->arch.old_guest_table || (i && hypercall_preempt_check()) ) { rc = -EAGAIN; break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 5f75636..b8c5422 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -326,7 +326,7 @@ hap_set_allocation(struct domain *d, unsigned int pages, int *preempted) else pages -= d->arch.paging.hap.p2m_pages; - while ( d->arch.paging.hap.total_pages != pages ) + for ( ; ; ) { if ( d->arch.paging.hap.total_pages < pages ) { @@ -355,6 +355,8 @@ hap_set_allocation(struct domain *d, unsigned int pages, int *preempted) d->arch.paging.hap.total_pages--; free_domheap_page(pg); } + else + break; /* Check to see if we need to yield and try again */ if ( preempted && hypercall_preempt_check() ) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 81645c4..d14565d 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -242,7 +242,8 @@ p2m_pod_set_cache_target(struct p2m_domain *p2m, unsigned long pod_target, int p p2m_pod_cache_add(p2m, page, order); - if ( hypercall_preempt_check() && preemptible ) + if ( preemptible && pod_target != p2m->pod.count && + hypercall_preempt_check() ) { ret = -EAGAIN; goto out; @@ -286,7 +287,8 @@ p2m_pod_set_cache_target(struct p2m_domain *p2m, unsigned long pod_target, int p put_page(page+i); - if ( hypercall_preempt_check() && preemptible ) + if ( preemptible && pod_target != p2m->pod.count && + hypercall_preempt_check() ) { ret = -EAGAIN; goto out; diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 6eb781e..517b5f1 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1672,7 +1672,7 @@ static unsigned int sh_set_allocation(struct domain *d, SHADOW_PRINTK("current %i target %i\n", d->arch.paging.shadow.total_pages, pages); - while ( d->arch.paging.shadow.total_pages != pages ) + for ( ; ; ) { if ( d->arch.paging.shadow.total_pages < pages ) { @@ -1707,6 +1707,8 @@ static unsigned int sh_set_allocation(struct domain *d, d->arch.paging.shadow.total_pages--; free_domheap_page(sp); } + else + break; /* Check to see if we need to yield and try again */ if ( preempted && hypercall_preempt_check() ) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c462317..ed4ae2d 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3596,13 +3596,6 @@ long do_set_trap_table(XEN_GUEST_HANDLE_PARAM(const_trap_info_t) traps) for ( ; ; ) { - if ( hypercall_preempt_check() ) - { - rc = hypercall_create_continuation( - __HYPERVISOR_set_trap_table, "h", traps); - break; - } - if ( copy_from_guest(&cur, traps, 1) ) { rc = -EFAULT; @@ -3623,6 +3616,13 @@ long do_set_trap_table(XEN_GUEST_HANDLE_PARAM(const_trap_info_t) traps) init_int80_direct_trap(curr); guest_handle_add_offset(traps, 1); + + if ( hypercall_preempt_check() ) + { + rc = hypercall_create_continuation( + __HYPERVISOR_set_trap_table, "h", traps); + break; + } } return rc; diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 21a82b9..5f0ea0a 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -329,13 +329,6 @@ int compat_set_trap_table(XEN_GUEST_HANDLE(trap_info_compat_t) traps) for ( ; ; ) { - if ( hypercall_preempt_check() ) - { - rc = hypercall_create_continuation( - __HYPERVISOR_set_trap_table, "h", traps); - break; - } - if ( copy_from_guest(&cur, traps, 1) ) { rc = -EFAULT; @@ -353,6 +346,13 @@ int compat_set_trap_table(XEN_GUEST_HANDLE(trap_info_compat_t) traps) init_int80_direct_trap(current); guest_handle_add_offset(traps, 1); + + if ( hypercall_preempt_check() ) + { + rc = hypercall_create_continuation( + __HYPERVISOR_set_trap_table, "h", traps); + break; + } } return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:01:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:01:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAc-0004pb-IR; Fri, 14 Mar 2014 22:01:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAb-0004p6-4a for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:37 +0000 Received: from [85.158.137.68:19829] by server-16.bemta-3.messagelabs.com id 5F/3B-13481-04C73235; Fri, 14 Mar 2014 22:01:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1394834494!747100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21834 invoked from network); 14 Mar 2014 22:01:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:01:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAY-0000kG-6V for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaAY-0002a7-5S for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:34 +0000 Date: Fri, 14 Mar 2014 22:01:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make hypercall preemption checks consistent X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd7bfce0395ace266159760e35dc49f7af3b90ce Author: Jan Beulich AuthorDate: Thu Mar 13 14:27:51 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:27:51 2014 +0100 x86: make hypercall preemption checks consistent - never preempt on the first iteration (ensure forward progress) - never preempt on the last iteration (pointless/wasteful) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan Acked-by: Keir Fraser --- xen/arch/x86/mm.c | 4 ++-- xen/arch/x86/mm/hap/hap.c | 4 +++- xen/arch/x86/mm/p2m-pod.c | 6 ++++-- xen/arch/x86/mm/shadow/common.c | 4 +++- xen/arch/x86/traps.c | 14 +++++++------- xen/arch/x86/x86_64/compat/traps.c | 14 +++++++------- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 172c68c..fdc5ed3 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2934,7 +2934,7 @@ long do_mmuext_op( for ( i = 0; i < count; i++ ) { - if ( curr->arch.old_guest_table || hypercall_preempt_check() ) + if ( curr->arch.old_guest_table || (i && hypercall_preempt_check()) ) { rc = -EAGAIN; break; @@ -3481,7 +3481,7 @@ long do_mmu_update( for ( i = 0; i < count; i++ ) { - if ( curr->arch.old_guest_table || hypercall_preempt_check() ) + if ( curr->arch.old_guest_table || (i && hypercall_preempt_check()) ) { rc = -EAGAIN; break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 5f75636..b8c5422 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -326,7 +326,7 @@ hap_set_allocation(struct domain *d, unsigned int pages, int *preempted) else pages -= d->arch.paging.hap.p2m_pages; - while ( d->arch.paging.hap.total_pages != pages ) + for ( ; ; ) { if ( d->arch.paging.hap.total_pages < pages ) { @@ -355,6 +355,8 @@ hap_set_allocation(struct domain *d, unsigned int pages, int *preempted) d->arch.paging.hap.total_pages--; free_domheap_page(pg); } + else + break; /* Check to see if we need to yield and try again */ if ( preempted && hypercall_preempt_check() ) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 81645c4..d14565d 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -242,7 +242,8 @@ p2m_pod_set_cache_target(struct p2m_domain *p2m, unsigned long pod_target, int p p2m_pod_cache_add(p2m, page, order); - if ( hypercall_preempt_check() && preemptible ) + if ( preemptible && pod_target != p2m->pod.count && + hypercall_preempt_check() ) { ret = -EAGAIN; goto out; @@ -286,7 +287,8 @@ p2m_pod_set_cache_target(struct p2m_domain *p2m, unsigned long pod_target, int p put_page(page+i); - if ( hypercall_preempt_check() && preemptible ) + if ( preemptible && pod_target != p2m->pod.count && + hypercall_preempt_check() ) { ret = -EAGAIN; goto out; diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 6eb781e..517b5f1 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1672,7 +1672,7 @@ static unsigned int sh_set_allocation(struct domain *d, SHADOW_PRINTK("current %i target %i\n", d->arch.paging.shadow.total_pages, pages); - while ( d->arch.paging.shadow.total_pages != pages ) + for ( ; ; ) { if ( d->arch.paging.shadow.total_pages < pages ) { @@ -1707,6 +1707,8 @@ static unsigned int sh_set_allocation(struct domain *d, d->arch.paging.shadow.total_pages--; free_domheap_page(sp); } + else + break; /* Check to see if we need to yield and try again */ if ( preempted && hypercall_preempt_check() ) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c462317..ed4ae2d 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3596,13 +3596,6 @@ long do_set_trap_table(XEN_GUEST_HANDLE_PARAM(const_trap_info_t) traps) for ( ; ; ) { - if ( hypercall_preempt_check() ) - { - rc = hypercall_create_continuation( - __HYPERVISOR_set_trap_table, "h", traps); - break; - } - if ( copy_from_guest(&cur, traps, 1) ) { rc = -EFAULT; @@ -3623,6 +3616,13 @@ long do_set_trap_table(XEN_GUEST_HANDLE_PARAM(const_trap_info_t) traps) init_int80_direct_trap(curr); guest_handle_add_offset(traps, 1); + + if ( hypercall_preempt_check() ) + { + rc = hypercall_create_continuation( + __HYPERVISOR_set_trap_table, "h", traps); + break; + } } return rc; diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 21a82b9..5f0ea0a 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -329,13 +329,6 @@ int compat_set_trap_table(XEN_GUEST_HANDLE(trap_info_compat_t) traps) for ( ; ; ) { - if ( hypercall_preempt_check() ) - { - rc = hypercall_create_continuation( - __HYPERVISOR_set_trap_table, "h", traps); - break; - } - if ( copy_from_guest(&cur, traps, 1) ) { rc = -EFAULT; @@ -353,6 +346,13 @@ int compat_set_trap_table(XEN_GUEST_HANDLE(trap_info_compat_t) traps) init_int80_direct_trap(current); guest_handle_add_offset(traps, 1); + + if ( hypercall_preempt_check() ) + { + rc = hypercall_create_continuation( + __HYPERVISOR_set_trap_table, "h", traps); + break; + } } return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAm-0004tK-Nf; Fri, 14 Mar 2014 22:01:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAl-0004st-8L for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:47 +0000 Received: from [85.158.137.68:48898] by server-12.bemta-3.messagelabs.com id AE/01-14831-A4C73235; Fri, 14 Mar 2014 22:01:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1394834504!752084!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31348 invoked from network); 14 Mar 2014 22:01:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:01:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAi-0000kP-Ip for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaAi-0002bC-9t for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:44 +0000 Date: Fri, 14 Mar 2014 22:01:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] time: move wallclock_time() declaration into common code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 237bc63847beb5d53e826e5a62f719c2bce48a30 Author: Andrew Cooper AuthorDate: Thu Mar 13 14:36:22 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:36:22 2014 +0100 time: move wallclock_time() declaration into common code It is called from common code, but has architecture specific implementations. Have one declaration instead of two. No functional change. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Keir Fraser --- xen/include/asm-arm/time.h | 3 --- xen/include/asm-x86/time.h | 3 --- xen/include/xen/time.h | 1 + 3 files changed, 1 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index 9d302d3..d10c737 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -12,9 +12,6 @@ static inline cycles_t get_cycles (void) return 0; } -struct tm; -struct tm wallclock_time(void); - /* List of timer's IRQ */ enum timer_ppi { diff --git a/xen/include/asm-x86/time.h b/xen/include/asm-x86/time.h index 147b39e..c01b0a2 100644 --- a/xen/include/asm-x86/time.h +++ b/xen/include/asm-x86/time.h @@ -48,9 +48,6 @@ int dom0_pit_access(struct ioreq *ioreq); int cpu_frequency_change(u64 freq); -struct tm; -struct tm wallclock_time(void); - void pit_broadcast_enter(void); void pit_broadcast_exit(void); int pit_broadcast_is_available(void); diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h index 95b4b91..3eb5b63 100644 --- a/xen/include/xen/time.h +++ b/xen/include/xen/time.h @@ -48,6 +48,7 @@ struct tm { int tm_isdst; /* daylight saving time */ }; struct tm gmtime(unsigned long t); +struct tm wallclock_time(void); #define SYSTEM_TIME_HZ 1000000000ULL #define NOW() ((s_time_t)get_s_time()) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAm-0004tK-Nf; Fri, 14 Mar 2014 22:01:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAl-0004st-8L for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:47 +0000 Received: from [85.158.137.68:48898] by server-12.bemta-3.messagelabs.com id AE/01-14831-A4C73235; Fri, 14 Mar 2014 22:01:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1394834504!752084!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31348 invoked from network); 14 Mar 2014 22:01:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:01:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAi-0000kP-Ip for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaAi-0002bC-9t for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:44 +0000 Date: Fri, 14 Mar 2014 22:01:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] time: move wallclock_time() declaration into common code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 237bc63847beb5d53e826e5a62f719c2bce48a30 Author: Andrew Cooper AuthorDate: Thu Mar 13 14:36:22 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:36:22 2014 +0100 time: move wallclock_time() declaration into common code It is called from common code, but has architecture specific implementations. Have one declaration instead of two. No functional change. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Keir Fraser --- xen/include/asm-arm/time.h | 3 --- xen/include/asm-x86/time.h | 3 --- xen/include/xen/time.h | 1 + 3 files changed, 1 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index 9d302d3..d10c737 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -12,9 +12,6 @@ static inline cycles_t get_cycles (void) return 0; } -struct tm; -struct tm wallclock_time(void); - /* List of timer's IRQ */ enum timer_ppi { diff --git a/xen/include/asm-x86/time.h b/xen/include/asm-x86/time.h index 147b39e..c01b0a2 100644 --- a/xen/include/asm-x86/time.h +++ b/xen/include/asm-x86/time.h @@ -48,9 +48,6 @@ int dom0_pit_access(struct ioreq *ioreq); int cpu_frequency_change(u64 freq); -struct tm; -struct tm wallclock_time(void); - void pit_broadcast_enter(void); void pit_broadcast_exit(void); int pit_broadcast_is_available(void); diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h index 95b4b91..3eb5b63 100644 --- a/xen/include/xen/time.h +++ b/xen/include/xen/time.h @@ -48,6 +48,7 @@ struct tm { int tm_isdst; /* daylight saving time */ }; struct tm gmtime(unsigned long t); +struct tm wallclock_time(void); #define SYSTEM_TIME_HZ 1000000000ULL #define NOW() ((s_time_t)get_s_time()) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAv-0004w5-Qp; Fri, 14 Mar 2014 22:01:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAv-0004vd-7U for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:57 +0000 Received: from [85.158.139.211:20300] by server-10.bemta-5.messagelabs.com id E6/08-27081-45C73235; Fri, 14 Mar 2014 22:01:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1394834514!1145423!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19210 invoked from network); 14 Mar 2014 22:01:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:01:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAs-0000kS-OD for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaAs-0002by-NC for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:54 +0000 Date: Fri, 14 Mar 2014 22:01:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: initialise time earlier during start_secondary() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd2658f966bc9e01a0a5fad9c53350d681067013 Author: Andrew Cooper AuthorDate: Thu Mar 13 14:37:04 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:37:04 2014 +0100 x86/time: initialise time earlier during start_secondary() It is safe to do so, and useful for "[second.microseconds]" style timestamps on printk()s during secondary bringup. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/smpboot.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 42b8a59..5014397 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -347,6 +347,8 @@ void start_secondary(void *unused) percpu_traps_init(); + init_percpu_time(); + cpu_init(); smp_callin(); @@ -381,8 +383,6 @@ void start_secondary(void *unused) cpumask_set_cpu(cpu, &cpu_online_map); unlock_vector_lock(); - init_percpu_time(); - /* We can take interrupts now: we're officially "up". */ local_irq_enable(); mtrr_ap_init(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaB6-0004yg-Tg; Fri, 14 Mar 2014 22:02:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaB5-0004y9-KX for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:07 +0000 Received: from [85.158.139.211:24266] by server-10.bemta-5.messagelabs.com id 0E/18-27081-E5C73235; Fri, 14 Mar 2014 22:02:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1394834525!1138290!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19481 invoked from network); 14 Mar 2014 22:02:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:02:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaB2-0000l1-Vc for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaB2-0002cX-T2 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:04 +0000 Date: Fri, 14 Mar 2014 22:02:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] console: provide timestamps as an offset since boot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d983db72bb5692d20c99f34570fef94e82d23277 Author: Andrew Cooper AuthorDate: Thu Mar 13 14:37:58 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:37:58 2014 +0100 console: provide timestamps as an offset since boot This adds a new "Linux style" console timestamp method, which is shorter and more useful than the current date/time timestamps with single-second granularity. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- docs/misc/xen-command-line.markdown | 15 +++++++-- xen/drivers/char/console.c | 56 +++++++++++++++++++++++++++++----- 2 files changed, 59 insertions(+), 12 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 8261e1c..80a0a55 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -275,11 +275,20 @@ cleared. This allows a single port to be shared by two subsystems makes sense on its own. ### console\_timestamps -> `= ` +> `= none | date | boot` -> Default: `false` +> Default: `none` + +Specify which timestamp format Xen should use for each console line. + +* `none`: No timestamps +* `date`: Date and time information + * `[YYYY-MM-DD HH:MM:SS]` +* `boot`: Seconds and microseconds since boot + * `[SSSSSS.uuuuuu]` -Flag to indicate whether include a timestamp with each console line. +For compatibility with the older boolean parameter, specifying +`console_timestamps` alone will enable the `date` option. ### console\_to\_ring > `= ` diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index beda79f..9c032bf 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -49,8 +49,17 @@ static bool_t __read_mostly opt_console_to_ring; boolean_param("console_to_ring", opt_console_to_ring); /* console_timestamps: include a timestamp prefix on every Xen console line. */ -static bool_t __read_mostly opt_console_timestamps; -boolean_param("console_timestamps", opt_console_timestamps); +enum con_timestamp_mode +{ + TSM_NONE, /* No timestamps */ + TSM_DATE, /* [YYYY-MM-DD HH:MM:SS] */ + TSM_BOOT /* [SSSSSS.uuuuuu] */ +}; + +static enum con_timestamp_mode __read_mostly opt_con_timestamp_mode = TSM_NONE; + +static void parse_console_timestamps(char *s); +custom_param("console_timestamps", parse_console_timestamps); /* conring_size: allows a large console ring than default (16kB). */ static uint32_t __initdata opt_conring_size; @@ -546,23 +555,52 @@ static int printk_prefix_check(char *p, char **pp) ((loglvl < upper_thresh) && printk_ratelimit())); } +static void __init parse_console_timestamps(char *s) +{ + if ( *s == '\0' || /* Compat for old booleanparam() */ + !strcmp(s, "date") ) + opt_con_timestamp_mode = TSM_DATE; + else if ( !strcmp(s, "boot") ) + opt_con_timestamp_mode = TSM_BOOT; + else if ( !strcmp(s, "none") ) + opt_con_timestamp_mode = TSM_NONE; +} + static void printk_start_of_line(const char *prefix) { struct tm tm; char tstr[32]; + uint64_t sec, nsec; __putstr(prefix); - if ( !opt_console_timestamps ) - return; + switch ( opt_con_timestamp_mode ) + { + case TSM_DATE: + tm = wallclock_time(); - tm = wallclock_time(); - if ( tm.tm_mday == 0 ) + if ( tm.tm_mday == 0 ) + return; + + if ( opt_con_timestamp_mode == TSM_DATE ) + snprintf(tstr, sizeof(tstr), "[%04u-%02u-%02u %02u:%02u:%02u] ", + 1900 + tm.tm_year, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec); + break; + + case TSM_BOOT: + sec = NOW(); + nsec = do_div(sec, 1000000000); + + snprintf(tstr, sizeof(tstr), "[%5"PRIu64".%06"PRIu64"] ", + sec, nsec / 1000); + break; + + case TSM_NONE: + default: return; + } - snprintf(tstr, sizeof(tstr), "[%04u-%02u-%02u %02u:%02u:%02u] ", - 1900 + tm.tm_year, tm.tm_mon + 1, tm.tm_mday, - tm.tm_hour, tm.tm_min, tm.tm_sec); __putstr(tstr); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAv-0004w5-Qp; Fri, 14 Mar 2014 22:01:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAv-0004vd-7U for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:57 +0000 Received: from [85.158.139.211:20300] by server-10.bemta-5.messagelabs.com id E6/08-27081-45C73235; Fri, 14 Mar 2014 22:01:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1394834514!1145423!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19210 invoked from network); 14 Mar 2014 22:01:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:01:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaAs-0000kS-OD for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaAs-0002by-NC for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:01:54 +0000 Date: Fri, 14 Mar 2014 22:01:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: initialise time earlier during start_secondary() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd2658f966bc9e01a0a5fad9c53350d681067013 Author: Andrew Cooper AuthorDate: Thu Mar 13 14:37:04 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:37:04 2014 +0100 x86/time: initialise time earlier during start_secondary() It is safe to do so, and useful for "[second.microseconds]" style timestamps on printk()s during secondary bringup. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/smpboot.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 42b8a59..5014397 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -347,6 +347,8 @@ void start_secondary(void *unused) percpu_traps_init(); + init_percpu_time(); + cpu_init(); smp_callin(); @@ -381,8 +383,6 @@ void start_secondary(void *unused) cpumask_set_cpu(cpu, &cpu_online_map); unlock_vector_lock(); - init_percpu_time(); - /* We can take interrupts now: we're officially "up". */ local_irq_enable(); mtrr_ap_init(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaB6-0004yg-Tg; Fri, 14 Mar 2014 22:02:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaB5-0004y9-KX for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:07 +0000 Received: from [85.158.139.211:24266] by server-10.bemta-5.messagelabs.com id 0E/18-27081-E5C73235; Fri, 14 Mar 2014 22:02:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1394834525!1138290!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19481 invoked from network); 14 Mar 2014 22:02:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:02:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaB2-0000l1-Vc for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaB2-0002cX-T2 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:04 +0000 Date: Fri, 14 Mar 2014 22:02:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] console: provide timestamps as an offset since boot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d983db72bb5692d20c99f34570fef94e82d23277 Author: Andrew Cooper AuthorDate: Thu Mar 13 14:37:58 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:37:58 2014 +0100 console: provide timestamps as an offset since boot This adds a new "Linux style" console timestamp method, which is shorter and more useful than the current date/time timestamps with single-second granularity. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- docs/misc/xen-command-line.markdown | 15 +++++++-- xen/drivers/char/console.c | 56 +++++++++++++++++++++++++++++----- 2 files changed, 59 insertions(+), 12 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 8261e1c..80a0a55 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -275,11 +275,20 @@ cleared. This allows a single port to be shared by two subsystems makes sense on its own. ### console\_timestamps -> `= ` +> `= none | date | boot` -> Default: `false` +> Default: `none` + +Specify which timestamp format Xen should use for each console line. + +* `none`: No timestamps +* `date`: Date and time information + * `[YYYY-MM-DD HH:MM:SS]` +* `boot`: Seconds and microseconds since boot + * `[SSSSSS.uuuuuu]` -Flag to indicate whether include a timestamp with each console line. +For compatibility with the older boolean parameter, specifying +`console_timestamps` alone will enable the `date` option. ### console\_to\_ring > `= ` diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index beda79f..9c032bf 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -49,8 +49,17 @@ static bool_t __read_mostly opt_console_to_ring; boolean_param("console_to_ring", opt_console_to_ring); /* console_timestamps: include a timestamp prefix on every Xen console line. */ -static bool_t __read_mostly opt_console_timestamps; -boolean_param("console_timestamps", opt_console_timestamps); +enum con_timestamp_mode +{ + TSM_NONE, /* No timestamps */ + TSM_DATE, /* [YYYY-MM-DD HH:MM:SS] */ + TSM_BOOT /* [SSSSSS.uuuuuu] */ +}; + +static enum con_timestamp_mode __read_mostly opt_con_timestamp_mode = TSM_NONE; + +static void parse_console_timestamps(char *s); +custom_param("console_timestamps", parse_console_timestamps); /* conring_size: allows a large console ring than default (16kB). */ static uint32_t __initdata opt_conring_size; @@ -546,23 +555,52 @@ static int printk_prefix_check(char *p, char **pp) ((loglvl < upper_thresh) && printk_ratelimit())); } +static void __init parse_console_timestamps(char *s) +{ + if ( *s == '\0' || /* Compat for old booleanparam() */ + !strcmp(s, "date") ) + opt_con_timestamp_mode = TSM_DATE; + else if ( !strcmp(s, "boot") ) + opt_con_timestamp_mode = TSM_BOOT; + else if ( !strcmp(s, "none") ) + opt_con_timestamp_mode = TSM_NONE; +} + static void printk_start_of_line(const char *prefix) { struct tm tm; char tstr[32]; + uint64_t sec, nsec; __putstr(prefix); - if ( !opt_console_timestamps ) - return; + switch ( opt_con_timestamp_mode ) + { + case TSM_DATE: + tm = wallclock_time(); - tm = wallclock_time(); - if ( tm.tm_mday == 0 ) + if ( tm.tm_mday == 0 ) + return; + + if ( opt_con_timestamp_mode == TSM_DATE ) + snprintf(tstr, sizeof(tstr), "[%04u-%02u-%02u %02u:%02u:%02u] ", + 1900 + tm.tm_year, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec); + break; + + case TSM_BOOT: + sec = NOW(); + nsec = do_div(sec, 1000000000); + + snprintf(tstr, sizeof(tstr), "[%5"PRIu64".%06"PRIu64"] ", + sec, nsec / 1000); + break; + + case TSM_NONE: + default: return; + } - snprintf(tstr, sizeof(tstr), "[%04u-%02u-%02u %02u:%02u:%02u] ", - 1900 + tm.tm_year, tm.tm_mon + 1, tm.tm_mday, - tm.tm_hour, tm.tm_min, tm.tm_sec); __putstr(tstr); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBH-00051o-0A; Fri, 14 Mar 2014 22:02:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBF-00051I-P5 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:17 +0000 Received: from [193.109.254.147:6424] by server-11.bemta-14.messagelabs.com id B9/21-24604-96C73235; Fri, 14 Mar 2014 22:02:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1394834535!1810717!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14696 invoked from network); 14 Mar 2014 22:02:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:02:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBD-0000lA-6D for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaBD-0002d4-3f for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:15 +0000 Date: Fri, 14 Mar 2014 22:02:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] console: Traditional console timestamps including milliseconds X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 006528196b81002a9c22e3e5c01a78542981ef60 Author: Andrew Cooper AuthorDate: Thu Mar 13 14:38:37 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:38:37 2014 +0100 console: Traditional console timestamps including milliseconds Suggested-by: Don Slutz Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Keir Fraser --- docs/misc/xen-command-line.markdown | 4 +++- xen/arch/arm/time.c | 2 +- xen/arch/x86/time.c | 10 +++++++--- xen/drivers/char/console.c | 11 ++++++++++- xen/include/xen/time.h | 2 +- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 80a0a55..689ffe6 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -275,7 +275,7 @@ cleared. This allows a single port to be shared by two subsystems makes sense on its own. ### console\_timestamps -> `= none | date | boot` +> `= none | date | datems | boot` > Default: `none` @@ -284,6 +284,8 @@ Specify which timestamp format Xen should use for each console line. * `none`: No timestamps * `date`: Date and time information * `[YYYY-MM-DD HH:MM:SS]` +* `datems`: Date and time, with milliseconds + * `[YYYY-MM-DD HH:MM:SS.mmm]` * `boot`: Seconds and microseconds since boot * `[SSSSSS.uuuuuu]` diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 81e3e28..22e94bb 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -282,7 +282,7 @@ void domain_set_time_offset(struct domain *d, int32_t time_offset_seconds) /* XXX update guest visible wallclock time */ } -struct tm wallclock_time(void) +struct tm wallclock_time(uint64_t *ns) { return (struct tm) { 0 }; } diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 4f4de22..f904af2 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1646,15 +1646,19 @@ int dom0_pit_access(struct ioreq *ioreq) return 0; } -struct tm wallclock_time(void) +struct tm wallclock_time(uint64_t *ns) { - uint64_t seconds; + uint64_t seconds, nsec; if ( !wc_sec ) return (struct tm) { 0 }; seconds = NOW() + SECONDS(wc_sec) + wc_nsec; - do_div(seconds, 1000000000); + nsec = do_div(seconds, 1000000000); + + if ( ns ) + *ns = nsec; + return gmtime(seconds); } diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 9c032bf..7fa9b78 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -53,6 +53,7 @@ enum con_timestamp_mode { TSM_NONE, /* No timestamps */ TSM_DATE, /* [YYYY-MM-DD HH:MM:SS] */ + TSM_DATE_MS, /* [YYYY-MM-DD HH:MM:SS.mmm] */ TSM_BOOT /* [SSSSSS.uuuuuu] */ }; @@ -560,6 +561,8 @@ static void __init parse_console_timestamps(char *s) if ( *s == '\0' || /* Compat for old booleanparam() */ !strcmp(s, "date") ) opt_con_timestamp_mode = TSM_DATE; + else if ( !strcmp(s, "datems") ) + opt_con_timestamp_mode = TSM_DATE_MS; else if ( !strcmp(s, "boot") ) opt_con_timestamp_mode = TSM_BOOT; else if ( !strcmp(s, "none") ) @@ -577,7 +580,8 @@ static void printk_start_of_line(const char *prefix) switch ( opt_con_timestamp_mode ) { case TSM_DATE: - tm = wallclock_time(); + case TSM_DATE_MS: + tm = wallclock_time(&nsec); if ( tm.tm_mday == 0 ) return; @@ -586,6 +590,11 @@ static void printk_start_of_line(const char *prefix) snprintf(tstr, sizeof(tstr), "[%04u-%02u-%02u %02u:%02u:%02u] ", 1900 + tm.tm_year, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); + else + snprintf(tstr, sizeof(tstr), + "[%04u-%02u-%02u %02u:%02u:%02u.%03"PRIu64"] ", + 1900 + tm.tm_year, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, nsec / 1000000); break; case TSM_BOOT: diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h index 3eb5b63..2703454 100644 --- a/xen/include/xen/time.h +++ b/xen/include/xen/time.h @@ -48,7 +48,7 @@ struct tm { int tm_isdst; /* daylight saving time */ }; struct tm gmtime(unsigned long t); -struct tm wallclock_time(void); +struct tm wallclock_time(uint64_t *ns); #define SYSTEM_TIME_HZ 1000000000ULL #define NOW() ((s_time_t)get_s_time()) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBH-00051o-0A; Fri, 14 Mar 2014 22:02:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBF-00051I-P5 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:17 +0000 Received: from [193.109.254.147:6424] by server-11.bemta-14.messagelabs.com id B9/21-24604-96C73235; Fri, 14 Mar 2014 22:02:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1394834535!1810717!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14696 invoked from network); 14 Mar 2014 22:02:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:02:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBD-0000lA-6D for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaBD-0002d4-3f for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:15 +0000 Date: Fri, 14 Mar 2014 22:02:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] console: Traditional console timestamps including milliseconds X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 006528196b81002a9c22e3e5c01a78542981ef60 Author: Andrew Cooper AuthorDate: Thu Mar 13 14:38:37 2014 +0100 Commit: Jan Beulich CommitDate: Thu Mar 13 14:38:37 2014 +0100 console: Traditional console timestamps including milliseconds Suggested-by: Don Slutz Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Keir Fraser --- docs/misc/xen-command-line.markdown | 4 +++- xen/arch/arm/time.c | 2 +- xen/arch/x86/time.c | 10 +++++++--- xen/drivers/char/console.c | 11 ++++++++++- xen/include/xen/time.h | 2 +- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 80a0a55..689ffe6 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -275,7 +275,7 @@ cleared. This allows a single port to be shared by two subsystems makes sense on its own. ### console\_timestamps -> `= none | date | boot` +> `= none | date | datems | boot` > Default: `none` @@ -284,6 +284,8 @@ Specify which timestamp format Xen should use for each console line. * `none`: No timestamps * `date`: Date and time information * `[YYYY-MM-DD HH:MM:SS]` +* `datems`: Date and time, with milliseconds + * `[YYYY-MM-DD HH:MM:SS.mmm]` * `boot`: Seconds and microseconds since boot * `[SSSSSS.uuuuuu]` diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 81e3e28..22e94bb 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -282,7 +282,7 @@ void domain_set_time_offset(struct domain *d, int32_t time_offset_seconds) /* XXX update guest visible wallclock time */ } -struct tm wallclock_time(void) +struct tm wallclock_time(uint64_t *ns) { return (struct tm) { 0 }; } diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 4f4de22..f904af2 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1646,15 +1646,19 @@ int dom0_pit_access(struct ioreq *ioreq) return 0; } -struct tm wallclock_time(void) +struct tm wallclock_time(uint64_t *ns) { - uint64_t seconds; + uint64_t seconds, nsec; if ( !wc_sec ) return (struct tm) { 0 }; seconds = NOW() + SECONDS(wc_sec) + wc_nsec; - do_div(seconds, 1000000000); + nsec = do_div(seconds, 1000000000); + + if ( ns ) + *ns = nsec; + return gmtime(seconds); } diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 9c032bf..7fa9b78 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -53,6 +53,7 @@ enum con_timestamp_mode { TSM_NONE, /* No timestamps */ TSM_DATE, /* [YYYY-MM-DD HH:MM:SS] */ + TSM_DATE_MS, /* [YYYY-MM-DD HH:MM:SS.mmm] */ TSM_BOOT /* [SSSSSS.uuuuuu] */ }; @@ -560,6 +561,8 @@ static void __init parse_console_timestamps(char *s) if ( *s == '\0' || /* Compat for old booleanparam() */ !strcmp(s, "date") ) opt_con_timestamp_mode = TSM_DATE; + else if ( !strcmp(s, "datems") ) + opt_con_timestamp_mode = TSM_DATE_MS; else if ( !strcmp(s, "boot") ) opt_con_timestamp_mode = TSM_BOOT; else if ( !strcmp(s, "none") ) @@ -577,7 +580,8 @@ static void printk_start_of_line(const char *prefix) switch ( opt_con_timestamp_mode ) { case TSM_DATE: - tm = wallclock_time(); + case TSM_DATE_MS: + tm = wallclock_time(&nsec); if ( tm.tm_mday == 0 ) return; @@ -586,6 +590,11 @@ static void printk_start_of_line(const char *prefix) snprintf(tstr, sizeof(tstr), "[%04u-%02u-%02u %02u:%02u:%02u] ", 1900 + tm.tm_year, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); + else + snprintf(tstr, sizeof(tstr), + "[%04u-%02u-%02u %02u:%02u:%02u.%03"PRIu64"] ", + 1900 + tm.tm_year, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, nsec / 1000000); break; case TSM_BOOT: diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h index 3eb5b63..2703454 100644 --- a/xen/include/xen/time.h +++ b/xen/include/xen/time.h @@ -48,7 +48,7 @@ struct tm { int tm_isdst; /* daylight saving time */ }; struct tm gmtime(unsigned long t); -struct tm wallclock_time(void); +struct tm wallclock_time(uint64_t *ns); #define SYSTEM_TIME_HZ 1000000000ULL #define NOW() ((s_time_t)get_s_time()) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBR-000551-2y; Fri, 14 Mar 2014 22:02:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBQ-00054Y-1m for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:28 +0000 Received: from [85.158.139.211:24999] by server-9.bemta-5.messagelabs.com id B2/EF-04350-37C73235; Fri, 14 Mar 2014 22:02:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1394834545!1149279!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7225 invoked from network); 14 Mar 2014 22:02:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:02:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBN-0000lG-Cn for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaBN-0002dQ-Bl for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:25 +0000 Date: Fri, 14 Mar 2014 22:02:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 838da99647a1123e59280b06c30d1c42002400dc Merge: 7eb73add5de5839f160b902dd894d3aecc10ba0c 006528196b81002a9c22e3e5c01a78542981ef60 Author: Ian Campbell AuthorDate: Thu Mar 13 13:58:27 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 13 13:58:27 2014 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging docs/misc/xen-command-line.markdown | 17 +++++++-- xen/arch/arm/time.c | 2 +- xen/arch/x86/irq.c | 4 +- xen/arch/x86/mm.c | 4 +- xen/arch/x86/mm/hap/hap.c | 4 ++- xen/arch/x86/mm/p2m-pod.c | 6 ++- xen/arch/x86/mm/shadow/common.c | 4 ++- xen/arch/x86/smpboot.c | 4 +- xen/arch/x86/time.c | 10 ++++-- xen/arch/x86/traps.c | 14 ++++---- xen/arch/x86/x86_64/compat/traps.c | 14 ++++---- xen/common/memory.c | 9 +++-- xen/common/multicall.c | 2 +- xen/drivers/char/console.c | 69 +++++++++++++++++++++++++++++------ xen/include/asm-arm/time.h | 3 -- xen/include/asm-x86/time.h | 3 -- xen/include/xen/time.h | 1 + 17 files changed, 117 insertions(+), 53 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBR-000551-2y; Fri, 14 Mar 2014 22:02:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBQ-00054Y-1m for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:28 +0000 Received: from [85.158.139.211:24999] by server-9.bemta-5.messagelabs.com id B2/EF-04350-37C73235; Fri, 14 Mar 2014 22:02:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1394834545!1149279!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7225 invoked from network); 14 Mar 2014 22:02:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:02:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBN-0000lG-Cn for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaBN-0002dQ-Bl for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:25 +0000 Date: Fri, 14 Mar 2014 22:02:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 838da99647a1123e59280b06c30d1c42002400dc Merge: 7eb73add5de5839f160b902dd894d3aecc10ba0c 006528196b81002a9c22e3e5c01a78542981ef60 Author: Ian Campbell AuthorDate: Thu Mar 13 13:58:27 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 13 13:58:27 2014 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging docs/misc/xen-command-line.markdown | 17 +++++++-- xen/arch/arm/time.c | 2 +- xen/arch/x86/irq.c | 4 +- xen/arch/x86/mm.c | 4 +- xen/arch/x86/mm/hap/hap.c | 4 ++- xen/arch/x86/mm/p2m-pod.c | 6 ++- xen/arch/x86/mm/shadow/common.c | 4 ++- xen/arch/x86/smpboot.c | 4 +- xen/arch/x86/time.c | 10 ++++-- xen/arch/x86/traps.c | 14 ++++---- xen/arch/x86/x86_64/compat/traps.c | 14 ++++---- xen/common/memory.c | 9 +++-- xen/common/multicall.c | 2 +- xen/drivers/char/console.c | 69 +++++++++++++++++++++++++++++------ xen/include/asm-arm/time.h | 3 -- xen/include/asm-x86/time.h | 3 -- xen/include/xen/time.h | 1 + 17 files changed, 117 insertions(+), 53 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBb-000585-5o; Fri, 14 Mar 2014 22:02:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBa-00057i-9N for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:38 +0000 Received: from [85.158.139.211:25330] by server-15.bemta-5.messagelabs.com id 76/7C-11079-D7C73235; Fri, 14 Mar 2014 22:02:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1394834555!1145574!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18707 invoked from network); 14 Mar 2014 22:02:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:02:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBX-0000lM-J7 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaBX-0002dq-Hc for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:35 +0000 Date: Fri, 14 Mar 2014 22:02:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix memory leak in libxl__strndup() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c5dabf13dae0a45c8ebf3ffe44b79f20cac7969f Author: Lai Jiangshan AuthorDate: Tue Mar 11 22:15:21 2014 +0800 Commit: Ian Jackson CommitDate: Thu Mar 13 16:41:42 2014 +0000 libxl: fix memory leak in libxl__strndup() Signed-off-by: Lai Jiangshan Acked-by: Ian Jackson --- tools/libxl/libxl_internal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index cf17658..16b82b9 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -155,6 +155,8 @@ char *libxl__strndup(libxl__gc *gc, const char *c, size_t n) if (!s) libxl__alloc_failed(CTX, __func__, n, 1); + libxl__ptr_add(gc, s); + return s; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBb-000585-5o; Fri, 14 Mar 2014 22:02:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBa-00057i-9N for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:38 +0000 Received: from [85.158.139.211:25330] by server-15.bemta-5.messagelabs.com id 76/7C-11079-D7C73235; Fri, 14 Mar 2014 22:02:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1394834555!1145574!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18707 invoked from network); 14 Mar 2014 22:02:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:02:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBX-0000lM-J7 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaBX-0002dq-Hc for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:35 +0000 Date: Fri, 14 Mar 2014 22:02:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix memory leak in libxl__strndup() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c5dabf13dae0a45c8ebf3ffe44b79f20cac7969f Author: Lai Jiangshan AuthorDate: Tue Mar 11 22:15:21 2014 +0800 Commit: Ian Jackson CommitDate: Thu Mar 13 16:41:42 2014 +0000 libxl: fix memory leak in libxl__strndup() Signed-off-by: Lai Jiangshan Acked-by: Ian Jackson --- tools/libxl/libxl_internal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index cf17658..16b82b9 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -155,6 +155,8 @@ char *libxl__strndup(libxl__gc *gc, const char *c, size_t n) if (!s) libxl__alloc_failed(CTX, __func__, n, 1); + libxl__ptr_add(gc, s); + return s; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBm-0005Bu-8Z; Fri, 14 Mar 2014 22:02:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBk-0005B7-J7 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:48 +0000 Received: from [85.158.137.68:54922] by server-8.bemta-3.messagelabs.com id 7A/02-21547-78C73235; Fri, 14 Mar 2014 22:02:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1394834566!744828!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19778 invoked from network); 14 Mar 2014 22:02:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:02:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBh-0000lS-Q5 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaBh-0002eq-OE for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:45 +0000 Date: Fri, 14 Mar 2014 22:02:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: simplify libxl__dirname() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 83e26b9c41f6d2d18f54eb855490fce519aead57 Author: Lai Jiangshan AuthorDate: Tue Mar 11 22:15:22 2014 +0800 Commit: Ian Jackson CommitDate: Thu Mar 13 16:51:13 2014 +0000 libxl: simplify libxl__dirname() Signed-off-by: Lai Jiangshan Acked-by: Ian Jackson --- tools/libxl/libxl_internal.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 16b82b9..1db48b6 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -162,14 +162,12 @@ char *libxl__strndup(libxl__gc *gc, const char *c, size_t n) char *libxl__dirname(libxl__gc *gc, const char *s) { - char *c; - char *ptr = libxl__strdup(gc, s); + char *c = strrchr(s, '/'); - c = strrchr(ptr, '/'); if (!c) return NULL; - *c = '\0'; - return ptr; + + return libxl__strndup(gc, s, c - s); } void libxl__logv(libxl_ctx *ctx, xentoollog_level msglevel, int errnoval, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBm-0005Bu-8Z; Fri, 14 Mar 2014 22:02:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBk-0005B7-J7 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:48 +0000 Received: from [85.158.137.68:54922] by server-8.bemta-3.messagelabs.com id 7A/02-21547-78C73235; Fri, 14 Mar 2014 22:02:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1394834566!744828!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19778 invoked from network); 14 Mar 2014 22:02:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:02:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBh-0000lS-Q5 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaBh-0002eq-OE for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:45 +0000 Date: Fri, 14 Mar 2014 22:02:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: simplify libxl__dirname() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 83e26b9c41f6d2d18f54eb855490fce519aead57 Author: Lai Jiangshan AuthorDate: Tue Mar 11 22:15:22 2014 +0800 Commit: Ian Jackson CommitDate: Thu Mar 13 16:51:13 2014 +0000 libxl: simplify libxl__dirname() Signed-off-by: Lai Jiangshan Acked-by: Ian Jackson --- tools/libxl/libxl_internal.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 16b82b9..1db48b6 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -162,14 +162,12 @@ char *libxl__strndup(libxl__gc *gc, const char *c, size_t n) char *libxl__dirname(libxl__gc *gc, const char *s) { - char *c; - char *ptr = libxl__strdup(gc, s); + char *c = strrchr(s, '/'); - c = strrchr(ptr, '/'); if (!c) return NULL; - *c = '\0'; - return ptr; + + return libxl__strndup(gc, s, c - s); } void libxl__logv(libxl_ctx *ctx, xentoollog_level msglevel, int errnoval, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBv-0005F9-FP; Fri, 14 Mar 2014 22:02:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBu-0005EX-CD for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:58 +0000 Received: from [193.109.254.147:58533] by server-1.bemta-14.messagelabs.com id AD/27-29588-19C73235; Fri, 14 Mar 2014 22:02:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1394834576!1817499!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2924 invoked from network); 14 Mar 2014 22:02:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:02:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBr-0000lY-VS for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaBr-0002fC-UV for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:55 +0000 Date: Fri, 14 Mar 2014 22:02:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xcutils: xc_save: avoid allocing local constant string X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 811006b4cef2bfa890676b41bd90f40a64f40bf7 Author: Lai Jiangshan AuthorDate: Tue Mar 11 22:15:24 2014 +0800 Commit: Ian Jackson CommitDate: Thu Mar 13 16:53:44 2014 +0000 tools/xcutils: xc_save: avoid allocing local constant string cmd_str doesn't need to be allocated. Signed-off-by: Lai Jiangshan Acked-by: Ian Jackson --- tools/xcutils/xc_save.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c index ecf5444..654c9c2 100644 --- a/tools/xcutils/xc_save.c +++ b/tools/xcutils/xc_save.c @@ -127,8 +127,7 @@ static int switch_qemu_logdirty(int domid, unsigned int enable, void *data) if (!xs_watch(xs, path, "qemu-logdirty-ret")) errx(1, "can't set watch in store (%s)\n", path); - if (!(cmd_str = strdup( enable == 0 ? "disable" : "enable"))) - errx(1, "can't get logdirty cmd path in store"); + cmd_str = enable == 0 ? "disable" : "enable"; /* Tell qemu that we want it to start logging dirty page to Xen */ strcpy(p, "cmd"); @@ -156,7 +155,6 @@ static int switch_qemu_logdirty(int domid, unsigned int enable, void *data) goto read_again; free(path); - free(cmd_str); free(ret_str); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:02:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:02:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBv-0005F9-FP; Fri, 14 Mar 2014 22:02:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBu-0005EX-CD for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:58 +0000 Received: from [193.109.254.147:58533] by server-1.bemta-14.messagelabs.com id AD/27-29588-19C73235; Fri, 14 Mar 2014 22:02:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1394834576!1817499!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2924 invoked from network); 14 Mar 2014 22:02:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:02:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaBr-0000lY-VS for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaBr-0002fC-UV for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:02:55 +0000 Date: Fri, 14 Mar 2014 22:02:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xcutils: xc_save: avoid allocing local constant string X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 811006b4cef2bfa890676b41bd90f40a64f40bf7 Author: Lai Jiangshan AuthorDate: Tue Mar 11 22:15:24 2014 +0800 Commit: Ian Jackson CommitDate: Thu Mar 13 16:53:44 2014 +0000 tools/xcutils: xc_save: avoid allocing local constant string cmd_str doesn't need to be allocated. Signed-off-by: Lai Jiangshan Acked-by: Ian Jackson --- tools/xcutils/xc_save.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c index ecf5444..654c9c2 100644 --- a/tools/xcutils/xc_save.c +++ b/tools/xcutils/xc_save.c @@ -127,8 +127,7 @@ static int switch_qemu_logdirty(int domid, unsigned int enable, void *data) if (!xs_watch(xs, path, "qemu-logdirty-ret")) errx(1, "can't set watch in store (%s)\n", path); - if (!(cmd_str = strdup( enable == 0 ? "disable" : "enable"))) - errx(1, "can't get logdirty cmd path in store"); + cmd_str = enable == 0 ? "disable" : "enable"; /* Tell qemu that we want it to start logging dirty page to Xen */ strcpy(p, "cmd"); @@ -156,7 +155,6 @@ static int switch_qemu_logdirty(int domid, unsigned int enable, void *data) goto read_again; free(path); - free(cmd_str); free(ret_str); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:03:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:03:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaC6-0005Hy-IM; Fri, 14 Mar 2014 22:03:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaC4-0005HZ-Ov for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:08 +0000 Received: from [85.158.143.35:17265] by server-1.bemta-4.messagelabs.com id B4/8A-09853-C9C73235; Fri, 14 Mar 2014 22:03:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1394834586!2212418!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24603 invoked from network); 14 Mar 2014 22:03:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:03:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaC2-0000m7-75 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaC2-0002fi-3D for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:06 +0000 Date: Fri, 14 Mar 2014 22:03:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: fix errno handling for HVM in xc_domain_save X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 29f0712bc008a9d6e611785424f797cfc185c1d3 Author: Ian Jackson AuthorDate: Thu Mar 13 17:59:49 2014 +0000 Commit: Ian Jackson CommitDate: Thu Mar 13 17:59:49 2014 +0000 tools/libxc: fix errno handling for HVM in xc_domain_save The previous patch (dda0b77d "tools/libxc: pass errno to callers of xc_domain_save") did not jump to the proper label if the domU is HVM. Signed-off-by: Ian Jackson Reviewed-by: Olaf Hering --- tools/libxc/xc_domain_save.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 9f96bb7..71f9b59 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -1836,8 +1836,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter } /* HVM guests are done now */ - errno = 0; - goto out; + goto success; } /* PV guests only from now on */ @@ -2037,6 +2036,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter } /* Success! */ + success: rc = errno = 0; goto out_rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:03:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:03:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaC6-0005Hy-IM; Fri, 14 Mar 2014 22:03:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaC4-0005HZ-Ov for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:08 +0000 Received: from [85.158.143.35:17265] by server-1.bemta-4.messagelabs.com id B4/8A-09853-C9C73235; Fri, 14 Mar 2014 22:03:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1394834586!2212418!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24603 invoked from network); 14 Mar 2014 22:03:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:03:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaC2-0000m7-75 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaC2-0002fi-3D for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:06 +0000 Date: Fri, 14 Mar 2014 22:03:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: fix errno handling for HVM in xc_domain_save X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 29f0712bc008a9d6e611785424f797cfc185c1d3 Author: Ian Jackson AuthorDate: Thu Mar 13 17:59:49 2014 +0000 Commit: Ian Jackson CommitDate: Thu Mar 13 17:59:49 2014 +0000 tools/libxc: fix errno handling for HVM in xc_domain_save The previous patch (dda0b77d "tools/libxc: pass errno to callers of xc_domain_save") did not jump to the proper label if the domU is HVM. Signed-off-by: Ian Jackson Reviewed-by: Olaf Hering --- tools/libxc/xc_domain_save.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 9f96bb7..71f9b59 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -1836,8 +1836,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter } /* HVM guests are done now */ - errno = 0; - goto out; + goto success; } /* PV guests only from now on */ @@ -2037,6 +2036,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter } /* Success! */ + success: rc = errno = 0; goto out_rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:03:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:03:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCH-0005LW-L7; Fri, 14 Mar 2014 22:03:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCF-0005Kn-UY for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:20 +0000 Received: from [85.158.137.68:7859] by server-16.bemta-3.messagelabs.com id 1E/FB-13481-6AC73235; Fri, 14 Mar 2014 22:03:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1394834596!729957!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23190 invoked from network); 14 Mar 2014 22:03:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:03:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCC-0000mD-CD for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaCC-0002g7-BF for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:16 +0000 Date: Fri, 14 Mar 2014 22:03:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/mfndump: Avoid unintentional NULL dereference X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e927d4be842cf44e8f0c92fb8c077a0e0f0383bb Author: Andrew Cooper AuthorDate: Thu Mar 13 11:09:07 2014 +0000 Commit: Ian Jackson CommitDate: Thu Mar 13 18:03:37 2014 +0000 tools/mfndump: Avoid unintentional NULL dereference If we failed to open an xc interface, using xch to log an error will end in tears. Print to stderr instead, as we are bailing immediately later. Signed-off-by: Andrew Cooper Coverity-id: 1191885 Acked-by: Ian Campbell CC: Ian Jackson Acked-by: Dario Faggioli --- tools/misc/xen-mfndump.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/misc/xen-mfndump.c b/tools/misc/xen-mfndump.c index 8064527..e1ea536 100644 --- a/tools/misc/xen-mfndump.c +++ b/tools/misc/xen-mfndump.c @@ -400,7 +400,7 @@ int main(int argc, char *argv[]) xch = xc_interface_open(0, 0, 0); if ( !xch ) { - ERROR("Failed to open an xc handler"); + fprintf(stderr, "Failed to open an xc handler"); return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:03:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:03:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCH-0005LW-L7; Fri, 14 Mar 2014 22:03:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCF-0005Kn-UY for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:20 +0000 Received: from [85.158.137.68:7859] by server-16.bemta-3.messagelabs.com id 1E/FB-13481-6AC73235; Fri, 14 Mar 2014 22:03:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1394834596!729957!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23190 invoked from network); 14 Mar 2014 22:03:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:03:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCC-0000mD-CD for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaCC-0002g7-BF for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:16 +0000 Date: Fri, 14 Mar 2014 22:03:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/mfndump: Avoid unintentional NULL dereference X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e927d4be842cf44e8f0c92fb8c077a0e0f0383bb Author: Andrew Cooper AuthorDate: Thu Mar 13 11:09:07 2014 +0000 Commit: Ian Jackson CommitDate: Thu Mar 13 18:03:37 2014 +0000 tools/mfndump: Avoid unintentional NULL dereference If we failed to open an xc interface, using xch to log an error will end in tears. Print to stderr instead, as we are bailing immediately later. Signed-off-by: Andrew Cooper Coverity-id: 1191885 Acked-by: Ian Campbell CC: Ian Jackson Acked-by: Dario Faggioli --- tools/misc/xen-mfndump.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/misc/xen-mfndump.c b/tools/misc/xen-mfndump.c index 8064527..e1ea536 100644 --- a/tools/misc/xen-mfndump.c +++ b/tools/misc/xen-mfndump.c @@ -400,7 +400,7 @@ int main(int argc, char *argv[]) xch = xc_interface_open(0, 0, 0); if ( !xch ) { - ERROR("Failed to open an xc handler"); + fprintf(stderr, "Failed to open an xc handler"); return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:03:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:03:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCR-0005Ob-3y; Fri, 14 Mar 2014 22:03:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCP-0005O4-Eu for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:29 +0000 Received: from [85.158.137.68:56167] by server-11.bemta-3.messagelabs.com id 71/A3-19438-0BC73235; Fri, 14 Mar 2014 22:03:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1394834606!740692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.7 required=7.0 tests=BIZ_TLD X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19001 invoked from network); 14 Mar 2014 22:03:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:03:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCM-0000mJ-Hs for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaCM-0002gT-Gu for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:26 +0000 Date: Fri, 14 Mar 2014 22:03:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Add none to vga parameter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2e5738ff47b9d2e1948024100f87b1a25fcf004a Author: Fabio Fantoni AuthorDate: Thu Mar 13 15:25:47 2014 +0100 Commit: Ian Jackson CommitDate: Thu Mar 13 18:09:57 2014 +0000 libxl: Add none to vga parameter Usage: vga="none" Make possible to not have an emulated vga on hvm domUs. Signed-off-by: Fabio Fantoni Reviewed-by: Anthony PERARD Tested-by: Paul Durrant --- docs/man/xl.cfg.pod.5 | 2 +- tools/libxl/libxl_create.c | 8 ++++++++ tools/libxl/libxl_dm.c | 5 +++++ tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 2 ++ 5 files changed, 17 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index d5ed82d..a6663b9 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1096,7 +1096,7 @@ This option is deprecated, use vga="stdvga" instead. =item B -Selects the emulated video card (stdvga|cirrus). +Selects the emulated video card (none|stdvga|cirrus). The default is cirrus. =item B diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 53e7cb6..d015cf4 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -226,6 +226,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, switch (b_info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_NONE: + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 0; + break; case LIBXL_VGA_INTERFACE_TYPE_STD: if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) b_info->video_memkb = 8 * 1024; @@ -246,6 +250,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: default: switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_NONE: + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 0; + break; case LIBXL_VGA_INTERFACE_TYPE_STD: if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) b_info->video_memkb = 16 * 1024; diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 5c06dfa..8abed7b 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -217,6 +217,9 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, break; case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: break; + case LIBXL_VGA_INTERFACE_TYPE_NONE: + flexarray_append_pair(dm_args, "-vga", "none"); + break; } if (b_info->u.hvm.boot) { @@ -510,6 +513,8 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, GCSPRINTF("vga.vram_size_mb=%d", libxl__sizekb_to_mb(b_info->video_memkb))); break; + case LIBXL_VGA_INTERFACE_TYPE_NONE: + break; } if (b_info->u.hvm.boot) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 7d3a62b..612645c 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -153,6 +153,7 @@ libxl_shutdown_reason = Enumeration("shutdown_reason", [ libxl_vga_interface_type = Enumeration("vga_interface_type", [ (1, "CIRRUS"), (2, "STD"), + (3, "NONE"), ], init_val = 1) libxl_vendor_device = Enumeration("vendor_device", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5a92c3b..6b1ebfa 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1687,6 +1687,8 @@ skip_vfb: b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_STD; } else if (!strcmp(buf, "cirrus")) { b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS; + } else if (!strcmp(buf, "none")) { + b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_NONE; } else { fprintf(stderr, "Unknown vga \"%s\" specified\n", buf); exit(1); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:03:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:03:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCR-0005Ob-3y; Fri, 14 Mar 2014 22:03:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCP-0005O4-Eu for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:29 +0000 Received: from [85.158.137.68:56167] by server-11.bemta-3.messagelabs.com id 71/A3-19438-0BC73235; Fri, 14 Mar 2014 22:03:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1394834606!740692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.7 required=7.0 tests=BIZ_TLD X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19001 invoked from network); 14 Mar 2014 22:03:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:03:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCM-0000mJ-Hs for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaCM-0002gT-Gu for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:26 +0000 Date: Fri, 14 Mar 2014 22:03:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Add none to vga parameter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2e5738ff47b9d2e1948024100f87b1a25fcf004a Author: Fabio Fantoni AuthorDate: Thu Mar 13 15:25:47 2014 +0100 Commit: Ian Jackson CommitDate: Thu Mar 13 18:09:57 2014 +0000 libxl: Add none to vga parameter Usage: vga="none" Make possible to not have an emulated vga on hvm domUs. Signed-off-by: Fabio Fantoni Reviewed-by: Anthony PERARD Tested-by: Paul Durrant --- docs/man/xl.cfg.pod.5 | 2 +- tools/libxl/libxl_create.c | 8 ++++++++ tools/libxl/libxl_dm.c | 5 +++++ tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 2 ++ 5 files changed, 17 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index d5ed82d..a6663b9 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1096,7 +1096,7 @@ This option is deprecated, use vga="stdvga" instead. =item B -Selects the emulated video card (stdvga|cirrus). +Selects the emulated video card (none|stdvga|cirrus). The default is cirrus. =item B diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 53e7cb6..d015cf4 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -226,6 +226,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, switch (b_info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_NONE: + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 0; + break; case LIBXL_VGA_INTERFACE_TYPE_STD: if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) b_info->video_memkb = 8 * 1024; @@ -246,6 +250,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: default: switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_NONE: + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 0; + break; case LIBXL_VGA_INTERFACE_TYPE_STD: if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) b_info->video_memkb = 16 * 1024; diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 5c06dfa..8abed7b 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -217,6 +217,9 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, break; case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: break; + case LIBXL_VGA_INTERFACE_TYPE_NONE: + flexarray_append_pair(dm_args, "-vga", "none"); + break; } if (b_info->u.hvm.boot) { @@ -510,6 +513,8 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, GCSPRINTF("vga.vram_size_mb=%d", libxl__sizekb_to_mb(b_info->video_memkb))); break; + case LIBXL_VGA_INTERFACE_TYPE_NONE: + break; } if (b_info->u.hvm.boot) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 7d3a62b..612645c 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -153,6 +153,7 @@ libxl_shutdown_reason = Enumeration("shutdown_reason", [ libxl_vga_interface_type = Enumeration("vga_interface_type", [ (1, "CIRRUS"), (2, "STD"), + (3, "NONE"), ], init_val = 1) libxl_vendor_device = Enumeration("vendor_device", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5a92c3b..6b1ebfa 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1687,6 +1687,8 @@ skip_vfb: b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_STD; } else if (!strcmp(buf, "cirrus")) { b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS; + } else if (!strcmp(buf, "none")) { + b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_NONE; } else { fprintf(stderr, "Unknown vga \"%s\" specified\n", buf); exit(1); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:03:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:03:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCa-0005RR-7d; Fri, 14 Mar 2014 22:03:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCZ-0005R1-5u for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:39 +0000 Received: from [85.158.143.35:18467] by server-1.bemta-4.messagelabs.com id D2/BA-09853-ABC73235; Fri, 14 Mar 2014 22:03:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1394834616!2228034!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14202 invoked from network); 14 Mar 2014 22:03:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:03:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCW-0000mP-MM for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaCW-0002hk-LL for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:36 +0000 Date: Fri, 14 Mar 2014 22:03:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] functional cleanup for __attribute__((packed)) changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f8be76e2fe2f7c014011b3b137b6692566a7d6a2 Author: Andrew Cooper AuthorDate: Fri Mar 14 09:42:28 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 09:42:28 2014 +0100 functional cleanup for __attribute__((packed)) changes This is to separate the functional changes from the noop consistency changes. * Pack struct cper_mce_record rather than creating a structure named __packed * Remove unreferenced struct xgt_desc * Use two u16's rather than two u32 16-bit bitfields Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Also drop now pointless (and always having been bogus) pack pragmas. Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce-apei.c | 5 +---- xen/arch/x86/hvm/vmx/vmcs.c | 5 ----- xen/common/trace.c | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce-apei.c b/xen/arch/x86/cpu/mcheck/mce-apei.c index 3370341..9488dbd 100644 --- a/xen/arch/x86/cpu/mcheck/mce-apei.c +++ b/xen/arch/x86/cpu/mcheck/mce-apei.c @@ -44,7 +44,6 @@ UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \ 0x04, 0x4a, 0x38, 0xfc) -#pragma pack(1) /* * CPER specification (in UEFI specification 2.3 appendix N) requires * byte-packed. @@ -53,9 +52,7 @@ struct cper_mce_record { struct cper_record_header hdr; struct cper_section_descriptor sec_hdr; struct mce mce; -} __packed; -/* Reset to default packing */ -#pragma pack() +} __attribute__((packed)); int apei_write_mce(struct mce *m) { diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 9ffb4af..4b886e5 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -670,11 +670,6 @@ void vmx_vmcs_exit(struct vcpu *v) } } -struct xgt_desc { - unsigned short size; - unsigned long address __attribute__((packed)); -}; - static void vmx_set_host_env(struct vcpu *v) { unsigned int cpu = smp_processor_id(); diff --git a/xen/common/trace.c b/xen/common/trace.c index 41ddc33..73ba57c 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -643,7 +643,7 @@ static inline void insert_lost_records(struct t_buf *buf) { struct { u32 lost_records; - u32 did:16, vid:16; + u16 did, vid; u64 first_tsc; } __attribute__((packed)) ed; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:03:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:03:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCa-0005RR-7d; Fri, 14 Mar 2014 22:03:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCZ-0005R1-5u for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:39 +0000 Received: from [85.158.143.35:18467] by server-1.bemta-4.messagelabs.com id D2/BA-09853-ABC73235; Fri, 14 Mar 2014 22:03:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1394834616!2228034!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14202 invoked from network); 14 Mar 2014 22:03:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:03:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCW-0000mP-MM for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaCW-0002hk-LL for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:36 +0000 Date: Fri, 14 Mar 2014 22:03:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] functional cleanup for __attribute__((packed)) changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f8be76e2fe2f7c014011b3b137b6692566a7d6a2 Author: Andrew Cooper AuthorDate: Fri Mar 14 09:42:28 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 09:42:28 2014 +0100 functional cleanup for __attribute__((packed)) changes This is to separate the functional changes from the noop consistency changes. * Pack struct cper_mce_record rather than creating a structure named __packed * Remove unreferenced struct xgt_desc * Use two u16's rather than two u32 16-bit bitfields Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Also drop now pointless (and always having been bogus) pack pragmas. Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce-apei.c | 5 +---- xen/arch/x86/hvm/vmx/vmcs.c | 5 ----- xen/common/trace.c | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce-apei.c b/xen/arch/x86/cpu/mcheck/mce-apei.c index 3370341..9488dbd 100644 --- a/xen/arch/x86/cpu/mcheck/mce-apei.c +++ b/xen/arch/x86/cpu/mcheck/mce-apei.c @@ -44,7 +44,6 @@ UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \ 0x04, 0x4a, 0x38, 0xfc) -#pragma pack(1) /* * CPER specification (in UEFI specification 2.3 appendix N) requires * byte-packed. @@ -53,9 +52,7 @@ struct cper_mce_record { struct cper_record_header hdr; struct cper_section_descriptor sec_hdr; struct mce mce; -} __packed; -/* Reset to default packing */ -#pragma pack() +} __attribute__((packed)); int apei_write_mce(struct mce *m) { diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 9ffb4af..4b886e5 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -670,11 +670,6 @@ void vmx_vmcs_exit(struct vcpu *v) } } -struct xgt_desc { - unsigned short size; - unsigned long address __attribute__((packed)); -}; - static void vmx_set_host_env(struct vcpu *v) { unsigned int cpu = smp_processor_id(); diff --git a/xen/common/trace.c b/xen/common/trace.c index 41ddc33..73ba57c 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -643,7 +643,7 @@ static inline void insert_lost_records(struct t_buf *buf) { struct { u32 lost_records; - u32 did:16, vid:16; + u16 did, vid; u64 first_tsc; } __attribute__((packed)) ed; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:03:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:03:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCk-0005UE-At; Fri, 14 Mar 2014 22:03:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCj-0005Tx-LJ for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:49 +0000 Received: from [85.158.143.35:18865] by server-2.bemta-4.messagelabs.com id DC/73-06539-4CC73235; Fri, 14 Mar 2014 22:03:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1394834627!2218151!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24231 invoked from network); 14 Mar 2014 22:03:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:03:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCg-0000mV-S5 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaCg-0002i6-Qa for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:46 +0000 Date: Fri, 14 Mar 2014 22:03:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common: shuffle use of __attribute__((packed)) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b683d68c3860c90e32e594e510ee011e3d758d52 Author: Andrew Cooper AuthorDate: Fri Mar 14 09:43:37 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 09:43:37 2014 +0100 common: shuffle use of __attribute__((packed)) This introduced a formal define in compiler.h, and is otherwise manual shuffling of __attribute__((packed)) statements to __packed at the head of the structure. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- xen/common/trace.c | 8 ++++---- xen/common/unlzma.c | 4 ++-- xen/drivers/char/ehci-dbgp.c | 8 ++++---- xen/include/xen/compat.h | 2 +- xen/include/xen/compiler.h | 2 ++ 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/xen/common/trace.c b/xen/common/trace.c index 73ba57c..1814165 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -641,11 +641,11 @@ static inline void insert_wrap_record(struct t_buf *buf, static inline void insert_lost_records(struct t_buf *buf) { - struct { + struct __packed { u32 lost_records; u16 did, vid; u64 first_tsc; - } __attribute__((packed)) ed; + } ed; ed.vid = current->vcpu_id; ed.did = current->domain->domain_id; @@ -819,10 +819,10 @@ unlock: void __trace_hypercall(uint32_t event, unsigned long op, const unsigned long *args) { - struct { + struct __packed { uint32_t op; uint32_t args[6]; - } __attribute__((packed)) d; + } d; uint32_t *a = d.args; #define APPEND_ARG32(i) \ diff --git a/xen/common/unlzma.c b/xen/common/unlzma.c index 4d04330..103d2df 100644 --- a/xen/common/unlzma.c +++ b/xen/common/unlzma.c @@ -214,11 +214,11 @@ rc_bit_tree_decode(struct rc *rc, uint16_t *p, int num_levels, int *symbol) */ -struct lzma_header { +struct __packed lzma_header { uint8_t pos; uint32_t dict_size; uint64_t dst_size; -} __attribute__ ((packed)) ; +}; #define LZMA_BASE_SIZE 1846 diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index b900d60..3feeafe 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -251,25 +251,25 @@ struct ehci_dbg_port { * For most devices, interfaces don't coordinate with each other, so * such requests may be made at any time. */ -struct usb_ctrlrequest { +struct __packed usb_ctrlrequest { u8 bRequestType; u8 bRequest; __le16 wValue; __le16 wIndex; __le16 wLength; -} __attribute__ ((packed)); +}; /* USB_DT_DEBUG: for special highspeed devices, replacing serial console */ #define USB_DT_DEBUG 0x0a -struct usb_debug_descriptor { +struct __packed usb_debug_descriptor { u8 bLength; u8 bDescriptorType; /* bulk endpoints with 8 byte maxpacket */ u8 bDebugInEndpoint; u8 bDebugOutEndpoint; -} __attribute__((packed)); +}; #define USB_DEBUG_DEVNUM 127 diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h index ca60699..d58aede 100644 --- a/xen/include/xen/compat.h +++ b/xen/include/xen/compat.h @@ -14,7 +14,7 @@ #define __DEFINE_COMPAT_HANDLE(name, type) \ typedef struct { \ compat_ptr_t c; \ - type *_[0] __attribute__((__packed__)); \ + type *_[0] __packed; \ } __compat_handle_ ## name #define DEFINE_COMPAT_HANDLE(name) \ diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index c80398d..6e07990 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -16,6 +16,8 @@ #define noreturn __attribute__((noreturn)) +#define __packed __attribute__((packed)) + #if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) #define unreachable() do {} while (1) #else -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:03:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:03:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCk-0005UE-At; Fri, 14 Mar 2014 22:03:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCj-0005Tx-LJ for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:49 +0000 Received: from [85.158.143.35:18865] by server-2.bemta-4.messagelabs.com id DC/73-06539-4CC73235; Fri, 14 Mar 2014 22:03:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1394834627!2218151!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24231 invoked from network); 14 Mar 2014 22:03:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:03:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCg-0000mV-S5 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaCg-0002i6-Qa for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:46 +0000 Date: Fri, 14 Mar 2014 22:03:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common: shuffle use of __attribute__((packed)) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b683d68c3860c90e32e594e510ee011e3d758d52 Author: Andrew Cooper AuthorDate: Fri Mar 14 09:43:37 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 09:43:37 2014 +0100 common: shuffle use of __attribute__((packed)) This introduced a formal define in compiler.h, and is otherwise manual shuffling of __attribute__((packed)) statements to __packed at the head of the structure. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- xen/common/trace.c | 8 ++++---- xen/common/unlzma.c | 4 ++-- xen/drivers/char/ehci-dbgp.c | 8 ++++---- xen/include/xen/compat.h | 2 +- xen/include/xen/compiler.h | 2 ++ 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/xen/common/trace.c b/xen/common/trace.c index 73ba57c..1814165 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -641,11 +641,11 @@ static inline void insert_wrap_record(struct t_buf *buf, static inline void insert_lost_records(struct t_buf *buf) { - struct { + struct __packed { u32 lost_records; u16 did, vid; u64 first_tsc; - } __attribute__((packed)) ed; + } ed; ed.vid = current->vcpu_id; ed.did = current->domain->domain_id; @@ -819,10 +819,10 @@ unlock: void __trace_hypercall(uint32_t event, unsigned long op, const unsigned long *args) { - struct { + struct __packed { uint32_t op; uint32_t args[6]; - } __attribute__((packed)) d; + } d; uint32_t *a = d.args; #define APPEND_ARG32(i) \ diff --git a/xen/common/unlzma.c b/xen/common/unlzma.c index 4d04330..103d2df 100644 --- a/xen/common/unlzma.c +++ b/xen/common/unlzma.c @@ -214,11 +214,11 @@ rc_bit_tree_decode(struct rc *rc, uint16_t *p, int num_levels, int *symbol) */ -struct lzma_header { +struct __packed lzma_header { uint8_t pos; uint32_t dict_size; uint64_t dst_size; -} __attribute__ ((packed)) ; +}; #define LZMA_BASE_SIZE 1846 diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index b900d60..3feeafe 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -251,25 +251,25 @@ struct ehci_dbg_port { * For most devices, interfaces don't coordinate with each other, so * such requests may be made at any time. */ -struct usb_ctrlrequest { +struct __packed usb_ctrlrequest { u8 bRequestType; u8 bRequest; __le16 wValue; __le16 wIndex; __le16 wLength; -} __attribute__ ((packed)); +}; /* USB_DT_DEBUG: for special highspeed devices, replacing serial console */ #define USB_DT_DEBUG 0x0a -struct usb_debug_descriptor { +struct __packed usb_debug_descriptor { u8 bLength; u8 bDescriptorType; /* bulk endpoints with 8 byte maxpacket */ u8 bDebugInEndpoint; u8 bDebugOutEndpoint; -} __attribute__((packed)); +}; #define USB_DEBUG_DEVNUM 127 diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h index ca60699..d58aede 100644 --- a/xen/include/xen/compat.h +++ b/xen/include/xen/compat.h @@ -14,7 +14,7 @@ #define __DEFINE_COMPAT_HANDLE(name, type) \ typedef struct { \ compat_ptr_t c; \ - type *_[0] __attribute__((__packed__)); \ + type *_[0] __packed; \ } __compat_handle_ ## name #define DEFINE_COMPAT_HANDLE(name) \ diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index c80398d..6e07990 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -16,6 +16,8 @@ #define noreturn __attribute__((noreturn)) +#define __packed __attribute__((packed)) + #if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) #define unreachable() do {} while (1) #else -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:04:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:04:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCw-0005XW-EA; Fri, 14 Mar 2014 22:04:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCu-0005X3-Vn for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:01 +0000 Received: from [85.158.137.68:57134] by server-16.bemta-3.messagelabs.com id EC/4C-13481-0DC73235; Fri, 14 Mar 2014 22:04:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1394834637!752247!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1360 invoked from network); 14 Mar 2014 22:03:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:03:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCr-0000mc-2f for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaCr-0002iS-1L for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:57 +0000 Date: Fri, 14 Mar 2014 22:03:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: shuffle use of __attribute__((packed)) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e5d6d05967aca80cfc2f2a87f489e25ec53917c Author: Andrew Cooper AuthorDate: Fri Mar 14 09:44:40 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 09:44:40 2014 +0100 x86: shuffle use of __attribute__((packed)) This is almost all manual shuffling of __attribute__((packed)) statements to __packed at the head of the structure. The only different change is in tboot.h, removing some now-redundant ifdefs. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- xen/arch/x86/bzimage.c | 4 +- xen/arch/x86/cpu/mcheck/mce-apei.c | 4 +- xen/arch/x86/dmi_scan.c | 8 ++-- xen/arch/x86/microcode_amd.c | 8 ++-- xen/arch/x86/mm/shadow/multi.c | 16 ++++---- xen/arch/x86/oprofile/backtrace.c | 8 ++-- xen/arch/x86/trace.c | 28 +++++++------- xen/include/asm-x86/apicdef.h | 4 +- xen/include/asm-x86/desc.h | 4 +- xen/include/asm-x86/e820.h | 4 +- xen/include/asm-x86/edd.h | 76 ++++++++++++++++++------------------ xen/include/asm-x86/hvm/svm/vmcb.h | 24 ++++++------ xen/include/asm-x86/hvm/vmx/vmx.h | 4 +- xen/include/asm-x86/i387.h | 4 +- xen/include/asm-x86/io_apic.h | 20 +++++----- xen/include/asm-x86/msi.h | 8 ++-- xen/include/asm-x86/processor.h | 4 +- xen/include/asm-x86/tboot.h | 4 -- xen/include/asm-x86/xstate.h | 4 +- 19 files changed, 116 insertions(+), 120 deletions(-) diff --git a/xen/arch/x86/bzimage.c b/xen/arch/x86/bzimage.c index d72b832..c86c39e 100644 --- a/xen/arch/x86/bzimage.c +++ b/xen/arch/x86/bzimage.c @@ -146,7 +146,7 @@ static __init int perform_gunzip(char *output, char *image, unsigned long image_ return rc; } -struct setup_header { +struct __packed setup_header { uint8_t _pad0[0x1f1]; /* skip uninteresting stuff */ uint8_t setup_sects; uint16_t root_flags; @@ -183,7 +183,7 @@ struct setup_header { uint64_t hardware_subarch_data; uint32_t payload_offset; uint32_t payload_length; - } __attribute__((packed)); + }; static __init int bzimage_check(struct setup_header *hdr, unsigned long len) { diff --git a/xen/arch/x86/cpu/mcheck/mce-apei.c b/xen/arch/x86/cpu/mcheck/mce-apei.c index 9488dbd..31f2302 100644 --- a/xen/arch/x86/cpu/mcheck/mce-apei.c +++ b/xen/arch/x86/cpu/mcheck/mce-apei.c @@ -48,11 +48,11 @@ * CPER specification (in UEFI specification 2.3 appendix N) requires * byte-packed. */ -struct cper_mce_record { +struct __packed cper_mce_record { struct cper_record_header hdr; struct cper_section_descriptor sec_hdr; struct mce mce; -} __attribute__((packed)); +}; int apei_write_mce(struct mce *m) { diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 9d4348b..500133a 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -18,16 +18,16 @@ #define memcpy_fromio memcpy #define alloc_bootmem(l) xmalloc_bytes(l) -struct dmi_eps { +struct __packed dmi_eps { char anchor[5]; /* "_DMI_" */ u8 checksum; u16 size; u32 address; u16 num_structures; u8 revision; -} __attribute__((packed)); +}; -struct smbios_eps { +struct __packed smbios_eps { char anchor[4]; /* "_SM_" */ u8 checksum; u8 length; @@ -36,7 +36,7 @@ struct smbios_eps { u8 revision; u8 _rsrvd_[5]; struct dmi_eps dmi; -} __attribute__((packed)); +}; struct dmi_header { diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 3014245..b227173 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -27,15 +27,15 @@ #include #include -struct equiv_cpu_entry { +struct __packed equiv_cpu_entry { uint32_t installed_cpu; uint32_t fixed_errata_mask; uint32_t fixed_errata_compare; uint16_t equiv_cpu; uint16_t reserved; -} __attribute__((packed)); +}; -struct microcode_header_amd { +struct __packed microcode_header_amd { uint32_t data_code; uint32_t patch_id; uint8_t mc_patch_data_id[2]; @@ -50,7 +50,7 @@ struct microcode_header_amd { uint8_t bios_api_rev; uint8_t reserved1[3]; uint32_t match_reg[8]; -} __attribute__((packed)); +}; #define UCODE_MAGIC 0x00414d44 #define UCODE_EQUIV_CPU_TABLE_TYPE 0x00000000 diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 3c1b25b..9dfa345 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2700,13 +2700,13 @@ static inline void trace_shadow_fixup(guest_l1e_t gl1e, { if ( tb_init_done ) { - struct { + struct __packed { /* for PAE, guest_l1e may be 64 while guest_va may be 32; so put it first for alignment sake. */ guest_l1e_t gl1e; guest_va_t va; u32 flags; - } __attribute__((packed)) d; + } d; u32 event; event = TRC_SHADOW_FIXUP | ((GUEST_PAGING_LEVELS-2)<<8); @@ -2724,13 +2724,13 @@ static inline void trace_not_shadow_fault(guest_l1e_t gl1e, { if ( tb_init_done ) { - struct { + struct __packed { /* for PAE, guest_l1e may be 64 while guest_va may be 32; so put it first for alignment sake. */ guest_l1e_t gl1e; guest_va_t va; u32 flags; - } __attribute__((packed)) d; + } d; u32 event; event = TRC_SHADOW_NOT_SHADOW | ((GUEST_PAGING_LEVELS-2)<<8); @@ -2749,7 +2749,7 @@ static inline void trace_shadow_emulate_other(u32 event, { if ( tb_init_done ) { - struct { + struct __packed { /* for PAE, guest_l1e may be 64 while guest_va may be 32; so put it first for alignment sake. */ #if GUEST_PAGING_LEVELS == 2 @@ -2758,7 +2758,7 @@ static inline void trace_shadow_emulate_other(u32 event, u64 gfn; #endif guest_va_t va; - } __attribute__((packed)) d; + } d; event |= ((GUEST_PAGING_LEVELS-2)<<8); @@ -2779,13 +2779,13 @@ static inline void trace_shadow_emulate(guest_l1e_t gl1e, unsigned long va) { if ( tb_init_done ) { - struct { + struct __packed { /* for PAE, guest_l1e may be 64 while guest_va may be 32; so put it first for alignment sake. */ guest_l1e_t gl1e, write_val; guest_va_t va; unsigned flags:29, emulation_count:3; - } __attribute__((packed)) d; + } d; u32 event; event = TRC_SHADOW_EMULATE | ((GUEST_PAGING_LEVELS-2)<<8); diff --git a/xen/arch/x86/oprofile/backtrace.c b/xen/arch/x86/oprofile/backtrace.c index b3ea7f3..94bd24c 100644 --- a/xen/arch/x86/oprofile/backtrace.c +++ b/xen/arch/x86/oprofile/backtrace.c @@ -15,17 +15,17 @@ #include #include -struct frame_head { +struct __packed frame_head { struct frame_head * ebp; unsigned long ret; -} __attribute__((packed)); +}; typedef struct frame_head frame_head_t; DEFINE_XEN_GUEST_HANDLE(frame_head_t); -struct frame_head_32bit { +struct __packed frame_head_32bit { uint32_t ebp; uint32_t ret; -} __attribute__((packed)); +}; typedef struct frame_head_32bit frame_head32_t; DEFINE_COMPAT_HANDLE(frame_head32_t); diff --git a/xen/arch/x86/trace.c b/xen/arch/x86/trace.c index b1804a4..64e9ad0 100644 --- a/xen/arch/x86/trace.c +++ b/xen/arch/x86/trace.c @@ -38,12 +38,12 @@ void __trace_pv_trap(int trapnr, unsigned long eip, { if ( is_pv_32on64_vcpu(current) ) { - struct { + struct __packed { unsigned eip:32, trapnr:15, use_error_code:1, error_code:16; - } __attribute__((packed)) d; + } d; d.eip = eip; d.trapnr = trapnr; @@ -54,12 +54,12 @@ void __trace_pv_trap(int trapnr, unsigned long eip, } else { - struct { + struct __packed { unsigned long eip; unsigned trapnr:15, use_error_code:1, error_code:16; - } __attribute__((packed)) d; + } d; unsigned event; d.eip = eip; @@ -79,9 +79,9 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) if ( is_pv_32on64_vcpu(current) ) { - struct { + struct __packed { u32 eip, addr, error_code; - } __attribute__((packed)) d; + } d; d.eip = eip; d.addr = addr; @@ -91,10 +91,10 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) } else { - struct { + struct __packed { unsigned long eip, addr; u32 error_code; - } __attribute__((packed)) d; + } d; unsigned event; d.eip = eip; @@ -125,18 +125,18 @@ void __trace_trap_two_addr(unsigned event, unsigned long va1, { if ( is_pv_32on64_vcpu(current) ) { - struct { + struct __packed { u32 va1, va2; - } __attribute__((packed)) d; + } d; d.va1=va1; d.va2=va2; __trace_var(event, 1, sizeof(d), &d); } else { - struct { + struct __packed { unsigned long va1, va2; - } __attribute__((packed)) d; + } d; d.va1=va1; d.va2=va2; event |= TRC_64_FLAG; @@ -158,10 +158,10 @@ void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) if ( is_pv_32on64_vcpu(current) ) { - struct { + struct __packed { l1_pgentry_t pte; u32 addr, eip; - } __attribute__((packed)) d; + } d; d.addr = addr; d.eip = eip; d.pte = npte; diff --git a/xen/include/asm-x86/apicdef.h b/xen/include/asm-x86/apicdef.h index 2bdb3df..d66c8ea 100644 --- a/xen/include/asm-x86/apicdef.h +++ b/xen/include/asm-x86/apicdef.h @@ -142,7 +142,7 @@ #define lapic ((volatile struct local_apic *)APIC_BASE) #ifndef __ASSEMBLY__ -struct local_apic { +struct __packed local_apic { /*000*/ struct { u32 __reserved[4]; } __reserved_01; @@ -388,7 +388,7 @@ struct local_apic { /*3F0*/ struct { u32 __reserved[4]; } __reserved_20; -} __attribute__ ((packed)); +}; #endif /* !__ASSEMBLY__ */ #undef u32 diff --git a/xen/include/asm-x86/desc.h b/xen/include/asm-x86/desc.h index 354b889..4edb834 100644 --- a/xen/include/asm-x86/desc.h +++ b/xen/include/asm-x86/desc.h @@ -181,10 +181,10 @@ do { \ (((u32)(addr) & 0x00FF0000U) >> 16); \ } while (0) -struct desc_ptr { +struct __packed desc_ptr { unsigned short limit; unsigned long base; -} __attribute__((__packed__)) ; +}; extern struct desc_struct boot_cpu_gdt_table[]; DECLARE_PER_CPU(struct desc_struct *, gdt_table); diff --git a/xen/include/asm-x86/e820.h b/xen/include/asm-x86/e820.h index 0fd81f6..08b413d 100644 --- a/xen/include/asm-x86/e820.h +++ b/xen/include/asm-x86/e820.h @@ -10,11 +10,11 @@ #define E820_NVS 4 #define E820_UNUSABLE 5 -struct e820entry { +struct __packed e820entry { uint64_t addr; uint64_t size; uint32_t type; -} __attribute__((packed)); +}; #define E820MAX 128 diff --git a/xen/include/asm-x86/edd.h b/xen/include/asm-x86/edd.h index 5544ba5..afaa237 100644 --- a/xen/include/asm-x86/edd.h +++ b/xen/include/asm-x86/edd.h @@ -25,7 +25,7 @@ #ifndef __ASSEMBLY__ -struct edd_info { +struct __packed edd_info { /* Int13, Fn48: Check Extensions Present. */ u8 device; /* %dl: device */ u8 version; /* %ah: major version */ @@ -35,7 +35,7 @@ struct edd_info { u8 legacy_max_head; /* %dh: maximum head number */ u8 legacy_sectors_per_track; /* %cl[5:0]: maximum sector number */ /* Int13, Fn41: Get Device Parameters (as filled into %ds:%esi). */ - struct edd_device_params { + struct __packed edd_device_params { u16 length; u16 info_flags; u32 num_default_cylinders; @@ -51,97 +51,97 @@ struct edd_info { u8 host_bus_type[4]; u8 interface_type[8]; union { - struct { + struct __packed { u16 base_address; u16 reserved1; u32 reserved2; - } __attribute__ ((packed)) isa; - struct { + } isa; + struct __packed { u8 bus; u8 slot; u8 function; u8 channel; u32 reserved; - } __attribute__ ((packed)) pci; + } pci; /* pcix is same as pci */ - struct { + struct __packed { u64 reserved; - } __attribute__ ((packed)) ibnd; - struct { + } ibnd; + struct __packed { u64 reserved; - } __attribute__ ((packed)) xprs; - struct { + } xprs; + struct __packed { u64 reserved; - } __attribute__ ((packed)) htpt; - struct { + } htpt; + struct __packed { u64 reserved; - } __attribute__ ((packed)) unknown; + } unknown; } interface_path; union { - struct { + struct __packed { u8 device; u8 reserved1; u16 reserved2; u32 reserved3; u64 reserved4; - } __attribute__ ((packed)) ata; - struct { + } ata; + struct __packed { u8 device; u8 lun; u8 reserved1; u8 reserved2; u32 reserved3; u64 reserved4; - } __attribute__ ((packed)) atapi; - struct { + } atapi; + struct __packed { u16 id; u64 lun; u16 reserved1; u32 reserved2; - } __attribute__ ((packed)) scsi; - struct { + } scsi; + struct __packed { u64 serial_number; u64 reserved; - } __attribute__ ((packed)) usb; - struct { + } usb; + struct __packed { u64 eui; u64 reserved; - } __attribute__ ((packed)) i1394; - struct { + } i1394; + struct __packed { u64 wwid; u64 lun; - } __attribute__ ((packed)) fibre; - struct { + } fibre; + struct __packed { u64 identity_tag; u64 reserved; - } __attribute__ ((packed)) i2o; - struct { + } i2o; + struct __packed { u32 array_number; u32 reserved1; u64 reserved2; - } __attribute__ ((packed)) raid; - struct { + } raid; + struct __packed { u8 device; u8 reserved1; u16 reserved2; u32 reserved3; u64 reserved4; - } __attribute__ ((packed)) sata; - struct { + } sata; + struct __packed { u64 reserved1; u64 reserved2; - } __attribute__ ((packed)) unknown; + } unknown; } device_path; u8 reserved4; u8 checksum; - } __attribute__ ((packed)) edd_device_params; -} __attribute__ ((packed)); + } edd_device_params; +}; -struct mbr_signature { +struct __packed mbr_signature { u8 device; u8 pad[3]; u32 signature; -} __attribute__ ((packed)); +}; /* These all reside in the boot trampoline. Access via bootsym(). */ extern struct mbr_signature boot_mbr_signature[]; diff --git a/xen/include/asm-x86/hvm/svm/vmcb.h b/xen/include/asm-x86/hvm/svm/vmcb.h index ade4bb2..9b0c789 100644 --- a/xen/include/asm-x86/hvm/svm/vmcb.h +++ b/xen/include/asm-x86/hvm/svm/vmcb.h @@ -309,7 +309,7 @@ enum VMEXIT_EXITCODE /* Definition of segment state is borrowed by the generic HVM code. */ typedef struct segment_register svm_segment_register_t; -typedef union +typedef union __packed { u64 bytes; struct @@ -321,9 +321,9 @@ typedef union u64 v: 1; u64 errorcode:32; } fields; -} __attribute__ ((packed)) eventinj_t; +} eventinj_t; -typedef union +typedef union __packed { u64 bytes; struct @@ -339,9 +339,9 @@ typedef union u64 vector: 8; u64 rsvd3: 24; } fields; -} __attribute__ ((packed)) vintr_t; +} vintr_t; -typedef union +typedef union __packed { u64 bytes; struct @@ -356,18 +356,18 @@ typedef union u64 rsv1: 9; u64 port: 16; } fields; -} __attribute__ ((packed)) ioio_info_t; +} ioio_info_t; -typedef union +typedef union __packed { u64 bytes; struct { u64 enable:1; } fields; -} __attribute__ ((packed)) lbrctrl_t; +} lbrctrl_t; -typedef union +typedef union __packed { uint32_t bytes; struct @@ -397,12 +397,12 @@ typedef union uint32_t lbr: 1; uint32_t resv: 21; } fields; -} __attribute__ ((packed)) vmcbcleanbits_t; +} vmcbcleanbits_t; #define IOPM_SIZE (12 * 1024) #define MSRPM_SIZE (8 * 1024) -struct vmcb_struct { +struct __packed vmcb_struct { u32 _cr_intercepts; /* offset 0x00 - cleanbit 0 */ u32 _dr_intercepts; /* offset 0x04 - cleanbit 0 */ u32 _exception_intercepts; /* offset 0x08 - cleanbit 0 */ @@ -487,7 +487,7 @@ struct vmcb_struct { u64 _lastintfromip; /* cleanbit 10 */ u64 _lastinttoip; /* cleanbit 10 */ u64 res16[301]; -} __attribute__ ((packed)); +}; struct svm_domain { }; diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index 827c97e..ac4380a 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -421,11 +421,11 @@ static inline void __invept(unsigned long type, u64 eptp, u64 gpa) static inline void __invvpid(unsigned long type, u16 vpid, u64 gva) { - struct { + struct __packed { u64 vpid:16; u64 rsvd:48; u64 gva; - } __attribute__ ((packed)) operand = {vpid, 0, gva}; + } operand = {vpid, 0, gva}; /* Fix up #UD exceptions which occur when TLBs are flushed before VMXON. */ asm volatile ( "1: " diff --git a/xen/include/asm-x86/i387.h b/xen/include/asm-x86/i387.h index 1f5fe50..38dbcae 100644 --- a/xen/include/asm-x86/i387.h +++ b/xen/include/asm-x86/i387.h @@ -28,11 +28,11 @@ struct ix87_state { uint32_t fdp; uint16_t fds, _res6; } env; - struct ix87_reg { + struct __packed ix87_reg { uint64_t mantissa; uint16_t exponent:15; uint16_t sign:1; - } __attribute__((__packed__)) r[8]; + } r[8]; }; void vcpu_restore_fpu_eager(struct vcpu *v); diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h index 6d90628..b318a36 100644 --- a/xen/include/asm-x86/io_apic.h +++ b/xen/include/asm-x86/io_apic.h @@ -36,41 +36,41 @@ */ union IO_APIC_reg_00 { u32 raw; - struct { + struct __packed { u32 __reserved_2 : 14, LTS : 1, delivery_type : 1, __reserved_1 : 8, ID : 8; - } __attribute__ ((packed)) bits; + } bits; }; union IO_APIC_reg_01 { u32 raw; - struct { + struct __packed { u32 version : 8, __reserved_2 : 7, PRQ : 1, entries : 8, __reserved_1 : 8; - } __attribute__ ((packed)) bits; + } bits; }; union IO_APIC_reg_02 { u32 raw; - struct { + struct __packed { u32 __reserved_2 : 24, arbitration : 4, __reserved_1 : 4; - } __attribute__ ((packed)) bits; + } bits; }; union IO_APIC_reg_03 { u32 raw; - struct { + struct __packed { u32 boot_DT : 1, __reserved_1 : 31; - } __attribute__ ((packed)) bits; + } bits; }; /* @@ -90,7 +90,7 @@ enum ioapic_irq_destination_types { dest_ExtINT = 7 }; -struct IO_APIC_route_entry { +struct __packed IO_APIC_route_entry { __u32 vector : 8, delivery_mode : 3, /* 000: FIXED * 001: lowest prio @@ -119,7 +119,7 @@ struct IO_APIC_route_entry { __u32 dest32; } dest; -} __attribute__ ((packed)); +}; /* * MP-BIOS irq configuration table structures: diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 89a9266..1dd0d8c 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -168,7 +168,7 @@ int msi_free_irq(struct msi_desc *entry); * MSI Defined Data Structures */ -struct msg_data { +struct __packed msg_data { #if defined(__LITTLE_ENDIAN_BITFIELD) __u32 vector : 8; __u32 delivery_mode : 3; /* 000b: FIXED | 001b: lowest prior */ @@ -186,9 +186,9 @@ struct msg_data { #else #error "Bitfield endianness not defined! Check your byteorder.h" #endif -} __attribute__ ((packed)); +}; -struct msg_address { +struct __packed msg_address { union { struct { #if defined(__LITTLE_ENDIAN_BITFIELD) @@ -212,7 +212,7 @@ struct msg_address { __u32 value; }lo_address; __u32 hi_address; -} __attribute__ ((packed)); +}; #define MAX_MSIX_TABLE_ENTRIES (PCI_MSIX_FLAGS_QSIZE + 1) #define MAX_MSIX_TABLE_PAGES PFN_UP(MAX_MSIX_TABLE_ENTRIES * \ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 498d8a7..f5e9eda 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -412,7 +412,7 @@ static always_inline void __mwait(unsigned long eax, unsigned long ecx) #define IOBMP_BYTES 8192 #define IOBMP_INVALID_OFFSET 0x8000 -struct tss_struct { +struct __packed __cacheline_aligned tss_struct { unsigned short back_link,__blh; union { u64 rsp0, esp0; }; union { u64 rsp1, esp1; }; @@ -426,7 +426,7 @@ struct tss_struct { u16 bitmap; /* Pads the TSS to be cacheline-aligned (total size is 0x80). */ u8 __cacheline_filler[24]; -} __cacheline_aligned __attribute__((packed)); +}; #define IST_NONE 0UL #define IST_DF 1UL diff --git a/xen/include/asm-x86/tboot.h b/xen/include/asm-x86/tboot.h index e77d1c0..d242862 100644 --- a/xen/include/asm-x86/tboot.h +++ b/xen/include/asm-x86/tboot.h @@ -39,10 +39,6 @@ #include -#ifndef __packed -#define __packed __attribute__ ((packed)) -#endif - typedef struct __packed { uint32_t data1; uint16_t data2; diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index de5711e..1a92ac3 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -42,7 +42,7 @@ extern u64 xfeature_mask; /* extended state save area */ -struct xsave_struct +struct __packed __attribute__((aligned (64))) xsave_struct { union { /* FPU/MMX, SSE */ char x[512]; @@ -73,7 +73,7 @@ struct xsave_struct struct { char x[XSTATE_YMM_SIZE]; } ymm; /* YMM */ char data[]; /* Future new states */ -} __attribute__ ((packed, aligned (64))); +}; /* extended state operations */ bool_t __must_check set_xcr0(u64 xfeatures); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:04:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:04:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCw-0005XW-EA; Fri, 14 Mar 2014 22:04:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCu-0005X3-Vn for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:01 +0000 Received: from [85.158.137.68:57134] by server-16.bemta-3.messagelabs.com id EC/4C-13481-0DC73235; Fri, 14 Mar 2014 22:04:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1394834637!752247!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1360 invoked from network); 14 Mar 2014 22:03:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:03:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaCr-0000mc-2f for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaCr-0002iS-1L for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:03:57 +0000 Date: Fri, 14 Mar 2014 22:03:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: shuffle use of __attribute__((packed)) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e5d6d05967aca80cfc2f2a87f489e25ec53917c Author: Andrew Cooper AuthorDate: Fri Mar 14 09:44:40 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 09:44:40 2014 +0100 x86: shuffle use of __attribute__((packed)) This is almost all manual shuffling of __attribute__((packed)) statements to __packed at the head of the structure. The only different change is in tboot.h, removing some now-redundant ifdefs. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- xen/arch/x86/bzimage.c | 4 +- xen/arch/x86/cpu/mcheck/mce-apei.c | 4 +- xen/arch/x86/dmi_scan.c | 8 ++-- xen/arch/x86/microcode_amd.c | 8 ++-- xen/arch/x86/mm/shadow/multi.c | 16 ++++---- xen/arch/x86/oprofile/backtrace.c | 8 ++-- xen/arch/x86/trace.c | 28 +++++++------- xen/include/asm-x86/apicdef.h | 4 +- xen/include/asm-x86/desc.h | 4 +- xen/include/asm-x86/e820.h | 4 +- xen/include/asm-x86/edd.h | 76 ++++++++++++++++++------------------ xen/include/asm-x86/hvm/svm/vmcb.h | 24 ++++++------ xen/include/asm-x86/hvm/vmx/vmx.h | 4 +- xen/include/asm-x86/i387.h | 4 +- xen/include/asm-x86/io_apic.h | 20 +++++----- xen/include/asm-x86/msi.h | 8 ++-- xen/include/asm-x86/processor.h | 4 +- xen/include/asm-x86/tboot.h | 4 -- xen/include/asm-x86/xstate.h | 4 +- 19 files changed, 116 insertions(+), 120 deletions(-) diff --git a/xen/arch/x86/bzimage.c b/xen/arch/x86/bzimage.c index d72b832..c86c39e 100644 --- a/xen/arch/x86/bzimage.c +++ b/xen/arch/x86/bzimage.c @@ -146,7 +146,7 @@ static __init int perform_gunzip(char *output, char *image, unsigned long image_ return rc; } -struct setup_header { +struct __packed setup_header { uint8_t _pad0[0x1f1]; /* skip uninteresting stuff */ uint8_t setup_sects; uint16_t root_flags; @@ -183,7 +183,7 @@ struct setup_header { uint64_t hardware_subarch_data; uint32_t payload_offset; uint32_t payload_length; - } __attribute__((packed)); + }; static __init int bzimage_check(struct setup_header *hdr, unsigned long len) { diff --git a/xen/arch/x86/cpu/mcheck/mce-apei.c b/xen/arch/x86/cpu/mcheck/mce-apei.c index 9488dbd..31f2302 100644 --- a/xen/arch/x86/cpu/mcheck/mce-apei.c +++ b/xen/arch/x86/cpu/mcheck/mce-apei.c @@ -48,11 +48,11 @@ * CPER specification (in UEFI specification 2.3 appendix N) requires * byte-packed. */ -struct cper_mce_record { +struct __packed cper_mce_record { struct cper_record_header hdr; struct cper_section_descriptor sec_hdr; struct mce mce; -} __attribute__((packed)); +}; int apei_write_mce(struct mce *m) { diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 9d4348b..500133a 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -18,16 +18,16 @@ #define memcpy_fromio memcpy #define alloc_bootmem(l) xmalloc_bytes(l) -struct dmi_eps { +struct __packed dmi_eps { char anchor[5]; /* "_DMI_" */ u8 checksum; u16 size; u32 address; u16 num_structures; u8 revision; -} __attribute__((packed)); +}; -struct smbios_eps { +struct __packed smbios_eps { char anchor[4]; /* "_SM_" */ u8 checksum; u8 length; @@ -36,7 +36,7 @@ struct smbios_eps { u8 revision; u8 _rsrvd_[5]; struct dmi_eps dmi; -} __attribute__((packed)); +}; struct dmi_header { diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 3014245..b227173 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -27,15 +27,15 @@ #include #include -struct equiv_cpu_entry { +struct __packed equiv_cpu_entry { uint32_t installed_cpu; uint32_t fixed_errata_mask; uint32_t fixed_errata_compare; uint16_t equiv_cpu; uint16_t reserved; -} __attribute__((packed)); +}; -struct microcode_header_amd { +struct __packed microcode_header_amd { uint32_t data_code; uint32_t patch_id; uint8_t mc_patch_data_id[2]; @@ -50,7 +50,7 @@ struct microcode_header_amd { uint8_t bios_api_rev; uint8_t reserved1[3]; uint32_t match_reg[8]; -} __attribute__((packed)); +}; #define UCODE_MAGIC 0x00414d44 #define UCODE_EQUIV_CPU_TABLE_TYPE 0x00000000 diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 3c1b25b..9dfa345 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2700,13 +2700,13 @@ static inline void trace_shadow_fixup(guest_l1e_t gl1e, { if ( tb_init_done ) { - struct { + struct __packed { /* for PAE, guest_l1e may be 64 while guest_va may be 32; so put it first for alignment sake. */ guest_l1e_t gl1e; guest_va_t va; u32 flags; - } __attribute__((packed)) d; + } d; u32 event; event = TRC_SHADOW_FIXUP | ((GUEST_PAGING_LEVELS-2)<<8); @@ -2724,13 +2724,13 @@ static inline void trace_not_shadow_fault(guest_l1e_t gl1e, { if ( tb_init_done ) { - struct { + struct __packed { /* for PAE, guest_l1e may be 64 while guest_va may be 32; so put it first for alignment sake. */ guest_l1e_t gl1e; guest_va_t va; u32 flags; - } __attribute__((packed)) d; + } d; u32 event; event = TRC_SHADOW_NOT_SHADOW | ((GUEST_PAGING_LEVELS-2)<<8); @@ -2749,7 +2749,7 @@ static inline void trace_shadow_emulate_other(u32 event, { if ( tb_init_done ) { - struct { + struct __packed { /* for PAE, guest_l1e may be 64 while guest_va may be 32; so put it first for alignment sake. */ #if GUEST_PAGING_LEVELS == 2 @@ -2758,7 +2758,7 @@ static inline void trace_shadow_emulate_other(u32 event, u64 gfn; #endif guest_va_t va; - } __attribute__((packed)) d; + } d; event |= ((GUEST_PAGING_LEVELS-2)<<8); @@ -2779,13 +2779,13 @@ static inline void trace_shadow_emulate(guest_l1e_t gl1e, unsigned long va) { if ( tb_init_done ) { - struct { + struct __packed { /* for PAE, guest_l1e may be 64 while guest_va may be 32; so put it first for alignment sake. */ guest_l1e_t gl1e, write_val; guest_va_t va; unsigned flags:29, emulation_count:3; - } __attribute__((packed)) d; + } d; u32 event; event = TRC_SHADOW_EMULATE | ((GUEST_PAGING_LEVELS-2)<<8); diff --git a/xen/arch/x86/oprofile/backtrace.c b/xen/arch/x86/oprofile/backtrace.c index b3ea7f3..94bd24c 100644 --- a/xen/arch/x86/oprofile/backtrace.c +++ b/xen/arch/x86/oprofile/backtrace.c @@ -15,17 +15,17 @@ #include #include -struct frame_head { +struct __packed frame_head { struct frame_head * ebp; unsigned long ret; -} __attribute__((packed)); +}; typedef struct frame_head frame_head_t; DEFINE_XEN_GUEST_HANDLE(frame_head_t); -struct frame_head_32bit { +struct __packed frame_head_32bit { uint32_t ebp; uint32_t ret; -} __attribute__((packed)); +}; typedef struct frame_head_32bit frame_head32_t; DEFINE_COMPAT_HANDLE(frame_head32_t); diff --git a/xen/arch/x86/trace.c b/xen/arch/x86/trace.c index b1804a4..64e9ad0 100644 --- a/xen/arch/x86/trace.c +++ b/xen/arch/x86/trace.c @@ -38,12 +38,12 @@ void __trace_pv_trap(int trapnr, unsigned long eip, { if ( is_pv_32on64_vcpu(current) ) { - struct { + struct __packed { unsigned eip:32, trapnr:15, use_error_code:1, error_code:16; - } __attribute__((packed)) d; + } d; d.eip = eip; d.trapnr = trapnr; @@ -54,12 +54,12 @@ void __trace_pv_trap(int trapnr, unsigned long eip, } else { - struct { + struct __packed { unsigned long eip; unsigned trapnr:15, use_error_code:1, error_code:16; - } __attribute__((packed)) d; + } d; unsigned event; d.eip = eip; @@ -79,9 +79,9 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) if ( is_pv_32on64_vcpu(current) ) { - struct { + struct __packed { u32 eip, addr, error_code; - } __attribute__((packed)) d; + } d; d.eip = eip; d.addr = addr; @@ -91,10 +91,10 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) } else { - struct { + struct __packed { unsigned long eip, addr; u32 error_code; - } __attribute__((packed)) d; + } d; unsigned event; d.eip = eip; @@ -125,18 +125,18 @@ void __trace_trap_two_addr(unsigned event, unsigned long va1, { if ( is_pv_32on64_vcpu(current) ) { - struct { + struct __packed { u32 va1, va2; - } __attribute__((packed)) d; + } d; d.va1=va1; d.va2=va2; __trace_var(event, 1, sizeof(d), &d); } else { - struct { + struct __packed { unsigned long va1, va2; - } __attribute__((packed)) d; + } d; d.va1=va1; d.va2=va2; event |= TRC_64_FLAG; @@ -158,10 +158,10 @@ void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) if ( is_pv_32on64_vcpu(current) ) { - struct { + struct __packed { l1_pgentry_t pte; u32 addr, eip; - } __attribute__((packed)) d; + } d; d.addr = addr; d.eip = eip; d.pte = npte; diff --git a/xen/include/asm-x86/apicdef.h b/xen/include/asm-x86/apicdef.h index 2bdb3df..d66c8ea 100644 --- a/xen/include/asm-x86/apicdef.h +++ b/xen/include/asm-x86/apicdef.h @@ -142,7 +142,7 @@ #define lapic ((volatile struct local_apic *)APIC_BASE) #ifndef __ASSEMBLY__ -struct local_apic { +struct __packed local_apic { /*000*/ struct { u32 __reserved[4]; } __reserved_01; @@ -388,7 +388,7 @@ struct local_apic { /*3F0*/ struct { u32 __reserved[4]; } __reserved_20; -} __attribute__ ((packed)); +}; #endif /* !__ASSEMBLY__ */ #undef u32 diff --git a/xen/include/asm-x86/desc.h b/xen/include/asm-x86/desc.h index 354b889..4edb834 100644 --- a/xen/include/asm-x86/desc.h +++ b/xen/include/asm-x86/desc.h @@ -181,10 +181,10 @@ do { \ (((u32)(addr) & 0x00FF0000U) >> 16); \ } while (0) -struct desc_ptr { +struct __packed desc_ptr { unsigned short limit; unsigned long base; -} __attribute__((__packed__)) ; +}; extern struct desc_struct boot_cpu_gdt_table[]; DECLARE_PER_CPU(struct desc_struct *, gdt_table); diff --git a/xen/include/asm-x86/e820.h b/xen/include/asm-x86/e820.h index 0fd81f6..08b413d 100644 --- a/xen/include/asm-x86/e820.h +++ b/xen/include/asm-x86/e820.h @@ -10,11 +10,11 @@ #define E820_NVS 4 #define E820_UNUSABLE 5 -struct e820entry { +struct __packed e820entry { uint64_t addr; uint64_t size; uint32_t type; -} __attribute__((packed)); +}; #define E820MAX 128 diff --git a/xen/include/asm-x86/edd.h b/xen/include/asm-x86/edd.h index 5544ba5..afaa237 100644 --- a/xen/include/asm-x86/edd.h +++ b/xen/include/asm-x86/edd.h @@ -25,7 +25,7 @@ #ifndef __ASSEMBLY__ -struct edd_info { +struct __packed edd_info { /* Int13, Fn48: Check Extensions Present. */ u8 device; /* %dl: device */ u8 version; /* %ah: major version */ @@ -35,7 +35,7 @@ struct edd_info { u8 legacy_max_head; /* %dh: maximum head number */ u8 legacy_sectors_per_track; /* %cl[5:0]: maximum sector number */ /* Int13, Fn41: Get Device Parameters (as filled into %ds:%esi). */ - struct edd_device_params { + struct __packed edd_device_params { u16 length; u16 info_flags; u32 num_default_cylinders; @@ -51,97 +51,97 @@ struct edd_info { u8 host_bus_type[4]; u8 interface_type[8]; union { - struct { + struct __packed { u16 base_address; u16 reserved1; u32 reserved2; - } __attribute__ ((packed)) isa; - struct { + } isa; + struct __packed { u8 bus; u8 slot; u8 function; u8 channel; u32 reserved; - } __attribute__ ((packed)) pci; + } pci; /* pcix is same as pci */ - struct { + struct __packed { u64 reserved; - } __attribute__ ((packed)) ibnd; - struct { + } ibnd; + struct __packed { u64 reserved; - } __attribute__ ((packed)) xprs; - struct { + } xprs; + struct __packed { u64 reserved; - } __attribute__ ((packed)) htpt; - struct { + } htpt; + struct __packed { u64 reserved; - } __attribute__ ((packed)) unknown; + } unknown; } interface_path; union { - struct { + struct __packed { u8 device; u8 reserved1; u16 reserved2; u32 reserved3; u64 reserved4; - } __attribute__ ((packed)) ata; - struct { + } ata; + struct __packed { u8 device; u8 lun; u8 reserved1; u8 reserved2; u32 reserved3; u64 reserved4; - } __attribute__ ((packed)) atapi; - struct { + } atapi; + struct __packed { u16 id; u64 lun; u16 reserved1; u32 reserved2; - } __attribute__ ((packed)) scsi; - struct { + } scsi; + struct __packed { u64 serial_number; u64 reserved; - } __attribute__ ((packed)) usb; - struct { + } usb; + struct __packed { u64 eui; u64 reserved; - } __attribute__ ((packed)) i1394; - struct { + } i1394; + struct __packed { u64 wwid; u64 lun; - } __attribute__ ((packed)) fibre; - struct { + } fibre; + struct __packed { u64 identity_tag; u64 reserved; - } __attribute__ ((packed)) i2o; - struct { + } i2o; + struct __packed { u32 array_number; u32 reserved1; u64 reserved2; - } __attribute__ ((packed)) raid; - struct { + } raid; + struct __packed { u8 device; u8 reserved1; u16 reserved2; u32 reserved3; u64 reserved4; - } __attribute__ ((packed)) sata; - struct { + } sata; + struct __packed { u64 reserved1; u64 reserved2; - } __attribute__ ((packed)) unknown; + } unknown; } device_path; u8 reserved4; u8 checksum; - } __attribute__ ((packed)) edd_device_params; -} __attribute__ ((packed)); + } edd_device_params; +}; -struct mbr_signature { +struct __packed mbr_signature { u8 device; u8 pad[3]; u32 signature; -} __attribute__ ((packed)); +}; /* These all reside in the boot trampoline. Access via bootsym(). */ extern struct mbr_signature boot_mbr_signature[]; diff --git a/xen/include/asm-x86/hvm/svm/vmcb.h b/xen/include/asm-x86/hvm/svm/vmcb.h index ade4bb2..9b0c789 100644 --- a/xen/include/asm-x86/hvm/svm/vmcb.h +++ b/xen/include/asm-x86/hvm/svm/vmcb.h @@ -309,7 +309,7 @@ enum VMEXIT_EXITCODE /* Definition of segment state is borrowed by the generic HVM code. */ typedef struct segment_register svm_segment_register_t; -typedef union +typedef union __packed { u64 bytes; struct @@ -321,9 +321,9 @@ typedef union u64 v: 1; u64 errorcode:32; } fields; -} __attribute__ ((packed)) eventinj_t; +} eventinj_t; -typedef union +typedef union __packed { u64 bytes; struct @@ -339,9 +339,9 @@ typedef union u64 vector: 8; u64 rsvd3: 24; } fields; -} __attribute__ ((packed)) vintr_t; +} vintr_t; -typedef union +typedef union __packed { u64 bytes; struct @@ -356,18 +356,18 @@ typedef union u64 rsv1: 9; u64 port: 16; } fields; -} __attribute__ ((packed)) ioio_info_t; +} ioio_info_t; -typedef union +typedef union __packed { u64 bytes; struct { u64 enable:1; } fields; -} __attribute__ ((packed)) lbrctrl_t; +} lbrctrl_t; -typedef union +typedef union __packed { uint32_t bytes; struct @@ -397,12 +397,12 @@ typedef union uint32_t lbr: 1; uint32_t resv: 21; } fields; -} __attribute__ ((packed)) vmcbcleanbits_t; +} vmcbcleanbits_t; #define IOPM_SIZE (12 * 1024) #define MSRPM_SIZE (8 * 1024) -struct vmcb_struct { +struct __packed vmcb_struct { u32 _cr_intercepts; /* offset 0x00 - cleanbit 0 */ u32 _dr_intercepts; /* offset 0x04 - cleanbit 0 */ u32 _exception_intercepts; /* offset 0x08 - cleanbit 0 */ @@ -487,7 +487,7 @@ struct vmcb_struct { u64 _lastintfromip; /* cleanbit 10 */ u64 _lastinttoip; /* cleanbit 10 */ u64 res16[301]; -} __attribute__ ((packed)); +}; struct svm_domain { }; diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index 827c97e..ac4380a 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -421,11 +421,11 @@ static inline void __invept(unsigned long type, u64 eptp, u64 gpa) static inline void __invvpid(unsigned long type, u16 vpid, u64 gva) { - struct { + struct __packed { u64 vpid:16; u64 rsvd:48; u64 gva; - } __attribute__ ((packed)) operand = {vpid, 0, gva}; + } operand = {vpid, 0, gva}; /* Fix up #UD exceptions which occur when TLBs are flushed before VMXON. */ asm volatile ( "1: " diff --git a/xen/include/asm-x86/i387.h b/xen/include/asm-x86/i387.h index 1f5fe50..38dbcae 100644 --- a/xen/include/asm-x86/i387.h +++ b/xen/include/asm-x86/i387.h @@ -28,11 +28,11 @@ struct ix87_state { uint32_t fdp; uint16_t fds, _res6; } env; - struct ix87_reg { + struct __packed ix87_reg { uint64_t mantissa; uint16_t exponent:15; uint16_t sign:1; - } __attribute__((__packed__)) r[8]; + } r[8]; }; void vcpu_restore_fpu_eager(struct vcpu *v); diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h index 6d90628..b318a36 100644 --- a/xen/include/asm-x86/io_apic.h +++ b/xen/include/asm-x86/io_apic.h @@ -36,41 +36,41 @@ */ union IO_APIC_reg_00 { u32 raw; - struct { + struct __packed { u32 __reserved_2 : 14, LTS : 1, delivery_type : 1, __reserved_1 : 8, ID : 8; - } __attribute__ ((packed)) bits; + } bits; }; union IO_APIC_reg_01 { u32 raw; - struct { + struct __packed { u32 version : 8, __reserved_2 : 7, PRQ : 1, entries : 8, __reserved_1 : 8; - } __attribute__ ((packed)) bits; + } bits; }; union IO_APIC_reg_02 { u32 raw; - struct { + struct __packed { u32 __reserved_2 : 24, arbitration : 4, __reserved_1 : 4; - } __attribute__ ((packed)) bits; + } bits; }; union IO_APIC_reg_03 { u32 raw; - struct { + struct __packed { u32 boot_DT : 1, __reserved_1 : 31; - } __attribute__ ((packed)) bits; + } bits; }; /* @@ -90,7 +90,7 @@ enum ioapic_irq_destination_types { dest_ExtINT = 7 }; -struct IO_APIC_route_entry { +struct __packed IO_APIC_route_entry { __u32 vector : 8, delivery_mode : 3, /* 000: FIXED * 001: lowest prio @@ -119,7 +119,7 @@ struct IO_APIC_route_entry { __u32 dest32; } dest; -} __attribute__ ((packed)); +}; /* * MP-BIOS irq configuration table structures: diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 89a9266..1dd0d8c 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -168,7 +168,7 @@ int msi_free_irq(struct msi_desc *entry); * MSI Defined Data Structures */ -struct msg_data { +struct __packed msg_data { #if defined(__LITTLE_ENDIAN_BITFIELD) __u32 vector : 8; __u32 delivery_mode : 3; /* 000b: FIXED | 001b: lowest prior */ @@ -186,9 +186,9 @@ struct msg_data { #else #error "Bitfield endianness not defined! Check your byteorder.h" #endif -} __attribute__ ((packed)); +}; -struct msg_address { +struct __packed msg_address { union { struct { #if defined(__LITTLE_ENDIAN_BITFIELD) @@ -212,7 +212,7 @@ struct msg_address { __u32 value; }lo_address; __u32 hi_address; -} __attribute__ ((packed)); +}; #define MAX_MSIX_TABLE_ENTRIES (PCI_MSIX_FLAGS_QSIZE + 1) #define MAX_MSIX_TABLE_PAGES PFN_UP(MAX_MSIX_TABLE_ENTRIES * \ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 498d8a7..f5e9eda 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -412,7 +412,7 @@ static always_inline void __mwait(unsigned long eax, unsigned long ecx) #define IOBMP_BYTES 8192 #define IOBMP_INVALID_OFFSET 0x8000 -struct tss_struct { +struct __packed __cacheline_aligned tss_struct { unsigned short back_link,__blh; union { u64 rsp0, esp0; }; union { u64 rsp1, esp1; }; @@ -426,7 +426,7 @@ struct tss_struct { u16 bitmap; /* Pads the TSS to be cacheline-aligned (total size is 0x80). */ u8 __cacheline_filler[24]; -} __cacheline_aligned __attribute__((packed)); +}; #define IST_NONE 0UL #define IST_DF 1UL diff --git a/xen/include/asm-x86/tboot.h b/xen/include/asm-x86/tboot.h index e77d1c0..d242862 100644 --- a/xen/include/asm-x86/tboot.h +++ b/xen/include/asm-x86/tboot.h @@ -39,10 +39,6 @@ #include -#ifndef __packed -#define __packed __attribute__ ((packed)) -#endif - typedef struct __packed { uint32_t data1; uint16_t data2; diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index de5711e..1a92ac3 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -42,7 +42,7 @@ extern u64 xfeature_mask; /* extended state save area */ -struct xsave_struct +struct __packed __attribute__((aligned (64))) xsave_struct { union { /* FPU/MMX, SSE */ char x[512]; @@ -73,7 +73,7 @@ struct xsave_struct struct { char x[XSTATE_YMM_SIZE]; } ymm; /* YMM */ char data[]; /* Future new states */ -} __attribute__ ((packed, aligned (64))); +}; /* extended state operations */ bool_t __must_check set_xcr0(u64 xfeatures); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:04:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:04:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaD4-0005Zs-Jd; Fri, 14 Mar 2014 22:04:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaD3-0005ZW-Lr for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:09 +0000 Received: from [193.109.254.147:15035] by server-1.bemta-14.messagelabs.com id E5/A7-29588-8DC73235; Fri, 14 Mar 2014 22:04:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1394834647!1803196!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27113 invoked from network); 14 Mar 2014 22:04:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:04:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaD1-0000nA-87 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaD1-0002j0-6S for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:07 +0000 Date: Fri, 14 Mar 2014 22:04:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: shuffle use of __attribute__((packed)) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b2f0271ef75229c1eec31fcfafbd82e31d5aa29c Author: Andrew Cooper AuthorDate: Fri Mar 14 09:45:24 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 09:45:24 2014 +0100 arm: shuffle use of __attribute__((packed)) This is all mechanical shuffling. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- xen/include/asm-arm/page.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index e00be9e..6fe7fc5 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -94,7 +94,7 @@ * bits that's not in use in a given node type can be used as * extra software-defined bits. */ -typedef struct { +typedef struct __packed { /* These are used in all kinds of entry. */ unsigned long valid:1; /* Valid mapping */ unsigned long table:1; /* == 1 in 4k map entries too */ @@ -126,11 +126,11 @@ typedef struct { unsigned long xnt:1; /* eXecute-Never */ unsigned long apt:2; /* Access Permissions */ unsigned long nst:1; /* Not-Secure */ -} __attribute__((__packed__)) lpae_pt_t; +} lpae_pt_t; /* The p2m tables have almost the same layout, but some of the permission * and cache-control bits are laid out differently (or missing) */ -typedef struct { +typedef struct __packed { /* These are used in all kinds of entry. */ unsigned long valid:1; /* Valid mapping */ unsigned long table:1; /* == 1 in 4k map entries too */ @@ -156,13 +156,13 @@ typedef struct { unsigned long type:4; /* Ignore by hardware. Used to store p2m types */ unsigned long sbz1:5; -} __attribute__((__packed__)) lpae_p2m_t; +} lpae_p2m_t; /* * Walk is the common bits of p2m and pt entries which are needed to * simply walk the table (e.g. for debug). */ -typedef struct { +typedef struct __packed { /* These are used in all kinds of entry. */ unsigned long valid:1; /* Valid mapping */ unsigned long table:1; /* == 1 in 4k map entries too */ @@ -173,7 +173,7 @@ typedef struct { unsigned long base:28; /* Base address of block or next table */ unsigned long pad1:24; -} __attribute__((__packed__)) lpae_walk_t; +} lpae_walk_t; typedef union { uint64_t bits; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:04:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:04:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaD4-0005Zs-Jd; Fri, 14 Mar 2014 22:04:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaD3-0005ZW-Lr for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:09 +0000 Received: from [193.109.254.147:15035] by server-1.bemta-14.messagelabs.com id E5/A7-29588-8DC73235; Fri, 14 Mar 2014 22:04:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1394834647!1803196!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27113 invoked from network); 14 Mar 2014 22:04:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:04:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaD1-0000nA-87 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaD1-0002j0-6S for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:07 +0000 Date: Fri, 14 Mar 2014 22:04:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: shuffle use of __attribute__((packed)) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b2f0271ef75229c1eec31fcfafbd82e31d5aa29c Author: Andrew Cooper AuthorDate: Fri Mar 14 09:45:24 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 09:45:24 2014 +0100 arm: shuffle use of __attribute__((packed)) This is all mechanical shuffling. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- xen/include/asm-arm/page.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index e00be9e..6fe7fc5 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -94,7 +94,7 @@ * bits that's not in use in a given node type can be used as * extra software-defined bits. */ -typedef struct { +typedef struct __packed { /* These are used in all kinds of entry. */ unsigned long valid:1; /* Valid mapping */ unsigned long table:1; /* == 1 in 4k map entries too */ @@ -126,11 +126,11 @@ typedef struct { unsigned long xnt:1; /* eXecute-Never */ unsigned long apt:2; /* Access Permissions */ unsigned long nst:1; /* Not-Secure */ -} __attribute__((__packed__)) lpae_pt_t; +} lpae_pt_t; /* The p2m tables have almost the same layout, but some of the permission * and cache-control bits are laid out differently (or missing) */ -typedef struct { +typedef struct __packed { /* These are used in all kinds of entry. */ unsigned long valid:1; /* Valid mapping */ unsigned long table:1; /* == 1 in 4k map entries too */ @@ -156,13 +156,13 @@ typedef struct { unsigned long type:4; /* Ignore by hardware. Used to store p2m types */ unsigned long sbz1:5; -} __attribute__((__packed__)) lpae_p2m_t; +} lpae_p2m_t; /* * Walk is the common bits of p2m and pt entries which are needed to * simply walk the table (e.g. for debug). */ -typedef struct { +typedef struct __packed { /* These are used in all kinds of entry. */ unsigned long valid:1; /* Valid mapping */ unsigned long table:1; /* == 1 in 4k map entries too */ @@ -173,7 +173,7 @@ typedef struct { unsigned long base:28; /* Base address of block or next table */ unsigned long pad1:24; -} __attribute__((__packed__)) lpae_walk_t; +} lpae_walk_t; typedef union { uint64_t bits; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:04:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:04:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDF-0005co-Me; Fri, 14 Mar 2014 22:04:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDE-0005cM-1j for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:20 +0000 Received: from [193.109.254.147:62346] by server-4.bemta-14.messagelabs.com id 57/7F-32066-3EC73235; Fri, 14 Mar 2014 22:04:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1394834657!1828783!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14114 invoked from network); 14 Mar 2014 22:04:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:04:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDB-0000nG-D9 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaDB-0002jO-Bo for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:17 +0000 Date: Fri, 14 Mar 2014 22:04:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: Shuffle use of __attribute__((packed)) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ef5d4c3aa77d8ebb843dcffad4a6ea2a8f01495 Author: Andrew Cooper AuthorDate: Fri Mar 14 09:46:34 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 09:46:34 2014 +0100 x86_emulate: Shuffle use of __attribute__((packed)) Also include #defines for the test code to allow compilation. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- tools/tests/x86_emulator/test_x86_emulator.c | 2 ++ tools/tests/x86_emulator/x86_emulate.c | 2 ++ xen/arch/x86/x86_emulate/x86_emulate.h | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 7404ee3..17b674b 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -7,6 +7,8 @@ #include #include +#define __packed __attribute__((packed)) + #include "x86_emulate/x86_emulate.h" #include "blowfish.h" diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c index b157ade..ef9bfe9 100644 --- a/tools/tests/x86_emulator/x86_emulate.c +++ b/tools/tests/x86_emulator/x86_emulate.c @@ -14,5 +14,7 @@ typedef bool bool_t; #define cpu_has_amd_erratum(nr) 0 #define mark_regs_dirty(r) ((void)(r)) +#define __packed __attribute__((packed)) + #include "x86_emulate/x86_emulate.h" #include "x86_emulate/x86_emulate.c" diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index 85bc4bc..107addf 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -55,7 +55,7 @@ enum x86_segment { * Attribute for segment selector. This is a copy of bit 40:47 & 52:55 of the * segment descriptor. It happens to match the format of an AMD SVM VMCB. */ -typedef union segment_attributes { +typedef union __packed segment_attributes { uint16_t bytes; struct { @@ -69,18 +69,18 @@ typedef union segment_attributes { uint16_t g: 1; /* 11; Bit 55 */ uint16_t pad: 4; } fields; -} __attribute__ ((packed)) segment_attributes_t; +} segment_attributes_t; /* * Full state of a segment register (visible and hidden portions). * Again, this happens to match the format of an AMD SVM VMCB. */ -struct segment_register { +struct __packed segment_register { uint16_t sel; segment_attributes_t attr; uint32_t limit; uint64_t base; -} __attribute__ ((packed)); +}; /* * Return codes from state-accessor functions and from x86_emulate(). -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:04:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:04:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDF-0005co-Me; Fri, 14 Mar 2014 22:04:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDE-0005cM-1j for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:20 +0000 Received: from [193.109.254.147:62346] by server-4.bemta-14.messagelabs.com id 57/7F-32066-3EC73235; Fri, 14 Mar 2014 22:04:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1394834657!1828783!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14114 invoked from network); 14 Mar 2014 22:04:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:04:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDB-0000nG-D9 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaDB-0002jO-Bo for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:17 +0000 Date: Fri, 14 Mar 2014 22:04:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: Shuffle use of __attribute__((packed)) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ef5d4c3aa77d8ebb843dcffad4a6ea2a8f01495 Author: Andrew Cooper AuthorDate: Fri Mar 14 09:46:34 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 09:46:34 2014 +0100 x86_emulate: Shuffle use of __attribute__((packed)) Also include #defines for the test code to allow compilation. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- tools/tests/x86_emulator/test_x86_emulator.c | 2 ++ tools/tests/x86_emulator/x86_emulate.c | 2 ++ xen/arch/x86/x86_emulate/x86_emulate.h | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 7404ee3..17b674b 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -7,6 +7,8 @@ #include #include +#define __packed __attribute__((packed)) + #include "x86_emulate/x86_emulate.h" #include "blowfish.h" diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c index b157ade..ef9bfe9 100644 --- a/tools/tests/x86_emulator/x86_emulate.c +++ b/tools/tests/x86_emulator/x86_emulate.c @@ -14,5 +14,7 @@ typedef bool bool_t; #define cpu_has_amd_erratum(nr) 0 #define mark_regs_dirty(r) ((void)(r)) +#define __packed __attribute__((packed)) + #include "x86_emulate/x86_emulate.h" #include "x86_emulate/x86_emulate.c" diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index 85bc4bc..107addf 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -55,7 +55,7 @@ enum x86_segment { * Attribute for segment selector. This is a copy of bit 40:47 & 52:55 of the * segment descriptor. It happens to match the format of an AMD SVM VMCB. */ -typedef union segment_attributes { +typedef union __packed segment_attributes { uint16_t bytes; struct { @@ -69,18 +69,18 @@ typedef union segment_attributes { uint16_t g: 1; /* 11; Bit 55 */ uint16_t pad: 4; } fields; -} __attribute__ ((packed)) segment_attributes_t; +} segment_attributes_t; /* * Full state of a segment register (visible and hidden portions). * Again, this happens to match the format of an AMD SVM VMCB. */ -struct segment_register { +struct __packed segment_register { uint16_t sel; segment_attributes_t attr; uint32_t limit; uint64_t base; -} __attribute__ ((packed)); +}; /* * Return codes from state-accessor functions and from x86_emulate(). -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:04:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:04:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDP-0005ff-Pp; Fri, 14 Mar 2014 22:04:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDN-0005f6-Uf for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:30 +0000 Received: from [193.109.254.147:62786] by server-4.bemta-14.messagelabs.com id 89/8F-32066-DEC73235; Fri, 14 Mar 2014 22:04:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1394834667!1817716!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13886 invoked from network); 14 Mar 2014 22:04:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:04:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDL-0000nM-J9 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaDL-0002jk-He for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:27 +0000 Date: Fri, 14 Mar 2014 22:04:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/tboot: Use an integer_param for "tboot=" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3c106a97220cdf87b1da0ccc035a0ed6f1eaf638 Author: Andrew Cooper AuthorDate: Fri Mar 14 09:48:39 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 09:48:39 2014 +0100 x86/tboot: Use an integer_param for "tboot=" rather than using a string param and manually parsing it. Signed-off-by: Andrew Cooper --- xen/arch/x86/tboot.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index ccde4a0..7bebfc0 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -15,8 +15,8 @@ #include /* tboot= */ -static char __initdata opt_tboot[20] = ""; -string_param("tboot", opt_tboot); +static unsigned long __initdata opt_tboot_pa; +integer_param("tboot", opt_tboot_pa); /* Global pointer to shared data; NULL means no measured launch. */ tboot_shared_t *g_tboot_shared; @@ -93,15 +93,13 @@ static void __init tboot_copy_memory(unsigned char *va, uint32_t size, void __init tboot_probe(void) { tboot_shared_t *tboot_shared; - unsigned long p_tboot_shared; /* Look for valid page-aligned address for shared page. */ - p_tboot_shared = simple_strtoul(opt_tboot, NULL, 0); - if ( (p_tboot_shared == 0) || ((p_tboot_shared & ~PAGE_MASK) != 0) ) + if ( !opt_tboot_pa || (opt_tboot_pa & ~PAGE_MASK) ) return; /* Map and check for tboot UUID. */ - set_fixmap(FIX_TBOOT_SHARED_BASE, p_tboot_shared); + set_fixmap(FIX_TBOOT_SHARED_BASE, opt_tboot_pa); tboot_shared = (tboot_shared_t *)fix_to_virt(FIX_TBOOT_SHARED_BASE); if ( tboot_shared == NULL ) return; @@ -117,7 +115,7 @@ void __init tboot_probe(void) } g_tboot_shared = tboot_shared; - printk("TBOOT: found shared page at phys addr %lx:\n", p_tboot_shared); + printk("TBOOT: found shared page at phys addr %#lx:\n", opt_tboot_pa); printk(" version: %d\n", tboot_shared->version); printk(" log_addr: %#x\n", tboot_shared->log_addr); printk(" shutdown_entry: %#x\n", tboot_shared->shutdown_entry); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:04:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:04:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDP-0005ff-Pp; Fri, 14 Mar 2014 22:04:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDN-0005f6-Uf for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:30 +0000 Received: from [193.109.254.147:62786] by server-4.bemta-14.messagelabs.com id 89/8F-32066-DEC73235; Fri, 14 Mar 2014 22:04:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1394834667!1817716!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13886 invoked from network); 14 Mar 2014 22:04:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:04:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDL-0000nM-J9 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaDL-0002jk-He for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:27 +0000 Date: Fri, 14 Mar 2014 22:04:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/tboot: Use an integer_param for "tboot=" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3c106a97220cdf87b1da0ccc035a0ed6f1eaf638 Author: Andrew Cooper AuthorDate: Fri Mar 14 09:48:39 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 09:48:39 2014 +0100 x86/tboot: Use an integer_param for "tboot=" rather than using a string param and manually parsing it. Signed-off-by: Andrew Cooper --- xen/arch/x86/tboot.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index ccde4a0..7bebfc0 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -15,8 +15,8 @@ #include /* tboot= */ -static char __initdata opt_tboot[20] = ""; -string_param("tboot", opt_tboot); +static unsigned long __initdata opt_tboot_pa; +integer_param("tboot", opt_tboot_pa); /* Global pointer to shared data; NULL means no measured launch. */ tboot_shared_t *g_tboot_shared; @@ -93,15 +93,13 @@ static void __init tboot_copy_memory(unsigned char *va, uint32_t size, void __init tboot_probe(void) { tboot_shared_t *tboot_shared; - unsigned long p_tboot_shared; /* Look for valid page-aligned address for shared page. */ - p_tboot_shared = simple_strtoul(opt_tboot, NULL, 0); - if ( (p_tboot_shared == 0) || ((p_tboot_shared & ~PAGE_MASK) != 0) ) + if ( !opt_tboot_pa || (opt_tboot_pa & ~PAGE_MASK) ) return; /* Map and check for tboot UUID. */ - set_fixmap(FIX_TBOOT_SHARED_BASE, p_tboot_shared); + set_fixmap(FIX_TBOOT_SHARED_BASE, opt_tboot_pa); tboot_shared = (tboot_shared_t *)fix_to_virt(FIX_TBOOT_SHARED_BASE); if ( tboot_shared == NULL ) return; @@ -117,7 +115,7 @@ void __init tboot_probe(void) } g_tboot_shared = tboot_shared; - printk("TBOOT: found shared page at phys addr %lx:\n", p_tboot_shared); + printk("TBOOT: found shared page at phys addr %#lx:\n", opt_tboot_pa); printk(" version: %d\n", tboot_shared->version); printk(" log_addr: %#x\n", tboot_shared->log_addr); printk(" shutdown_entry: %#x\n", tboot_shared->shutdown_entry); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:04:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:04:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDZ-0005je-Tc; Fri, 14 Mar 2014 22:04:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDY-0005j6-8W for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:40 +0000 Received: from [193.109.254.147:11085] by server-5.bemta-14.messagelabs.com id D1/CD-16688-7FC73235; Fri, 14 Mar 2014 22:04:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1394834677!1793973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28673 invoked from network); 14 Mar 2014 22:04:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:04:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDV-0000nS-O6 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaDV-0002kg-N5 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:37 +0000 Date: Fri, 14 Mar 2014 22:04:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/vtpm: explain dom0 physical TPM access caveats X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2fb930dd374669a7618cd79998975201fc31c745 Author: Daniel De Graaf AuthorDate: Wed Mar 12 10:37:40 2014 -0400 Commit: Ian Campbell CommitDate: Fri Mar 14 11:00:20 2014 +0000 docs/vtpm: explain dom0 physical TPM access caveats Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- docs/misc/vtpm.txt | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/docs/misc/vtpm.txt b/docs/misc/vtpm.txt index df1dfae..d20b424 100644 --- a/docs/misc/vtpm.txt +++ b/docs/misc/vtpm.txt @@ -120,10 +120,24 @@ the stubdom tree. Compiling the LINUX dom0 kernel: -------------------------------- -The Linux dom0 kernel should not try accessing the TPM while the vTPM -Manager domain is accessing it; the simplest way to accomplish this is -to ensure the kernel is compiled without a driver for the TPM, or avoid -loading the driver by blacklisting the module. +Because the TPM manager uses direct access to the physical TPM, it may interfere +with access to the TPM by dom0. The simplest solution for this is to prevent +dom0 from accessing the physical TPM by compiling the kernel without a driver or +blacklisting the module. If dom0 needs a TPM but does not need to use it during +the boot process (i.e. it is not using IMA), a virtual TPM can be attached to +dom0 after the system is booted. + +Because the TPM manager does not yet accept requests for deep quotes, if a quote +or other request needs to be fulfilled by the physical TPM, dom0 will need to +access the physical TPM. In order to prevent interference, the TPM Manager and +dom0 should use different values for the TPM's locality; since Linux always uses +locality 0, using locality 2 for the TPM Manager is recommended. If both Linux +and the TPM Manager attempt to access the TPM at the same time, the TPM device +will return a busy status; some applications will consider this a fatal error +instead of retrying the command at a later time. If a vTPM gets an error when +loading its key, it will currently generate a fresh vTPM image (with a new EK, +SRK, and blank NVRAM). + Compiling the LINUX domU kernel: -------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:04:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:04:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDZ-0005je-Tc; Fri, 14 Mar 2014 22:04:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDY-0005j6-8W for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:40 +0000 Received: from [193.109.254.147:11085] by server-5.bemta-14.messagelabs.com id D1/CD-16688-7FC73235; Fri, 14 Mar 2014 22:04:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1394834677!1793973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28673 invoked from network); 14 Mar 2014 22:04:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:04:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDV-0000nS-O6 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaDV-0002kg-N5 for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:37 +0000 Date: Fri, 14 Mar 2014 22:04:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/vtpm: explain dom0 physical TPM access caveats X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2fb930dd374669a7618cd79998975201fc31c745 Author: Daniel De Graaf AuthorDate: Wed Mar 12 10:37:40 2014 -0400 Commit: Ian Campbell CommitDate: Fri Mar 14 11:00:20 2014 +0000 docs/vtpm: explain dom0 physical TPM access caveats Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- docs/misc/vtpm.txt | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/docs/misc/vtpm.txt b/docs/misc/vtpm.txt index df1dfae..d20b424 100644 --- a/docs/misc/vtpm.txt +++ b/docs/misc/vtpm.txt @@ -120,10 +120,24 @@ the stubdom tree. Compiling the LINUX dom0 kernel: -------------------------------- -The Linux dom0 kernel should not try accessing the TPM while the vTPM -Manager domain is accessing it; the simplest way to accomplish this is -to ensure the kernel is compiled without a driver for the TPM, or avoid -loading the driver by blacklisting the module. +Because the TPM manager uses direct access to the physical TPM, it may interfere +with access to the TPM by dom0. The simplest solution for this is to prevent +dom0 from accessing the physical TPM by compiling the kernel without a driver or +blacklisting the module. If dom0 needs a TPM but does not need to use it during +the boot process (i.e. it is not using IMA), a virtual TPM can be attached to +dom0 after the system is booted. + +Because the TPM manager does not yet accept requests for deep quotes, if a quote +or other request needs to be fulfilled by the physical TPM, dom0 will need to +access the physical TPM. In order to prevent interference, the TPM Manager and +dom0 should use different values for the TPM's locality; since Linux always uses +locality 0, using locality 2 for the TPM Manager is recommended. If both Linux +and the TPM Manager attempt to access the TPM at the same time, the TPM device +will return a busy status; some applications will consider this a fatal error +instead of retrying the command at a later time. If a vTPM gets an error when +loading its key, it will currently generate a fresh vTPM image (with a new EK, +SRK, and blank NVRAM). + Compiling the LINUX domU kernel: -------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:04:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:04:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDk-0005mg-0G; Fri, 14 Mar 2014 22:04:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDi-0005mH-8s for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:50 +0000 Received: from [85.158.143.35:23185] by server-2.bemta-4.messagelabs.com id BD/C3-06539-10D73235; Fri, 14 Mar 2014 22:04:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1394834688!2229636!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11566 invoked from network); 14 Mar 2014 22:04:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:04:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDf-0000nY-SS for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaDf-0002lZ-RW for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:47 +0000 Date: Fri, 14 Mar 2014 22:04:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] unlzma: fix build of stubdom unsafe decompressors X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 419c5fb192cac87c0d7eec8d7c349e73c7f2854a Author: Andrew Cooper AuthorDate: Fri Mar 14 13:07:38 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 13:07:38 2014 +0100 unlzma: fix build of stubdom unsafe decompressors c/s b683d68c386 changed the packing attribute on struct lzma_header. However, this is 3rd library code used by stubdomains. Revert the change to lzma_header alone to avoid needless divergence from its source. Reported-by: Sander Eikelenboom Signed-off-by: Andrew Cooper --- xen/common/unlzma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/unlzma.c b/xen/common/unlzma.c index 103d2df..a7da55b 100644 --- a/xen/common/unlzma.c +++ b/xen/common/unlzma.c @@ -214,11 +214,11 @@ rc_bit_tree_decode(struct rc *rc, uint16_t *p, int num_levels, int *symbol) */ -struct __packed lzma_header { +struct lzma_header { uint8_t pos; uint32_t dict_size; uint64_t dst_size; -}; +} __attribute__((packed)) ; #define LZMA_BASE_SIZE 1846 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 14 22:04:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Mar 2014 22:04:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDk-0005mg-0G; Fri, 14 Mar 2014 22:04:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDi-0005mH-8s for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:50 +0000 Received: from [85.158.143.35:23185] by server-2.bemta-4.messagelabs.com id BD/C3-06539-10D73235; Fri, 14 Mar 2014 22:04:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1394834688!2229636!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11566 invoked from network); 14 Mar 2014 22:04:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2014 22:04:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOaDf-0000nY-SS for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOaDf-0002lZ-RW for xen-changelog@lists.xensource.com; Fri, 14 Mar 2014 22:04:47 +0000 Date: Fri, 14 Mar 2014 22:04:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] unlzma: fix build of stubdom unsafe decompressors X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 419c5fb192cac87c0d7eec8d7c349e73c7f2854a Author: Andrew Cooper AuthorDate: Fri Mar 14 13:07:38 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 13:07:38 2014 +0100 unlzma: fix build of stubdom unsafe decompressors c/s b683d68c386 changed the packing attribute on struct lzma_header. However, this is 3rd library code used by stubdomains. Revert the change to lzma_header alone to avoid needless divergence from its source. Reported-by: Sander Eikelenboom Signed-off-by: Andrew Cooper --- xen/common/unlzma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/unlzma.c b/xen/common/unlzma.c index 103d2df..a7da55b 100644 --- a/xen/common/unlzma.c +++ b/xen/common/unlzma.c @@ -214,11 +214,11 @@ rc_bit_tree_decode(struct rc *rc, uint16_t *p, int num_levels, int *symbol) */ -struct __packed lzma_header { +struct lzma_header { uint8_t pos; uint32_t dict_size; uint64_t dst_size; -}; +} __attribute__((packed)) ; #define LZMA_BASE_SIZE 1846 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:44:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:44:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4W-0006TZ-Uh; Sat, 15 Mar 2014 10:44:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4V-0006TU-Tn for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:08 +0000 Received: from [85.158.137.68:58801] by server-8.bemta-3.messagelabs.com id 4E/C1-21547-7FE24235; Sat, 15 Mar 2014 10:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1394880243!805147!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18527 invoked from network); 15 Mar 2014 10:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4R-000732-FV for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm4R-00088G-7x for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:03 +0000 Date: Sat, 15 Mar 2014 10:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: update config.{sub,guess} X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0c68ddf3085b90d72b7d3b6affd1fe8fa16eb6be Author: Ian Jackson AuthorDate: Fri Mar 14 12:00:11 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 14 14:16:38 2014 +0000 tools: update config.{sub,guess} Update to versions from Debian Wheezy's autotools-dev package (20120608.1) Adds ARM aarch64 support. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- config.guess | 258 ++++++++++++++++++++++++++++++++-------------------------- config.sub | 218 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 286 insertions(+), 190 deletions(-) diff --git a/config.guess b/config.guess index c2246a4..d622a44 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ timestamp='2009-12-30' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -181,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -224,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -296,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -395,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -481,8 +482,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -495,7 +496,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -552,7 +553,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -595,52 +596,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -731,22 +732,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -770,14 +771,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -789,13 +790,12 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -804,15 +804,18 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -858,6 +861,13 @@ EOF i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -867,7 +877,7 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -879,20 +889,29 @@ EOF then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -934,7 +953,7 @@ EOF test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -960,7 +979,7 @@ EOF echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -968,14 +987,17 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -984,11 +1006,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1020,7 +1042,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1048,13 +1070,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1089,8 +1111,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1133,10 +1155,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1162,11 +1184,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1231,6 +1253,9 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1276,13 +1301,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1300,6 +1325,9 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1322,11 +1350,11 @@ main () #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff --git a/config.sub b/config.sub index c2d1257..6205f84 100755 --- a/config.sub +++ b/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ timestamp='2010-01-22' # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ version="\ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -124,13 +122,18 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -157,8 +160,8 @@ case $os in os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -174,10 +177,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -222,6 +225,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -246,17 +255,22 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -282,29 +296,39 @@ case $basic_machine in | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -314,6 +338,21 @@ case $basic_machine in basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -328,21 +367,25 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -368,26 +411,29 @@ case $basic_machine in | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -412,7 +458,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -482,11 +528,20 @@ case $basic_machine in basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -518,7 +573,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -676,7 +731,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -734,7 +788,7 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -773,10 +827,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -841,6 +903,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -923,9 +991,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1019,6 +1088,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1075,25 +1147,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1163,6 +1218,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1260,11 +1318,11 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1300,8 +1358,9 @@ case $os in | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1348,7 +1407,7 @@ case $os in -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1397,7 +1456,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1442,8 +1501,8 @@ case $os in -dicos*) os=-dicos ;; - -nacl*) - ;; + -nacl*) + ;; -none) ;; *) @@ -1466,10 +1525,10 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1481,8 +1540,20 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1502,14 +1573,11 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1536,7 +1604,7 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:44:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:44:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4W-0006TZ-Uh; Sat, 15 Mar 2014 10:44:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4V-0006TU-Tn for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:08 +0000 Received: from [85.158.137.68:58801] by server-8.bemta-3.messagelabs.com id 4E/C1-21547-7FE24235; Sat, 15 Mar 2014 10:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1394880243!805147!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18527 invoked from network); 15 Mar 2014 10:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4R-000732-FV for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm4R-00088G-7x for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:03 +0000 Date: Sat, 15 Mar 2014 10:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: update config.{sub,guess} X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0c68ddf3085b90d72b7d3b6affd1fe8fa16eb6be Author: Ian Jackson AuthorDate: Fri Mar 14 12:00:11 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 14 14:16:38 2014 +0000 tools: update config.{sub,guess} Update to versions from Debian Wheezy's autotools-dev package (20120608.1) Adds ARM aarch64 support. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- config.guess | 258 ++++++++++++++++++++++++++++++++-------------------------- config.sub | 218 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 286 insertions(+), 190 deletions(-) diff --git a/config.guess b/config.guess index c2246a4..d622a44 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ timestamp='2009-12-30' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -181,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -224,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -296,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -395,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -481,8 +482,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -495,7 +496,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -552,7 +553,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -595,52 +596,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -731,22 +732,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -770,14 +771,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -789,13 +790,12 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -804,15 +804,18 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -858,6 +861,13 @@ EOF i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -867,7 +877,7 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -879,20 +889,29 @@ EOF then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -934,7 +953,7 @@ EOF test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -960,7 +979,7 @@ EOF echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -968,14 +987,17 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -984,11 +1006,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1020,7 +1042,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1048,13 +1070,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1089,8 +1111,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1133,10 +1155,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1162,11 +1184,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1231,6 +1253,9 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1276,13 +1301,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1300,6 +1325,9 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1322,11 +1350,11 @@ main () #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff --git a/config.sub b/config.sub index c2d1257..6205f84 100755 --- a/config.sub +++ b/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ timestamp='2010-01-22' # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ version="\ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -124,13 +122,18 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -157,8 +160,8 @@ case $os in os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -174,10 +177,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -222,6 +225,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -246,17 +255,22 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -282,29 +296,39 @@ case $basic_machine in | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -314,6 +338,21 @@ case $basic_machine in basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -328,21 +367,25 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -368,26 +411,29 @@ case $basic_machine in | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -412,7 +458,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -482,11 +528,20 @@ case $basic_machine in basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -518,7 +573,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -676,7 +731,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -734,7 +788,7 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -773,10 +827,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -841,6 +903,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -923,9 +991,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1019,6 +1088,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1075,25 +1147,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1163,6 +1218,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1260,11 +1318,11 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1300,8 +1358,9 @@ case $os in | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1348,7 +1407,7 @@ case $os in -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1397,7 +1456,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1442,8 +1501,8 @@ case $os in -dicos*) os=-dicos ;; - -nacl*) - ;; + -nacl*) + ;; -none) ;; *) @@ -1466,10 +1525,10 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1481,8 +1540,20 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1502,14 +1573,11 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1536,7 +1604,7 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4g-0006U1-3Y; Sat, 15 Mar 2014 10:44:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4e-0006Ts-QJ for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:17 +0000 Received: from [85.158.137.68:60979] by server-7.bemta-3.messagelabs.com id 12/F2-04151-00F24235; Sat, 15 Mar 2014 10:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1394880254!809148!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9349 invoked from network); 15 Mar 2014 10:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4b-000735-Kz for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm4b-00088f-IH for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:13 +0000 Date: Sat, 15 Mar 2014 10:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce clean_and_invalidate_xen_dcache() macro X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc31a1ac2ecd56e8348171de85e4d59c56d70397 Author: Oleksandr Tyshchenko AuthorDate: Tue Mar 11 15:19:44 2014 +0200 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:22 2014 +0000 xen/arm: Introduce clean_and_invalidate_xen_dcache() macro This macro is very similar to clean_xen_dcache(), but it performs clean and invalidate dcache. Also modify flush_page_to_ram() to call clean_and_invalidate_xen_dcache_va_range() function. Signed-off-by: Oleksandr Tyshchenko Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 8 ++------ xen/include/asm-arm/page.h | 26 ++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 308a798..544aa87 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -344,13 +344,9 @@ unsigned long domain_page_map_to_mfn(const void *ptr) void flush_page_to_ram(unsigned long mfn) { - void *p, *v = map_domain_page(mfn); - - dsb(); /* So the CPU issues all writes to the range */ - for ( p = v; p < v + PAGE_SIZE ; p += cacheline_bytes ) - asm volatile (__clean_and_invalidate_xen_dcache_one(0) : : "r" (p)); - dsb(); /* So we know the flushes happen before continuing */ + void *v = map_domain_page(mfn); + clean_and_invalidate_xen_dcache_va_range(v, PAGE_SIZE); unmap_domain_page(v); } diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 6fe7fc5..905beb8 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -226,7 +226,7 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn) /* Actual cacheline size on the boot CPU. */ extern size_t cacheline_bytes; -/* Function for flushing medium-sized areas. +/* Functions for flushing medium-sized areas. * if 'range' is large enough we might want to use model-specific * full-cache flushes. */ static inline void clean_xen_dcache_va_range(void *p, unsigned long size) @@ -238,7 +238,17 @@ static inline void clean_xen_dcache_va_range(void *p, unsigned long size) dsb(); /* So we know the flushes happen before continuing */ } -/* Macro for flushing a single small item. The predicate is always +static inline void clean_and_invalidate_xen_dcache_va_range + (void *p, unsigned long size) +{ + void *end; + dsb(); /* So the CPU issues all writes to the range */ + for ( end = p + size; p < end; p += cacheline_bytes ) + asm volatile (__clean_and_invalidate_xen_dcache_one(0) : : "r" (p)); + dsb(); /* So we know the flushes happen before continuing */ +} + +/* Macros for flushing a single small item. The predicate is always * compile-time constant so this will compile down to 3 instructions in * the common case. */ #define clean_xen_dcache(x) do { \ @@ -253,6 +263,18 @@ static inline void clean_xen_dcache_va_range(void *p, unsigned long size) : : "r" (_p), "m" (*_p)); \ } while (0) +#define clean_and_invalidate_xen_dcache(x) do { \ + typeof(x) *_p = &(x); \ + if ( sizeof(x) > MIN_CACHELINE_BYTES || sizeof(x) > alignof(x) ) \ + clean_and_invalidate_xen_dcache_va_range(_p, sizeof(x)); \ + else \ + asm volatile ( \ + "dsb sy;" /* Finish all earlier writes */ \ + __clean_and_invalidate_xen_dcache_one(0) \ + "dsb sy;" /* Finish flush before continuing */ \ + : : "r" (_p), "m" (*_p)); \ +} while (0) + /* Flush the dcache for an entire page. */ void flush_page_to_ram(unsigned long mfn); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4g-0006U1-3Y; Sat, 15 Mar 2014 10:44:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4e-0006Ts-QJ for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:17 +0000 Received: from [85.158.137.68:60979] by server-7.bemta-3.messagelabs.com id 12/F2-04151-00F24235; Sat, 15 Mar 2014 10:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1394880254!809148!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9349 invoked from network); 15 Mar 2014 10:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4b-000735-Kz for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm4b-00088f-IH for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:13 +0000 Date: Sat, 15 Mar 2014 10:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce clean_and_invalidate_xen_dcache() macro X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc31a1ac2ecd56e8348171de85e4d59c56d70397 Author: Oleksandr Tyshchenko AuthorDate: Tue Mar 11 15:19:44 2014 +0200 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:22 2014 +0000 xen/arm: Introduce clean_and_invalidate_xen_dcache() macro This macro is very similar to clean_xen_dcache(), but it performs clean and invalidate dcache. Also modify flush_page_to_ram() to call clean_and_invalidate_xen_dcache_va_range() function. Signed-off-by: Oleksandr Tyshchenko Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 8 ++------ xen/include/asm-arm/page.h | 26 ++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 308a798..544aa87 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -344,13 +344,9 @@ unsigned long domain_page_map_to_mfn(const void *ptr) void flush_page_to_ram(unsigned long mfn) { - void *p, *v = map_domain_page(mfn); - - dsb(); /* So the CPU issues all writes to the range */ - for ( p = v; p < v + PAGE_SIZE ; p += cacheline_bytes ) - asm volatile (__clean_and_invalidate_xen_dcache_one(0) : : "r" (p)); - dsb(); /* So we know the flushes happen before continuing */ + void *v = map_domain_page(mfn); + clean_and_invalidate_xen_dcache_va_range(v, PAGE_SIZE); unmap_domain_page(v); } diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 6fe7fc5..905beb8 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -226,7 +226,7 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn) /* Actual cacheline size on the boot CPU. */ extern size_t cacheline_bytes; -/* Function for flushing medium-sized areas. +/* Functions for flushing medium-sized areas. * if 'range' is large enough we might want to use model-specific * full-cache flushes. */ static inline void clean_xen_dcache_va_range(void *p, unsigned long size) @@ -238,7 +238,17 @@ static inline void clean_xen_dcache_va_range(void *p, unsigned long size) dsb(); /* So we know the flushes happen before continuing */ } -/* Macro for flushing a single small item. The predicate is always +static inline void clean_and_invalidate_xen_dcache_va_range + (void *p, unsigned long size) +{ + void *end; + dsb(); /* So the CPU issues all writes to the range */ + for ( end = p + size; p < end; p += cacheline_bytes ) + asm volatile (__clean_and_invalidate_xen_dcache_one(0) : : "r" (p)); + dsb(); /* So we know the flushes happen before continuing */ +} + +/* Macros for flushing a single small item. The predicate is always * compile-time constant so this will compile down to 3 instructions in * the common case. */ #define clean_xen_dcache(x) do { \ @@ -253,6 +263,18 @@ static inline void clean_xen_dcache_va_range(void *p, unsigned long size) : : "r" (_p), "m" (*_p)); \ } while (0) +#define clean_and_invalidate_xen_dcache(x) do { \ + typeof(x) *_p = &(x); \ + if ( sizeof(x) > MIN_CACHELINE_BYTES || sizeof(x) > alignof(x) ) \ + clean_and_invalidate_xen_dcache_va_range(_p, sizeof(x)); \ + else \ + asm volatile ( \ + "dsb sy;" /* Finish all earlier writes */ \ + __clean_and_invalidate_xen_dcache_one(0) \ + "dsb sy;" /* Finish flush before continuing */ \ + : : "r" (_p), "m" (*_p)); \ +} while (0) + /* Flush the dcache for an entire page. */ void flush_page_to_ram(unsigned long mfn); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4q-0006V9-6B; Sat, 15 Mar 2014 10:44:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4o-0006Uo-KI for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:26 +0000 Received: from [85.158.137.68:48334] by server-10.bemta-3.messagelabs.com id D8/1F-16608-90F24235; Sat, 15 Mar 2014 10:44:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1394880264!794219!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17630 invoked from network); 15 Mar 2014 10:44:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:44:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4l-000738-P1 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm4l-000891-Na for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:23 +0000 Date: Sat, 15 Mar 2014 10:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Clean and invalidate dcache for boot pagetables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit adf8340b3f19c3bc9959bf498ef07690e8faa50a Author: Oleksandr Tyshchenko AuthorDate: Tue Mar 11 15:19:45 2014 +0200 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:22 2014 +0000 xen/arm: Clean and invalidate dcache for boot pagetables We need to invalidate dcache too after zeroing boot pagetables to avoid unpredictable behavior which may take place after non-boot CPUs enable their caches. So, replace clean_xen_dcache() macro by a clean_and_invalidate_xen_dcache() for boot pagetables. Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 544aa87..305879f 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -480,13 +480,13 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Clear the copy of the boot pagetables. Each secondary CPU * rebuilds these itself (see head.S) */ memset(boot_pgtable, 0x0, PAGE_SIZE); - clean_xen_dcache(boot_pgtable); + clean_and_invalidate_xen_dcache(boot_pgtable); #ifdef CONFIG_ARM_64 memset(boot_first, 0x0, PAGE_SIZE); - clean_xen_dcache(boot_first); + clean_and_invalidate_xen_dcache(boot_first); #endif memset(boot_second, 0x0, PAGE_SIZE); - clean_xen_dcache(boot_second); + clean_and_invalidate_xen_dcache(boot_second); /* Break up the Xen mapping into 4k pages and protect them separately. */ for ( i = 0; i < LPAE_ENTRIES; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4q-0006V9-6B; Sat, 15 Mar 2014 10:44:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4o-0006Uo-KI for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:26 +0000 Received: from [85.158.137.68:48334] by server-10.bemta-3.messagelabs.com id D8/1F-16608-90F24235; Sat, 15 Mar 2014 10:44:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1394880264!794219!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17630 invoked from network); 15 Mar 2014 10:44:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:44:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4l-000738-P1 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm4l-000891-Na for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:23 +0000 Date: Sat, 15 Mar 2014 10:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Clean and invalidate dcache for boot pagetables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit adf8340b3f19c3bc9959bf498ef07690e8faa50a Author: Oleksandr Tyshchenko AuthorDate: Tue Mar 11 15:19:45 2014 +0200 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:22 2014 +0000 xen/arm: Clean and invalidate dcache for boot pagetables We need to invalidate dcache too after zeroing boot pagetables to avoid unpredictable behavior which may take place after non-boot CPUs enable their caches. So, replace clean_xen_dcache() macro by a clean_and_invalidate_xen_dcache() for boot pagetables. Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 544aa87..305879f 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -480,13 +480,13 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Clear the copy of the boot pagetables. Each secondary CPU * rebuilds these itself (see head.S) */ memset(boot_pgtable, 0x0, PAGE_SIZE); - clean_xen_dcache(boot_pgtable); + clean_and_invalidate_xen_dcache(boot_pgtable); #ifdef CONFIG_ARM_64 memset(boot_first, 0x0, PAGE_SIZE); - clean_xen_dcache(boot_first); + clean_and_invalidate_xen_dcache(boot_first); #endif memset(boot_second, 0x0, PAGE_SIZE); - clean_xen_dcache(boot_second); + clean_and_invalidate_xen_dcache(boot_second); /* Break up the Xen mapping into 4k pages and protect them separately. */ for ( i = 0; i < LPAE_ENTRIES; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:44:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:44:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4z-0006WO-8q; Sat, 15 Mar 2014 10:44:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4y-0006WB-9O for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:36 +0000 Received: from [193.109.254.147:61674] by server-16.bemta-14.messagelabs.com id 2C/3E-21945-31F24235; Sat, 15 Mar 2014 10:44:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1394880274!1889001!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22316 invoked from network); 15 Mar 2014 10:44:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:44:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4v-00073I-Tf for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm4v-0008AB-RY for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:33 +0000 Date: Sat, 15 Mar 2014 10:44:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3647a486ec05b1e01930ff299b18fc2b632e2cb0 Author: Ian Campbell AuthorDate: Wed Feb 26 12:13:00 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:22 2014 +0000 libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified Otherwise we deference a NULL pointer. I saw this while experimenting with libvirt on Xen on ARM, xl already checks that the command line is non NULL and provides "" as a default. Signed-off-by: Ian Campbell Acked-by: Julien Grall Cc: george.dunlap@citrix.com> --- tools/libxl/libxl_arm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 0a1c8c5..0cfd0cf 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -164,8 +164,10 @@ static int make_chosen_node(libxl__gc *gc, void *fdt, res = fdt_begin_node(fdt, "chosen"); if (res) return res; - res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline); - if (res) return res; + if (info->u.pv.cmdline) { + res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline); + if (res) return res; + } res = fdt_end_node(fdt); if (res) return res; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:44:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:44:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4z-0006WO-8q; Sat, 15 Mar 2014 10:44:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4y-0006WB-9O for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:36 +0000 Received: from [193.109.254.147:61674] by server-16.bemta-14.messagelabs.com id 2C/3E-21945-31F24235; Sat, 15 Mar 2014 10:44:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1394880274!1889001!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22316 invoked from network); 15 Mar 2014 10:44:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:44:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm4v-00073I-Tf for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm4v-0008AB-RY for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:33 +0000 Date: Sat, 15 Mar 2014 10:44:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3647a486ec05b1e01930ff299b18fc2b632e2cb0 Author: Ian Campbell AuthorDate: Wed Feb 26 12:13:00 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:22 2014 +0000 libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified Otherwise we deference a NULL pointer. I saw this while experimenting with libvirt on Xen on ARM, xl already checks that the command line is non NULL and provides "" as a default. Signed-off-by: Ian Campbell Acked-by: Julien Grall Cc: george.dunlap@citrix.com> --- tools/libxl/libxl_arm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 0a1c8c5..0cfd0cf 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -164,8 +164,10 @@ static int make_chosen_node(libxl__gc *gc, void *fdt, res = fdt_begin_node(fdt, "chosen"); if (res) return res; - res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline); - if (res) return res; + if (info->u.pv.cmdline) { + res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline); + if (res) return res; + } res = fdt_end_node(fdt); if (res) return res; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:44:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5A-0006Y8-Bi; Sat, 15 Mar 2014 10:44:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm59-0006Xu-2z for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:47 +0000 Received: from [85.158.139.211:10581] by server-8.bemta-5.messagelabs.com id 5F/A1-11310-E1F24235; Sat, 15 Mar 2014 10:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1394880284!1210210!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4179 invoked from network); 15 Mar 2014 10:44:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:44:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm56-00073P-4d for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm55-0008AX-WF for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:44 +0000 Date: Sat, 15 Mar 2014 10:44:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm32: proc-v7.S: Rename v7_init and ACTLR_V7_SMP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b1bcab913bea2c7a7bdb865a855fb5775e3f3f5a Author: Julien Grall AuthorDate: Wed Mar 5 12:46:21 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:22 2014 +0000 xen/arm32: proc-v7.S: Rename v7_init and ACTLR_V7_SMP The function v7_init and the define ACTLR_V7_SMP are Cortex A15/A7 specific. To avoid misuse when new ARMv7 processors will be supported, create one label per processor type and rename ACTLR_V7_SMP in ACTRL_CAXX_SMP Signed-off-by: Julien Grall Reviewed-by: Tim Deegan Acked-by: Ian Campbell --- xen/arch/arm/arm32/proc-v7.S | 12 +++++++----- xen/include/asm-arm/arm32/processor.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S index 2c8cb9c..8fb42db 100644 --- a/xen/arch/arm/arm32/proc-v7.S +++ b/xen/arch/arm/arm32/proc-v7.S @@ -20,10 +20,12 @@ #include #include -v7_init: +ca15mp_init: +ca7mp_init: +brahma15mp_init: /* Set up the SMP bit in ACTLR */ mrc CP32(r0, ACTLR) - orr r0, r0, #(ACTLR_V7_SMP) /* enable SMP bit */ + orr r0, r0, #(ACTLR_CAXX_SMP) /* enable SMP bit */ mcr CP32(r0, ACTLR) mov pc, lr @@ -32,7 +34,7 @@ v7_init: __v7_ca15mp_proc_info: .long 0x410FC0F0 /* Cortex-A15 */ .long 0xFF0FFFF0 /* Mask */ - .long v7_init + .long ca15mp_init .size __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info .section ".init.proc.info", #alloc, #execinstr @@ -40,7 +42,7 @@ __v7_ca15mp_proc_info: __v7_ca7mp_proc_info: .long 0x410FC070 /* Cortex-A7 */ .long 0xFF0FFFF0 /* Mask */ - .long v7_init + .long ca7mp_init .size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info .section ".init.proc.info", #alloc, #execinstr @@ -48,7 +50,7 @@ __v7_ca7mp_proc_info: __v7_brahma15mp_proc_info: .long 0x420F00F2 /* Broadcom Brahma-B15 */ .long 0xFF0FFFFF /* Mask */ - .long v7_init + .long brahma15mp_init .size __v7_brahma15mp_proc_info, . - __v7_brahma15mp_proc_info /* diff --git a/xen/include/asm-arm/arm32/processor.h b/xen/include/asm-arm/arm32/processor.h index d1b89d0..8a35cee 100644 --- a/xen/include/asm-arm/arm32/processor.h +++ b/xen/include/asm-arm/arm32/processor.h @@ -1,7 +1,7 @@ #ifndef __ASM_ARM_ARM32_PROCESSOR_H #define __ASM_ARM_ARM32_PROCESSOR_H -#define ACTLR_V7_SMP (1<<6) +#define ACTLR_CAXX_SMP (1<<6) #ifndef __ASSEMBLY__ /* On stack VCPU state */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:44:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5A-0006Y8-Bi; Sat, 15 Mar 2014 10:44:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm59-0006Xu-2z for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:47 +0000 Received: from [85.158.139.211:10581] by server-8.bemta-5.messagelabs.com id 5F/A1-11310-E1F24235; Sat, 15 Mar 2014 10:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1394880284!1210210!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4179 invoked from network); 15 Mar 2014 10:44:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:44:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm56-00073P-4d for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm55-0008AX-WF for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:44 +0000 Date: Sat, 15 Mar 2014 10:44:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm32: proc-v7.S: Rename v7_init and ACTLR_V7_SMP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b1bcab913bea2c7a7bdb865a855fb5775e3f3f5a Author: Julien Grall AuthorDate: Wed Mar 5 12:46:21 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:22 2014 +0000 xen/arm32: proc-v7.S: Rename v7_init and ACTLR_V7_SMP The function v7_init and the define ACTLR_V7_SMP are Cortex A15/A7 specific. To avoid misuse when new ARMv7 processors will be supported, create one label per processor type and rename ACTLR_V7_SMP in ACTRL_CAXX_SMP Signed-off-by: Julien Grall Reviewed-by: Tim Deegan Acked-by: Ian Campbell --- xen/arch/arm/arm32/proc-v7.S | 12 +++++++----- xen/include/asm-arm/arm32/processor.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S index 2c8cb9c..8fb42db 100644 --- a/xen/arch/arm/arm32/proc-v7.S +++ b/xen/arch/arm/arm32/proc-v7.S @@ -20,10 +20,12 @@ #include #include -v7_init: +ca15mp_init: +ca7mp_init: +brahma15mp_init: /* Set up the SMP bit in ACTLR */ mrc CP32(r0, ACTLR) - orr r0, r0, #(ACTLR_V7_SMP) /* enable SMP bit */ + orr r0, r0, #(ACTLR_CAXX_SMP) /* enable SMP bit */ mcr CP32(r0, ACTLR) mov pc, lr @@ -32,7 +34,7 @@ v7_init: __v7_ca15mp_proc_info: .long 0x410FC0F0 /* Cortex-A15 */ .long 0xFF0FFFF0 /* Mask */ - .long v7_init + .long ca15mp_init .size __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info .section ".init.proc.info", #alloc, #execinstr @@ -40,7 +42,7 @@ __v7_ca15mp_proc_info: __v7_ca7mp_proc_info: .long 0x410FC070 /* Cortex-A7 */ .long 0xFF0FFFF0 /* Mask */ - .long v7_init + .long ca7mp_init .size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info .section ".init.proc.info", #alloc, #execinstr @@ -48,7 +50,7 @@ __v7_ca7mp_proc_info: __v7_brahma15mp_proc_info: .long 0x420F00F2 /* Broadcom Brahma-B15 */ .long 0xFF0FFFFF /* Mask */ - .long v7_init + .long brahma15mp_init .size __v7_brahma15mp_proc_info, . - __v7_brahma15mp_proc_info /* diff --git a/xen/include/asm-arm/arm32/processor.h b/xen/include/asm-arm/arm32/processor.h index d1b89d0..8a35cee 100644 --- a/xen/include/asm-arm/arm32/processor.h +++ b/xen/include/asm-arm/arm32/processor.h @@ -1,7 +1,7 @@ #ifndef __ASM_ARM_ARM32_PROCESSOR_H #define __ASM_ARM_ARM32_PROCESSOR_H -#define ACTLR_V7_SMP (1<<6) +#define ACTLR_CAXX_SMP (1<<6) #ifndef __ASSEMBLY__ /* On stack VCPU state */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:45:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:45:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5K-0006ZO-Ea; Sat, 15 Mar 2014 10:44:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5I-0006Yx-UZ for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:57 +0000 Received: from [85.158.139.211:10849] by server-11.bemta-5.messagelabs.com id DC/5E-30804-82F24235; Sat, 15 Mar 2014 10:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1394880294!1209777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24747 invoked from network); 15 Mar 2014 10:44:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:44:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5G-00073U-8f for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm5G-0008At-7D for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:54 +0000 Date: Sat, 15 Mar 2014 10:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm32: head.S: Remove CA15 and CA7 specific includes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 679bd6e334c8d2f5628e3e6a3a62a8811d90df57 Author: Julien Grall AuthorDate: Wed Mar 5 12:46:22 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:23 2014 +0000 xen/arm32: head.S: Remove CA15 and CA7 specific includes head.S only contains generic code. It should not include headers for a specific processor. Signed-off-by: Julien Grall Reviewed-by: Tim Deegan Acked-by: Ian Campbell --- xen/arch/arm/arm32/head.S | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 0110807..e889596 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -19,8 +19,6 @@ #include #include -#include -#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:45:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:45:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5K-0006ZO-Ea; Sat, 15 Mar 2014 10:44:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5I-0006Yx-UZ for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:57 +0000 Received: from [85.158.139.211:10849] by server-11.bemta-5.messagelabs.com id DC/5E-30804-82F24235; Sat, 15 Mar 2014 10:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1394880294!1209777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24747 invoked from network); 15 Mar 2014 10:44:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:44:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5G-00073U-8f for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm5G-0008At-7D for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:44:54 +0000 Date: Sat, 15 Mar 2014 10:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm32: head.S: Remove CA15 and CA7 specific includes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 679bd6e334c8d2f5628e3e6a3a62a8811d90df57 Author: Julien Grall AuthorDate: Wed Mar 5 12:46:22 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:23 2014 +0000 xen/arm32: head.S: Remove CA15 and CA7 specific includes head.S only contains generic code. It should not include headers for a specific processor. Signed-off-by: Julien Grall Reviewed-by: Tim Deegan Acked-by: Ian Campbell --- xen/arch/arm/arm32/head.S | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 0110807..e889596 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -19,8 +19,6 @@ #include #include -#include -#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:45:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:45:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5z-0006fM-69; Sat, 15 Mar 2014 10:45:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5x-0006fE-TK for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:38 +0000 Received: from [193.109.254.147:59189] by server-14.bemta-14.messagelabs.com id 95/D2-29228-15F24235; Sat, 15 Mar 2014 10:45:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1394880335!1880230!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18318 invoked from network); 15 Mar 2014 10:45:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:45:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5v-00074h-7K for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm5v-0008DD-5i for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:35 +0000 Date: Sat, 15 Mar 2014 10:45:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove asm-arm/processor-ca{15, 7}.h headers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d073bf65c8b70d23de7e4b8d67182f18131499e Author: Julien Grall AuthorDate: Wed Mar 5 12:46:26 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:23 2014 +0000 xen/arm: Remove asm-arm/processor-ca{15, 7}.h headers Theses headers are not in the right directory and are not used anymore. Signed-off-by: Julien Grall Reviewed-by: Tim Deegan Acked-by: Ian Campbell --- xen/include/asm-arm/processor-ca15.h | 42 ---------------------------------- xen/include/asm-arm/processor-ca7.h | 20 ---------------- 2 files changed, 0 insertions(+), 62 deletions(-) diff --git a/xen/include/asm-arm/processor-ca15.h b/xen/include/asm-arm/processor-ca15.h deleted file mode 100644 index f65f40a..0000000 --- a/xen/include/asm-arm/processor-ca15.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef __ASM_ARM_PROCESSOR_CA15_H -#define __ASM_ARM_PROCESSOR_CA15_H - -/* ACTLR Auxiliary Control Register, Cortex A15 */ -#define ACTLR_CA15_SNOOP_DELAYED (1<<31) -#define ACTLR_CA15_MAIN_CLOCK (1<<30) -#define ACTLR_CA15_NEON_CLOCK (1<<29) -#define ACTLR_CA15_NONCACHE (1<<24) -#define ACTLR_CA15_INORDER_REQ (1<<23) -#define ACTLR_CA15_INORDER_LOAD (1<<22) -#define ACTLR_CA15_L2_TLB_PREFETCH (1<<21) -#define ACTLR_CA15_L2_IPA_PA_CACHE (1<<20) -#define ACTLR_CA15_L2_CACHE (1<<19) -#define ACTLR_CA15_L2_PA_CACHE (1<<18) -#define ACTLR_CA15_TLB (1<<17) -#define ACTLR_CA15_STRONGY_ORDERED (1<<16) -#define ACTLR_CA15_INORDER (1<<15) -#define ACTLR_CA15_FORCE_LIM (1<<14) -#define ACTLR_CA15_CP_FLUSH (1<<13) -#define ACTLR_CA15_CP_PUSH (1<<12) -#define ACTLR_CA15_LIM (1<<11) -#define ACTLR_CA15_SER (1<<10) -#define ACTLR_CA15_OPT (1<<9) -#define ACTLR_CA15_WFI (1<<8) -#define ACTLR_CA15_WFE (1<<7) -#define ACTLR_CA15_SMP (1<<6) -#define ACTLR_CA15_PLD (1<<5) -#define ACTLR_CA15_IP (1<<4) -#define ACTLR_CA15_MICRO_BTB (1<<3) -#define ACTLR_CA15_LOOP_ONE (1<<2) -#define ACTLR_CA15_LOOP_DISABLE (1<<1) -#define ACTLR_CA15_BTB (1<<0) - -#endif /* __ASM_ARM_PROCESSOR_CA15_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-arm/processor-ca7.h b/xen/include/asm-arm/processor-ca7.h deleted file mode 100644 index 5048a95..0000000 --- a/xen/include/asm-arm/processor-ca7.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __ASM_ARM_PROCESSOR_CA7_H -#define __ASM_ARM_PROCESSOR_CA7_H - -/* ACTLR Auxiliary Control Register, Cortex A7 */ -#define ACTLR_CA7_DDI (1<<28) -#define ACTLR_CA7_DDVM (1<<15) -#define ACTLR_CA7_L1RADIS (1<<12) -#define ACTLR_CA7_L2RADIS (1<<11) -#define ACTLR_CA7_DODMBS (1<<10) -#define ACTLR_CA7_SMP (1<<6) - -#endif /* __ASM_ARM_PROCESSOR_CA7_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:45:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:45:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5z-0006fM-69; Sat, 15 Mar 2014 10:45:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5x-0006fE-TK for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:38 +0000 Received: from [193.109.254.147:59189] by server-14.bemta-14.messagelabs.com id 95/D2-29228-15F24235; Sat, 15 Mar 2014 10:45:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1394880335!1880230!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18318 invoked from network); 15 Mar 2014 10:45:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:45:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5v-00074h-7K for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm5v-0008DD-5i for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:35 +0000 Date: Sat, 15 Mar 2014 10:45:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove asm-arm/processor-ca{15, 7}.h headers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d073bf65c8b70d23de7e4b8d67182f18131499e Author: Julien Grall AuthorDate: Wed Mar 5 12:46:26 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:23 2014 +0000 xen/arm: Remove asm-arm/processor-ca{15, 7}.h headers Theses headers are not in the right directory and are not used anymore. Signed-off-by: Julien Grall Reviewed-by: Tim Deegan Acked-by: Ian Campbell --- xen/include/asm-arm/processor-ca15.h | 42 ---------------------------------- xen/include/asm-arm/processor-ca7.h | 20 ---------------- 2 files changed, 0 insertions(+), 62 deletions(-) diff --git a/xen/include/asm-arm/processor-ca15.h b/xen/include/asm-arm/processor-ca15.h deleted file mode 100644 index f65f40a..0000000 --- a/xen/include/asm-arm/processor-ca15.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef __ASM_ARM_PROCESSOR_CA15_H -#define __ASM_ARM_PROCESSOR_CA15_H - -/* ACTLR Auxiliary Control Register, Cortex A15 */ -#define ACTLR_CA15_SNOOP_DELAYED (1<<31) -#define ACTLR_CA15_MAIN_CLOCK (1<<30) -#define ACTLR_CA15_NEON_CLOCK (1<<29) -#define ACTLR_CA15_NONCACHE (1<<24) -#define ACTLR_CA15_INORDER_REQ (1<<23) -#define ACTLR_CA15_INORDER_LOAD (1<<22) -#define ACTLR_CA15_L2_TLB_PREFETCH (1<<21) -#define ACTLR_CA15_L2_IPA_PA_CACHE (1<<20) -#define ACTLR_CA15_L2_CACHE (1<<19) -#define ACTLR_CA15_L2_PA_CACHE (1<<18) -#define ACTLR_CA15_TLB (1<<17) -#define ACTLR_CA15_STRONGY_ORDERED (1<<16) -#define ACTLR_CA15_INORDER (1<<15) -#define ACTLR_CA15_FORCE_LIM (1<<14) -#define ACTLR_CA15_CP_FLUSH (1<<13) -#define ACTLR_CA15_CP_PUSH (1<<12) -#define ACTLR_CA15_LIM (1<<11) -#define ACTLR_CA15_SER (1<<10) -#define ACTLR_CA15_OPT (1<<9) -#define ACTLR_CA15_WFI (1<<8) -#define ACTLR_CA15_WFE (1<<7) -#define ACTLR_CA15_SMP (1<<6) -#define ACTLR_CA15_PLD (1<<5) -#define ACTLR_CA15_IP (1<<4) -#define ACTLR_CA15_MICRO_BTB (1<<3) -#define ACTLR_CA15_LOOP_ONE (1<<2) -#define ACTLR_CA15_LOOP_DISABLE (1<<1) -#define ACTLR_CA15_BTB (1<<0) - -#endif /* __ASM_ARM_PROCESSOR_CA15_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-arm/processor-ca7.h b/xen/include/asm-arm/processor-ca7.h deleted file mode 100644 index 5048a95..0000000 --- a/xen/include/asm-arm/processor-ca7.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __ASM_ARM_PROCESSOR_CA7_H -#define __ASM_ARM_PROCESSOR_CA7_H - -/* ACTLR Auxiliary Control Register, Cortex A7 */ -#define ACTLR_CA7_DDI (1<<28) -#define ACTLR_CA7_DDVM (1<<15) -#define ACTLR_CA7_L1RADIS (1<<12) -#define ACTLR_CA7_L2RADIS (1<<11) -#define ACTLR_CA7_DODMBS (1<<10) -#define ACTLR_CA7_SMP (1<<6) - -#endif /* __ASM_ARM_PROCESSOR_CA7_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:46:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:46:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5q-0006eV-3O; Sat, 15 Mar 2014 10:45:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5o-0006e8-3S for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:28 +0000 Received: from [85.158.139.211:63043] by server-14.bemta-5.messagelabs.com id 25/4B-15696-74F24235; Sat, 15 Mar 2014 10:45:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1394880325!975340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5268 invoked from network); 15 Mar 2014 10:45:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:45:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5l-00074e-3E for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm5l-0008CH-15 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:25 +0000 Date: Sat, 15 Mar 2014 10:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove processor specific setup in vcpu_initialise X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 633d01dc4e28567d5033d19336852939b0b70cf8 Author: Julien Grall AuthorDate: Wed Mar 5 12:46:25 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:23 2014 +0000 xen/arm: Remove processor specific setup in vcpu_initialise This patch introduces the possibility to have specific processor callbacks that can be called in various place. Currently VCPU initialisation code contains processor specific setup (for Cortex A7 and Cortex A15) for the ACTRL registers. It's possible to have processor with a different layout for this register. Move this setup in a specific callback for ARM v7 processor. Signed-off-by: Julien Grall Reviewed-by: Tim Deegan Acked-by: Ian Campbell Cc: marc.ceeeee@gmail.com --- xen/arch/arm/Makefile | 1 + xen/arch/arm/arm32/Makefile | 2 +- xen/arch/arm/arm32/proc-caxx.c | 35 ++++++++++++++++++++++++++++ xen/arch/arm/arm32/proc-v7.S | 3 ++ xen/arch/arm/domain.c | 8 +----- xen/arch/arm/processor.c | 49 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/setup.c | 3 ++ xen/include/asm-arm/procinfo.h | 17 ++++++++++++- 8 files changed, 109 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index d70f6d5..63e0460 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -32,6 +32,7 @@ obj-y += vuart.o obj-y += hvm.o obj-y += device.o obj-y += decode.o +obj-y += processor.o #obj-bin-y += ....o diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index 65ecff4..df0e7de 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -1,7 +1,7 @@ subdir-y += lib obj-y += entry.o -obj-y += proc-v7.o +obj-y += proc-v7.o proc-caxx.o obj-y += traps.o obj-y += domain.o diff --git a/xen/arch/arm/arm32/proc-caxx.c b/xen/arch/arm/arm32/proc-caxx.c new file mode 100644 index 0000000..9166a1d --- /dev/null +++ b/xen/arch/arm/arm32/proc-caxx.c @@ -0,0 +1,35 @@ +/* + * xen/arch/arm/arm32/proc-caxx.c + * + * arm V7 Cortex A15 and A7 initialisation + * + * Julien Grall + * Copyright (c) 2014 Linaro Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include +#include + +#define ACTLR_SMP (1 << 6) + +static void caxx_vcpu_initialise(struct vcpu *v) +{ + /* If the guest has more 1 VCPU, enable the SMP bit in ACTLR */ + if ( v->domain->max_vcpus > 1 ) + v->arch.actlr |= ACTLR_SMP; + else + v->arch.actlr &= ~ACTLR_SMP; +} + +const struct processor caxx_processor = { + .vcpu_initialise = caxx_vcpu_initialise, +}; diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S index 8fb42db..b0d5343 100644 --- a/xen/arch/arm/arm32/proc-v7.S +++ b/xen/arch/arm/arm32/proc-v7.S @@ -35,6 +35,7 @@ __v7_ca15mp_proc_info: .long 0x410FC0F0 /* Cortex-A15 */ .long 0xFF0FFFF0 /* Mask */ .long ca15mp_init + .long caxx_processor .size __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info .section ".init.proc.info", #alloc, #execinstr @@ -43,6 +44,7 @@ __v7_ca7mp_proc_info: .long 0x410FC070 /* Cortex-A7 */ .long 0xFF0FFFF0 /* Mask */ .long ca7mp_init + .long caxx_processor .size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info .section ".init.proc.info", #alloc, #execinstr @@ -51,6 +53,7 @@ __v7_brahma15mp_proc_info: .long 0x420F00F2 /* Broadcom Brahma-B15 */ .long 0xFF0FFFFF /* Mask */ .long brahma15mp_init + .long caxx_processor .size __v7_brahma15mp_proc_info, . - __v7_brahma15mp_proc_info /* diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 8f20fdf..82a1e79 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include @@ -480,11 +480,7 @@ int vcpu_initialise(struct vcpu *v) v->arch.actlr = READ_SYSREG32(ACTLR_EL1); - /* XXX: Handle other than CA15 cpus */ - if ( v->domain->max_vcpus > 1 ) - v->arch.actlr |= ACTLR_CA15_SMP; - else - v->arch.actlr &= ~ACTLR_CA15_SMP; + processor_vcpu_initialise(v); if ( (rc = vcpu_vgic_init(v)) != 0 ) return rc; diff --git a/xen/arch/arm/processor.c b/xen/arch/arm/processor.c new file mode 100644 index 0000000..8c425ce --- /dev/null +++ b/xen/arch/arm/processor.c @@ -0,0 +1,49 @@ +/* + * xen/arch/arm/processor.c + * + * Helpers to execute processor specific code. + * + * Julien Grall + * Copyright (C) 2014 Linaro Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include + +static const struct processor *processor = NULL; + +void __init processor_setup(void) +{ + const struct proc_info_list *procinfo; + + procinfo = lookup_processor_type(); + if ( !procinfo ) + return; + + processor = procinfo->processor; +} + +void processor_vcpu_initialise(struct vcpu *v) +{ + if ( !processor || !processor->vcpu_initialise ) + return; + + processor->vcpu_initialise(v); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 9480f42..4a3016a 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -43,6 +43,7 @@ #include #include #include +#include struct cpuinfo_arm __read_mostly boot_cpu_data; @@ -149,6 +150,8 @@ static void __init processor_id(void) { printk("32-bit Execution: Unsupported\n"); } + + processor_setup(); } static void dt_unreserved_regions(paddr_t s, paddr_t e, diff --git a/xen/include/asm-arm/procinfo.h b/xen/include/asm-arm/procinfo.h index 9d3feb7..26306b3 100644 --- a/xen/include/asm-arm/procinfo.h +++ b/xen/include/asm-arm/procinfo.h @@ -21,10 +21,23 @@ #ifndef __ASM_ARM_PROCINFO_H #define __ASM_ARM_PROCINFO_H +#include + +struct processor { + /* Initialize specific processor register for the new VPCU*/ + void (*vcpu_initialise)(struct vcpu *v); +}; + struct proc_info_list { - unsigned int cpu_val; - unsigned int cpu_mask; + unsigned int cpu_val; + unsigned int cpu_mask; void (*cpu_init)(void); + struct processor *processor; }; +const __init struct proc_info_list *lookup_processor_type(void); + +void __init processor_setup(void); +void processor_vcpu_initialise(struct vcpu *v); + #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:46:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:46:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5e-0006cd-KU; Sat, 15 Mar 2014 10:45:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5d-0006cP-El for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:17 +0000 Received: from [193.109.254.147:58489] by server-15.bemta-14.messagelabs.com id B3/E0-10839-C3F24235; Sat, 15 Mar 2014 10:45:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1394880315!1864996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27012 invoked from network); 15 Mar 2014 10:45:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:45:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5a-00074b-Ta for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm5a-0008Bv-MV for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:14 +0000 Date: Sat, 15 Mar 2014 10:45:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm64: Implement lookup_processor_type as a dummy function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ce1b3a3eabc034a51a2517b557a70fe48a9e994d Author: Julien Grall AuthorDate: Wed Mar 5 12:46:24 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:23 2014 +0000 xen/arm64: Implement lookup_processor_type as a dummy function ARM64 implementation doesn't yet have specific code per processor. This function will be used in a later patch. Signed-off-by: Julien Grall Reviewed-by: Tim Deegan Acked-by: Ian campbell --- xen/arch/arm/arm64/head.S | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 6f80db2..d151724 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -546,6 +546,13 @@ putn: ret #endif /* EARLY_PRINTK */ +/* This provides a C-API version of __lookup_processor_type + * TODO: For now, the implementation return NULL every time + */ +GLOBAL(lookup_processor_type) + mov x0, #0 + ret + /* * Local variables: * mode: ASM -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:46:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:46:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5X-0006bU-Hg; Sat, 15 Mar 2014 10:45:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5V-0006b6-SB for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:10 +0000 Received: from [85.158.137.68:5303] by server-12.bemta-3.messagelabs.com id 64/C9-14831-53F24235; Sat, 15 Mar 2014 10:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1394880305!801976!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27170 invoked from network); 15 Mar 2014 10:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5Q-00074V-Jn for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm5Q-0008BU-Bn for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:04 +0000 Date: Sat, 15 Mar 2014 10:45:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm32: Introduce lookup_processor_type X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit db996100025b879ec7a10875671c06cbe76922f4 Author: Julien Grall AuthorDate: Wed Mar 5 12:46:23 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:23 2014 +0000 xen/arm32: Introduce lookup_processor_type Looking for a specific proc_info structure is already implemented in assembly. Implement lookup_processor_type to avoid duplicate code between C and assembly. This function searches the proc_info_list structure following the processor ID. If the search fail, it will return NULL, otherwise a pointer to this structure for the specific processor. Signed-off-by: Julien Grall Reviewed-by: Tim Deegan Acked-by: Ian Campbell --- xen/arch/arm/arm32/head.S | 57 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 43 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index e889596..72cda34 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -198,26 +198,16 @@ skip_bss: PRINT("- Setting up control registers -\r\n") /* Get processor specific proc info into r1 */ - mrc CP32(r0, MIDR) /* r0 := our cpu id */ - ldr r1, = __proc_info_start - add r1, r1, r10 /* r1 := paddr of table (start) */ - ldr r2, = __proc_info_end - add r2, r2, r10 /* r2 := paddr of table (end) */ -1: ldr r3, [r1, #PROCINFO_cpu_mask] - and r4, r0, r3 /* r4 := our cpu id with mask */ - ldr r3, [r1, #PROCINFO_cpu_val] /* r3 := cpu val in current proc info */ - teq r4, r3 - beq 2f /* Match => exit, or try next proc info */ - add r1, r1, #PROCINFO_sizeof - cmp r1, r2 - blo 1b + bl __lookup_processor_type + teq r1, #0 + bne 1f mov r4, r0 PRINT("- Missing processor info: ") mov r0, r4 bl putn PRINT(" -\r\n") b fail -2: +1: /* Jump to cpu_init */ ldr r1, [r1, #PROCINFO_cpu_init] /* r1 := vaddr(init func) */ @@ -545,6 +535,45 @@ putn: mov pc, lr #endif /* !EARLY_PRINTK */ +/* This provides a C-API version of __lookup_processor_type */ +GLOBAL(lookup_processor_type) + stmfd sp!, {r4, r10, lr} + mov r10, #0 /* r10 := offset between virt&phys */ + bl __lookup_processor_type + mov r0, r1 + ldmfd sp!, {r4, r10, pc} + +/* Read processor ID register (CP#15, CR0), and Look up in the linker-built + * supported processor list. Note that we can't use the absolute addresses for + * the __proc_info lists since we aren't running with the MMU on (and therefore, + * we are not in correct address space). We have to calculate the offset. + * + * r10: offset between virt&phys + * + * Returns: + * r0: CPUID + * r1: proc_info pointer + * Clobbers r2-r4 + */ +__lookup_processor_type: + mrc CP32(r0, MIDR) /* r0 := our cpu id */ + ldr r1, = __proc_info_start + add r1, r1, r10 /* r1 := paddr of table (start) */ + ldr r2, = __proc_info_end + add r2, r2, r10 /* r2 := paddr of table (end) */ +1: ldr r3, [r1, #PROCINFO_cpu_mask] + and r4, r0, r3 /* r4 := our cpu id with mask */ + ldr r3, [r1, #PROCINFO_cpu_val] /* r3 := cpu val in current proc info */ + teq r4, r3 + beq 2f /* Match => exit, or try next proc info */ + add r1, r1, #PROCINFO_sizeof + cmp r1, r2 + blo 1b + /* We failed to find the proc_info, return NULL */ + mov r1, #0 +2: + mov pc, lr + /* * Local variables: * mode: ASM -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:46:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:46:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5q-0006eV-3O; Sat, 15 Mar 2014 10:45:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5o-0006e8-3S for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:28 +0000 Received: from [85.158.139.211:63043] by server-14.bemta-5.messagelabs.com id 25/4B-15696-74F24235; Sat, 15 Mar 2014 10:45:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1394880325!975340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5268 invoked from network); 15 Mar 2014 10:45:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:45:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5l-00074e-3E for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm5l-0008CH-15 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:25 +0000 Date: Sat, 15 Mar 2014 10:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove processor specific setup in vcpu_initialise X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 633d01dc4e28567d5033d19336852939b0b70cf8 Author: Julien Grall AuthorDate: Wed Mar 5 12:46:25 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:23 2014 +0000 xen/arm: Remove processor specific setup in vcpu_initialise This patch introduces the possibility to have specific processor callbacks that can be called in various place. Currently VCPU initialisation code contains processor specific setup (for Cortex A7 and Cortex A15) for the ACTRL registers. It's possible to have processor with a different layout for this register. Move this setup in a specific callback for ARM v7 processor. Signed-off-by: Julien Grall Reviewed-by: Tim Deegan Acked-by: Ian Campbell Cc: marc.ceeeee@gmail.com --- xen/arch/arm/Makefile | 1 + xen/arch/arm/arm32/Makefile | 2 +- xen/arch/arm/arm32/proc-caxx.c | 35 ++++++++++++++++++++++++++++ xen/arch/arm/arm32/proc-v7.S | 3 ++ xen/arch/arm/domain.c | 8 +----- xen/arch/arm/processor.c | 49 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/setup.c | 3 ++ xen/include/asm-arm/procinfo.h | 17 ++++++++++++- 8 files changed, 109 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index d70f6d5..63e0460 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -32,6 +32,7 @@ obj-y += vuart.o obj-y += hvm.o obj-y += device.o obj-y += decode.o +obj-y += processor.o #obj-bin-y += ....o diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index 65ecff4..df0e7de 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -1,7 +1,7 @@ subdir-y += lib obj-y += entry.o -obj-y += proc-v7.o +obj-y += proc-v7.o proc-caxx.o obj-y += traps.o obj-y += domain.o diff --git a/xen/arch/arm/arm32/proc-caxx.c b/xen/arch/arm/arm32/proc-caxx.c new file mode 100644 index 0000000..9166a1d --- /dev/null +++ b/xen/arch/arm/arm32/proc-caxx.c @@ -0,0 +1,35 @@ +/* + * xen/arch/arm/arm32/proc-caxx.c + * + * arm V7 Cortex A15 and A7 initialisation + * + * Julien Grall + * Copyright (c) 2014 Linaro Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include +#include + +#define ACTLR_SMP (1 << 6) + +static void caxx_vcpu_initialise(struct vcpu *v) +{ + /* If the guest has more 1 VCPU, enable the SMP bit in ACTLR */ + if ( v->domain->max_vcpus > 1 ) + v->arch.actlr |= ACTLR_SMP; + else + v->arch.actlr &= ~ACTLR_SMP; +} + +const struct processor caxx_processor = { + .vcpu_initialise = caxx_vcpu_initialise, +}; diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S index 8fb42db..b0d5343 100644 --- a/xen/arch/arm/arm32/proc-v7.S +++ b/xen/arch/arm/arm32/proc-v7.S @@ -35,6 +35,7 @@ __v7_ca15mp_proc_info: .long 0x410FC0F0 /* Cortex-A15 */ .long 0xFF0FFFF0 /* Mask */ .long ca15mp_init + .long caxx_processor .size __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info .section ".init.proc.info", #alloc, #execinstr @@ -43,6 +44,7 @@ __v7_ca7mp_proc_info: .long 0x410FC070 /* Cortex-A7 */ .long 0xFF0FFFF0 /* Mask */ .long ca7mp_init + .long caxx_processor .size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info .section ".init.proc.info", #alloc, #execinstr @@ -51,6 +53,7 @@ __v7_brahma15mp_proc_info: .long 0x420F00F2 /* Broadcom Brahma-B15 */ .long 0xFF0FFFFF /* Mask */ .long brahma15mp_init + .long caxx_processor .size __v7_brahma15mp_proc_info, . - __v7_brahma15mp_proc_info /* diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 8f20fdf..82a1e79 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include @@ -480,11 +480,7 @@ int vcpu_initialise(struct vcpu *v) v->arch.actlr = READ_SYSREG32(ACTLR_EL1); - /* XXX: Handle other than CA15 cpus */ - if ( v->domain->max_vcpus > 1 ) - v->arch.actlr |= ACTLR_CA15_SMP; - else - v->arch.actlr &= ~ACTLR_CA15_SMP; + processor_vcpu_initialise(v); if ( (rc = vcpu_vgic_init(v)) != 0 ) return rc; diff --git a/xen/arch/arm/processor.c b/xen/arch/arm/processor.c new file mode 100644 index 0000000..8c425ce --- /dev/null +++ b/xen/arch/arm/processor.c @@ -0,0 +1,49 @@ +/* + * xen/arch/arm/processor.c + * + * Helpers to execute processor specific code. + * + * Julien Grall + * Copyright (C) 2014 Linaro Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include + +static const struct processor *processor = NULL; + +void __init processor_setup(void) +{ + const struct proc_info_list *procinfo; + + procinfo = lookup_processor_type(); + if ( !procinfo ) + return; + + processor = procinfo->processor; +} + +void processor_vcpu_initialise(struct vcpu *v) +{ + if ( !processor || !processor->vcpu_initialise ) + return; + + processor->vcpu_initialise(v); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 9480f42..4a3016a 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -43,6 +43,7 @@ #include #include #include +#include struct cpuinfo_arm __read_mostly boot_cpu_data; @@ -149,6 +150,8 @@ static void __init processor_id(void) { printk("32-bit Execution: Unsupported\n"); } + + processor_setup(); } static void dt_unreserved_regions(paddr_t s, paddr_t e, diff --git a/xen/include/asm-arm/procinfo.h b/xen/include/asm-arm/procinfo.h index 9d3feb7..26306b3 100644 --- a/xen/include/asm-arm/procinfo.h +++ b/xen/include/asm-arm/procinfo.h @@ -21,10 +21,23 @@ #ifndef __ASM_ARM_PROCINFO_H #define __ASM_ARM_PROCINFO_H +#include + +struct processor { + /* Initialize specific processor register for the new VPCU*/ + void (*vcpu_initialise)(struct vcpu *v); +}; + struct proc_info_list { - unsigned int cpu_val; - unsigned int cpu_mask; + unsigned int cpu_val; + unsigned int cpu_mask; void (*cpu_init)(void); + struct processor *processor; }; +const __init struct proc_info_list *lookup_processor_type(void); + +void __init processor_setup(void); +void processor_vcpu_initialise(struct vcpu *v); + #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:46:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:46:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5X-0006bU-Hg; Sat, 15 Mar 2014 10:45:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5V-0006b6-SB for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:10 +0000 Received: from [85.158.137.68:5303] by server-12.bemta-3.messagelabs.com id 64/C9-14831-53F24235; Sat, 15 Mar 2014 10:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1394880305!801976!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27170 invoked from network); 15 Mar 2014 10:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5Q-00074V-Jn for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm5Q-0008BU-Bn for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:04 +0000 Date: Sat, 15 Mar 2014 10:45:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm32: Introduce lookup_processor_type X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit db996100025b879ec7a10875671c06cbe76922f4 Author: Julien Grall AuthorDate: Wed Mar 5 12:46:23 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:23 2014 +0000 xen/arm32: Introduce lookup_processor_type Looking for a specific proc_info structure is already implemented in assembly. Implement lookup_processor_type to avoid duplicate code between C and assembly. This function searches the proc_info_list structure following the processor ID. If the search fail, it will return NULL, otherwise a pointer to this structure for the specific processor. Signed-off-by: Julien Grall Reviewed-by: Tim Deegan Acked-by: Ian Campbell --- xen/arch/arm/arm32/head.S | 57 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 43 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index e889596..72cda34 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -198,26 +198,16 @@ skip_bss: PRINT("- Setting up control registers -\r\n") /* Get processor specific proc info into r1 */ - mrc CP32(r0, MIDR) /* r0 := our cpu id */ - ldr r1, = __proc_info_start - add r1, r1, r10 /* r1 := paddr of table (start) */ - ldr r2, = __proc_info_end - add r2, r2, r10 /* r2 := paddr of table (end) */ -1: ldr r3, [r1, #PROCINFO_cpu_mask] - and r4, r0, r3 /* r4 := our cpu id with mask */ - ldr r3, [r1, #PROCINFO_cpu_val] /* r3 := cpu val in current proc info */ - teq r4, r3 - beq 2f /* Match => exit, or try next proc info */ - add r1, r1, #PROCINFO_sizeof - cmp r1, r2 - blo 1b + bl __lookup_processor_type + teq r1, #0 + bne 1f mov r4, r0 PRINT("- Missing processor info: ") mov r0, r4 bl putn PRINT(" -\r\n") b fail -2: +1: /* Jump to cpu_init */ ldr r1, [r1, #PROCINFO_cpu_init] /* r1 := vaddr(init func) */ @@ -545,6 +535,45 @@ putn: mov pc, lr #endif /* !EARLY_PRINTK */ +/* This provides a C-API version of __lookup_processor_type */ +GLOBAL(lookup_processor_type) + stmfd sp!, {r4, r10, lr} + mov r10, #0 /* r10 := offset between virt&phys */ + bl __lookup_processor_type + mov r0, r1 + ldmfd sp!, {r4, r10, pc} + +/* Read processor ID register (CP#15, CR0), and Look up in the linker-built + * supported processor list. Note that we can't use the absolute addresses for + * the __proc_info lists since we aren't running with the MMU on (and therefore, + * we are not in correct address space). We have to calculate the offset. + * + * r10: offset between virt&phys + * + * Returns: + * r0: CPUID + * r1: proc_info pointer + * Clobbers r2-r4 + */ +__lookup_processor_type: + mrc CP32(r0, MIDR) /* r0 := our cpu id */ + ldr r1, = __proc_info_start + add r1, r1, r10 /* r1 := paddr of table (start) */ + ldr r2, = __proc_info_end + add r2, r2, r10 /* r2 := paddr of table (end) */ +1: ldr r3, [r1, #PROCINFO_cpu_mask] + and r4, r0, r3 /* r4 := our cpu id with mask */ + ldr r3, [r1, #PROCINFO_cpu_val] /* r3 := cpu val in current proc info */ + teq r4, r3 + beq 2f /* Match => exit, or try next proc info */ + add r1, r1, #PROCINFO_sizeof + cmp r1, r2 + blo 1b + /* We failed to find the proc_info, return NULL */ + mov r1, #0 +2: + mov pc, lr + /* * Local variables: * mode: ASM -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 10:46:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 10:46:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5e-0006cd-KU; Sat, 15 Mar 2014 10:45:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5d-0006cP-El for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:17 +0000 Received: from [193.109.254.147:58489] by server-15.bemta-14.messagelabs.com id B3/E0-10839-C3F24235; Sat, 15 Mar 2014 10:45:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1394880315!1864996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27012 invoked from network); 15 Mar 2014 10:45:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 10:45:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOm5a-00074b-Ta for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOm5a-0008Bv-MV for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 10:45:14 +0000 Date: Sat, 15 Mar 2014 10:45:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm64: Implement lookup_processor_type as a dummy function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ce1b3a3eabc034a51a2517b557a70fe48a9e994d Author: Julien Grall AuthorDate: Wed Mar 5 12:46:24 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 14 14:56:23 2014 +0000 xen/arm64: Implement lookup_processor_type as a dummy function ARM64 implementation doesn't yet have specific code per processor. This function will be used in a later patch. Signed-off-by: Julien Grall Reviewed-by: Tim Deegan Acked-by: Ian campbell --- xen/arch/arm/arm64/head.S | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 6f80db2..d151724 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -546,6 +546,13 @@ putn: ret #endif /* EARLY_PRINTK */ +/* This provides a C-API version of __lookup_processor_type + * TODO: For now, the implementation return NULL every time + */ +GLOBAL(lookup_processor_type) + mov x0, #0 + ret + /* * Local variables: * mode: ASM -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:44:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:44:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwd-0005xJ-GY; Sat, 15 Mar 2014 12:44:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwc-0005xE-Sk for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:07 +0000 Received: from [85.158.137.68:24666] by server-12.bemta-3.messagelabs.com id F8/AB-14831-61B44235; Sat, 15 Mar 2014 12:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1394887444!819224!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19962 invoked from network); 15 Mar 2014 12:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwZ-00088m-VG for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnwZ-00033u-LI for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:03 +0000 Date: Sat, 15 Mar 2014 12:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/libxc: Correct read_exact() error messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50082c5090081f1b15fa554baab25a0063821254 Author: Andrew Cooper AuthorDate: Tue Jan 7 10:04:23 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 14 14:23:26 2014 +0000 tools/libxc: Correct read_exact() error messages The errors have been incorrectly identifying their function since c/s 861aef6e1558bebad8fc60c1c723f0706fd3ed87 which did a lot of error handling cleanup. Use __func__ to ensure the name remains correct in the future. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell CC: Ian Jackson (cherry picked from commit 1671cdeac7da663fb2963f3e587fa279dcd0238b) --- tools/libxc/xc_domain_restore.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 297546c..00e015d 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -87,7 +87,7 @@ static ssize_t rdexact(xc_interface *xch, struct restore_ctx *ctx, if ( len == -1 && errno == EINTR ) continue; if ( !FD_ISSET(fd, &rfds) ) { - ERROR("read_exact_timed failed (select returned %zd)", len); + ERROR("%s failed (select returned %zd)", __func__, len); errno = ETIMEDOUT; return -1; } @@ -101,7 +101,7 @@ static ssize_t rdexact(xc_interface *xch, struct restore_ctx *ctx, errno = 0; } if ( len <= 0 ) { - ERROR("read_exact_timed failed (read rc: %d, errno: %d)", len, errno); + ERROR("%s failed (read rc: %d, errno: %d)", __func__, len, errno); return -1; } offset += len; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:44:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:44:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwd-0005xJ-GY; Sat, 15 Mar 2014 12:44:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwc-0005xE-Sk for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:07 +0000 Received: from [85.158.137.68:24666] by server-12.bemta-3.messagelabs.com id F8/AB-14831-61B44235; Sat, 15 Mar 2014 12:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1394887444!819224!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19962 invoked from network); 15 Mar 2014 12:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwZ-00088m-VG for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnwZ-00033u-LI for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:03 +0000 Date: Sat, 15 Mar 2014 12:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/libxc: Correct read_exact() error messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50082c5090081f1b15fa554baab25a0063821254 Author: Andrew Cooper AuthorDate: Tue Jan 7 10:04:23 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 14 14:23:26 2014 +0000 tools/libxc: Correct read_exact() error messages The errors have been incorrectly identifying their function since c/s 861aef6e1558bebad8fc60c1c723f0706fd3ed87 which did a lot of error handling cleanup. Use __func__ to ensure the name remains correct in the future. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell CC: Ian Jackson (cherry picked from commit 1671cdeac7da663fb2963f3e587fa279dcd0238b) --- tools/libxc/xc_domain_restore.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 297546c..00e015d 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -87,7 +87,7 @@ static ssize_t rdexact(xc_interface *xch, struct restore_ctx *ctx, if ( len == -1 && errno == EINTR ) continue; if ( !FD_ISSET(fd, &rfds) ) { - ERROR("read_exact_timed failed (select returned %zd)", len); + ERROR("%s failed (select returned %zd)", __func__, len); errno = ETIMEDOUT; return -1; } @@ -101,7 +101,7 @@ static ssize_t rdexact(xc_interface *xch, struct restore_ctx *ctx, errno = 0; } if ( len <= 0 ) { - ERROR("read_exact_timed failed (read rc: %d, errno: %d)", len, errno); + ERROR("%s failed (read rc: %d, errno: %d)", __func__, len, errno); return -1; } offset += len; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:44:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwo-0005xw-Vq; Sat, 15 Mar 2014 12:44:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwn-0005xd-DX for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:17 +0000 Received: from [85.158.137.68:6331] by server-16.bemta-3.messagelabs.com id 4E/05-13481-02B44235; Sat, 15 Mar 2014 12:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1394887454!812533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17815 invoked from network); 15 Mar 2014 12:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwk-00088p-6X for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnwk-00034R-1y for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:14 +0000 Date: Sat, 15 Mar 2014 12:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Auto-assign NIC devids in initiate_domain_create X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 449062ac3636b37db615fd5f4f7e109e746f7b8b Author: Stefan Bader AuthorDate: Wed Jan 8 18:26:59 2014 +0100 Commit: Ian Jackson CommitDate: Fri Mar 14 14:23:48 2014 +0000 libxl: Auto-assign NIC devids in initiate_domain_create This will change initiate_domain_create to walk through NIC definitions and automatically assign devids to those which have not assigned one. The devids are needed later in domcreate_launch_dm (for HVM domains using emulated NICs). The command string for starting the device-model has those ids as part of its arguments. Assignment of devids in the hotplug case is handled by libxl_device_nic_add but that would be called too late in the startup case. I also moved the call to libxl__device_nic_setdefault here as this seems to be the only path leading there and avoids doing the loop a third time. The two loops are trying to handle a case where the caller sets some devids (not sure that should be valid) but leaves some unset. Signed-off-by: Stefan Bader Acked-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 2d03be65d5c50053fec4a5fa1d691972e5d953c9) --- tools/libxl/libxl_create.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 0c32d0b..d1e2ebc 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -628,6 +628,7 @@ static void initiate_domain_create(libxl__egc *egc, libxl_ctx *ctx = libxl__gc_owner(gc); uint32_t domid; int i, ret; + size_t last_devid = -1; /* convenience aliases */ libxl_domain_config *const d_config = dcs->guest_config; @@ -668,6 +669,29 @@ static void initiate_domain_create(libxl__egc *egc, libxl_device_disk *bootdisk = d_config->num_disks > 0 ? &d_config->disks[0] : NULL; + /* + * The devid has to be set before launching the device model. For the + * hotplug case this is done in libxl_device_nic_add but on domain + * creation this is called too late. + * Make two runs over configured NICs in order to avoid duplicate IDs + * in case the caller partially assigned IDs. + */ + for (i = 0; i < d_config->num_nics; i++) { + /* We have to init the nic here, because we still haven't + * called libxl_device_nic_add when domcreate_launch_dm gets called, + * but qemu needs the nic information to be complete. + */ + ret = libxl__device_nic_setdefault(gc, &d_config->nics[i], domid); + if (ret) goto error_out; + + if (d_config->nics[i].devid > last_devid) + last_devid = d_config->nics[i].devid; + } + for (i = 0; i < d_config->num_nics; i++) { + if (d_config->nics[i].devid < 0) + d_config->nics[i].devid = ++last_devid; + } + if (restore_fd >= 0) { LOG(DEBUG, "restoring, not running bootloader\n"); domcreate_bootloader_done(egc, &dcs->bl, 0); @@ -980,17 +1004,6 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, } } - - - for (i = 0; i < d_config->num_nics; i++) { - /* We have to init the nic here, because we still haven't - * called libxl_device_nic_add at this point, but qemu needs - * the nic information to be complete. - */ - ret = libxl__device_nic_setdefault(gc, &d_config->nics[i], domid); - if (ret) - goto error_out; - } switch (d_config->c_info.type) { case LIBXL_DOMAIN_TYPE_HVM: { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:44:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwo-0005xw-Vq; Sat, 15 Mar 2014 12:44:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwn-0005xd-DX for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:17 +0000 Received: from [85.158.137.68:6331] by server-16.bemta-3.messagelabs.com id 4E/05-13481-02B44235; Sat, 15 Mar 2014 12:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1394887454!812533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17815 invoked from network); 15 Mar 2014 12:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwk-00088p-6X for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnwk-00034R-1y for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:14 +0000 Date: Sat, 15 Mar 2014 12:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Auto-assign NIC devids in initiate_domain_create X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 449062ac3636b37db615fd5f4f7e109e746f7b8b Author: Stefan Bader AuthorDate: Wed Jan 8 18:26:59 2014 +0100 Commit: Ian Jackson CommitDate: Fri Mar 14 14:23:48 2014 +0000 libxl: Auto-assign NIC devids in initiate_domain_create This will change initiate_domain_create to walk through NIC definitions and automatically assign devids to those which have not assigned one. The devids are needed later in domcreate_launch_dm (for HVM domains using emulated NICs). The command string for starting the device-model has those ids as part of its arguments. Assignment of devids in the hotplug case is handled by libxl_device_nic_add but that would be called too late in the startup case. I also moved the call to libxl__device_nic_setdefault here as this seems to be the only path leading there and avoids doing the loop a third time. The two loops are trying to handle a case where the caller sets some devids (not sure that should be valid) but leaves some unset. Signed-off-by: Stefan Bader Acked-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 2d03be65d5c50053fec4a5fa1d691972e5d953c9) --- tools/libxl/libxl_create.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 0c32d0b..d1e2ebc 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -628,6 +628,7 @@ static void initiate_domain_create(libxl__egc *egc, libxl_ctx *ctx = libxl__gc_owner(gc); uint32_t domid; int i, ret; + size_t last_devid = -1; /* convenience aliases */ libxl_domain_config *const d_config = dcs->guest_config; @@ -668,6 +669,29 @@ static void initiate_domain_create(libxl__egc *egc, libxl_device_disk *bootdisk = d_config->num_disks > 0 ? &d_config->disks[0] : NULL; + /* + * The devid has to be set before launching the device model. For the + * hotplug case this is done in libxl_device_nic_add but on domain + * creation this is called too late. + * Make two runs over configured NICs in order to avoid duplicate IDs + * in case the caller partially assigned IDs. + */ + for (i = 0; i < d_config->num_nics; i++) { + /* We have to init the nic here, because we still haven't + * called libxl_device_nic_add when domcreate_launch_dm gets called, + * but qemu needs the nic information to be complete. + */ + ret = libxl__device_nic_setdefault(gc, &d_config->nics[i], domid); + if (ret) goto error_out; + + if (d_config->nics[i].devid > last_devid) + last_devid = d_config->nics[i].devid; + } + for (i = 0; i < d_config->num_nics; i++) { + if (d_config->nics[i].devid < 0) + d_config->nics[i].devid = ++last_devid; + } + if (restore_fd >= 0) { LOG(DEBUG, "restoring, not running bootloader\n"); domcreate_bootloader_done(egc, &dcs->bl, 0); @@ -980,17 +1004,6 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, } } - - - for (i = 0; i < d_config->num_nics; i++) { - /* We have to init the nic here, because we still haven't - * called libxl_device_nic_add at this point, but qemu needs - * the nic information to be complete. - */ - ret = libxl__device_nic_setdefault(gc, &d_config->nics[i], domid); - if (ret) - goto error_out; - } switch (d_config->c_info.type) { case LIBXL_DOMAIN_TYPE_HVM: { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwy-0005z1-3H; Sat, 15 Mar 2014 12:44:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnww-0005yq-Tm for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:27 +0000 Received: from [85.158.139.211:16386] by server-11.bemta-5.messagelabs.com id 7E/47-30804-A2B44235; Sat, 15 Mar 2014 12:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1394887464!1227535!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 877 invoked from network); 15 Mar 2014 12:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwu-00088s-AF for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnwu-00034w-9D for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:24 +0000 Date: Sat, 15 Mar 2014 12:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.3-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a963a5cc83c3a0a6b29758c0a7a9a7214f987dfb Author: Jan Beulich AuthorDate: Fri Mar 14 17:31:45 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:31:45 2014 +0100 update Xen version to 4.3.3-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 292f86c..f7b8ca0 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 3 -export XEN_EXTRAVERSION ?= .2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwy-0005z1-3H; Sat, 15 Mar 2014 12:44:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnww-0005yq-Tm for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:27 +0000 Received: from [85.158.139.211:16386] by server-11.bemta-5.messagelabs.com id 7E/47-30804-A2B44235; Sat, 15 Mar 2014 12:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1394887464!1227535!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 877 invoked from network); 15 Mar 2014 12:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnwu-00088s-AF for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnwu-00034w-9D for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:24 +0000 Date: Sat, 15 Mar 2014 12:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.3-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a963a5cc83c3a0a6b29758c0a7a9a7214f987dfb Author: Jan Beulich AuthorDate: Fri Mar 14 17:31:45 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:31:45 2014 +0100 update Xen version to 4.3.3-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 292f86c..f7b8ca0 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 3 -export XEN_EXTRAVERSION ?= .2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:44:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnx9-000610-5u; Sat, 15 Mar 2014 12:44:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnx7-00060X-Bf for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:37 +0000 Received: from [85.158.143.35:36563] by server-1.bemta-4.messagelabs.com id DC/F9-09853-43B44235; Sat, 15 Mar 2014 12:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1394887474!2292598!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8330 invoked from network); 15 Mar 2014 12:44:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnx4-000891-EV for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnx4-00035M-Cr for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:34 +0000 Date: Sat, 15 Mar 2014 12:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/MCE: Fix race condition in mctelem_reserve X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 20951c7d363a73bf9d7f8eaceccbbb6ebf32522f Author: Frediano Ziglio AuthorDate: Fri Mar 14 17:33:37 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:33:37 2014 +0100 x86/MCE: Fix race condition in mctelem_reserve These lines (in mctelem_reserve) newhead = oldhead->mcte_next; if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { are racy. After you read the newhead pointer it can happen that another flow (thread or recursive invocation) change all the list but set head with same value. So oldhead is the same as *freelp but you are setting a new head that could point to whatever element (even already used). This patch use instead a bit array and atomic bit operations. Signed-off-by: Frediano Ziglio Reviewed-by: Liu Jinsong master commit: 60ea3a3ac3d2bcd8e85b250fdbfc46b3b9dc7085 master date: 2014-02-24 12:07:41 +0100 --- xen/arch/x86/cpu/mcheck/mctelem.c | 81 ++++++++++++++----------------------- 1 files changed, 30 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index 895ce1a..ed8e8d2 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -37,24 +37,19 @@ struct mctelem_ent { void *mcte_data; /* corresponding data payload */ }; -#define MCTE_F_HOME_URGENT 0x0001U /* free to urgent freelist */ -#define MCTE_F_HOME_NONURGENT 0x0002U /* free to nonurgent freelist */ -#define MCTE_F_CLASS_URGENT 0x0004U /* in use - urgent errors */ -#define MCTE_F_CLASS_NONURGENT 0x0008U /* in use - nonurgent errors */ +#define MCTE_F_CLASS_URGENT 0x0001U /* in use - urgent errors */ +#define MCTE_F_CLASS_NONURGENT 0x0002U /* in use - nonurgent errors */ #define MCTE_F_STATE_FREE 0x0010U /* on a freelist */ #define MCTE_F_STATE_UNCOMMITTED 0x0020U /* reserved; on no list */ #define MCTE_F_STATE_COMMITTED 0x0040U /* on a committed list */ #define MCTE_F_STATE_PROCESSING 0x0080U /* on a processing list */ -#define MCTE_F_MASK_HOME (MCTE_F_HOME_URGENT | MCTE_F_HOME_NONURGENT) #define MCTE_F_MASK_CLASS (MCTE_F_CLASS_URGENT | MCTE_F_CLASS_NONURGENT) #define MCTE_F_MASK_STATE (MCTE_F_STATE_FREE | \ MCTE_F_STATE_UNCOMMITTED | \ MCTE_F_STATE_COMMITTED | \ MCTE_F_STATE_PROCESSING) -#define MCTE_HOME(tep) ((tep)->mcte_flags & MCTE_F_MASK_HOME) - #define MCTE_CLASS(tep) ((tep)->mcte_flags & MCTE_F_MASK_CLASS) #define MCTE_SET_CLASS(tep, new) do { \ (tep)->mcte_flags &= ~MCTE_F_MASK_CLASS; \ @@ -69,6 +64,8 @@ struct mctelem_ent { #define MC_URGENT_NENT 10 #define MC_NONURGENT_NENT 20 +#define MC_NENT (MC_URGENT_NENT + MC_NONURGENT_NENT) + #define MC_NCLASSES (MC_NONURGENT + 1) #define COOKIE2MCTE(c) ((struct mctelem_ent *)(c)) @@ -77,11 +74,9 @@ struct mctelem_ent { static struct mc_telem_ctl { /* Linked lists that thread the array members together. * - * The free lists are singly-linked via mcte_next, and we allocate - * from them by atomically unlinking an element from the head. - * Consumed entries are returned to the head of the free list. - * When an entry is reserved off the free list it is not linked - * on any list until it is committed or dismissed. + * The free lists is a bit array where bit 1 means free. + * This as element number is quite small and is easy to + * atomically allocate that way. * * The committed list grows at the head and we do not maintain a * tail pointer; insertions are performed atomically. The head @@ -101,7 +96,7 @@ static struct mc_telem_ctl { * we can lock it for updates. The head of the processing list * always has the oldest telemetry, and we append (as above) * at the tail of the processing list. */ - struct mctelem_ent *mctc_free[MC_NCLASSES]; + DECLARE_BITMAP(mctc_free, MC_NENT); struct mctelem_ent *mctc_committed[MC_NCLASSES]; struct mctelem_ent *mctc_processing_head[MC_NCLASSES]; struct mctelem_ent *mctc_processing_tail[MC_NCLASSES]; @@ -207,14 +202,14 @@ int mctelem_has_deferred(unsigned int cpu) */ static void mctelem_free(struct mctelem_ent *tep) { - mctelem_class_t target = MCTE_HOME(tep) == MCTE_F_HOME_URGENT ? - MC_URGENT : MC_NONURGENT; - BUG_ON(tep->mcte_refcnt != 0); BUG_ON(MCTE_STATE(tep) != MCTE_F_STATE_FREE); tep->mcte_prev = NULL; - mctelem_xchg_head(&mctctl.mctc_free[target], &tep->mcte_next, tep); + tep->mcte_next = NULL; + + /* set free in array */ + set_bit(tep - mctctl.mctc_elems, mctctl.mctc_free); } /* Increment the reference count of an entry that is not linked on to @@ -274,34 +269,25 @@ void mctelem_init(int reqdatasz) } if ((mctctl.mctc_elems = xmalloc_array(struct mctelem_ent, - MC_URGENT_NENT + MC_NONURGENT_NENT)) == NULL || - (datarr = xmalloc_bytes((MC_URGENT_NENT + MC_NONURGENT_NENT) * - datasz)) == NULL) { + MC_NENT)) == NULL || + (datarr = xmalloc_bytes(MC_NENT * datasz)) == NULL) { if (mctctl.mctc_elems) xfree(mctctl.mctc_elems); printk("Allocations for MCA telemetry failed\n"); return; } - for (i = 0; i < MC_URGENT_NENT + MC_NONURGENT_NENT; i++) { - struct mctelem_ent *tep, **tepp; + for (i = 0; i < MC_NENT; i++) { + struct mctelem_ent *tep; tep = mctctl.mctc_elems + i; tep->mcte_flags = MCTE_F_STATE_FREE; tep->mcte_refcnt = 0; tep->mcte_data = datarr + i * datasz; - if (i < MC_URGENT_NENT) { - tepp = &mctctl.mctc_free[MC_URGENT]; - tep->mcte_flags |= MCTE_F_HOME_URGENT; - } else { - tepp = &mctctl.mctc_free[MC_NONURGENT]; - tep->mcte_flags |= MCTE_F_HOME_NONURGENT; - } - - tep->mcte_next = *tepp; + __set_bit(i, mctctl.mctc_free); + tep->mcte_next = NULL; tep->mcte_prev = NULL; - *tepp = tep; } } @@ -310,32 +296,25 @@ static int mctelem_drop_count; /* Reserve a telemetry entry, or return NULL if none available. * If we return an entry then the caller must subsequently call exactly one of - * mctelem_unreserve or mctelem_commit for that entry. + * mctelem_dismiss or mctelem_commit for that entry. */ mctelem_cookie_t mctelem_reserve(mctelem_class_t which) { - struct mctelem_ent **freelp; - struct mctelem_ent *oldhead, *newhead; - mctelem_class_t target = (which == MC_URGENT) ? - MC_URGENT : MC_NONURGENT; + unsigned bit; + unsigned start_bit = (which == MC_URGENT) ? 0 : MC_URGENT_NENT; - freelp = &mctctl.mctc_free[target]; for (;;) { - if ((oldhead = *freelp) == NULL) { - if (which == MC_URGENT && target == MC_URGENT) { - /* raid the non-urgent freelist */ - target = MC_NONURGENT; - freelp = &mctctl.mctc_free[target]; - continue; - } else { - mctelem_drop_count++; - return (NULL); - } + bit = find_next_bit(mctctl.mctc_free, MC_NENT, start_bit); + + if (bit >= MC_NENT) { + mctelem_drop_count++; + return (NULL); } - newhead = oldhead->mcte_next; - if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { - struct mctelem_ent *tep = oldhead; + /* try to allocate, atomically clear free bit */ + if (test_and_clear_bit(bit, mctctl.mctc_free)) { + /* return element we got */ + struct mctelem_ent *tep = mctctl.mctc_elems + bit; mctelem_hold(tep); MCTE_TRANSITION_STATE(tep, FREE, UNCOMMITTED); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:44:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnx9-000610-5u; Sat, 15 Mar 2014 12:44:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnx7-00060X-Bf for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:37 +0000 Received: from [85.158.143.35:36563] by server-1.bemta-4.messagelabs.com id DC/F9-09853-43B44235; Sat, 15 Mar 2014 12:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1394887474!2292598!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8330 invoked from network); 15 Mar 2014 12:44:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnx4-000891-EV for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnx4-00035M-Cr for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:34 +0000 Date: Sat, 15 Mar 2014 12:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/MCE: Fix race condition in mctelem_reserve X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 20951c7d363a73bf9d7f8eaceccbbb6ebf32522f Author: Frediano Ziglio AuthorDate: Fri Mar 14 17:33:37 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:33:37 2014 +0100 x86/MCE: Fix race condition in mctelem_reserve These lines (in mctelem_reserve) newhead = oldhead->mcte_next; if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { are racy. After you read the newhead pointer it can happen that another flow (thread or recursive invocation) change all the list but set head with same value. So oldhead is the same as *freelp but you are setting a new head that could point to whatever element (even already used). This patch use instead a bit array and atomic bit operations. Signed-off-by: Frediano Ziglio Reviewed-by: Liu Jinsong master commit: 60ea3a3ac3d2bcd8e85b250fdbfc46b3b9dc7085 master date: 2014-02-24 12:07:41 +0100 --- xen/arch/x86/cpu/mcheck/mctelem.c | 81 ++++++++++++++----------------------- 1 files changed, 30 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index 895ce1a..ed8e8d2 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -37,24 +37,19 @@ struct mctelem_ent { void *mcte_data; /* corresponding data payload */ }; -#define MCTE_F_HOME_URGENT 0x0001U /* free to urgent freelist */ -#define MCTE_F_HOME_NONURGENT 0x0002U /* free to nonurgent freelist */ -#define MCTE_F_CLASS_URGENT 0x0004U /* in use - urgent errors */ -#define MCTE_F_CLASS_NONURGENT 0x0008U /* in use - nonurgent errors */ +#define MCTE_F_CLASS_URGENT 0x0001U /* in use - urgent errors */ +#define MCTE_F_CLASS_NONURGENT 0x0002U /* in use - nonurgent errors */ #define MCTE_F_STATE_FREE 0x0010U /* on a freelist */ #define MCTE_F_STATE_UNCOMMITTED 0x0020U /* reserved; on no list */ #define MCTE_F_STATE_COMMITTED 0x0040U /* on a committed list */ #define MCTE_F_STATE_PROCESSING 0x0080U /* on a processing list */ -#define MCTE_F_MASK_HOME (MCTE_F_HOME_URGENT | MCTE_F_HOME_NONURGENT) #define MCTE_F_MASK_CLASS (MCTE_F_CLASS_URGENT | MCTE_F_CLASS_NONURGENT) #define MCTE_F_MASK_STATE (MCTE_F_STATE_FREE | \ MCTE_F_STATE_UNCOMMITTED | \ MCTE_F_STATE_COMMITTED | \ MCTE_F_STATE_PROCESSING) -#define MCTE_HOME(tep) ((tep)->mcte_flags & MCTE_F_MASK_HOME) - #define MCTE_CLASS(tep) ((tep)->mcte_flags & MCTE_F_MASK_CLASS) #define MCTE_SET_CLASS(tep, new) do { \ (tep)->mcte_flags &= ~MCTE_F_MASK_CLASS; \ @@ -69,6 +64,8 @@ struct mctelem_ent { #define MC_URGENT_NENT 10 #define MC_NONURGENT_NENT 20 +#define MC_NENT (MC_URGENT_NENT + MC_NONURGENT_NENT) + #define MC_NCLASSES (MC_NONURGENT + 1) #define COOKIE2MCTE(c) ((struct mctelem_ent *)(c)) @@ -77,11 +74,9 @@ struct mctelem_ent { static struct mc_telem_ctl { /* Linked lists that thread the array members together. * - * The free lists are singly-linked via mcte_next, and we allocate - * from them by atomically unlinking an element from the head. - * Consumed entries are returned to the head of the free list. - * When an entry is reserved off the free list it is not linked - * on any list until it is committed or dismissed. + * The free lists is a bit array where bit 1 means free. + * This as element number is quite small and is easy to + * atomically allocate that way. * * The committed list grows at the head and we do not maintain a * tail pointer; insertions are performed atomically. The head @@ -101,7 +96,7 @@ static struct mc_telem_ctl { * we can lock it for updates. The head of the processing list * always has the oldest telemetry, and we append (as above) * at the tail of the processing list. */ - struct mctelem_ent *mctc_free[MC_NCLASSES]; + DECLARE_BITMAP(mctc_free, MC_NENT); struct mctelem_ent *mctc_committed[MC_NCLASSES]; struct mctelem_ent *mctc_processing_head[MC_NCLASSES]; struct mctelem_ent *mctc_processing_tail[MC_NCLASSES]; @@ -207,14 +202,14 @@ int mctelem_has_deferred(unsigned int cpu) */ static void mctelem_free(struct mctelem_ent *tep) { - mctelem_class_t target = MCTE_HOME(tep) == MCTE_F_HOME_URGENT ? - MC_URGENT : MC_NONURGENT; - BUG_ON(tep->mcte_refcnt != 0); BUG_ON(MCTE_STATE(tep) != MCTE_F_STATE_FREE); tep->mcte_prev = NULL; - mctelem_xchg_head(&mctctl.mctc_free[target], &tep->mcte_next, tep); + tep->mcte_next = NULL; + + /* set free in array */ + set_bit(tep - mctctl.mctc_elems, mctctl.mctc_free); } /* Increment the reference count of an entry that is not linked on to @@ -274,34 +269,25 @@ void mctelem_init(int reqdatasz) } if ((mctctl.mctc_elems = xmalloc_array(struct mctelem_ent, - MC_URGENT_NENT + MC_NONURGENT_NENT)) == NULL || - (datarr = xmalloc_bytes((MC_URGENT_NENT + MC_NONURGENT_NENT) * - datasz)) == NULL) { + MC_NENT)) == NULL || + (datarr = xmalloc_bytes(MC_NENT * datasz)) == NULL) { if (mctctl.mctc_elems) xfree(mctctl.mctc_elems); printk("Allocations for MCA telemetry failed\n"); return; } - for (i = 0; i < MC_URGENT_NENT + MC_NONURGENT_NENT; i++) { - struct mctelem_ent *tep, **tepp; + for (i = 0; i < MC_NENT; i++) { + struct mctelem_ent *tep; tep = mctctl.mctc_elems + i; tep->mcte_flags = MCTE_F_STATE_FREE; tep->mcte_refcnt = 0; tep->mcte_data = datarr + i * datasz; - if (i < MC_URGENT_NENT) { - tepp = &mctctl.mctc_free[MC_URGENT]; - tep->mcte_flags |= MCTE_F_HOME_URGENT; - } else { - tepp = &mctctl.mctc_free[MC_NONURGENT]; - tep->mcte_flags |= MCTE_F_HOME_NONURGENT; - } - - tep->mcte_next = *tepp; + __set_bit(i, mctctl.mctc_free); + tep->mcte_next = NULL; tep->mcte_prev = NULL; - *tepp = tep; } } @@ -310,32 +296,25 @@ static int mctelem_drop_count; /* Reserve a telemetry entry, or return NULL if none available. * If we return an entry then the caller must subsequently call exactly one of - * mctelem_unreserve or mctelem_commit for that entry. + * mctelem_dismiss or mctelem_commit for that entry. */ mctelem_cookie_t mctelem_reserve(mctelem_class_t which) { - struct mctelem_ent **freelp; - struct mctelem_ent *oldhead, *newhead; - mctelem_class_t target = (which == MC_URGENT) ? - MC_URGENT : MC_NONURGENT; + unsigned bit; + unsigned start_bit = (which == MC_URGENT) ? 0 : MC_URGENT_NENT; - freelp = &mctctl.mctc_free[target]; for (;;) { - if ((oldhead = *freelp) == NULL) { - if (which == MC_URGENT && target == MC_URGENT) { - /* raid the non-urgent freelist */ - target = MC_NONURGENT; - freelp = &mctctl.mctc_free[target]; - continue; - } else { - mctelem_drop_count++; - return (NULL); - } + bit = find_next_bit(mctctl.mctc_free, MC_NENT, start_bit); + + if (bit >= MC_NENT) { + mctelem_drop_count++; + return (NULL); } - newhead = oldhead->mcte_next; - if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { - struct mctelem_ent *tep = oldhead; + /* try to allocate, atomically clear free bit */ + if (test_and_clear_bit(bit, mctctl.mctc_free)) { + /* return element we got */ + struct mctelem_ent *tep = mctctl.mctc_elems + bit; mctelem_hold(tep); MCTE_TRANSITION_STATE(tep, FREE, UNCOMMITTED); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:44:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxJ-00062x-8t; Sat, 15 Mar 2014 12:44:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxH-00062U-A2 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:47 +0000 Received: from [85.158.143.35:2284] by server-3.bemta-4.messagelabs.com id 9A/78-13602-E3B44235; Sat, 15 Mar 2014 12:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1394887485!2290860!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11501 invoked from network); 15 Mar 2014 12:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxE-00089A-Ro for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnxE-00036b-HF for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:44 +0000 Date: Sat, 15 Mar 2014 12:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Nested VMX: update nested paging mode on vmexit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0656fa71bb42956cf43587fa39bbfb9eb4f3478 Author: Yang Zhang AuthorDate: Fri Mar 14 17:35:31 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:35:31 2014 +0100 Nested VMX: update nested paging mode on vmexit Since SVM and VMX use different mechanism to emulate the virtual-vmentry and virtual-vmexit, it's hard to update the nested paging mode correctly in common code. So we need to update the nested paging mode in their respective code path. SVM already updates the nested paging mode on vmexit. This patch adds the same logic in VMX side. Previous discussion is here: http://lists.xen.org/archives/html/xen-devel/2013-12/msg01759.html Signed-off-by: Yang Zhang Reviewed-by: Christoph Egger master commit: fd1864f48d8914fb8eeb6841cd08c2c09b368909 master date: 2014-02-24 12:09:52 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 9346a54..fa211d1 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2489,6 +2489,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vcpu_nestedhvm(v).nv_vmswitch_in_progress = 0; if ( nestedhvm_vcpu_in_guestmode(v) ) { + paging_update_nestedmode(v); if ( nvmx_n2_vmexit_handler(regs, exit_reason) ) goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:44:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxJ-00062x-8t; Sat, 15 Mar 2014 12:44:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxH-00062U-A2 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:47 +0000 Received: from [85.158.143.35:2284] by server-3.bemta-4.messagelabs.com id 9A/78-13602-E3B44235; Sat, 15 Mar 2014 12:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1394887485!2290860!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11501 invoked from network); 15 Mar 2014 12:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxE-00089A-Ro for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnxE-00036b-HF for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:44 +0000 Date: Sat, 15 Mar 2014 12:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Nested VMX: update nested paging mode on vmexit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0656fa71bb42956cf43587fa39bbfb9eb4f3478 Author: Yang Zhang AuthorDate: Fri Mar 14 17:35:31 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:35:31 2014 +0100 Nested VMX: update nested paging mode on vmexit Since SVM and VMX use different mechanism to emulate the virtual-vmentry and virtual-vmexit, it's hard to update the nested paging mode correctly in common code. So we need to update the nested paging mode in their respective code path. SVM already updates the nested paging mode on vmexit. This patch adds the same logic in VMX side. Previous discussion is here: http://lists.xen.org/archives/html/xen-devel/2013-12/msg01759.html Signed-off-by: Yang Zhang Reviewed-by: Christoph Egger master commit: fd1864f48d8914fb8eeb6841cd08c2c09b368909 master date: 2014-02-24 12:09:52 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 9346a54..fa211d1 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2489,6 +2489,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vcpu_nestedhvm(v).nv_vmswitch_in_progress = 0; if ( nestedhvm_vcpu_in_guestmode(v) ) { + paging_update_nestedmode(v); if ( nvmx_n2_vmexit_handler(regs, exit_reason) ) goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:45:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:45:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxU-00064o-LK; Sat, 15 Mar 2014 12:45:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxT-00064M-AK for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:59 +0000 Received: from [85.158.137.68:32018] by server-13.bemta-3.messagelabs.com id 01/24-18692-A4B44235; Sat, 15 Mar 2014 12:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1394887495!809364!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4702 invoked from network); 15 Mar 2014 12:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxO-00089D-VO for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnxO-000373-US for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:54 +0000 Date: Sat, 15 Mar 2014 12:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/pci: Store VF's memory space displacement in a 64-bit value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 997af141831646c874c203f87e65f3c4ab093d88 Author: Boris Ostrovsky AuthorDate: Fri Mar 14 17:36:09 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:36:09 2014 +0100 x86/pci: Store VF's memory space displacement in a 64-bit value VF's memory space offset can be greater than 4GB and therefore needs to be stored in a 64-bit variable. Signed-off-by: Boris Ostrovsky master commit: 001bdcee7bc19be3e047d227b4d940c04972eb02 master date: 2014-02-13 10:49:55 +0100 --- xen/arch/x86/msi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index d5192c2..a8cb93e 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -589,7 +589,8 @@ static int msi_capability_init(struct pci_dev *dev, static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) { u8 limit; - u32 addr, base = PCI_BASE_ADDRESS_0, disp = 0; + u32 addr, base = PCI_BASE_ADDRESS_0; + u64 disp = 0; if ( vf >= 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:45:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:45:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxU-00064o-LK; Sat, 15 Mar 2014 12:45:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxT-00064M-AK for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:59 +0000 Received: from [85.158.137.68:32018] by server-13.bemta-3.messagelabs.com id 01/24-18692-A4B44235; Sat, 15 Mar 2014 12:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1394887495!809364!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4702 invoked from network); 15 Mar 2014 12:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxO-00089D-VO for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnxO-000373-US for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:44:54 +0000 Date: Sat, 15 Mar 2014 12:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/pci: Store VF's memory space displacement in a 64-bit value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 997af141831646c874c203f87e65f3c4ab093d88 Author: Boris Ostrovsky AuthorDate: Fri Mar 14 17:36:09 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:36:09 2014 +0100 x86/pci: Store VF's memory space displacement in a 64-bit value VF's memory space offset can be greater than 4GB and therefore needs to be stored in a 64-bit variable. Signed-off-by: Boris Ostrovsky master commit: 001bdcee7bc19be3e047d227b4d940c04972eb02 master date: 2014-02-13 10:49:55 +0100 --- xen/arch/x86/msi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index d5192c2..a8cb93e 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -589,7 +589,8 @@ static int msi_capability_init(struct pci_dev *dev, static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) { u8 limit; - u32 addr, base = PCI_BASE_ADDRESS_0, disp = 0; + u32 addr, base = PCI_BASE_ADDRESS_0; + u64 disp = 0; if ( vf >= 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:45:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:45:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxc-000661-Nu; Sat, 15 Mar 2014 12:45:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxb-00065o-Tx for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:08 +0000 Received: from [85.158.143.35:37681] by server-3.bemta-4.messagelabs.com id 53/98-13602-35B44235; Sat, 15 Mar 2014 12:45:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1394887505!2290054!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24774 invoked from network); 15 Mar 2014 12:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxZ-0008AC-Gw for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnxZ-00037k-2B for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:05 +0000 Date: Sat, 15 Mar 2014 12:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/MSI: don't risk division by zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6184e3a1b8d11874ad931fb94eb8d49648a37795 Author: Jan Beulich AuthorDate: Fri Mar 14 17:36:48 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:36:48 2014 +0100 x86/MSI: don't risk division by zero The check in question is redundant with the one in the immediately following if(), where dividing by zero gets carefully avoided. Spotted-by: Boris Ostrovsky Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky master commit: 5d160d913e03b581bdddde73535c18ac670cf0a9 master date: 2014-02-24 12:11:01 +0100 --- xen/arch/x86/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index a8cb93e..6081126 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -615,7 +615,7 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) return 0; base = pos + PCI_SRIOV_BAR; vf -= PCI_BDF(bus, slot, func) + offset; - if ( vf < 0 || (vf && vf % stride) ) + if ( vf < 0 ) return 0; if ( stride ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:45:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:45:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxc-000661-Nu; Sat, 15 Mar 2014 12:45:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxb-00065o-Tx for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:08 +0000 Received: from [85.158.143.35:37681] by server-3.bemta-4.messagelabs.com id 53/98-13602-35B44235; Sat, 15 Mar 2014 12:45:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1394887505!2290054!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24774 invoked from network); 15 Mar 2014 12:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxZ-0008AC-Gw for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnxZ-00037k-2B for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:05 +0000 Date: Sat, 15 Mar 2014 12:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/MSI: don't risk division by zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6184e3a1b8d11874ad931fb94eb8d49648a37795 Author: Jan Beulich AuthorDate: Fri Mar 14 17:36:48 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:36:48 2014 +0100 x86/MSI: don't risk division by zero The check in question is redundant with the one in the immediately following if(), where dividing by zero gets carefully avoided. Spotted-by: Boris Ostrovsky Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky master commit: 5d160d913e03b581bdddde73535c18ac670cf0a9 master date: 2014-02-24 12:11:01 +0100 --- xen/arch/x86/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index a8cb93e..6081126 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -615,7 +615,7 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) return 0; base = pos + PCI_SRIOV_BAR; vf -= PCI_BDF(bus, slot, func) + offset; - if ( vf < 0 || (vf && vf % stride) ) + if ( vf < 0 ) return 0; if ( stride ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:45:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:45:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxx-0006A6-Vu; Sat, 15 Mar 2014 12:45:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxx-00069s-6F for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:29 +0000 Received: from [85.158.139.211:27609] by server-10.bemta-5.messagelabs.com id 76/8A-27081-86B44235; Sat, 15 Mar 2014 12:45:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1394887526!1208343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24378 invoked from network); 15 Mar 2014 12:45:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:45:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxu-0008AQ-46 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnxu-00038U-2W for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:26 +0000 Date: Sat, 15 Mar 2014 12:45:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] IOMMU: generalize and correct softirq processing during Dom0 device setup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b5454c4843d63064ead95843a7e2f2290f52ff91 Author: Jan Beulich AuthorDate: Fri Mar 14 17:38:30 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:38:30 2014 +0100 IOMMU: generalize and correct softirq processing during Dom0 device setup c/s 21039:95f5a4ce8f24 ("VT-d: reduce default verbosity") having put a call to process_pending_softirqs() in VT-d's domain_context_mapping() was wrong in two ways: For one we shouldn't be doing this when setting up a device during DomU assignment. And then - I didn't check whether that was the case already back then - we shouldn't call that function with the pcidevs_lock (or in fact any spin lock) held. Move the "preemption" into generic code, at once dealing with further actual (too much output elsewhere - particularly on systems with very many host bridge like devices - having been observed to still cause the watchdog to trigger when enabled) and potential (other IOMMU code may also end up being too verbose) issues. Do the "preemption" once per device actually being set up when in verbose mode, and once per bus otherwise. Note that dropping pcidevs_lock around the process_pending_softirqs() invocation is specifically not a problem here: We're in an __init function and aren't racing with potential additions/removals of PCI devices. Not acquiring the lock in setup_dom0_pci_devices() otoh is not an option, as there are too many places that assert the lock being held. Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang master commit: 9ef5aa944a6a0df7f5938983043c7e46f158bbc6 master date: 2014-03-04 10:52:20 +0100 --- xen/drivers/passthrough/pci.c | 15 +++++++++++++++ xen/drivers/passthrough/vtd/iommu.c | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index f2756c9..c402526 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -914,6 +915,20 @@ static int __init _setup_dom0_pci_devices(struct pci_seg *pseg, void *arg) printk(XENLOG_WARNING "Dom%d owning %04x:%02x:%02x.%u?\n", pdev->domain->domain_id, pseg->nr, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); + + if ( iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); + } + } + + if ( !iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); } } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 8b6282f..ac1753f 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -1486,9 +1485,6 @@ static int domain_context_mapping( break; } - if ( iommu_verbose ) - process_pending_softirqs(); - return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:45:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:45:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxx-0006A6-Vu; Sat, 15 Mar 2014 12:45:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxx-00069s-6F for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:29 +0000 Received: from [85.158.139.211:27609] by server-10.bemta-5.messagelabs.com id 76/8A-27081-86B44235; Sat, 15 Mar 2014 12:45:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1394887526!1208343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24378 invoked from network); 15 Mar 2014 12:45:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:45:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxu-0008AQ-46 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnxu-00038U-2W for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:26 +0000 Date: Sat, 15 Mar 2014 12:45:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] IOMMU: generalize and correct softirq processing during Dom0 device setup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b5454c4843d63064ead95843a7e2f2290f52ff91 Author: Jan Beulich AuthorDate: Fri Mar 14 17:38:30 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:38:30 2014 +0100 IOMMU: generalize and correct softirq processing during Dom0 device setup c/s 21039:95f5a4ce8f24 ("VT-d: reduce default verbosity") having put a call to process_pending_softirqs() in VT-d's domain_context_mapping() was wrong in two ways: For one we shouldn't be doing this when setting up a device during DomU assignment. And then - I didn't check whether that was the case already back then - we shouldn't call that function with the pcidevs_lock (or in fact any spin lock) held. Move the "preemption" into generic code, at once dealing with further actual (too much output elsewhere - particularly on systems with very many host bridge like devices - having been observed to still cause the watchdog to trigger when enabled) and potential (other IOMMU code may also end up being too verbose) issues. Do the "preemption" once per device actually being set up when in verbose mode, and once per bus otherwise. Note that dropping pcidevs_lock around the process_pending_softirqs() invocation is specifically not a problem here: We're in an __init function and aren't racing with potential additions/removals of PCI devices. Not acquiring the lock in setup_dom0_pci_devices() otoh is not an option, as there are too many places that assert the lock being held. Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang master commit: 9ef5aa944a6a0df7f5938983043c7e46f158bbc6 master date: 2014-03-04 10:52:20 +0100 --- xen/drivers/passthrough/pci.c | 15 +++++++++++++++ xen/drivers/passthrough/vtd/iommu.c | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index f2756c9..c402526 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -914,6 +915,20 @@ static int __init _setup_dom0_pci_devices(struct pci_seg *pseg, void *arg) printk(XENLOG_WARNING "Dom%d owning %04x:%02x:%02x.%u?\n", pdev->domain->domain_id, pseg->nr, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); + + if ( iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); + } + } + + if ( !iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); } } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 8b6282f..ac1753f 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -1486,9 +1485,6 @@ static int domain_context_mapping( break; } - if ( iommu_verbose ) - process_pending_softirqs(); - return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:45:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:45:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxo-00068f-Sx; Sat, 15 Mar 2014 12:45:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxn-00068S-Td for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:20 +0000 Received: from [85.158.143.35:3440] by server-1.bemta-4.messagelabs.com id 00/3A-09853-F5B44235; Sat, 15 Mar 2014 12:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1394887516!2311215!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6937 invoked from network); 15 Mar 2014 12:45:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:45:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxj-0008AK-Vw for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnxj-000388-Lf for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:15 +0000 Date: Sat, 15 Mar 2014 12:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/mce: Reduce boot-time logspam X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72cc9a42bda6be206772d6e5667014c0a4edaafb Author: Andrew Cooper AuthorDate: Fri Mar 14 17:37:26 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:37:26 2014 +0100 x86/mce: Reduce boot-time logspam When booting with "no-mce", the user does not need to be told that "MCE support [was] disabled by bootparam" for each cpu. Furthermore, a file:line reference is unnecessary. Signed-off-by: Andrew Cooper master commit: a5ab9c9fa29cda7e1b18dbcaa69a5dbded96de32 master date: 2014-02-25 09:30:59 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 93d7ae1..5f410f3 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -729,8 +729,10 @@ void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp) { enum mcheck_type inited = mcheck_none; - if (mce_disabled == 1) { - dprintk(XENLOG_INFO, "MCE support disabled by bootparam\n"); + if ( mce_disabled ) + { + if ( bsp ) + printk(XENLOG_INFO "MCE support disabled by bootparam\n"); return; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:45:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:45:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxo-00068f-Sx; Sat, 15 Mar 2014 12:45:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxn-00068S-Td for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:20 +0000 Received: from [85.158.143.35:3440] by server-1.bemta-4.messagelabs.com id 00/3A-09853-F5B44235; Sat, 15 Mar 2014 12:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1394887516!2311215!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6937 invoked from network); 15 Mar 2014 12:45:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:45:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnxj-0008AK-Vw for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnxj-000388-Lf for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:15 +0000 Date: Sat, 15 Mar 2014 12:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/mce: Reduce boot-time logspam X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72cc9a42bda6be206772d6e5667014c0a4edaafb Author: Andrew Cooper AuthorDate: Fri Mar 14 17:37:26 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:37:26 2014 +0100 x86/mce: Reduce boot-time logspam When booting with "no-mce", the user does not need to be told that "MCE support [was] disabled by bootparam" for each cpu. Furthermore, a file:line reference is unnecessary. Signed-off-by: Andrew Cooper master commit: a5ab9c9fa29cda7e1b18dbcaa69a5dbded96de32 master date: 2014-02-25 09:30:59 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 93d7ae1..5f410f3 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -729,8 +729,10 @@ void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp) { enum mcheck_type inited = mcheck_none; - if (mce_disabled == 1) { - dprintk(XENLOG_INFO, "MCE support disabled by bootparam\n"); + if ( mce_disabled ) + { + if ( bsp ) + printk(XENLOG_INFO "MCE support disabled by bootparam\n"); return; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:46:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:46:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyI-0006DL-2v; Sat, 15 Mar 2014 12:45:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyH-0006Cy-7O for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:49 +0000 Received: from [193.109.254.147:3753] by server-2.bemta-14.messagelabs.com id 8D/9E-01236-C7B44235; Sat, 15 Mar 2014 12:45:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1394887546!1872718!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12265 invoked from network); 15 Mar 2014 12:45:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:45:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyE-0008AW-G9 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnyE-00039m-EB for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:46 +0000 Date: Sat, 15 Mar 2014 12:45:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: fix memory type merging in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed78859b67efc0409ccc085abd9f7ea45d414da1 Author: Jan Beulich AuthorDate: Fri Mar 14 17:39:43 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:39:43 2014 +0100 x86/HVM: fix memory type merging in epte_get_entry_emt() Using the minimum numeric value of guest and host specified memory types is too simplistic - it works only correctly for a subset of types. It is in particular the WT/WP combination that needs conversion to UC if the two types conflict. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: b99113b9d5fac5149de8496f55afa00e285b1ff3 master date: 2014-03-10 11:03:53 +0100 --- xen/arch/x86/hvm/mtrr.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index e2da462..b77a4e5 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -717,5 +717,35 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); - return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); + + /* If both types match we're fine. */ + if ( likely(gmtrr_mtype == hmtrr_mtype) ) + return hmtrr_mtype; + + /* If either type is UC, we have to go with that one. */ + if ( gmtrr_mtype == MTRR_TYPE_UNCACHABLE || + hmtrr_mtype == MTRR_TYPE_UNCACHABLE ) + return MTRR_TYPE_UNCACHABLE; + + /* If either type is WB, we have to go with the other one. */ + if ( gmtrr_mtype == MTRR_TYPE_WRBACK ) + return hmtrr_mtype; + if ( hmtrr_mtype == MTRR_TYPE_WRBACK ) + return gmtrr_mtype; + + /* + * At this point we have disagreeing WC, WT, or WP types. The only + * combination that can be cleanly resolved is WT:WP. The ones involving + * WC need to be converted to UC, both due to the memory ordering + * differences and because WC disallows reads to be cached (WT and WP + * permit this), while WT and WP require writes to go straight to memory + * (WC can buffer them). + */ + if ( (gmtrr_mtype == MTRR_TYPE_WRTHROUGH && + hmtrr_mtype == MTRR_TYPE_WRPROT) || + (gmtrr_mtype == MTRR_TYPE_WRPROT && + hmtrr_mtype == MTRR_TYPE_WRTHROUGH) ) + return MTRR_TYPE_WRPROT; + + return MTRR_TYPE_UNCACHABLE; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:46:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:46:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOny9-0006BR-0E; Sat, 15 Mar 2014 12:45:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOny6-0006BE-U2 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:39 +0000 Received: from [85.158.143.35:4120] by server-3.bemta-4.messagelabs.com id 85/C8-13602-27B44235; Sat, 15 Mar 2014 12:45:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1394887536!2291789!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26301 invoked from network); 15 Mar 2014 12:45:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:45:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOny4-0008AT-BA for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOny4-00038u-6l for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:36 +0000 Date: Sat, 15 Mar 2014 12:45:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/hvm: refine the judgment on IDENT_PT for EMT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 896a105366dca3259f7a84d8b9282738122c9d73 Author: Dongxiao Xu AuthorDate: Fri Mar 14 17:39:11 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:39:11 2014 +0100 x86/hvm: refine the judgment on IDENT_PT for EMT When trying to get the EPT EMT type, the judgment on HVM_PARAM_IDENT_PT is not correct which always returns WB type if the parameter is not set. Remove the related code. Signed-off-by: Dongxiao Xu We can't fully drop the dependency yet, but we should certainly avoid overriding cases already properly handled. The reason for this is that the guest setting up its MTRRs happens _after_ the EPT tables got already constructed, and no code is in place to propagate this to the EPT code. Without this check we're forcing the guest to run with all of its memory uncachable until something happens to re-write every single EPT entry. But of course this has to be just a temporary solution. In the same spirit we should defer the "very early" (when the guest is still being constructed and has no vCPU yet) override to the last possible point. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: cadfd7bca999c0a795dc27be72d43c92e8943a0b master date: 2014-03-10 11:02:25 +0100 --- xen/arch/x86/hvm/mtrr.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 4ff1e55..e2da462 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -689,12 +689,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, *ipat = 0; - if ( (current->domain != d) && - ((d->vcpu == NULL) || ((v = d->vcpu[0]) == NULL)) ) - return MTRR_TYPE_WRBACK; - - if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) - return MTRR_TYPE_WRBACK; + if ( v->domain != d ) + v = d->vcpu ? d->vcpu[0] : NULL; if ( !mfn_valid(mfn_x(mfn)) ) return MTRR_TYPE_UNCACHABLE; @@ -717,7 +713,9 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, return MTRR_TYPE_WRBACK; } - gmtrr_mtype = get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)); + gmtrr_mtype = v && d->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ? + get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : + MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:46:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:46:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyI-0006DL-2v; Sat, 15 Mar 2014 12:45:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyH-0006Cy-7O for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:49 +0000 Received: from [193.109.254.147:3753] by server-2.bemta-14.messagelabs.com id 8D/9E-01236-C7B44235; Sat, 15 Mar 2014 12:45:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1394887546!1872718!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12265 invoked from network); 15 Mar 2014 12:45:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:45:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyE-0008AW-G9 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnyE-00039m-EB for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:46 +0000 Date: Sat, 15 Mar 2014 12:45:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: fix memory type merging in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed78859b67efc0409ccc085abd9f7ea45d414da1 Author: Jan Beulich AuthorDate: Fri Mar 14 17:39:43 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:39:43 2014 +0100 x86/HVM: fix memory type merging in epte_get_entry_emt() Using the minimum numeric value of guest and host specified memory types is too simplistic - it works only correctly for a subset of types. It is in particular the WT/WP combination that needs conversion to UC if the two types conflict. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: b99113b9d5fac5149de8496f55afa00e285b1ff3 master date: 2014-03-10 11:03:53 +0100 --- xen/arch/x86/hvm/mtrr.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index e2da462..b77a4e5 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -717,5 +717,35 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); - return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); + + /* If both types match we're fine. */ + if ( likely(gmtrr_mtype == hmtrr_mtype) ) + return hmtrr_mtype; + + /* If either type is UC, we have to go with that one. */ + if ( gmtrr_mtype == MTRR_TYPE_UNCACHABLE || + hmtrr_mtype == MTRR_TYPE_UNCACHABLE ) + return MTRR_TYPE_UNCACHABLE; + + /* If either type is WB, we have to go with the other one. */ + if ( gmtrr_mtype == MTRR_TYPE_WRBACK ) + return hmtrr_mtype; + if ( hmtrr_mtype == MTRR_TYPE_WRBACK ) + return gmtrr_mtype; + + /* + * At this point we have disagreeing WC, WT, or WP types. The only + * combination that can be cleanly resolved is WT:WP. The ones involving + * WC need to be converted to UC, both due to the memory ordering + * differences and because WC disallows reads to be cached (WT and WP + * permit this), while WT and WP require writes to go straight to memory + * (WC can buffer them). + */ + if ( (gmtrr_mtype == MTRR_TYPE_WRTHROUGH && + hmtrr_mtype == MTRR_TYPE_WRPROT) || + (gmtrr_mtype == MTRR_TYPE_WRPROT && + hmtrr_mtype == MTRR_TYPE_WRTHROUGH) ) + return MTRR_TYPE_WRPROT; + + return MTRR_TYPE_UNCACHABLE; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:46:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:46:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOny9-0006BR-0E; Sat, 15 Mar 2014 12:45:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOny6-0006BE-U2 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:39 +0000 Received: from [85.158.143.35:4120] by server-3.bemta-4.messagelabs.com id 85/C8-13602-27B44235; Sat, 15 Mar 2014 12:45:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1394887536!2291789!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26301 invoked from network); 15 Mar 2014 12:45:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:45:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOny4-0008AT-BA for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOny4-00038u-6l for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:36 +0000 Date: Sat, 15 Mar 2014 12:45:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/hvm: refine the judgment on IDENT_PT for EMT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 896a105366dca3259f7a84d8b9282738122c9d73 Author: Dongxiao Xu AuthorDate: Fri Mar 14 17:39:11 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:39:11 2014 +0100 x86/hvm: refine the judgment on IDENT_PT for EMT When trying to get the EPT EMT type, the judgment on HVM_PARAM_IDENT_PT is not correct which always returns WB type if the parameter is not set. Remove the related code. Signed-off-by: Dongxiao Xu We can't fully drop the dependency yet, but we should certainly avoid overriding cases already properly handled. The reason for this is that the guest setting up its MTRRs happens _after_ the EPT tables got already constructed, and no code is in place to propagate this to the EPT code. Without this check we're forcing the guest to run with all of its memory uncachable until something happens to re-write every single EPT entry. But of course this has to be just a temporary solution. In the same spirit we should defer the "very early" (when the guest is still being constructed and has no vCPU yet) override to the last possible point. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: cadfd7bca999c0a795dc27be72d43c92e8943a0b master date: 2014-03-10 11:02:25 +0100 --- xen/arch/x86/hvm/mtrr.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 4ff1e55..e2da462 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -689,12 +689,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, *ipat = 0; - if ( (current->domain != d) && - ((d->vcpu == NULL) || ((v = d->vcpu[0]) == NULL)) ) - return MTRR_TYPE_WRBACK; - - if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) - return MTRR_TYPE_WRBACK; + if ( v->domain != d ) + v = d->vcpu ? d->vcpu[0] : NULL; if ( !mfn_valid(mfn_x(mfn)) ) return MTRR_TYPE_UNCACHABLE; @@ -717,7 +713,9 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, return MTRR_TYPE_WRBACK; } - gmtrr_mtype = get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)); + gmtrr_mtype = v && d->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ? + get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : + MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:46:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:46:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyT-0006Fu-64; Sat, 15 Mar 2014 12:46:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyR-0006FS-Cc for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:59 +0000 Received: from [85.158.139.211:34277] by server-12.bemta-5.messagelabs.com id 79/99-03824-68B44235; Sat, 15 Mar 2014 12:45:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1394887556!1213000!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28819 invoked from network); 15 Mar 2014 12:45:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:45:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyO-0008Ac-L6 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnyO-0003AB-Iw for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:56 +0000 Date: Sat, 15 Mar 2014 12:45:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: consolidate passthrough handling in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77a5a30eec664ec09906b78ccf0007a551124b98 Author: Jan Beulich AuthorDate: Fri Mar 14 17:40:26 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:40:26 2014 +0100 x86/HVM: consolidate passthrough handling in epte_get_entry_emt() It is inconsistent to depend on iommu_enabled alone: For a guest without devices passed through to it, it is of no concern whether the IOMMU is enabled. There's one rather special case to take care of: VMX code marks the LAPIC access page as MMIO. The added assertion needs to take this into consideration, and the subsequent handling of the direct MMIO case was inconsistent too: That page would have been WB in the absence of an IOMMU, but UC in the presence of it, while in fact the cachabilty of this page is entirely unrelated to an IOMMU being in use. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: 3089a6d82bdf3112ccb1dd074ce34a8cbdc4ccd8 master date: 2014-03-10 11:04:36 +0100 --- xen/arch/x86/hvm/mtrr.c | 10 ++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index b77a4e5..146c2e6 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -698,14 +698,20 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, if ( hvm_get_mem_pinned_cacheattr(d, gfn, &type) ) return type; - if ( !iommu_enabled ) + if ( !iommu_enabled || + (rangeset_is_empty(d->iomem_caps) && + rangeset_is_empty(d->arch.ioport_caps) && + !has_arch_pdevs(d)) ) { + ASSERT(!direct_mmio || + mfn_x(mfn) == d->arch.hvm_domain.vmx.apic_access_mfn); *ipat = 1; return MTRR_TYPE_WRBACK; } if ( direct_mmio ) - return MTRR_TYPE_UNCACHABLE; + return mfn_x(mfn) != d->arch.hvm_domain.vmx.apic_access_mfn + ? MTRR_TYPE_UNCACHABLE : MTRR_TYPE_WRBACK; if ( iommu_snoop ) { diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index fa211d1..45b77a1 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2004,9 +2004,9 @@ static int vmx_alloc_vlapic_mapping(struct domain *d) if ( apic_va == NULL ) return -ENOMEM; share_xen_page_with_guest(virt_to_page(apic_va), d, XENSHARE_writable); + d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), _mfn(virt_to_mfn(apic_va))); - d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:46:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:46:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyT-0006Fu-64; Sat, 15 Mar 2014 12:46:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyR-0006FS-Cc for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:59 +0000 Received: from [85.158.139.211:34277] by server-12.bemta-5.messagelabs.com id 79/99-03824-68B44235; Sat, 15 Mar 2014 12:45:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1394887556!1213000!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28819 invoked from network); 15 Mar 2014 12:45:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:45:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyO-0008Ac-L6 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnyO-0003AB-Iw for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:45:56 +0000 Date: Sat, 15 Mar 2014 12:45:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: consolidate passthrough handling in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77a5a30eec664ec09906b78ccf0007a551124b98 Author: Jan Beulich AuthorDate: Fri Mar 14 17:40:26 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:40:26 2014 +0100 x86/HVM: consolidate passthrough handling in epte_get_entry_emt() It is inconsistent to depend on iommu_enabled alone: For a guest without devices passed through to it, it is of no concern whether the IOMMU is enabled. There's one rather special case to take care of: VMX code marks the LAPIC access page as MMIO. The added assertion needs to take this into consideration, and the subsequent handling of the direct MMIO case was inconsistent too: That page would have been WB in the absence of an IOMMU, but UC in the presence of it, while in fact the cachabilty of this page is entirely unrelated to an IOMMU being in use. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: 3089a6d82bdf3112ccb1dd074ce34a8cbdc4ccd8 master date: 2014-03-10 11:04:36 +0100 --- xen/arch/x86/hvm/mtrr.c | 10 ++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index b77a4e5..146c2e6 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -698,14 +698,20 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, if ( hvm_get_mem_pinned_cacheattr(d, gfn, &type) ) return type; - if ( !iommu_enabled ) + if ( !iommu_enabled || + (rangeset_is_empty(d->iomem_caps) && + rangeset_is_empty(d->arch.ioport_caps) && + !has_arch_pdevs(d)) ) { + ASSERT(!direct_mmio || + mfn_x(mfn) == d->arch.hvm_domain.vmx.apic_access_mfn); *ipat = 1; return MTRR_TYPE_WRBACK; } if ( direct_mmio ) - return MTRR_TYPE_UNCACHABLE; + return mfn_x(mfn) != d->arch.hvm_domain.vmx.apic_access_mfn + ? MTRR_TYPE_UNCACHABLE : MTRR_TYPE_WRBACK; if ( iommu_snoop ) { diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index fa211d1..45b77a1 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2004,9 +2004,9 @@ static int vmx_alloc_vlapic_mapping(struct domain *d) if ( apic_va == NULL ) return -ENOMEM; share_xen_page_with_guest(virt_to_page(apic_va), d, XENSHARE_writable); + d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), _mfn(virt_to_mfn(apic_va))); - d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:46:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:46:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyd-0006IW-A6; Sat, 15 Mar 2014 12:46:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyb-0006IB-OV for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:46:09 +0000 Received: from [85.158.139.211:25195] by server-7.bemta-5.messagelabs.com id 9B/5F-20531-09B44235; Sat, 15 Mar 2014 12:46:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1394887567!1219361!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24519 invoked from network); 15 Mar 2014 12:46:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:46:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyY-0008BF-QT for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:46:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnyY-0003Ai-Ne for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:46:06 +0000 Date: Sat, 15 Mar 2014 12:46:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xmalloc: handle correctly page allocation when align > size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a82fc4f48e535cd828452fb52e71bdc6dc6e071c Author: Julien Grall AuthorDate: Fri Mar 14 17:41:00 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:41:00 2014 +0100 xmalloc: handle correctly page allocation when align > size When align is superior to size, we need to retrieve the order from align during multiple page allocation. I guess it was the goal of the commit fb034f42 "xmalloc: make close-to-PAGE_SIZE allocations more efficient". Signed-off-by: Julien Grall Acked-by: Keir Fraser master commit: ac2cba2901779f66bbfab298faa15c956e91393a master date: 2014-03-10 14:40:50 +0100 --- xen/common/xmalloc_tlsf.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c index d3bdfa7..a5769c9 100644 --- a/xen/common/xmalloc_tlsf.c +++ b/xen/common/xmalloc_tlsf.c @@ -527,11 +527,10 @@ static void xmalloc_pool_put(void *p) static void *xmalloc_whole_pages(unsigned long size, unsigned long align) { - unsigned int i, order = get_order_from_bytes(size); + unsigned int i, order; void *res, *p; - if ( align > size ) - get_order_from_bytes(align); + order = get_order_from_bytes(max(align, size)); res = alloc_xenheap_pages(order, 0); if ( res == NULL ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 12:46:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 12:46:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyd-0006IW-A6; Sat, 15 Mar 2014 12:46:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyb-0006IB-OV for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:46:09 +0000 Received: from [85.158.139.211:25195] by server-7.bemta-5.messagelabs.com id 9B/5F-20531-09B44235; Sat, 15 Mar 2014 12:46:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1394887567!1219361!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24519 invoked from network); 15 Mar 2014 12:46:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 12:46:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOnyY-0008BF-QT for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:46:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOnyY-0003Ai-Ne for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 12:46:06 +0000 Date: Sat, 15 Mar 2014 12:46:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xmalloc: handle correctly page allocation when align > size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a82fc4f48e535cd828452fb52e71bdc6dc6e071c Author: Julien Grall AuthorDate: Fri Mar 14 17:41:00 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:41:00 2014 +0100 xmalloc: handle correctly page allocation when align > size When align is superior to size, we need to retrieve the order from align during multiple page allocation. I guess it was the goal of the commit fb034f42 "xmalloc: make close-to-PAGE_SIZE allocations more efficient". Signed-off-by: Julien Grall Acked-by: Keir Fraser master commit: ac2cba2901779f66bbfab298faa15c956e91393a master date: 2014-03-10 14:40:50 +0100 --- xen/common/xmalloc_tlsf.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c index d3bdfa7..a5769c9 100644 --- a/xen/common/xmalloc_tlsf.c +++ b/xen/common/xmalloc_tlsf.c @@ -527,11 +527,10 @@ static void xmalloc_pool_put(void *p) static void *xmalloc_whole_pages(unsigned long size, unsigned long align) { - unsigned int i, order = get_order_from_bytes(size); + unsigned int i, order; void *res, *p; - if ( align > size ) - get_order_from_bytes(align); + order = get_order_from_bytes(max(align, size)); res = alloc_xenheap_pages(order, 0); if ( res == NULL ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:33:26 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOO-0000Ki-QX; Sat, 15 Mar 2014 18:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtON-0000Kd-Bc for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:07 +0000 Received: from [85.158.137.68:7123] by server-4.bemta-3.messagelabs.com id B7/74-17399-2EC94235; Sat, 15 Mar 2014 18:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1394908383!834665!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16122 invoked from network); 15 Mar 2014 18:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOJ-0003HA-DB for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtOJ-0004i9-2D for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:03 +0000 Date: Sat, 15 Mar 2014 18:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools/libxc: Correct read_exact() error messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50d989262d136b7a5a602c80681705ac6cfe95a8 Author: Andrew Cooper AuthorDate: Tue Jan 7 10:04:23 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 14 14:24:31 2014 +0000 tools/libxc: Correct read_exact() error messages The errors have been incorrectly identifying their function since c/s 861aef6e1558bebad8fc60c1c723f0706fd3ed87 which did a lot of error handling cleanup. Use __func__ to ensure the name remains correct in the future. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell CC: Ian Jackson (cherry picked from commit 1671cdeac7da663fb2963f3e587fa279dcd0238b) --- tools/libxc/xc_domain_restore.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index f9ed6b2..e72caf8 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -76,7 +76,7 @@ static ssize_t rdexact(xc_interface *xch, struct restore_ctx *ctx, if ( len == -1 && errno == EINTR ) continue; if ( !FD_ISSET(fd, &rfds) ) { - ERROR("read_exact_timed failed (select returned %zd)", len); + ERROR("%s failed (select returned %zd)", __func__, len); errno = ETIMEDOUT; return -1; } @@ -90,7 +90,7 @@ static ssize_t rdexact(xc_interface *xch, struct restore_ctx *ctx, errno = 0; } if ( len <= 0 ) { - ERROR("read_exact_timed failed (read rc: %d, errno: %d)", len, errno); + ERROR("%s failed (read rc: %d, errno: %d)", __func__, len, errno); return -1; } offset += len; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:33:26 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOO-0000Ki-QX; Sat, 15 Mar 2014 18:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtON-0000Kd-Bc for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:07 +0000 Received: from [85.158.137.68:7123] by server-4.bemta-3.messagelabs.com id B7/74-17399-2EC94235; Sat, 15 Mar 2014 18:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1394908383!834665!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16122 invoked from network); 15 Mar 2014 18:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOJ-0003HA-DB for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtOJ-0004i9-2D for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:03 +0000 Date: Sat, 15 Mar 2014 18:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools/libxc: Correct read_exact() error messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50d989262d136b7a5a602c80681705ac6cfe95a8 Author: Andrew Cooper AuthorDate: Tue Jan 7 10:04:23 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 14 14:24:31 2014 +0000 tools/libxc: Correct read_exact() error messages The errors have been incorrectly identifying their function since c/s 861aef6e1558bebad8fc60c1c723f0706fd3ed87 which did a lot of error handling cleanup. Use __func__ to ensure the name remains correct in the future. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell CC: Ian Jackson (cherry picked from commit 1671cdeac7da663fb2963f3e587fa279dcd0238b) --- tools/libxc/xc_domain_restore.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index f9ed6b2..e72caf8 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -76,7 +76,7 @@ static ssize_t rdexact(xc_interface *xch, struct restore_ctx *ctx, if ( len == -1 && errno == EINTR ) continue; if ( !FD_ISSET(fd, &rfds) ) { - ERROR("read_exact_timed failed (select returned %zd)", len); + ERROR("%s failed (select returned %zd)", __func__, len); errno = ETIMEDOUT; return -1; } @@ -90,7 +90,7 @@ static ssize_t rdexact(xc_interface *xch, struct restore_ctx *ctx, errno = 0; } if ( len <= 0 ) { - ERROR("read_exact_timed failed (read rc: %d, errno: %d)", len, errno); + ERROR("%s failed (read rc: %d, errno: %d)", __func__, len, errno); return -1; } offset += len; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:33:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOW-0000LA-Vv; Sat, 15 Mar 2014 18:33:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOW-0000L3-8A for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:16 +0000 Received: from [85.158.143.35:63221] by server-1.bemta-4.messagelabs.com id D8/CC-09853-BEC94235; Sat, 15 Mar 2014 18:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1394908393!2313002!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30837 invoked from network); 15 Mar 2014 18:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOT-0003HD-MJ for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtOT-0004jH-Gh for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:13 +0000 Date: Sat, 15 Mar 2014 18:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/pci: Store VF's memory space displacement in a 64-bit value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa669779b4a9d07d35a9708ac97d2c98063c29b1 Author: Boris Ostrovsky AuthorDate: Fri Mar 14 17:43:15 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:43:15 2014 +0100 x86/pci: Store VF's memory space displacement in a 64-bit value VF's memory space offset can be greater than 4GB and therefore needs to be stored in a 64-bit variable. Signed-off-by: Boris Ostrovsky master commit: 001bdcee7bc19be3e047d227b4d940c04972eb02 master date: 2014-02-13 10:49:55 +0100 --- xen/arch/x86/msi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index bf6b542..5da0410 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -571,7 +571,8 @@ static int msi_capability_init(struct pci_dev *dev, static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) { u8 limit; - u32 addr, base = PCI_BASE_ADDRESS_0, disp = 0; + u32 addr, base = PCI_BASE_ADDRESS_0; + u64 disp = 0; if ( vf >= 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:33:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOW-0000LA-Vv; Sat, 15 Mar 2014 18:33:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOW-0000L3-8A for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:16 +0000 Received: from [85.158.143.35:63221] by server-1.bemta-4.messagelabs.com id D8/CC-09853-BEC94235; Sat, 15 Mar 2014 18:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1394908393!2313002!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30837 invoked from network); 15 Mar 2014 18:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOT-0003HD-MJ for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtOT-0004jH-Gh for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:13 +0000 Date: Sat, 15 Mar 2014 18:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/pci: Store VF's memory space displacement in a 64-bit value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa669779b4a9d07d35a9708ac97d2c98063c29b1 Author: Boris Ostrovsky AuthorDate: Fri Mar 14 17:43:15 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:43:15 2014 +0100 x86/pci: Store VF's memory space displacement in a 64-bit value VF's memory space offset can be greater than 4GB and therefore needs to be stored in a 64-bit variable. Signed-off-by: Boris Ostrovsky master commit: 001bdcee7bc19be3e047d227b4d940c04972eb02 master date: 2014-02-13 10:49:55 +0100 --- xen/arch/x86/msi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index bf6b542..5da0410 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -571,7 +571,8 @@ static int msi_capability_init(struct pci_dev *dev, static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) { u8 limit; - u32 addr, base = PCI_BASE_ADDRESS_0, disp = 0; + u32 addr, base = PCI_BASE_ADDRESS_0; + u64 disp = 0; if ( vf >= 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:33:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOi-0000Ma-2L; Sat, 15 Mar 2014 18:33:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOg-0000M9-Nj for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:27 +0000 Received: from [85.158.143.35:61220] by server-3.bemta-4.messagelabs.com id 5E/DC-13602-6FC94235; Sat, 15 Mar 2014 18:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1394908404!2319962!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26255 invoked from network); 15 Mar 2014 18:33:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOd-0003HG-TM for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtOd-0004jf-P5 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:23 +0000 Date: Sat, 15 Mar 2014 18:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/MCE: Fix race condition in mctelem_reserve X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ea3ec32f7956917eb0339b2b0df24e8f658a05ed Author: Frediano Ziglio AuthorDate: Fri Mar 14 17:44:19 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:44:19 2014 +0100 x86/MCE: Fix race condition in mctelem_reserve These lines (in mctelem_reserve) newhead = oldhead->mcte_next; if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { are racy. After you read the newhead pointer it can happen that another flow (thread or recursive invocation) change all the list but set head with same value. So oldhead is the same as *freelp but you are setting a new head that could point to whatever element (even already used). This patch use instead a bit array and atomic bit operations. Signed-off-by: Frediano Ziglio Reviewed-by: Liu Jinsong master commit: 60ea3a3ac3d2bcd8e85b250fdbfc46b3b9dc7085 master date: 2014-02-24 12:07:41 +0100 --- xen/arch/x86/cpu/mcheck/mctelem.c | 81 ++++++++++++++----------------------- 1 files changed, 30 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index 895ce1a..ed8e8d2 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -37,24 +37,19 @@ struct mctelem_ent { void *mcte_data; /* corresponding data payload */ }; -#define MCTE_F_HOME_URGENT 0x0001U /* free to urgent freelist */ -#define MCTE_F_HOME_NONURGENT 0x0002U /* free to nonurgent freelist */ -#define MCTE_F_CLASS_URGENT 0x0004U /* in use - urgent errors */ -#define MCTE_F_CLASS_NONURGENT 0x0008U /* in use - nonurgent errors */ +#define MCTE_F_CLASS_URGENT 0x0001U /* in use - urgent errors */ +#define MCTE_F_CLASS_NONURGENT 0x0002U /* in use - nonurgent errors */ #define MCTE_F_STATE_FREE 0x0010U /* on a freelist */ #define MCTE_F_STATE_UNCOMMITTED 0x0020U /* reserved; on no list */ #define MCTE_F_STATE_COMMITTED 0x0040U /* on a committed list */ #define MCTE_F_STATE_PROCESSING 0x0080U /* on a processing list */ -#define MCTE_F_MASK_HOME (MCTE_F_HOME_URGENT | MCTE_F_HOME_NONURGENT) #define MCTE_F_MASK_CLASS (MCTE_F_CLASS_URGENT | MCTE_F_CLASS_NONURGENT) #define MCTE_F_MASK_STATE (MCTE_F_STATE_FREE | \ MCTE_F_STATE_UNCOMMITTED | \ MCTE_F_STATE_COMMITTED | \ MCTE_F_STATE_PROCESSING) -#define MCTE_HOME(tep) ((tep)->mcte_flags & MCTE_F_MASK_HOME) - #define MCTE_CLASS(tep) ((tep)->mcte_flags & MCTE_F_MASK_CLASS) #define MCTE_SET_CLASS(tep, new) do { \ (tep)->mcte_flags &= ~MCTE_F_MASK_CLASS; \ @@ -69,6 +64,8 @@ struct mctelem_ent { #define MC_URGENT_NENT 10 #define MC_NONURGENT_NENT 20 +#define MC_NENT (MC_URGENT_NENT + MC_NONURGENT_NENT) + #define MC_NCLASSES (MC_NONURGENT + 1) #define COOKIE2MCTE(c) ((struct mctelem_ent *)(c)) @@ -77,11 +74,9 @@ struct mctelem_ent { static struct mc_telem_ctl { /* Linked lists that thread the array members together. * - * The free lists are singly-linked via mcte_next, and we allocate - * from them by atomically unlinking an element from the head. - * Consumed entries are returned to the head of the free list. - * When an entry is reserved off the free list it is not linked - * on any list until it is committed or dismissed. + * The free lists is a bit array where bit 1 means free. + * This as element number is quite small and is easy to + * atomically allocate that way. * * The committed list grows at the head and we do not maintain a * tail pointer; insertions are performed atomically. The head @@ -101,7 +96,7 @@ static struct mc_telem_ctl { * we can lock it for updates. The head of the processing list * always has the oldest telemetry, and we append (as above) * at the tail of the processing list. */ - struct mctelem_ent *mctc_free[MC_NCLASSES]; + DECLARE_BITMAP(mctc_free, MC_NENT); struct mctelem_ent *mctc_committed[MC_NCLASSES]; struct mctelem_ent *mctc_processing_head[MC_NCLASSES]; struct mctelem_ent *mctc_processing_tail[MC_NCLASSES]; @@ -207,14 +202,14 @@ int mctelem_has_deferred(unsigned int cpu) */ static void mctelem_free(struct mctelem_ent *tep) { - mctelem_class_t target = MCTE_HOME(tep) == MCTE_F_HOME_URGENT ? - MC_URGENT : MC_NONURGENT; - BUG_ON(tep->mcte_refcnt != 0); BUG_ON(MCTE_STATE(tep) != MCTE_F_STATE_FREE); tep->mcte_prev = NULL; - mctelem_xchg_head(&mctctl.mctc_free[target], &tep->mcte_next, tep); + tep->mcte_next = NULL; + + /* set free in array */ + set_bit(tep - mctctl.mctc_elems, mctctl.mctc_free); } /* Increment the reference count of an entry that is not linked on to @@ -274,34 +269,25 @@ void mctelem_init(int reqdatasz) } if ((mctctl.mctc_elems = xmalloc_array(struct mctelem_ent, - MC_URGENT_NENT + MC_NONURGENT_NENT)) == NULL || - (datarr = xmalloc_bytes((MC_URGENT_NENT + MC_NONURGENT_NENT) * - datasz)) == NULL) { + MC_NENT)) == NULL || + (datarr = xmalloc_bytes(MC_NENT * datasz)) == NULL) { if (mctctl.mctc_elems) xfree(mctctl.mctc_elems); printk("Allocations for MCA telemetry failed\n"); return; } - for (i = 0; i < MC_URGENT_NENT + MC_NONURGENT_NENT; i++) { - struct mctelem_ent *tep, **tepp; + for (i = 0; i < MC_NENT; i++) { + struct mctelem_ent *tep; tep = mctctl.mctc_elems + i; tep->mcte_flags = MCTE_F_STATE_FREE; tep->mcte_refcnt = 0; tep->mcte_data = datarr + i * datasz; - if (i < MC_URGENT_NENT) { - tepp = &mctctl.mctc_free[MC_URGENT]; - tep->mcte_flags |= MCTE_F_HOME_URGENT; - } else { - tepp = &mctctl.mctc_free[MC_NONURGENT]; - tep->mcte_flags |= MCTE_F_HOME_NONURGENT; - } - - tep->mcte_next = *tepp; + __set_bit(i, mctctl.mctc_free); + tep->mcte_next = NULL; tep->mcte_prev = NULL; - *tepp = tep; } } @@ -310,32 +296,25 @@ static int mctelem_drop_count; /* Reserve a telemetry entry, or return NULL if none available. * If we return an entry then the caller must subsequently call exactly one of - * mctelem_unreserve or mctelem_commit for that entry. + * mctelem_dismiss or mctelem_commit for that entry. */ mctelem_cookie_t mctelem_reserve(mctelem_class_t which) { - struct mctelem_ent **freelp; - struct mctelem_ent *oldhead, *newhead; - mctelem_class_t target = (which == MC_URGENT) ? - MC_URGENT : MC_NONURGENT; + unsigned bit; + unsigned start_bit = (which == MC_URGENT) ? 0 : MC_URGENT_NENT; - freelp = &mctctl.mctc_free[target]; for (;;) { - if ((oldhead = *freelp) == NULL) { - if (which == MC_URGENT && target == MC_URGENT) { - /* raid the non-urgent freelist */ - target = MC_NONURGENT; - freelp = &mctctl.mctc_free[target]; - continue; - } else { - mctelem_drop_count++; - return (NULL); - } + bit = find_next_bit(mctctl.mctc_free, MC_NENT, start_bit); + + if (bit >= MC_NENT) { + mctelem_drop_count++; + return (NULL); } - newhead = oldhead->mcte_next; - if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { - struct mctelem_ent *tep = oldhead; + /* try to allocate, atomically clear free bit */ + if (test_and_clear_bit(bit, mctctl.mctc_free)) { + /* return element we got */ + struct mctelem_ent *tep = mctctl.mctc_elems + bit; mctelem_hold(tep); MCTE_TRANSITION_STATE(tep, FREE, UNCOMMITTED); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:33:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOi-0000Ma-2L; Sat, 15 Mar 2014 18:33:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOg-0000M9-Nj for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:27 +0000 Received: from [85.158.143.35:61220] by server-3.bemta-4.messagelabs.com id 5E/DC-13602-6FC94235; Sat, 15 Mar 2014 18:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1394908404!2319962!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26255 invoked from network); 15 Mar 2014 18:33:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOd-0003HG-TM for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtOd-0004jf-P5 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:23 +0000 Date: Sat, 15 Mar 2014 18:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/MCE: Fix race condition in mctelem_reserve X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ea3ec32f7956917eb0339b2b0df24e8f658a05ed Author: Frediano Ziglio AuthorDate: Fri Mar 14 17:44:19 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:44:19 2014 +0100 x86/MCE: Fix race condition in mctelem_reserve These lines (in mctelem_reserve) newhead = oldhead->mcte_next; if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { are racy. After you read the newhead pointer it can happen that another flow (thread or recursive invocation) change all the list but set head with same value. So oldhead is the same as *freelp but you are setting a new head that could point to whatever element (even already used). This patch use instead a bit array and atomic bit operations. Signed-off-by: Frediano Ziglio Reviewed-by: Liu Jinsong master commit: 60ea3a3ac3d2bcd8e85b250fdbfc46b3b9dc7085 master date: 2014-02-24 12:07:41 +0100 --- xen/arch/x86/cpu/mcheck/mctelem.c | 81 ++++++++++++++----------------------- 1 files changed, 30 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index 895ce1a..ed8e8d2 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -37,24 +37,19 @@ struct mctelem_ent { void *mcte_data; /* corresponding data payload */ }; -#define MCTE_F_HOME_URGENT 0x0001U /* free to urgent freelist */ -#define MCTE_F_HOME_NONURGENT 0x0002U /* free to nonurgent freelist */ -#define MCTE_F_CLASS_URGENT 0x0004U /* in use - urgent errors */ -#define MCTE_F_CLASS_NONURGENT 0x0008U /* in use - nonurgent errors */ +#define MCTE_F_CLASS_URGENT 0x0001U /* in use - urgent errors */ +#define MCTE_F_CLASS_NONURGENT 0x0002U /* in use - nonurgent errors */ #define MCTE_F_STATE_FREE 0x0010U /* on a freelist */ #define MCTE_F_STATE_UNCOMMITTED 0x0020U /* reserved; on no list */ #define MCTE_F_STATE_COMMITTED 0x0040U /* on a committed list */ #define MCTE_F_STATE_PROCESSING 0x0080U /* on a processing list */ -#define MCTE_F_MASK_HOME (MCTE_F_HOME_URGENT | MCTE_F_HOME_NONURGENT) #define MCTE_F_MASK_CLASS (MCTE_F_CLASS_URGENT | MCTE_F_CLASS_NONURGENT) #define MCTE_F_MASK_STATE (MCTE_F_STATE_FREE | \ MCTE_F_STATE_UNCOMMITTED | \ MCTE_F_STATE_COMMITTED | \ MCTE_F_STATE_PROCESSING) -#define MCTE_HOME(tep) ((tep)->mcte_flags & MCTE_F_MASK_HOME) - #define MCTE_CLASS(tep) ((tep)->mcte_flags & MCTE_F_MASK_CLASS) #define MCTE_SET_CLASS(tep, new) do { \ (tep)->mcte_flags &= ~MCTE_F_MASK_CLASS; \ @@ -69,6 +64,8 @@ struct mctelem_ent { #define MC_URGENT_NENT 10 #define MC_NONURGENT_NENT 20 +#define MC_NENT (MC_URGENT_NENT + MC_NONURGENT_NENT) + #define MC_NCLASSES (MC_NONURGENT + 1) #define COOKIE2MCTE(c) ((struct mctelem_ent *)(c)) @@ -77,11 +74,9 @@ struct mctelem_ent { static struct mc_telem_ctl { /* Linked lists that thread the array members together. * - * The free lists are singly-linked via mcte_next, and we allocate - * from them by atomically unlinking an element from the head. - * Consumed entries are returned to the head of the free list. - * When an entry is reserved off the free list it is not linked - * on any list until it is committed or dismissed. + * The free lists is a bit array where bit 1 means free. + * This as element number is quite small and is easy to + * atomically allocate that way. * * The committed list grows at the head and we do not maintain a * tail pointer; insertions are performed atomically. The head @@ -101,7 +96,7 @@ static struct mc_telem_ctl { * we can lock it for updates. The head of the processing list * always has the oldest telemetry, and we append (as above) * at the tail of the processing list. */ - struct mctelem_ent *mctc_free[MC_NCLASSES]; + DECLARE_BITMAP(mctc_free, MC_NENT); struct mctelem_ent *mctc_committed[MC_NCLASSES]; struct mctelem_ent *mctc_processing_head[MC_NCLASSES]; struct mctelem_ent *mctc_processing_tail[MC_NCLASSES]; @@ -207,14 +202,14 @@ int mctelem_has_deferred(unsigned int cpu) */ static void mctelem_free(struct mctelem_ent *tep) { - mctelem_class_t target = MCTE_HOME(tep) == MCTE_F_HOME_URGENT ? - MC_URGENT : MC_NONURGENT; - BUG_ON(tep->mcte_refcnt != 0); BUG_ON(MCTE_STATE(tep) != MCTE_F_STATE_FREE); tep->mcte_prev = NULL; - mctelem_xchg_head(&mctctl.mctc_free[target], &tep->mcte_next, tep); + tep->mcte_next = NULL; + + /* set free in array */ + set_bit(tep - mctctl.mctc_elems, mctctl.mctc_free); } /* Increment the reference count of an entry that is not linked on to @@ -274,34 +269,25 @@ void mctelem_init(int reqdatasz) } if ((mctctl.mctc_elems = xmalloc_array(struct mctelem_ent, - MC_URGENT_NENT + MC_NONURGENT_NENT)) == NULL || - (datarr = xmalloc_bytes((MC_URGENT_NENT + MC_NONURGENT_NENT) * - datasz)) == NULL) { + MC_NENT)) == NULL || + (datarr = xmalloc_bytes(MC_NENT * datasz)) == NULL) { if (mctctl.mctc_elems) xfree(mctctl.mctc_elems); printk("Allocations for MCA telemetry failed\n"); return; } - for (i = 0; i < MC_URGENT_NENT + MC_NONURGENT_NENT; i++) { - struct mctelem_ent *tep, **tepp; + for (i = 0; i < MC_NENT; i++) { + struct mctelem_ent *tep; tep = mctctl.mctc_elems + i; tep->mcte_flags = MCTE_F_STATE_FREE; tep->mcte_refcnt = 0; tep->mcte_data = datarr + i * datasz; - if (i < MC_URGENT_NENT) { - tepp = &mctctl.mctc_free[MC_URGENT]; - tep->mcte_flags |= MCTE_F_HOME_URGENT; - } else { - tepp = &mctctl.mctc_free[MC_NONURGENT]; - tep->mcte_flags |= MCTE_F_HOME_NONURGENT; - } - - tep->mcte_next = *tepp; + __set_bit(i, mctctl.mctc_free); + tep->mcte_next = NULL; tep->mcte_prev = NULL; - *tepp = tep; } } @@ -310,32 +296,25 @@ static int mctelem_drop_count; /* Reserve a telemetry entry, or return NULL if none available. * If we return an entry then the caller must subsequently call exactly one of - * mctelem_unreserve or mctelem_commit for that entry. + * mctelem_dismiss or mctelem_commit for that entry. */ mctelem_cookie_t mctelem_reserve(mctelem_class_t which) { - struct mctelem_ent **freelp; - struct mctelem_ent *oldhead, *newhead; - mctelem_class_t target = (which == MC_URGENT) ? - MC_URGENT : MC_NONURGENT; + unsigned bit; + unsigned start_bit = (which == MC_URGENT) ? 0 : MC_URGENT_NENT; - freelp = &mctctl.mctc_free[target]; for (;;) { - if ((oldhead = *freelp) == NULL) { - if (which == MC_URGENT && target == MC_URGENT) { - /* raid the non-urgent freelist */ - target = MC_NONURGENT; - freelp = &mctctl.mctc_free[target]; - continue; - } else { - mctelem_drop_count++; - return (NULL); - } + bit = find_next_bit(mctctl.mctc_free, MC_NENT, start_bit); + + if (bit >= MC_NENT) { + mctelem_drop_count++; + return (NULL); } - newhead = oldhead->mcte_next; - if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { - struct mctelem_ent *tep = oldhead; + /* try to allocate, atomically clear free bit */ + if (test_and_clear_bit(bit, mctctl.mctc_free)) { + /* return element we got */ + struct mctelem_ent *tep = mctctl.mctc_elems + bit; mctelem_hold(tep); MCTE_TRANSITION_STATE(tep, FREE, UNCOMMITTED); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:33:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:33:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOs-0000Nu-57; Sat, 15 Mar 2014 18:33:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOq-0000NY-Ax for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:36 +0000 Received: from [85.158.143.35:63569] by server-2.bemta-4.messagelabs.com id FE/59-06539-FFC94235; Sat, 15 Mar 2014 18:33:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1394908414!1632136!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11681 invoked from network); 15 Mar 2014 18:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOo-0003HP-0k for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtOn-0004k6-Vu for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:33 +0000 Date: Sat, 15 Mar 2014 18:33:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/MSI: don't risk division by zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f4c6912c95ed5d5bb08e1b07b9588876595ecdbd Author: Jan Beulich AuthorDate: Fri Mar 14 17:45:14 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:45:14 2014 +0100 x86/MSI: don't risk division by zero The check in question is redundant with the one in the immediately following if(), where dividing by zero gets carefully avoided. Spotted-by: Boris Ostrovsky Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky master commit: 5d160d913e03b581bdddde73535c18ac670cf0a9 master date: 2014-02-24 12:11:01 +0100 --- xen/arch/x86/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 5da0410..4d98fd1 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -597,7 +597,7 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) return 0; base = pos + PCI_SRIOV_BAR; vf -= PCI_BDF(bus, slot, func) + offset; - if ( vf < 0 || (vf && vf % stride) ) + if ( vf < 0 ) return 0; if ( stride ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:33:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:33:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOs-0000Nu-57; Sat, 15 Mar 2014 18:33:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOq-0000NY-Ax for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:36 +0000 Received: from [85.158.143.35:63569] by server-2.bemta-4.messagelabs.com id FE/59-06539-FFC94235; Sat, 15 Mar 2014 18:33:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1394908414!1632136!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11681 invoked from network); 15 Mar 2014 18:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOo-0003HP-0k for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtOn-0004k6-Vu for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:33 +0000 Date: Sat, 15 Mar 2014 18:33:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/MSI: don't risk division by zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f4c6912c95ed5d5bb08e1b07b9588876595ecdbd Author: Jan Beulich AuthorDate: Fri Mar 14 17:45:14 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:45:14 2014 +0100 x86/MSI: don't risk division by zero The check in question is redundant with the one in the immediately following if(), where dividing by zero gets carefully avoided. Spotted-by: Boris Ostrovsky Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky master commit: 5d160d913e03b581bdddde73535c18ac670cf0a9 master date: 2014-02-24 12:11:01 +0100 --- xen/arch/x86/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 5da0410..4d98fd1 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -597,7 +597,7 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) return 0; base = pos + PCI_SRIOV_BAR; vf -= PCI_BDF(bus, slot, func) + offset; - if ( vf < 0 || (vf && vf % stride) ) + if ( vf < 0 ) return 0; if ( stride ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:33:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:33:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtP2-0000Pa-7e; Sat, 15 Mar 2014 18:33:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtP0-0000PE-KS for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:46 +0000 Received: from [193.109.254.147:10449] by server-8.bemta-14.messagelabs.com id 4C/BE-18529-A0D94235; Sat, 15 Mar 2014 18:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1394908424!1868764!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6578 invoked from network); 15 Mar 2014 18:33:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOy-0003HV-4a for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtOy-0004kS-3a for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:44 +0000 Date: Sat, 15 Mar 2014 18:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mce: Reduce boot-time logspam X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d404af9ba05389a43de8cf56e6c174bfb86db62e Author: Andrew Cooper AuthorDate: Fri Mar 14 17:45:52 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:45:52 2014 +0100 x86/mce: Reduce boot-time logspam When booting with "no-mce", the user does not need to be told that "MCE support [was] disabled by bootparam" for each cpu. Furthermore, a file:line reference is unnecessary. Signed-off-by: Andrew Cooper master commit: a5ab9c9fa29cda7e1b18dbcaa69a5dbded96de32 master date: 2014-02-25 09:30:59 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 66d8dfa..10aa558 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -808,8 +808,10 @@ void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp) { enum mcheck_type inited = mcheck_none; - if (mce_disabled == 1) { - dprintk(XENLOG_INFO, "MCE support disabled by bootparam\n"); + if ( mce_disabled ) + { + if ( bsp ) + printk(XENLOG_INFO "MCE support disabled by bootparam\n"); return; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:33:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:33:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtP2-0000Pa-7e; Sat, 15 Mar 2014 18:33:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtP0-0000PE-KS for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:46 +0000 Received: from [193.109.254.147:10449] by server-8.bemta-14.messagelabs.com id 4C/BE-18529-A0D94235; Sat, 15 Mar 2014 18:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1394908424!1868764!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6578 invoked from network); 15 Mar 2014 18:33:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtOy-0003HV-4a for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtOy-0004kS-3a for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:44 +0000 Date: Sat, 15 Mar 2014 18:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mce: Reduce boot-time logspam X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d404af9ba05389a43de8cf56e6c174bfb86db62e Author: Andrew Cooper AuthorDate: Fri Mar 14 17:45:52 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:45:52 2014 +0100 x86/mce: Reduce boot-time logspam When booting with "no-mce", the user does not need to be told that "MCE support [was] disabled by bootparam" for each cpu. Furthermore, a file:line reference is unnecessary. Signed-off-by: Andrew Cooper master commit: a5ab9c9fa29cda7e1b18dbcaa69a5dbded96de32 master date: 2014-02-25 09:30:59 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 66d8dfa..10aa558 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -808,8 +808,10 @@ void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp) { enum mcheck_type inited = mcheck_none; - if (mce_disabled == 1) { - dprintk(XENLOG_INFO, "MCE support disabled by bootparam\n"); + if ( mce_disabled ) + { + if ( bsp ) + printk(XENLOG_INFO "MCE support disabled by bootparam\n"); return; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:34:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:34:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPC-0000Qe-As; Sat, 15 Mar 2014 18:33:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPA-0000QH-Ru for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:57 +0000 Received: from [193.109.254.147:17122] by server-12.bemta-14.messagelabs.com id 54/07-17220-41D94235; Sat, 15 Mar 2014 18:33:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1394908434!1921836!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11519 invoked from network); 15 Mar 2014 18:33:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:33:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtP8-0003Hb-91 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtP8-0004kp-7W for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:54 +0000 Date: Sat, 15 Mar 2014 18:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] IOMMU: generalize and correct softirq processing during Dom0 device setup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 83a20cab51bbedf48d45ca662cbde0a63f57fbb7 Author: Jan Beulich AuthorDate: Fri Mar 14 17:50:03 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:50:03 2014 +0100 IOMMU: generalize and correct softirq processing during Dom0 device setup c/s 21039:95f5a4ce8f24 ("VT-d: reduce default verbosity") having put a call to process_pending_softirqs() in VT-d's domain_context_mapping() was wrong in two ways: For one we shouldn't be doing this when setting up a device during DomU assignment. And then - I didn't check whether that was the case already back then - we shouldn't call that function with the pcidevs_lock (or in fact any spin lock) held. Move the "preemption" into generic code, at once dealing with further actual (too much output elsewhere - particularly on systems with very many host bridge like devices - having been observed to still cause the watchdog to trigger when enabled) and potential (other IOMMU code may also end up being too verbose) issues. Do the "preemption" once per device actually being set up when in verbose mode, and once per bus otherwise. Note that dropping pcidevs_lock around the process_pending_softirqs() invocation is specifically not a problem here: We're in an __init function and aren't racing with potential additions/removals of PCI devices. Not acquiring the lock in setup_dom0_pci_devices() otoh is not an option, as there are too many places that assert the lock being held. Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang master commit: 9ef5aa944a6a0df7f5938983043c7e46f158bbc6 master date: 2014-03-04 10:52:20 +0100 --- xen/drivers/passthrough/pci.c | 15 +++++++++++++++ xen/drivers/passthrough/vtd/iommu.c | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 30515a9..00a7129 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #ifdef CONFIG_X86 @@ -705,6 +706,20 @@ static int __init _setup_dom0_pci_devices(struct pci_seg *pseg, void *arg) pdev->domain = ctxt->d; list_add(&pdev->domain_list, &ctxt->d->arch.pdev_list); ctxt->handler(pdev); + + if ( iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); + } + } + + if ( !iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); } } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 709778b..8052a25 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #if defined(__i386__) || defined(__x86_64__) @@ -1524,9 +1523,6 @@ static int domain_context_mapping( break; } - if ( iommu_verbose ) - process_pending_softirqs(); - return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:34:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:34:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPC-0000Qe-As; Sat, 15 Mar 2014 18:33:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPA-0000QH-Ru for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:57 +0000 Received: from [193.109.254.147:17122] by server-12.bemta-14.messagelabs.com id 54/07-17220-41D94235; Sat, 15 Mar 2014 18:33:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1394908434!1921836!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11519 invoked from network); 15 Mar 2014 18:33:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:33:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtP8-0003Hb-91 for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtP8-0004kp-7W for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:33:54 +0000 Date: Sat, 15 Mar 2014 18:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] IOMMU: generalize and correct softirq processing during Dom0 device setup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 83a20cab51bbedf48d45ca662cbde0a63f57fbb7 Author: Jan Beulich AuthorDate: Fri Mar 14 17:50:03 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:50:03 2014 +0100 IOMMU: generalize and correct softirq processing during Dom0 device setup c/s 21039:95f5a4ce8f24 ("VT-d: reduce default verbosity") having put a call to process_pending_softirqs() in VT-d's domain_context_mapping() was wrong in two ways: For one we shouldn't be doing this when setting up a device during DomU assignment. And then - I didn't check whether that was the case already back then - we shouldn't call that function with the pcidevs_lock (or in fact any spin lock) held. Move the "preemption" into generic code, at once dealing with further actual (too much output elsewhere - particularly on systems with very many host bridge like devices - having been observed to still cause the watchdog to trigger when enabled) and potential (other IOMMU code may also end up being too verbose) issues. Do the "preemption" once per device actually being set up when in verbose mode, and once per bus otherwise. Note that dropping pcidevs_lock around the process_pending_softirqs() invocation is specifically not a problem here: We're in an __init function and aren't racing with potential additions/removals of PCI devices. Not acquiring the lock in setup_dom0_pci_devices() otoh is not an option, as there are too many places that assert the lock being held. Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang master commit: 9ef5aa944a6a0df7f5938983043c7e46f158bbc6 master date: 2014-03-04 10:52:20 +0100 --- xen/drivers/passthrough/pci.c | 15 +++++++++++++++ xen/drivers/passthrough/vtd/iommu.c | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 30515a9..00a7129 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #ifdef CONFIG_X86 @@ -705,6 +706,20 @@ static int __init _setup_dom0_pci_devices(struct pci_seg *pseg, void *arg) pdev->domain = ctxt->d; list_add(&pdev->domain_list, &ctxt->d->arch.pdev_list); ctxt->handler(pdev); + + if ( iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); + } + } + + if ( !iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); } } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 709778b..8052a25 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #if defined(__i386__) || defined(__x86_64__) @@ -1524,9 +1523,6 @@ static int domain_context_mapping( break; } - if ( iommu_verbose ) - process_pending_softirqs(); - return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:34:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:34:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPQ-0000Rz-Di; Sat, 15 Mar 2014 18:34:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPL-0000RK-Aw for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:10 +0000 Received: from [85.158.139.211:10905] by server-7.bemta-5.messagelabs.com id 47/B4-20531-E1D94235; Sat, 15 Mar 2014 18:34:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1394908444!1012574!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2337 invoked from network); 15 Mar 2014 18:34:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:34:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPI-0003IA-EH for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtPI-0004lL-Bc for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:04 +0000 Date: Sat, 15 Mar 2014 18:34:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/hvm: refine the judgment on IDENT_PT for EMT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 999d56f527282399b68592635e55625fbf9b94d7 Author: Dongxiao Xu AuthorDate: Fri Mar 14 17:51:07 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:51:07 2014 +0100 x86/hvm: refine the judgment on IDENT_PT for EMT When trying to get the EPT EMT type, the judgment on HVM_PARAM_IDENT_PT is not correct which always returns WB type if the parameter is not set. Remove the related code. Signed-off-by: Dongxiao Xu We can't fully drop the dependency yet, but we should certainly avoid overriding cases already properly handled. The reason for this is that the guest setting up its MTRRs happens _after_ the EPT tables got already constructed, and no code is in place to propagate this to the EPT code. Without this check we're forcing the guest to run with all of its memory uncachable until something happens to re-write every single EPT entry. But of course this has to be just a temporary solution. In the same spirit we should defer the "very early" (when the guest is still being constructed and has no vCPU yet) override to the last possible point. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: cadfd7bca999c0a795dc27be72d43c92e8943a0b master date: 2014-03-10 11:02:25 +0100 --- xen/arch/x86/hvm/mtrr.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 4842d63..8ab9426 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -689,12 +689,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, *ipat = 0; - if ( (current->domain != d) && - ((d->vcpu == NULL) || ((v = d->vcpu[0]) == NULL)) ) - return MTRR_TYPE_WRBACK; - - if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) - return MTRR_TYPE_WRBACK; + if ( v->domain != d ) + v = d->vcpu ? d->vcpu[0] : NULL; if ( !mfn_valid(mfn_x(mfn)) ) return MTRR_TYPE_UNCACHABLE; @@ -717,7 +713,9 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, return MTRR_TYPE_WRBACK; } - gmtrr_mtype = get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)); + gmtrr_mtype = v && d->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ? + get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : + MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:34:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:34:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPi-0000Uw-Lr; Sat, 15 Mar 2014 18:34:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPg-0000Uc-BF for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:28 +0000 Received: from [85.158.137.68:13147] by server-7.bemta-3.messagelabs.com id C7/D0-04151-33D94235; Sat, 15 Mar 2014 18:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1394908465!846414!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23272 invoked from network); 15 Mar 2014 18:34:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:34:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPc-0003IJ-PX for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtPc-0004mb-OA for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:24 +0000 Date: Sat, 15 Mar 2014 18:34:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: consolidate passthrough handling in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ea3db636df531428320e6ab61479731be283ac23 Author: Jan Beulich AuthorDate: Fri Mar 14 17:52:27 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:52:27 2014 +0100 x86/HVM: consolidate passthrough handling in epte_get_entry_emt() It is inconsistent to depend on iommu_enabled alone: For a guest without devices passed through to it, it is of no concern whether the IOMMU is enabled. There's one rather special case to take care of: VMX code marks the LAPIC access page as MMIO. The added assertion needs to take this into consideration, and the subsequent handling of the direct MMIO case was inconsistent too: That page would have been WB in the absence of an IOMMU, but UC in the presence of it, while in fact the cachabilty of this page is entirely unrelated to an IOMMU being in use. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: 3089a6d82bdf3112ccb1dd074ce34a8cbdc4ccd8 master date: 2014-03-10 11:04:36 +0100 --- xen/arch/x86/hvm/mtrr.c | 10 ++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index e56d270..1e84e35 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -698,14 +698,20 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, if ( hvm_get_mem_pinned_cacheattr(d, gfn, &type) ) return type; - if ( !iommu_enabled ) + if ( !iommu_enabled || + (rangeset_is_empty(d->iomem_caps) && + rangeset_is_empty(d->arch.ioport_caps) && + !has_arch_pdevs(d)) ) { + ASSERT(!direct_mmio || + mfn_x(mfn) == d->arch.hvm_domain.vmx.apic_access_mfn); *ipat = 1; return MTRR_TYPE_WRBACK; } if ( direct_mmio ) - return MTRR_TYPE_UNCACHABLE; + return mfn_x(mfn) != d->arch.hvm_domain.vmx.apic_access_mfn + ? MTRR_TYPE_UNCACHABLE : MTRR_TYPE_WRBACK; if ( iommu_snoop ) { diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f7c1130..1bf0297 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2006,9 +2006,9 @@ static int vmx_alloc_vlapic_mapping(struct domain *d) if ( apic_va == NULL ) return -ENOMEM; share_xen_page_with_guest(virt_to_page(apic_va), d, XENSHARE_writable); + d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), _mfn(virt_to_mfn(apic_va))); - d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:34:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:34:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPW-0000TQ-Iv; Sat, 15 Mar 2014 18:34:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPV-0000T5-Ao for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:17 +0000 Received: from [193.109.254.147:11493] by server-3.bemta-14.messagelabs.com id F9/5A-00432-82D94235; Sat, 15 Mar 2014 18:34:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1394908454!1205958!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11138 invoked from network); 15 Mar 2014 18:34:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:34:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPS-0003IG-LU for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtPS-0004mF-HM for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:14 +0000 Date: Sat, 15 Mar 2014 18:34:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: fix memory type merging in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1df316f038151cb23350337b6e1ee1a94fb4f9d8 Author: Jan Beulich AuthorDate: Fri Mar 14 17:51:39 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:51:39 2014 +0100 x86/HVM: fix memory type merging in epte_get_entry_emt() Using the minimum numeric value of guest and host specified memory types is too simplistic - it works only correctly for a subset of types. It is in particular the WT/WP combination that needs conversion to UC if the two types conflict. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: b99113b9d5fac5149de8496f55afa00e285b1ff3 master date: 2014-03-10 11:03:53 +0100 --- xen/arch/x86/hvm/mtrr.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 8ab9426..e56d270 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -717,5 +717,35 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); - return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); + + /* If both types match we're fine. */ + if ( likely(gmtrr_mtype == hmtrr_mtype) ) + return hmtrr_mtype; + + /* If either type is UC, we have to go with that one. */ + if ( gmtrr_mtype == MTRR_TYPE_UNCACHABLE || + hmtrr_mtype == MTRR_TYPE_UNCACHABLE ) + return MTRR_TYPE_UNCACHABLE; + + /* If either type is WB, we have to go with the other one. */ + if ( gmtrr_mtype == MTRR_TYPE_WRBACK ) + return hmtrr_mtype; + if ( hmtrr_mtype == MTRR_TYPE_WRBACK ) + return gmtrr_mtype; + + /* + * At this point we have disagreeing WC, WT, or WP types. The only + * combination that can be cleanly resolved is WT:WP. The ones involving + * WC need to be converted to UC, both due to the memory ordering + * differences and because WC disallows reads to be cached (WT and WP + * permit this), while WT and WP require writes to go straight to memory + * (WC can buffer them). + */ + if ( (gmtrr_mtype == MTRR_TYPE_WRTHROUGH && + hmtrr_mtype == MTRR_TYPE_WRPROT) || + (gmtrr_mtype == MTRR_TYPE_WRPROT && + hmtrr_mtype == MTRR_TYPE_WRTHROUGH) ) + return MTRR_TYPE_WRPROT; + + return MTRR_TYPE_UNCACHABLE; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:34:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:34:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPi-0000Uw-Lr; Sat, 15 Mar 2014 18:34:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPg-0000Uc-BF for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:28 +0000 Received: from [85.158.137.68:13147] by server-7.bemta-3.messagelabs.com id C7/D0-04151-33D94235; Sat, 15 Mar 2014 18:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1394908465!846414!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23272 invoked from network); 15 Mar 2014 18:34:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:34:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPc-0003IJ-PX for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtPc-0004mb-OA for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:24 +0000 Date: Sat, 15 Mar 2014 18:34:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: consolidate passthrough handling in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ea3db636df531428320e6ab61479731be283ac23 Author: Jan Beulich AuthorDate: Fri Mar 14 17:52:27 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:52:27 2014 +0100 x86/HVM: consolidate passthrough handling in epte_get_entry_emt() It is inconsistent to depend on iommu_enabled alone: For a guest without devices passed through to it, it is of no concern whether the IOMMU is enabled. There's one rather special case to take care of: VMX code marks the LAPIC access page as MMIO. The added assertion needs to take this into consideration, and the subsequent handling of the direct MMIO case was inconsistent too: That page would have been WB in the absence of an IOMMU, but UC in the presence of it, while in fact the cachabilty of this page is entirely unrelated to an IOMMU being in use. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: 3089a6d82bdf3112ccb1dd074ce34a8cbdc4ccd8 master date: 2014-03-10 11:04:36 +0100 --- xen/arch/x86/hvm/mtrr.c | 10 ++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index e56d270..1e84e35 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -698,14 +698,20 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, if ( hvm_get_mem_pinned_cacheattr(d, gfn, &type) ) return type; - if ( !iommu_enabled ) + if ( !iommu_enabled || + (rangeset_is_empty(d->iomem_caps) && + rangeset_is_empty(d->arch.ioport_caps) && + !has_arch_pdevs(d)) ) { + ASSERT(!direct_mmio || + mfn_x(mfn) == d->arch.hvm_domain.vmx.apic_access_mfn); *ipat = 1; return MTRR_TYPE_WRBACK; } if ( direct_mmio ) - return MTRR_TYPE_UNCACHABLE; + return mfn_x(mfn) != d->arch.hvm_domain.vmx.apic_access_mfn + ? MTRR_TYPE_UNCACHABLE : MTRR_TYPE_WRBACK; if ( iommu_snoop ) { diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f7c1130..1bf0297 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2006,9 +2006,9 @@ static int vmx_alloc_vlapic_mapping(struct domain *d) if ( apic_va == NULL ) return -ENOMEM; share_xen_page_with_guest(virt_to_page(apic_va), d, XENSHARE_writable); + d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), _mfn(virt_to_mfn(apic_va))); - d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:34:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:34:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPW-0000TQ-Iv; Sat, 15 Mar 2014 18:34:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPV-0000T5-Ao for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:17 +0000 Received: from [193.109.254.147:11493] by server-3.bemta-14.messagelabs.com id F9/5A-00432-82D94235; Sat, 15 Mar 2014 18:34:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1394908454!1205958!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11138 invoked from network); 15 Mar 2014 18:34:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:34:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPS-0003IG-LU for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtPS-0004mF-HM for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:14 +0000 Date: Sat, 15 Mar 2014 18:34:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: fix memory type merging in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1df316f038151cb23350337b6e1ee1a94fb4f9d8 Author: Jan Beulich AuthorDate: Fri Mar 14 17:51:39 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:51:39 2014 +0100 x86/HVM: fix memory type merging in epte_get_entry_emt() Using the minimum numeric value of guest and host specified memory types is too simplistic - it works only correctly for a subset of types. It is in particular the WT/WP combination that needs conversion to UC if the two types conflict. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: b99113b9d5fac5149de8496f55afa00e285b1ff3 master date: 2014-03-10 11:03:53 +0100 --- xen/arch/x86/hvm/mtrr.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 8ab9426..e56d270 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -717,5 +717,35 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); - return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); + + /* If both types match we're fine. */ + if ( likely(gmtrr_mtype == hmtrr_mtype) ) + return hmtrr_mtype; + + /* If either type is UC, we have to go with that one. */ + if ( gmtrr_mtype == MTRR_TYPE_UNCACHABLE || + hmtrr_mtype == MTRR_TYPE_UNCACHABLE ) + return MTRR_TYPE_UNCACHABLE; + + /* If either type is WB, we have to go with the other one. */ + if ( gmtrr_mtype == MTRR_TYPE_WRBACK ) + return hmtrr_mtype; + if ( hmtrr_mtype == MTRR_TYPE_WRBACK ) + return gmtrr_mtype; + + /* + * At this point we have disagreeing WC, WT, or WP types. The only + * combination that can be cleanly resolved is WT:WP. The ones involving + * WC need to be converted to UC, both due to the memory ordering + * differences and because WC disallows reads to be cached (WT and WP + * permit this), while WT and WP require writes to go straight to memory + * (WC can buffer them). + */ + if ( (gmtrr_mtype == MTRR_TYPE_WRTHROUGH && + hmtrr_mtype == MTRR_TYPE_WRPROT) || + (gmtrr_mtype == MTRR_TYPE_WRPROT && + hmtrr_mtype == MTRR_TYPE_WRTHROUGH) ) + return MTRR_TYPE_WRPROT; + + return MTRR_TYPE_UNCACHABLE; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 15 18:34:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Mar 2014 18:34:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPQ-0000Rz-Di; Sat, 15 Mar 2014 18:34:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPL-0000RK-Aw for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:10 +0000 Received: from [85.158.139.211:10905] by server-7.bemta-5.messagelabs.com id 47/B4-20531-E1D94235; Sat, 15 Mar 2014 18:34:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1394908444!1012574!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2337 invoked from network); 15 Mar 2014 18:34:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2014 18:34:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WOtPI-0003IA-EH for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WOtPI-0004lL-Bc for xen-changelog@lists.xensource.com; Sat, 15 Mar 2014 18:34:04 +0000 Date: Sat, 15 Mar 2014 18:34:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/hvm: refine the judgment on IDENT_PT for EMT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 999d56f527282399b68592635e55625fbf9b94d7 Author: Dongxiao Xu AuthorDate: Fri Mar 14 17:51:07 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:51:07 2014 +0100 x86/hvm: refine the judgment on IDENT_PT for EMT When trying to get the EPT EMT type, the judgment on HVM_PARAM_IDENT_PT is not correct which always returns WB type if the parameter is not set. Remove the related code. Signed-off-by: Dongxiao Xu We can't fully drop the dependency yet, but we should certainly avoid overriding cases already properly handled. The reason for this is that the guest setting up its MTRRs happens _after_ the EPT tables got already constructed, and no code is in place to propagate this to the EPT code. Without this check we're forcing the guest to run with all of its memory uncachable until something happens to re-write every single EPT entry. But of course this has to be just a temporary solution. In the same spirit we should defer the "very early" (when the guest is still being constructed and has no vCPU yet) override to the last possible point. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: cadfd7bca999c0a795dc27be72d43c92e8943a0b master date: 2014-03-10 11:02:25 +0100 --- xen/arch/x86/hvm/mtrr.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 4842d63..8ab9426 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -689,12 +689,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, *ipat = 0; - if ( (current->domain != d) && - ((d->vcpu == NULL) || ((v = d->vcpu[0]) == NULL)) ) - return MTRR_TYPE_WRBACK; - - if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) - return MTRR_TYPE_WRBACK; + if ( v->domain != d ) + v = d->vcpu ? d->vcpu[0] : NULL; if ( !mfn_valid(mfn_x(mfn)) ) return MTRR_TYPE_UNCACHABLE; @@ -717,7 +713,9 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, return MTRR_TYPE_WRBACK; } - gmtrr_mtype = get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)); + gmtrr_mtype = v && d->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ? + get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : + MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:11:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqW-0007Lw-12; Sun, 16 Mar 2014 13:11:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqJ-0007Lc-4i for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:18 +0000 Received: from [85.158.143.35:6356] by server-2.bemta-4.messagelabs.com id AF/78-06539-AE2A5235; Sun, 16 Mar 2014 13:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1394975464!2414917!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21346 invoked from network); 16 Mar 2014 13:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqG-0004Xi-Fn for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAqF-0003LY-Bi for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:04 +0000 Date: Sun, 16 Mar 2014 13:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.1-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f69f1fb8e20a4fd04bfef50cbdddcf810c108277 Author: Ian Jackson AuthorDate: Fri Mar 14 14:27:47 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 14 14:27:47 2014 +0000 update Xen version to 4.4.1-pre Signed-off-by: Ian Jackson --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 39839a3..9c0d356 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= .0$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:11:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqX-0007M6-3P; Sun, 16 Mar 2014 13:11:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqV-0007Ln-Rp for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:19 +0000 Received: from [193.109.254.147:39226] by server-4.bemta-14.messagelabs.com id B0/FC-32066-6F2A5235; Sun, 16 Mar 2014 13:11:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1394975475!1959993!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2859 invoked from network); 16 Mar 2014 13:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqQ-0004Xl-U6 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAqQ-0003Lw-LN for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:14 +0000 Date: Sun, 16 Mar 2014 13:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update MAINTAINERS for stable branch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c261a2e8dc37080c0195e5c34126a4a379229e1b Author: Jan Beulich AuthorDate: Fri Mar 14 16:09:49 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 16:09:49 2014 +0100 update MAINTAINERS for stable branch --- MAINTAINERS | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7757cdd..902c077 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -49,9 +49,14 @@ for inclusion in xen-unstable. Please see http://wiki.xen.org/wiki/Xen_Maintenance_Releases for more information. -Remember to copy the appropriate stable branch maintainer who will be -listed in this section of the MAINTAINERS file in the appropriate -branch. +Remember to copy the stable branch maintainer. The maintainer for this +branch is: + + Jan Beulich + +Tools backport requests should also be copied to: + + Ian Jackson Unstable Subsystem Maintainers ============================== -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:11:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqW-0007Lw-12; Sun, 16 Mar 2014 13:11:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqJ-0007Lc-4i for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:18 +0000 Received: from [85.158.143.35:6356] by server-2.bemta-4.messagelabs.com id AF/78-06539-AE2A5235; Sun, 16 Mar 2014 13:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1394975464!2414917!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21346 invoked from network); 16 Mar 2014 13:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqG-0004Xi-Fn for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAqF-0003LY-Bi for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:04 +0000 Date: Sun, 16 Mar 2014 13:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.1-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f69f1fb8e20a4fd04bfef50cbdddcf810c108277 Author: Ian Jackson AuthorDate: Fri Mar 14 14:27:47 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 14 14:27:47 2014 +0000 update Xen version to 4.4.1-pre Signed-off-by: Ian Jackson --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 39839a3..9c0d356 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= .0$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:11:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqX-0007M6-3P; Sun, 16 Mar 2014 13:11:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqV-0007Ln-Rp for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:19 +0000 Received: from [193.109.254.147:39226] by server-4.bemta-14.messagelabs.com id B0/FC-32066-6F2A5235; Sun, 16 Mar 2014 13:11:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1394975475!1959993!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2859 invoked from network); 16 Mar 2014 13:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqQ-0004Xl-U6 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAqQ-0003Lw-LN for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:14 +0000 Date: Sun, 16 Mar 2014 13:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update MAINTAINERS for stable branch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c261a2e8dc37080c0195e5c34126a4a379229e1b Author: Jan Beulich AuthorDate: Fri Mar 14 16:09:49 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 16:09:49 2014 +0100 update MAINTAINERS for stable branch --- MAINTAINERS | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7757cdd..902c077 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -49,9 +49,14 @@ for inclusion in xen-unstable. Please see http://wiki.xen.org/wiki/Xen_Maintenance_Releases for more information. -Remember to copy the appropriate stable branch maintainer who will be -listed in this section of the MAINTAINERS file in the appropriate -branch. +Remember to copy the stable branch maintainer. The maintainer for this +branch is: + + Jan Beulich + +Tools backport requests should also be copied to: + + Ian Jackson Unstable Subsystem Maintainers ============================== -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:11:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:11:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqg-0007NO-NE; Sun, 16 Mar 2014 13:11:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqe-0007Mw-MO for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:29 +0000 Received: from [85.158.137.68:39823] by server-17.bemta-3.messagelabs.com id 6B/AE-22741-FF2A5235; Sun, 16 Mar 2014 13:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1394975485!921042!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14541 invoked from network); 16 Mar 2014 13:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqb-0004Xo-2h for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAqb-0003MI-1O for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:25 +0000 Date: Sun, 16 Mar 2014 13:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/MCE: Fix race condition in mctelem_reserve X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9bd7260131d65a1c378dd3dc1cf3bc20c40fadd2 Author: Frediano Ziglio AuthorDate: Fri Mar 14 17:18:32 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:18:32 2014 +0100 x86/MCE: Fix race condition in mctelem_reserve These lines (in mctelem_reserve) newhead = oldhead->mcte_next; if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { are racy. After you read the newhead pointer it can happen that another flow (thread or recursive invocation) change all the list but set head with same value. So oldhead is the same as *freelp but you are setting a new head that could point to whatever element (even already used). This patch use instead a bit array and atomic bit operations. Signed-off-by: Frediano Ziglio Reviewed-by: Liu Jinsong master commit: 60ea3a3ac3d2bcd8e85b250fdbfc46b3b9dc7085 master date: 2014-02-24 12:07:41 +0100 --- xen/arch/x86/cpu/mcheck/mctelem.c | 81 ++++++++++++++----------------------- 1 files changed, 30 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index 895ce1a..ed8e8d2 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -37,24 +37,19 @@ struct mctelem_ent { void *mcte_data; /* corresponding data payload */ }; -#define MCTE_F_HOME_URGENT 0x0001U /* free to urgent freelist */ -#define MCTE_F_HOME_NONURGENT 0x0002U /* free to nonurgent freelist */ -#define MCTE_F_CLASS_URGENT 0x0004U /* in use - urgent errors */ -#define MCTE_F_CLASS_NONURGENT 0x0008U /* in use - nonurgent errors */ +#define MCTE_F_CLASS_URGENT 0x0001U /* in use - urgent errors */ +#define MCTE_F_CLASS_NONURGENT 0x0002U /* in use - nonurgent errors */ #define MCTE_F_STATE_FREE 0x0010U /* on a freelist */ #define MCTE_F_STATE_UNCOMMITTED 0x0020U /* reserved; on no list */ #define MCTE_F_STATE_COMMITTED 0x0040U /* on a committed list */ #define MCTE_F_STATE_PROCESSING 0x0080U /* on a processing list */ -#define MCTE_F_MASK_HOME (MCTE_F_HOME_URGENT | MCTE_F_HOME_NONURGENT) #define MCTE_F_MASK_CLASS (MCTE_F_CLASS_URGENT | MCTE_F_CLASS_NONURGENT) #define MCTE_F_MASK_STATE (MCTE_F_STATE_FREE | \ MCTE_F_STATE_UNCOMMITTED | \ MCTE_F_STATE_COMMITTED | \ MCTE_F_STATE_PROCESSING) -#define MCTE_HOME(tep) ((tep)->mcte_flags & MCTE_F_MASK_HOME) - #define MCTE_CLASS(tep) ((tep)->mcte_flags & MCTE_F_MASK_CLASS) #define MCTE_SET_CLASS(tep, new) do { \ (tep)->mcte_flags &= ~MCTE_F_MASK_CLASS; \ @@ -69,6 +64,8 @@ struct mctelem_ent { #define MC_URGENT_NENT 10 #define MC_NONURGENT_NENT 20 +#define MC_NENT (MC_URGENT_NENT + MC_NONURGENT_NENT) + #define MC_NCLASSES (MC_NONURGENT + 1) #define COOKIE2MCTE(c) ((struct mctelem_ent *)(c)) @@ -77,11 +74,9 @@ struct mctelem_ent { static struct mc_telem_ctl { /* Linked lists that thread the array members together. * - * The free lists are singly-linked via mcte_next, and we allocate - * from them by atomically unlinking an element from the head. - * Consumed entries are returned to the head of the free list. - * When an entry is reserved off the free list it is not linked - * on any list until it is committed or dismissed. + * The free lists is a bit array where bit 1 means free. + * This as element number is quite small and is easy to + * atomically allocate that way. * * The committed list grows at the head and we do not maintain a * tail pointer; insertions are performed atomically. The head @@ -101,7 +96,7 @@ static struct mc_telem_ctl { * we can lock it for updates. The head of the processing list * always has the oldest telemetry, and we append (as above) * at the tail of the processing list. */ - struct mctelem_ent *mctc_free[MC_NCLASSES]; + DECLARE_BITMAP(mctc_free, MC_NENT); struct mctelem_ent *mctc_committed[MC_NCLASSES]; struct mctelem_ent *mctc_processing_head[MC_NCLASSES]; struct mctelem_ent *mctc_processing_tail[MC_NCLASSES]; @@ -207,14 +202,14 @@ int mctelem_has_deferred(unsigned int cpu) */ static void mctelem_free(struct mctelem_ent *tep) { - mctelem_class_t target = MCTE_HOME(tep) == MCTE_F_HOME_URGENT ? - MC_URGENT : MC_NONURGENT; - BUG_ON(tep->mcte_refcnt != 0); BUG_ON(MCTE_STATE(tep) != MCTE_F_STATE_FREE); tep->mcte_prev = NULL; - mctelem_xchg_head(&mctctl.mctc_free[target], &tep->mcte_next, tep); + tep->mcte_next = NULL; + + /* set free in array */ + set_bit(tep - mctctl.mctc_elems, mctctl.mctc_free); } /* Increment the reference count of an entry that is not linked on to @@ -274,34 +269,25 @@ void mctelem_init(int reqdatasz) } if ((mctctl.mctc_elems = xmalloc_array(struct mctelem_ent, - MC_URGENT_NENT + MC_NONURGENT_NENT)) == NULL || - (datarr = xmalloc_bytes((MC_URGENT_NENT + MC_NONURGENT_NENT) * - datasz)) == NULL) { + MC_NENT)) == NULL || + (datarr = xmalloc_bytes(MC_NENT * datasz)) == NULL) { if (mctctl.mctc_elems) xfree(mctctl.mctc_elems); printk("Allocations for MCA telemetry failed\n"); return; } - for (i = 0; i < MC_URGENT_NENT + MC_NONURGENT_NENT; i++) { - struct mctelem_ent *tep, **tepp; + for (i = 0; i < MC_NENT; i++) { + struct mctelem_ent *tep; tep = mctctl.mctc_elems + i; tep->mcte_flags = MCTE_F_STATE_FREE; tep->mcte_refcnt = 0; tep->mcte_data = datarr + i * datasz; - if (i < MC_URGENT_NENT) { - tepp = &mctctl.mctc_free[MC_URGENT]; - tep->mcte_flags |= MCTE_F_HOME_URGENT; - } else { - tepp = &mctctl.mctc_free[MC_NONURGENT]; - tep->mcte_flags |= MCTE_F_HOME_NONURGENT; - } - - tep->mcte_next = *tepp; + __set_bit(i, mctctl.mctc_free); + tep->mcte_next = NULL; tep->mcte_prev = NULL; - *tepp = tep; } } @@ -310,32 +296,25 @@ static int mctelem_drop_count; /* Reserve a telemetry entry, or return NULL if none available. * If we return an entry then the caller must subsequently call exactly one of - * mctelem_unreserve or mctelem_commit for that entry. + * mctelem_dismiss or mctelem_commit for that entry. */ mctelem_cookie_t mctelem_reserve(mctelem_class_t which) { - struct mctelem_ent **freelp; - struct mctelem_ent *oldhead, *newhead; - mctelem_class_t target = (which == MC_URGENT) ? - MC_URGENT : MC_NONURGENT; + unsigned bit; + unsigned start_bit = (which == MC_URGENT) ? 0 : MC_URGENT_NENT; - freelp = &mctctl.mctc_free[target]; for (;;) { - if ((oldhead = *freelp) == NULL) { - if (which == MC_URGENT && target == MC_URGENT) { - /* raid the non-urgent freelist */ - target = MC_NONURGENT; - freelp = &mctctl.mctc_free[target]; - continue; - } else { - mctelem_drop_count++; - return (NULL); - } + bit = find_next_bit(mctctl.mctc_free, MC_NENT, start_bit); + + if (bit >= MC_NENT) { + mctelem_drop_count++; + return (NULL); } - newhead = oldhead->mcte_next; - if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { - struct mctelem_ent *tep = oldhead; + /* try to allocate, atomically clear free bit */ + if (test_and_clear_bit(bit, mctctl.mctc_free)) { + /* return element we got */ + struct mctelem_ent *tep = mctctl.mctc_elems + bit; mctelem_hold(tep); MCTE_TRANSITION_STATE(tep, FREE, UNCOMMITTED); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:11:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:11:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqg-0007NO-NE; Sun, 16 Mar 2014 13:11:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqe-0007Mw-MO for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:29 +0000 Received: from [85.158.137.68:39823] by server-17.bemta-3.messagelabs.com id 6B/AE-22741-FF2A5235; Sun, 16 Mar 2014 13:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1394975485!921042!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14541 invoked from network); 16 Mar 2014 13:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqb-0004Xo-2h for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAqb-0003MI-1O for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:25 +0000 Date: Sun, 16 Mar 2014 13:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/MCE: Fix race condition in mctelem_reserve X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9bd7260131d65a1c378dd3dc1cf3bc20c40fadd2 Author: Frediano Ziglio AuthorDate: Fri Mar 14 17:18:32 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:18:32 2014 +0100 x86/MCE: Fix race condition in mctelem_reserve These lines (in mctelem_reserve) newhead = oldhead->mcte_next; if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { are racy. After you read the newhead pointer it can happen that another flow (thread or recursive invocation) change all the list but set head with same value. So oldhead is the same as *freelp but you are setting a new head that could point to whatever element (even already used). This patch use instead a bit array and atomic bit operations. Signed-off-by: Frediano Ziglio Reviewed-by: Liu Jinsong master commit: 60ea3a3ac3d2bcd8e85b250fdbfc46b3b9dc7085 master date: 2014-02-24 12:07:41 +0100 --- xen/arch/x86/cpu/mcheck/mctelem.c | 81 ++++++++++++++----------------------- 1 files changed, 30 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index 895ce1a..ed8e8d2 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -37,24 +37,19 @@ struct mctelem_ent { void *mcte_data; /* corresponding data payload */ }; -#define MCTE_F_HOME_URGENT 0x0001U /* free to urgent freelist */ -#define MCTE_F_HOME_NONURGENT 0x0002U /* free to nonurgent freelist */ -#define MCTE_F_CLASS_URGENT 0x0004U /* in use - urgent errors */ -#define MCTE_F_CLASS_NONURGENT 0x0008U /* in use - nonurgent errors */ +#define MCTE_F_CLASS_URGENT 0x0001U /* in use - urgent errors */ +#define MCTE_F_CLASS_NONURGENT 0x0002U /* in use - nonurgent errors */ #define MCTE_F_STATE_FREE 0x0010U /* on a freelist */ #define MCTE_F_STATE_UNCOMMITTED 0x0020U /* reserved; on no list */ #define MCTE_F_STATE_COMMITTED 0x0040U /* on a committed list */ #define MCTE_F_STATE_PROCESSING 0x0080U /* on a processing list */ -#define MCTE_F_MASK_HOME (MCTE_F_HOME_URGENT | MCTE_F_HOME_NONURGENT) #define MCTE_F_MASK_CLASS (MCTE_F_CLASS_URGENT | MCTE_F_CLASS_NONURGENT) #define MCTE_F_MASK_STATE (MCTE_F_STATE_FREE | \ MCTE_F_STATE_UNCOMMITTED | \ MCTE_F_STATE_COMMITTED | \ MCTE_F_STATE_PROCESSING) -#define MCTE_HOME(tep) ((tep)->mcte_flags & MCTE_F_MASK_HOME) - #define MCTE_CLASS(tep) ((tep)->mcte_flags & MCTE_F_MASK_CLASS) #define MCTE_SET_CLASS(tep, new) do { \ (tep)->mcte_flags &= ~MCTE_F_MASK_CLASS; \ @@ -69,6 +64,8 @@ struct mctelem_ent { #define MC_URGENT_NENT 10 #define MC_NONURGENT_NENT 20 +#define MC_NENT (MC_URGENT_NENT + MC_NONURGENT_NENT) + #define MC_NCLASSES (MC_NONURGENT + 1) #define COOKIE2MCTE(c) ((struct mctelem_ent *)(c)) @@ -77,11 +74,9 @@ struct mctelem_ent { static struct mc_telem_ctl { /* Linked lists that thread the array members together. * - * The free lists are singly-linked via mcte_next, and we allocate - * from them by atomically unlinking an element from the head. - * Consumed entries are returned to the head of the free list. - * When an entry is reserved off the free list it is not linked - * on any list until it is committed or dismissed. + * The free lists is a bit array where bit 1 means free. + * This as element number is quite small and is easy to + * atomically allocate that way. * * The committed list grows at the head and we do not maintain a * tail pointer; insertions are performed atomically. The head @@ -101,7 +96,7 @@ static struct mc_telem_ctl { * we can lock it for updates. The head of the processing list * always has the oldest telemetry, and we append (as above) * at the tail of the processing list. */ - struct mctelem_ent *mctc_free[MC_NCLASSES]; + DECLARE_BITMAP(mctc_free, MC_NENT); struct mctelem_ent *mctc_committed[MC_NCLASSES]; struct mctelem_ent *mctc_processing_head[MC_NCLASSES]; struct mctelem_ent *mctc_processing_tail[MC_NCLASSES]; @@ -207,14 +202,14 @@ int mctelem_has_deferred(unsigned int cpu) */ static void mctelem_free(struct mctelem_ent *tep) { - mctelem_class_t target = MCTE_HOME(tep) == MCTE_F_HOME_URGENT ? - MC_URGENT : MC_NONURGENT; - BUG_ON(tep->mcte_refcnt != 0); BUG_ON(MCTE_STATE(tep) != MCTE_F_STATE_FREE); tep->mcte_prev = NULL; - mctelem_xchg_head(&mctctl.mctc_free[target], &tep->mcte_next, tep); + tep->mcte_next = NULL; + + /* set free in array */ + set_bit(tep - mctctl.mctc_elems, mctctl.mctc_free); } /* Increment the reference count of an entry that is not linked on to @@ -274,34 +269,25 @@ void mctelem_init(int reqdatasz) } if ((mctctl.mctc_elems = xmalloc_array(struct mctelem_ent, - MC_URGENT_NENT + MC_NONURGENT_NENT)) == NULL || - (datarr = xmalloc_bytes((MC_URGENT_NENT + MC_NONURGENT_NENT) * - datasz)) == NULL) { + MC_NENT)) == NULL || + (datarr = xmalloc_bytes(MC_NENT * datasz)) == NULL) { if (mctctl.mctc_elems) xfree(mctctl.mctc_elems); printk("Allocations for MCA telemetry failed\n"); return; } - for (i = 0; i < MC_URGENT_NENT + MC_NONURGENT_NENT; i++) { - struct mctelem_ent *tep, **tepp; + for (i = 0; i < MC_NENT; i++) { + struct mctelem_ent *tep; tep = mctctl.mctc_elems + i; tep->mcte_flags = MCTE_F_STATE_FREE; tep->mcte_refcnt = 0; tep->mcte_data = datarr + i * datasz; - if (i < MC_URGENT_NENT) { - tepp = &mctctl.mctc_free[MC_URGENT]; - tep->mcte_flags |= MCTE_F_HOME_URGENT; - } else { - tepp = &mctctl.mctc_free[MC_NONURGENT]; - tep->mcte_flags |= MCTE_F_HOME_NONURGENT; - } - - tep->mcte_next = *tepp; + __set_bit(i, mctctl.mctc_free); + tep->mcte_next = NULL; tep->mcte_prev = NULL; - *tepp = tep; } } @@ -310,32 +296,25 @@ static int mctelem_drop_count; /* Reserve a telemetry entry, or return NULL if none available. * If we return an entry then the caller must subsequently call exactly one of - * mctelem_unreserve or mctelem_commit for that entry. + * mctelem_dismiss or mctelem_commit for that entry. */ mctelem_cookie_t mctelem_reserve(mctelem_class_t which) { - struct mctelem_ent **freelp; - struct mctelem_ent *oldhead, *newhead; - mctelem_class_t target = (which == MC_URGENT) ? - MC_URGENT : MC_NONURGENT; + unsigned bit; + unsigned start_bit = (which == MC_URGENT) ? 0 : MC_URGENT_NENT; - freelp = &mctctl.mctc_free[target]; for (;;) { - if ((oldhead = *freelp) == NULL) { - if (which == MC_URGENT && target == MC_URGENT) { - /* raid the non-urgent freelist */ - target = MC_NONURGENT; - freelp = &mctctl.mctc_free[target]; - continue; - } else { - mctelem_drop_count++; - return (NULL); - } + bit = find_next_bit(mctctl.mctc_free, MC_NENT, start_bit); + + if (bit >= MC_NENT) { + mctelem_drop_count++; + return (NULL); } - newhead = oldhead->mcte_next; - if (cmpxchgptr(freelp, oldhead, newhead) == oldhead) { - struct mctelem_ent *tep = oldhead; + /* try to allocate, atomically clear free bit */ + if (test_and_clear_bit(bit, mctctl.mctc_free)) { + /* return element we got */ + struct mctelem_ent *tep = mctctl.mctc_elems + bit; mctelem_hold(tep); MCTE_TRANSITION_STATE(tep, FREE, UNCOMMITTED); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:11:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:11:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqq-0007PD-7v; Sun, 16 Mar 2014 13:11:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqo-0007Ol-2H for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:38 +0000 Received: from [85.158.139.211:49546] by server-14.bemta-5.messagelabs.com id A3/8B-15696-903A5235; Sun, 16 Mar 2014 13:11:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1394975495!1090345!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23847 invoked from network); 16 Mar 2014 13:11:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:11:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAql-0004Xt-7i for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAql-0003NE-5J for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:35 +0000 Date: Sun, 16 Mar 2014 13:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Nested VMX: update nested paging mode on vmexit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d2a5fcf09f75b3fc1584375b71517b62c0be53f Author: Yang Zhang AuthorDate: Fri Mar 14 17:22:30 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:22:30 2014 +0100 Nested VMX: update nested paging mode on vmexit Since SVM and VMX use different mechanism to emulate the virtual-vmentry and virtual-vmexit, it's hard to update the nested paging mode correctly in common code. So we need to update the nested paging mode in their respective code path. SVM already updates the nested paging mode on vmexit. This patch adds the same logic in VMX side. Previous discussion is here: http://lists.xen.org/archives/html/xen-devel/2013-12/msg01759.html Signed-off-by: Yang Zhang Reviewed-by: Christoph Egger master commit: fd1864f48d8914fb8eeb6841cd08c2c09b368909 master date: 2014-02-24 12:09:52 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f6409d6..baf3040 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2541,6 +2541,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vcpu_nestedhvm(v).nv_vmswitch_in_progress = 0; if ( nestedhvm_vcpu_in_guestmode(v) ) { + paging_update_nestedmode(v); if ( nvmx_n2_vmexit_handler(regs, exit_reason) ) goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:11:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:11:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqq-0007PD-7v; Sun, 16 Mar 2014 13:11:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqo-0007Ol-2H for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:38 +0000 Received: from [85.158.139.211:49546] by server-14.bemta-5.messagelabs.com id A3/8B-15696-903A5235; Sun, 16 Mar 2014 13:11:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1394975495!1090345!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23847 invoked from network); 16 Mar 2014 13:11:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:11:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAql-0004Xt-7i for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAql-0003NE-5J for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:35 +0000 Date: Sun, 16 Mar 2014 13:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Nested VMX: update nested paging mode on vmexit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d2a5fcf09f75b3fc1584375b71517b62c0be53f Author: Yang Zhang AuthorDate: Fri Mar 14 17:22:30 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:22:30 2014 +0100 Nested VMX: update nested paging mode on vmexit Since SVM and VMX use different mechanism to emulate the virtual-vmentry and virtual-vmexit, it's hard to update the nested paging mode correctly in common code. So we need to update the nested paging mode in their respective code path. SVM already updates the nested paging mode on vmexit. This patch adds the same logic in VMX side. Previous discussion is here: http://lists.xen.org/archives/html/xen-devel/2013-12/msg01759.html Signed-off-by: Yang Zhang Reviewed-by: Christoph Egger master commit: fd1864f48d8914fb8eeb6841cd08c2c09b368909 master date: 2014-02-24 12:09:52 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f6409d6..baf3040 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2541,6 +2541,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vcpu_nestedhvm(v).nv_vmswitch_in_progress = 0; if ( nestedhvm_vcpu_in_guestmode(v) ) { + paging_update_nestedmode(v); if ( nvmx_n2_vmexit_handler(regs, exit_reason) ) goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:11:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:11:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAr0-0007Qv-EV; Sun, 16 Mar 2014 13:11:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqy-0007QP-24 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:48 +0000 Received: from [85.158.139.211:53866] by server-8.bemta-5.messagelabs.com id 07/E5-11310-313A5235; Sun, 16 Mar 2014 13:11:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1394975505!1320636!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27289 invoked from network); 16 Mar 2014 13:11:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:11:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqv-0004Y3-Bs for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAqv-0003Na-AV for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:45 +0000 Date: Sun, 16 Mar 2014 13:11:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/MSI: don't risk division by zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09f13cea2ca2da009026d05b7175558e84bc2f8a Author: Jan Beulich AuthorDate: Fri Mar 14 17:23:27 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:23:27 2014 +0100 x86/MSI: don't risk division by zero The check in question is redundant with the one in the immediately following if(), where dividing by zero gets carefully avoided. Spotted-by: Boris Ostrovsky Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky master commit: 5d160d913e03b581bdddde73535c18ac670cf0a9 master date: 2014-02-24 12:11:01 +0100 --- xen/arch/x86/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 1aaceeb..61d6dd0 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -636,7 +636,7 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) return 0; base = pos + PCI_SRIOV_BAR; vf -= PCI_BDF(bus, slot, func) + offset; - if ( vf < 0 || (vf && vf % stride) ) + if ( vf < 0 ) return 0; if ( stride ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:11:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:11:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAr0-0007Qv-EV; Sun, 16 Mar 2014 13:11:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqy-0007QP-24 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:48 +0000 Received: from [85.158.139.211:53866] by server-8.bemta-5.messagelabs.com id 07/E5-11310-313A5235; Sun, 16 Mar 2014 13:11:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1394975505!1320636!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27289 invoked from network); 16 Mar 2014 13:11:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:11:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAqv-0004Y3-Bs for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAqv-0003Na-AV for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:45 +0000 Date: Sun, 16 Mar 2014 13:11:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/MSI: don't risk division by zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09f13cea2ca2da009026d05b7175558e84bc2f8a Author: Jan Beulich AuthorDate: Fri Mar 14 17:23:27 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:23:27 2014 +0100 x86/MSI: don't risk division by zero The check in question is redundant with the one in the immediately following if(), where dividing by zero gets carefully avoided. Spotted-by: Boris Ostrovsky Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky master commit: 5d160d913e03b581bdddde73535c18ac670cf0a9 master date: 2014-02-24 12:11:01 +0100 --- xen/arch/x86/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 1aaceeb..61d6dd0 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -636,7 +636,7 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) return 0; base = pos + PCI_SRIOV_BAR; vf -= PCI_BDF(bus, slot, func) + offset; - if ( vf < 0 || (vf && vf % stride) ) + if ( vf < 0 ) return 0; if ( stride ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:12:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:12:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAr8-0007Sq-H4; Sun, 16 Mar 2014 13:11:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAr7-0007Sc-Pu for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:57 +0000 Received: from [193.109.254.147:22011] by server-11.bemta-14.messagelabs.com id 54/03-24604-D13A5235; Sun, 16 Mar 2014 13:11:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1394975515!1296447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1690 invoked from network); 16 Mar 2014 13:11:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAr5-0004YC-GC for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAr5-0003Nx-Eh for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:55 +0000 Date: Sun, 16 Mar 2014 13:11:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/mce: Reduce boot-time logspam X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dbe2cbc0180c43965b1e0aec7e33edf5b0863552 Author: Andrew Cooper AuthorDate: Fri Mar 14 17:24:16 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:24:16 2014 +0100 x86/mce: Reduce boot-time logspam When booting with "no-mce", the user does not need to be told that "MCE support [was] disabled by bootparam" for each cpu. Furthermore, a file:line reference is unnecessary. Signed-off-by: Andrew Cooper master commit: a5ab9c9fa29cda7e1b18dbcaa69a5dbded96de32 master date: 2014-02-25 09:30:59 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index b375ef7..af6f0be 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -729,8 +729,10 @@ void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp) { enum mcheck_type inited = mcheck_none; - if (mce_disabled == 1) { - dprintk(XENLOG_INFO, "MCE support disabled by bootparam\n"); + if ( mce_disabled ) + { + if ( bsp ) + printk(XENLOG_INFO "MCE support disabled by bootparam\n"); return; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:12:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:12:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAr8-0007Sq-H4; Sun, 16 Mar 2014 13:11:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAr7-0007Sc-Pu for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:57 +0000 Received: from [193.109.254.147:22011] by server-11.bemta-14.messagelabs.com id 54/03-24604-D13A5235; Sun, 16 Mar 2014 13:11:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1394975515!1296447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1690 invoked from network); 16 Mar 2014 13:11:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAr5-0004YC-GC for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAr5-0003Nx-Eh for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:11:55 +0000 Date: Sun, 16 Mar 2014 13:11:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/mce: Reduce boot-time logspam X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dbe2cbc0180c43965b1e0aec7e33edf5b0863552 Author: Andrew Cooper AuthorDate: Fri Mar 14 17:24:16 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:24:16 2014 +0100 x86/mce: Reduce boot-time logspam When booting with "no-mce", the user does not need to be told that "MCE support [was] disabled by bootparam" for each cpu. Furthermore, a file:line reference is unnecessary. Signed-off-by: Andrew Cooper master commit: a5ab9c9fa29cda7e1b18dbcaa69a5dbded96de32 master date: 2014-02-25 09:30:59 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index b375ef7..af6f0be 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -729,8 +729,10 @@ void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp) { enum mcheck_type inited = mcheck_none; - if (mce_disabled == 1) { - dprintk(XENLOG_INFO, "MCE support disabled by bootparam\n"); + if ( mce_disabled ) + { + if ( bsp ) + printk(XENLOG_INFO "MCE support disabled by bootparam\n"); return; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:12:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:12:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArU-0007U7-LL; Sun, 16 Mar 2014 13:12:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArI-0007TL-71 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:19 +0000 Received: from [193.109.254.147:49701] by server-10.bemta-14.messagelabs.com id 3E/4C-10711-723A5235; Sun, 16 Mar 2014 13:12:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1394975525!2011825!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16480 invoked from network); 16 Mar 2014 13:12:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArF-0004Yi-KM for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPArF-0003OT-Iu for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:05 +0000 Date: Sun, 16 Mar 2014 13:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] IOMMU: generalize and correct softirq processing during Dom0 device setup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cdac89d18725608c655f211cc4d5a642dab1a047 Author: Jan Beulich AuthorDate: Fri Mar 14 17:25:27 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:25:27 2014 +0100 IOMMU: generalize and correct softirq processing during Dom0 device setup c/s 21039:95f5a4ce8f24 ("VT-d: reduce default verbosity") having put a call to process_pending_softirqs() in VT-d's domain_context_mapping() was wrong in two ways: For one we shouldn't be doing this when setting up a device during DomU assignment. And then - I didn't check whether that was the case already back then - we shouldn't call that function with the pcidevs_lock (or in fact any spin lock) held. Move the "preemption" into generic code, at once dealing with further actual (too much output elsewhere - particularly on systems with very many host bridge like devices - having been observed to still cause the watchdog to trigger when enabled) and potential (other IOMMU code may also end up being too verbose) issues. Do the "preemption" once per device actually being set up when in verbose mode, and once per bus otherwise. Note that dropping pcidevs_lock around the process_pending_softirqs() invocation is specifically not a problem here: We're in an __init function and aren't racing with potential additions/removals of PCI devices. Not acquiring the lock in setup_dom0_pci_devices() otoh is not an option, as there are too many places that assert the lock being held. Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang master commit: 9ef5aa944a6a0df7f5938983043c7e46f158bbc6 master date: 2014-03-04 10:52:20 +0100 --- xen/drivers/passthrough/pci.c | 15 +++++++++++++++ xen/drivers/passthrough/vtd/iommu.c | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index c5c8344..ff78142 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -922,6 +923,20 @@ static int __init _setup_dom0_pci_devices(struct pci_seg *pseg, void *arg) printk(XENLOG_WARNING "Dom%d owning %04x:%02x:%02x.%u?\n", pdev->domain->domain_id, pseg->nr, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); + + if ( iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); + } + } + + if ( !iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); } } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 5f10034..e2a4778 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -1494,9 +1493,6 @@ static int domain_context_mapping( break; } - if ( iommu_verbose ) - process_pending_softirqs(); - return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:12:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:12:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArU-0007U7-LL; Sun, 16 Mar 2014 13:12:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArI-0007TL-71 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:19 +0000 Received: from [193.109.254.147:49701] by server-10.bemta-14.messagelabs.com id 3E/4C-10711-723A5235; Sun, 16 Mar 2014 13:12:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1394975525!2011825!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16480 invoked from network); 16 Mar 2014 13:12:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArF-0004Yi-KM for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPArF-0003OT-Iu for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:05 +0000 Date: Sun, 16 Mar 2014 13:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] IOMMU: generalize and correct softirq processing during Dom0 device setup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cdac89d18725608c655f211cc4d5a642dab1a047 Author: Jan Beulich AuthorDate: Fri Mar 14 17:25:27 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:25:27 2014 +0100 IOMMU: generalize and correct softirq processing during Dom0 device setup c/s 21039:95f5a4ce8f24 ("VT-d: reduce default verbosity") having put a call to process_pending_softirqs() in VT-d's domain_context_mapping() was wrong in two ways: For one we shouldn't be doing this when setting up a device during DomU assignment. And then - I didn't check whether that was the case already back then - we shouldn't call that function with the pcidevs_lock (or in fact any spin lock) held. Move the "preemption" into generic code, at once dealing with further actual (too much output elsewhere - particularly on systems with very many host bridge like devices - having been observed to still cause the watchdog to trigger when enabled) and potential (other IOMMU code may also end up being too verbose) issues. Do the "preemption" once per device actually being set up when in verbose mode, and once per bus otherwise. Note that dropping pcidevs_lock around the process_pending_softirqs() invocation is specifically not a problem here: We're in an __init function and aren't racing with potential additions/removals of PCI devices. Not acquiring the lock in setup_dom0_pci_devices() otoh is not an option, as there are too many places that assert the lock being held. Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang master commit: 9ef5aa944a6a0df7f5938983043c7e46f158bbc6 master date: 2014-03-04 10:52:20 +0100 --- xen/drivers/passthrough/pci.c | 15 +++++++++++++++ xen/drivers/passthrough/vtd/iommu.c | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index c5c8344..ff78142 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -922,6 +923,20 @@ static int __init _setup_dom0_pci_devices(struct pci_seg *pseg, void *arg) printk(XENLOG_WARNING "Dom%d owning %04x:%02x:%02x.%u?\n", pdev->domain->domain_id, pseg->nr, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); + + if ( iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); + } + } + + if ( !iommu_verbose ) + { + spin_unlock(&pcidevs_lock); + process_pending_softirqs(); + spin_lock(&pcidevs_lock); } } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 5f10034..e2a4778 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -1494,9 +1493,6 @@ static int domain_context_mapping( break; } - if ( iommu_verbose ) - process_pending_softirqs(); - return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:12:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:12:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArU-0007UC-Oe; Sun, 16 Mar 2014 13:12:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArS-0007TM-Dm for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:19 +0000 Received: from [85.158.143.35:11085] by server-2.bemta-4.messagelabs.com id B3/D8-06539-133A5235; Sun, 16 Mar 2014 13:12:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1394975535!2411679!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17072 invoked from network); 16 Mar 2014 13:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArP-0004Yl-Ps for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPArP-0003Or-Nw for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:15 +0000 Date: Sun, 16 Mar 2014 13:12:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/hvm: refine the judgment on IDENT_PT for EMT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 85fc087ebf722abef3198bc644fc723cb9a0ab95 Author: Dongxiao Xu AuthorDate: Fri Mar 14 17:27:01 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:27:01 2014 +0100 x86/hvm: refine the judgment on IDENT_PT for EMT When trying to get the EPT EMT type, the judgment on HVM_PARAM_IDENT_PT is not correct which always returns WB type if the parameter is not set. Remove the related code. Signed-off-by: Dongxiao Xu We can't fully drop the dependency yet, but we should certainly avoid overriding cases already properly handled. The reason for this is that the guest setting up its MTRRs happens _after_ the EPT tables got already constructed, and no code is in place to propagate this to the EPT code. Without this check we're forcing the guest to run with all of its memory uncachable until something happens to re-write every single EPT entry. But of course this has to be just a temporary solution. In the same spirit we should defer the "very early" (when the guest is still being constructed and has no vCPU yet) override to the last possible point. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: cadfd7bca999c0a795dc27be72d43c92e8943a0b master date: 2014-03-10 11:02:25 +0100 --- xen/arch/x86/hvm/mtrr.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 9937f5a..e7c0fd9 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -689,13 +689,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, *ipat = 0; - if ( (current->domain != d) && - ((d->vcpu == NULL) || ((v = d->vcpu[0]) == NULL)) ) - return MTRR_TYPE_WRBACK; - - if ( !is_pvh_vcpu(v) && - !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) - return MTRR_TYPE_WRBACK; + if ( v->domain != d ) + v = d->vcpu ? d->vcpu[0] : NULL; if ( !mfn_valid(mfn_x(mfn)) ) return MTRR_TYPE_UNCACHABLE; @@ -718,7 +713,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, return MTRR_TYPE_WRBACK; } - gmtrr_mtype = is_hvm_vcpu(v) ? + gmtrr_mtype = is_hvm_domain(d) && v && + d->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ? get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : MTRR_TYPE_WRBACK; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:12:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:12:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArU-0007UC-Oe; Sun, 16 Mar 2014 13:12:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArS-0007TM-Dm for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:19 +0000 Received: from [85.158.143.35:11085] by server-2.bemta-4.messagelabs.com id B3/D8-06539-133A5235; Sun, 16 Mar 2014 13:12:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1394975535!2411679!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17072 invoked from network); 16 Mar 2014 13:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArP-0004Yl-Ps for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPArP-0003Or-Nw for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:15 +0000 Date: Sun, 16 Mar 2014 13:12:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/hvm: refine the judgment on IDENT_PT for EMT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 85fc087ebf722abef3198bc644fc723cb9a0ab95 Author: Dongxiao Xu AuthorDate: Fri Mar 14 17:27:01 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:27:01 2014 +0100 x86/hvm: refine the judgment on IDENT_PT for EMT When trying to get the EPT EMT type, the judgment on HVM_PARAM_IDENT_PT is not correct which always returns WB type if the parameter is not set. Remove the related code. Signed-off-by: Dongxiao Xu We can't fully drop the dependency yet, but we should certainly avoid overriding cases already properly handled. The reason for this is that the guest setting up its MTRRs happens _after_ the EPT tables got already constructed, and no code is in place to propagate this to the EPT code. Without this check we're forcing the guest to run with all of its memory uncachable until something happens to re-write every single EPT entry. But of course this has to be just a temporary solution. In the same spirit we should defer the "very early" (when the guest is still being constructed and has no vCPU yet) override to the last possible point. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: cadfd7bca999c0a795dc27be72d43c92e8943a0b master date: 2014-03-10 11:02:25 +0100 --- xen/arch/x86/hvm/mtrr.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 9937f5a..e7c0fd9 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -689,13 +689,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, *ipat = 0; - if ( (current->domain != d) && - ((d->vcpu == NULL) || ((v = d->vcpu[0]) == NULL)) ) - return MTRR_TYPE_WRBACK; - - if ( !is_pvh_vcpu(v) && - !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) - return MTRR_TYPE_WRBACK; + if ( v->domain != d ) + v = d->vcpu ? d->vcpu[0] : NULL; if ( !mfn_valid(mfn_x(mfn)) ) return MTRR_TYPE_UNCACHABLE; @@ -718,7 +713,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, return MTRR_TYPE_WRBACK; } - gmtrr_mtype = is_hvm_vcpu(v) ? + gmtrr_mtype = is_hvm_domain(d) && v && + d->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ? get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : MTRR_TYPE_WRBACK; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:13:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:13:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAro-0007ZB-95; Sun, 16 Mar 2014 13:12:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArn-0007Yv-74 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:39 +0000 Received: from [85.158.137.68:15596] by server-15.bemta-3.messagelabs.com id 13/9B-13757-643A5235; Sun, 16 Mar 2014 13:12:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1394975556!913328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15782 invoked from network); 16 Mar 2014 13:12:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:12:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArk-0004Z0-3X for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPArk-0003QN-2Z for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:36 +0000 Date: Sun, 16 Mar 2014 13:12:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: consolidate passthrough handling in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9337cb937d80953f08b10d45a9e75f005a855477 Author: Jan Beulich AuthorDate: Fri Mar 14 17:28:20 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:28:20 2014 +0100 x86/HVM: consolidate passthrough handling in epte_get_entry_emt() It is inconsistent to depend on iommu_enabled alone: For a guest without devices passed through to it, it is of no concern whether the IOMMU is enabled. There's one rather special case to take care of: VMX code marks the LAPIC access page as MMIO. The added assertion needs to take this into consideration, and the subsequent handling of the direct MMIO case was inconsistent too: That page would have been WB in the absence of an IOMMU, but UC in the presence of it, while in fact the cachabilty of this page is entirely unrelated to an IOMMU being in use. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: 3089a6d82bdf3112ccb1dd074ce34a8cbdc4ccd8 master date: 2014-03-10 11:04:36 +0100 --- xen/arch/x86/hvm/mtrr.c | 10 ++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index b33bf34..dd1561e 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -698,14 +698,20 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, if ( hvm_get_mem_pinned_cacheattr(d, gfn, &type) ) return type; - if ( !iommu_enabled ) + if ( !iommu_enabled || + (rangeset_is_empty(d->iomem_caps) && + rangeset_is_empty(d->arch.ioport_caps) && + !has_arch_pdevs(d)) ) { + ASSERT(!direct_mmio || + mfn_x(mfn) == d->arch.hvm_domain.vmx.apic_access_mfn); *ipat = 1; return MTRR_TYPE_WRBACK; } if ( direct_mmio ) - return MTRR_TYPE_UNCACHABLE; + return mfn_x(mfn) != d->arch.hvm_domain.vmx.apic_access_mfn + ? MTRR_TYPE_UNCACHABLE : MTRR_TYPE_WRBACK; if ( iommu_snoop ) { diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index baf3040..fb514a6 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2038,9 +2038,9 @@ static int vmx_alloc_vlapic_mapping(struct domain *d) if ( apic_va == NULL ) return -ENOMEM; share_xen_page_with_guest(virt_to_page(apic_va), d, XENSHARE_writable); + d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), _mfn(virt_to_mfn(apic_va))); - d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:13:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:13:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAs8-0007bu-TE; Sun, 16 Mar 2014 13:13:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAs7-0007be-E8 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:59 +0000 Received: from [85.158.137.68:46827] by server-6.bemta-3.messagelabs.com id 4B/F4-00470-A53A5235; Sun, 16 Mar 2014 13:12:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1394975576!901537!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1145 invoked from network); 16 Mar 2014 13:12:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:12:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAs4-0004Z6-C9 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAs4-0003R5-B7 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:56 +0000 Date: Sun, 16 Mar 2014 13:12:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xmalloc: handle correctly page allocation when align > size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 67fda497099b7451fb2dec826af120bf6333bc67 Author: Julien Grall AuthorDate: Fri Mar 14 17:29:54 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:29:54 2014 +0100 xmalloc: handle correctly page allocation when align > size When align is superior to size, we need to retrieve the order from align during multiple page allocation. I guess it was the goal of the commit fb034f42 "xmalloc: make close-to-PAGE_SIZE allocations more efficient". Signed-off-by: Julien Grall Acked-by: Keir Fraser master commit: ac2cba2901779f66bbfab298faa15c956e91393a master date: 2014-03-10 14:40:50 +0100 --- xen/common/xmalloc_tlsf.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c index d3bdfa7..a5769c9 100644 --- a/xen/common/xmalloc_tlsf.c +++ b/xen/common/xmalloc_tlsf.c @@ -527,11 +527,10 @@ static void xmalloc_pool_put(void *p) static void *xmalloc_whole_pages(unsigned long size, unsigned long align) { - unsigned int i, order = get_order_from_bytes(size); + unsigned int i, order; void *res, *p; - if ( align > size ) - get_order_from_bytes(align); + order = get_order_from_bytes(max(align, size)); res = alloc_xenheap_pages(order, 0); if ( res == NULL ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:13:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:13:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAre-0007WX-3x; Sun, 16 Mar 2014 13:12:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArc-0007WC-Of for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:28 +0000 Received: from [193.109.254.147:45754] by server-8.bemta-14.messagelabs.com id 2C/39-18529-B33A5235; Sun, 16 Mar 2014 13:12:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1394975546!1296496!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4410 invoked from network); 16 Mar 2014 13:12:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:12:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArZ-0004Yr-VP for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPArZ-0003PD-TG for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:25 +0000 Date: Sun, 16 Mar 2014 13:12:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: fix memory type merging in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6fc747461edc2dc920d07a247acda9552c7bbfb9 Author: Jan Beulich AuthorDate: Fri Mar 14 17:27:42 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:27:42 2014 +0100 x86/HVM: fix memory type merging in epte_get_entry_emt() Using the minimum numeric value of guest and host specified memory types is too simplistic - it works only correctly for a subset of types. It is in particular the WT/WP combination that needs conversion to UC if the two types conflict. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: b99113b9d5fac5149de8496f55afa00e285b1ff3 master date: 2014-03-10 11:03:53 +0100 --- xen/arch/x86/hvm/mtrr.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index e7c0fd9..b33bf34 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -719,5 +719,35 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); - return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); + + /* If both types match we're fine. */ + if ( likely(gmtrr_mtype == hmtrr_mtype) ) + return hmtrr_mtype; + + /* If either type is UC, we have to go with that one. */ + if ( gmtrr_mtype == MTRR_TYPE_UNCACHABLE || + hmtrr_mtype == MTRR_TYPE_UNCACHABLE ) + return MTRR_TYPE_UNCACHABLE; + + /* If either type is WB, we have to go with the other one. */ + if ( gmtrr_mtype == MTRR_TYPE_WRBACK ) + return hmtrr_mtype; + if ( hmtrr_mtype == MTRR_TYPE_WRBACK ) + return gmtrr_mtype; + + /* + * At this point we have disagreeing WC, WT, or WP types. The only + * combination that can be cleanly resolved is WT:WP. The ones involving + * WC need to be converted to UC, both due to the memory ordering + * differences and because WC disallows reads to be cached (WT and WP + * permit this), while WT and WP require writes to go straight to memory + * (WC can buffer them). + */ + if ( (gmtrr_mtype == MTRR_TYPE_WRTHROUGH && + hmtrr_mtype == MTRR_TYPE_WRPROT) || + (gmtrr_mtype == MTRR_TYPE_WRPROT && + hmtrr_mtype == MTRR_TYPE_WRTHROUGH) ) + return MTRR_TYPE_WRPROT; + + return MTRR_TYPE_UNCACHABLE; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:13:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:13:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAry-0007aW-EJ; Sun, 16 Mar 2014 13:12:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArw-0007aL-P9 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:48 +0000 Received: from [85.158.143.35:12134] by server-3.bemta-4.messagelabs.com id 44/8E-13602-053A5235; Sun, 16 Mar 2014 13:12:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1394975566!2387648!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5179 invoked from network); 16 Mar 2014 13:12:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:12:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAru-0004Z3-8c for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAru-0003Qj-6m for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:46 +0000 Date: Sun, 16 Mar 2014 13:12:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] kexec: identify which cpu the kexec image is being executed on X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f81f1c6c45c3a7b3b99ee56e71d5374186fe6c37 Author: Andrew Cooper AuthorDate: Fri Mar 14 17:29:03 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:29:03 2014 +0100 kexec: identify which cpu the kexec image is being executed on A patch to this effect has been in XenServer for a little while, and has proved to be a useful debugging point for servers which have different behaviours depending when crashing on the non-bootstrap processor. Moving the printk() from kexec_panic() to one_cpu_only() means that it will only be printed for the cpu which wins the race along the kexec path. Signed-off-by: Andrew Cooper Acked-by: David Vrabel master commit: 4509ada6ba1f09cc8f4fa23e009e7e5a963b6086 master date: 2014-03-10 11:11:28 +0100 --- xen/common/kexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 481b0c2..23d964e 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -265,6 +265,8 @@ static int noinline one_cpu_only(void) } set_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags); + printk("Executing kexec image on cpu%u\n", cpu); + return 0; } @@ -340,8 +342,6 @@ void kexec_crash(void) if ( !test_bit(KEXEC_IMAGE_CRASH_BASE + pos, &kexec_flags) ) return; - printk("Executing crash image\n"); - kexecing = TRUE; if ( kexec_common_shutdown() != 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:13:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:13:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAs8-0007bu-TE; Sun, 16 Mar 2014 13:13:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAs7-0007be-E8 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:59 +0000 Received: from [85.158.137.68:46827] by server-6.bemta-3.messagelabs.com id 4B/F4-00470-A53A5235; Sun, 16 Mar 2014 13:12:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1394975576!901537!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1145 invoked from network); 16 Mar 2014 13:12:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:12:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAs4-0004Z6-C9 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAs4-0003R5-B7 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:56 +0000 Date: Sun, 16 Mar 2014 13:12:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xmalloc: handle correctly page allocation when align > size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 67fda497099b7451fb2dec826af120bf6333bc67 Author: Julien Grall AuthorDate: Fri Mar 14 17:29:54 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:29:54 2014 +0100 xmalloc: handle correctly page allocation when align > size When align is superior to size, we need to retrieve the order from align during multiple page allocation. I guess it was the goal of the commit fb034f42 "xmalloc: make close-to-PAGE_SIZE allocations more efficient". Signed-off-by: Julien Grall Acked-by: Keir Fraser master commit: ac2cba2901779f66bbfab298faa15c956e91393a master date: 2014-03-10 14:40:50 +0100 --- xen/common/xmalloc_tlsf.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c index d3bdfa7..a5769c9 100644 --- a/xen/common/xmalloc_tlsf.c +++ b/xen/common/xmalloc_tlsf.c @@ -527,11 +527,10 @@ static void xmalloc_pool_put(void *p) static void *xmalloc_whole_pages(unsigned long size, unsigned long align) { - unsigned int i, order = get_order_from_bytes(size); + unsigned int i, order; void *res, *p; - if ( align > size ) - get_order_from_bytes(align); + order = get_order_from_bytes(max(align, size)); res = alloc_xenheap_pages(order, 0); if ( res == NULL ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:13:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:13:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAre-0007WX-3x; Sun, 16 Mar 2014 13:12:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArc-0007WC-Of for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:28 +0000 Received: from [193.109.254.147:45754] by server-8.bemta-14.messagelabs.com id 2C/39-18529-B33A5235; Sun, 16 Mar 2014 13:12:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1394975546!1296496!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4410 invoked from network); 16 Mar 2014 13:12:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:12:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArZ-0004Yr-VP for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPArZ-0003PD-TG for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:25 +0000 Date: Sun, 16 Mar 2014 13:12:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: fix memory type merging in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6fc747461edc2dc920d07a247acda9552c7bbfb9 Author: Jan Beulich AuthorDate: Fri Mar 14 17:27:42 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:27:42 2014 +0100 x86/HVM: fix memory type merging in epte_get_entry_emt() Using the minimum numeric value of guest and host specified memory types is too simplistic - it works only correctly for a subset of types. It is in particular the WT/WP combination that needs conversion to UC if the two types conflict. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: b99113b9d5fac5149de8496f55afa00e285b1ff3 master date: 2014-03-10 11:03:53 +0100 --- xen/arch/x86/hvm/mtrr.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index e7c0fd9..b33bf34 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -719,5 +719,35 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); - return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); + + /* If both types match we're fine. */ + if ( likely(gmtrr_mtype == hmtrr_mtype) ) + return hmtrr_mtype; + + /* If either type is UC, we have to go with that one. */ + if ( gmtrr_mtype == MTRR_TYPE_UNCACHABLE || + hmtrr_mtype == MTRR_TYPE_UNCACHABLE ) + return MTRR_TYPE_UNCACHABLE; + + /* If either type is WB, we have to go with the other one. */ + if ( gmtrr_mtype == MTRR_TYPE_WRBACK ) + return hmtrr_mtype; + if ( hmtrr_mtype == MTRR_TYPE_WRBACK ) + return gmtrr_mtype; + + /* + * At this point we have disagreeing WC, WT, or WP types. The only + * combination that can be cleanly resolved is WT:WP. The ones involving + * WC need to be converted to UC, both due to the memory ordering + * differences and because WC disallows reads to be cached (WT and WP + * permit this), while WT and WP require writes to go straight to memory + * (WC can buffer them). + */ + if ( (gmtrr_mtype == MTRR_TYPE_WRTHROUGH && + hmtrr_mtype == MTRR_TYPE_WRPROT) || + (gmtrr_mtype == MTRR_TYPE_WRPROT && + hmtrr_mtype == MTRR_TYPE_WRTHROUGH) ) + return MTRR_TYPE_WRPROT; + + return MTRR_TYPE_UNCACHABLE; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:13:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:13:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAro-0007ZB-95; Sun, 16 Mar 2014 13:12:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArn-0007Yv-74 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:39 +0000 Received: from [85.158.137.68:15596] by server-15.bemta-3.messagelabs.com id 13/9B-13757-643A5235; Sun, 16 Mar 2014 13:12:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1394975556!913328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15782 invoked from network); 16 Mar 2014 13:12:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:12:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArk-0004Z0-3X for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPArk-0003QN-2Z for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:36 +0000 Date: Sun, 16 Mar 2014 13:12:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: consolidate passthrough handling in epte_get_entry_emt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9337cb937d80953f08b10d45a9e75f005a855477 Author: Jan Beulich AuthorDate: Fri Mar 14 17:28:20 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:28:20 2014 +0100 x86/HVM: consolidate passthrough handling in epte_get_entry_emt() It is inconsistent to depend on iommu_enabled alone: For a guest without devices passed through to it, it is of no concern whether the IOMMU is enabled. There's one rather special case to take care of: VMX code marks the LAPIC access page as MMIO. The added assertion needs to take this into consideration, and the subsequent handling of the direct MMIO case was inconsistent too: That page would have been WB in the absence of an IOMMU, but UC in the presence of it, while in fact the cachabilty of this page is entirely unrelated to an IOMMU being in use. Signed-off-by: Jan Beulich Reviewed-by: "Xu, Dongxiao" Acked-by: Keir Fraser master commit: 3089a6d82bdf3112ccb1dd074ce34a8cbdc4ccd8 master date: 2014-03-10 11:04:36 +0100 --- xen/arch/x86/hvm/mtrr.c | 10 ++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index b33bf34..dd1561e 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -698,14 +698,20 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, if ( hvm_get_mem_pinned_cacheattr(d, gfn, &type) ) return type; - if ( !iommu_enabled ) + if ( !iommu_enabled || + (rangeset_is_empty(d->iomem_caps) && + rangeset_is_empty(d->arch.ioport_caps) && + !has_arch_pdevs(d)) ) { + ASSERT(!direct_mmio || + mfn_x(mfn) == d->arch.hvm_domain.vmx.apic_access_mfn); *ipat = 1; return MTRR_TYPE_WRBACK; } if ( direct_mmio ) - return MTRR_TYPE_UNCACHABLE; + return mfn_x(mfn) != d->arch.hvm_domain.vmx.apic_access_mfn + ? MTRR_TYPE_UNCACHABLE : MTRR_TYPE_WRBACK; if ( iommu_snoop ) { diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index baf3040..fb514a6 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2038,9 +2038,9 @@ static int vmx_alloc_vlapic_mapping(struct domain *d) if ( apic_va == NULL ) return -ENOMEM; share_xen_page_with_guest(virt_to_page(apic_va), d, XENSHARE_writable); + d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), _mfn(virt_to_mfn(apic_va))); - d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 16 13:13:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 16 Mar 2014 13:13:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAry-0007aW-EJ; Sun, 16 Mar 2014 13:12:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPArw-0007aL-P9 for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:48 +0000 Received: from [85.158.143.35:12134] by server-3.bemta-4.messagelabs.com id 44/8E-13602-053A5235; Sun, 16 Mar 2014 13:12:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1394975566!2387648!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5179 invoked from network); 16 Mar 2014 13:12:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2014 13:12:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPAru-0004Z3-8c for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPAru-0003Qj-6m for xen-changelog@lists.xensource.com; Sun, 16 Mar 2014 13:12:46 +0000 Date: Sun, 16 Mar 2014 13:12:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] kexec: identify which cpu the kexec image is being executed on X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f81f1c6c45c3a7b3b99ee56e71d5374186fe6c37 Author: Andrew Cooper AuthorDate: Fri Mar 14 17:29:03 2014 +0100 Commit: Jan Beulich CommitDate: Fri Mar 14 17:29:03 2014 +0100 kexec: identify which cpu the kexec image is being executed on A patch to this effect has been in XenServer for a little while, and has proved to be a useful debugging point for servers which have different behaviours depending when crashing on the non-bootstrap processor. Moving the printk() from kexec_panic() to one_cpu_only() means that it will only be printed for the cpu which wins the race along the kexec path. Signed-off-by: Andrew Cooper Acked-by: David Vrabel master commit: 4509ada6ba1f09cc8f4fa23e009e7e5a963b6086 master date: 2014-03-10 11:11:28 +0100 --- xen/common/kexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 481b0c2..23d964e 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -265,6 +265,8 @@ static int noinline one_cpu_only(void) } set_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags); + printk("Executing kexec image on cpu%u\n", cpu); + return 0; } @@ -340,8 +342,6 @@ void kexec_crash(void) if ( !test_bit(KEXEC_IMAGE_CRASH_BASE + pos, &kexec_flags) ) return; - printk("Executing crash image\n"); - kexecing = TRUE; if ( kexec_common_shutdown() != 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 17 21:44:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Mar 2014 21:44:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPfKX-0004UH-Lo; Mon, 17 Mar 2014 21:44:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPfKH-0004U1-MT for xen-changelog@lists.xensource.com; Mon, 17 Mar 2014 21:44:20 +0000 Received: from [85.158.137.68:62934] by server-15.bemta-3.messagelabs.com id F9/D3-13757-4AC67235; Mon, 17 Mar 2014 21:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1395092643!1206689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14218 invoked from network); 17 Mar 2014 21:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Mar 2014 21:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPfKE-0006w3-Pw for xen-changelog@lists.xensource.com; Mon, 17 Mar 2014 21:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPfKE-00029C-8J for xen-changelog@lists.xensource.com; Mon, 17 Mar 2014 21:44:02 +0000 Date: Mon, 17 Mar 2014 21:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: increase priority of SGIs used as IPIs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8ccfba815c21c5188cfebb800e7c82bbd98b967c Author: Ian Campbell AuthorDate: Mon Mar 17 11:31:02 2014 +0000 Commit: Ian Campbell CommitDate: Mon Mar 17 12:47:48 2014 +0000 xen: arm: increase priority of SGIs used as IPIs Code such as on_selected_cpus expects/requires that an IPI can preempt a processor which is just handling a normal interrupt. Lacking this property can result in a deadlock between two CPUs trying to IPI each other from interrupt context. For the time being there is only two priorities, IRQ and IPI, although it is also conceivable that in the future some IPIs might be higher priority than others. This could be used to implement a better BUG() than we have now, but I haven't tackled that yet. Tested with a debug patch which sends a local IPI from a keyhandler, which is run in serial interrupt context. Signed-off-by: Ian Campbell Acked-by: Julien Grall Cc: Oleksandr Tyshchenko --- xen/arch/arm/gic.c | 22 +++++++++++++++------- xen/arch/arm/time.c | 6 +++--- xen/include/asm-arm/gic.h | 22 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index d028e30..91a2982 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -322,7 +322,8 @@ static void __init gic_dist_init(void) /* Default priority for global interrupts */ for ( i = 32; i < gic.lines; i += 4 ) - GICD[GICD_IPRIORITYR + i / 4] = 0xa0a0a0a0; + GICD[GICD_IPRIORITYR + i / 4] = + GIC_PRI_IRQ<<24 | GIC_PRI_IRQ<<16 | GIC_PRI_IRQ<<8 | GIC_PRI_IRQ; /* Disable all global interrupts */ for ( i = 32; i < gic.lines; i += 32 ) @@ -343,9 +344,14 @@ static void __cpuinit gic_cpu_init(void) * be set up here with the other per-cpu state. */ GICD[GICD_ICENABLER] = 0xffff0000; /* Disable all PPI */ GICD[GICD_ISENABLER] = 0x0000ffff; /* Enable all SGI */ - /* Set PPI and SGI priorities */ - for (i = 0; i < 32; i += 4) - GICD[GICD_IPRIORITYR + i / 4] = 0xa0a0a0a0; + /* Set SGI priorities */ + for (i = 0; i < 16; i += 4) + GICD[GICD_IPRIORITYR + i / 4] = + GIC_PRI_IPI<<24 | GIC_PRI_IPI<<16 | GIC_PRI_IPI<<8 | GIC_PRI_IPI; + /* Set PPI priorities */ + for (i = 16; i < 32; i += 4) + GICD[GICD_IPRIORITYR + i / 4] = + GIC_PRI_IRQ<<24 | GIC_PRI_IRQ<<16 | GIC_PRI_IRQ<<8 | GIC_PRI_IRQ; /* Local settings: interface controller */ GICC[GICC_PMR] = 0xff; /* Don't mask by priority */ @@ -541,7 +547,8 @@ void gic_disable_cpu(void) void gic_route_ppis(void) { /* GIC maintenance */ - gic_route_dt_irq(&gic.maintenance, cpumask_of(smp_processor_id()), 0xa0); + gic_route_dt_irq(&gic.maintenance, cpumask_of(smp_processor_id()), + GIC_PRI_IRQ); /* Route timer interrupt */ route_timer_interrupt(); } @@ -556,7 +563,8 @@ void gic_route_spis(void) if ( (irq = serial_dt_irq(seridx)) == NULL ) continue; - gic_route_dt_irq(irq, cpumask_of(smp_processor_id()), 0xa0); + gic_route_dt_irq(irq, cpumask_of(smp_processor_id()), + GIC_PRI_IRQ); } } @@ -779,7 +787,7 @@ int gic_route_irq_to_guest(struct domain *d, const struct dt_irq *irq, level = dt_irq_is_level_triggered(irq); gic_set_irq_properties(irq->irq, level, cpumask_of(smp_processor_id()), - 0xa0); + GIC_PRI_IRQ); retval = __setup_irq(desc, irq->irq, action); if (retval) { diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 22e94bb..ba281e9 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -222,11 +222,11 @@ static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) void __cpuinit route_timer_interrupt(void) { gic_route_dt_irq(&timer_irq[TIMER_PHYS_NONSECURE_PPI], - cpumask_of(smp_processor_id()), 0xa0); + cpumask_of(smp_processor_id()), GIC_PRI_IRQ); gic_route_dt_irq(&timer_irq[TIMER_HYP_PPI], - cpumask_of(smp_processor_id()), 0xa0); + cpumask_of(smp_processor_id()), GIC_PRI_IRQ); gic_route_dt_irq(&timer_irq[TIMER_VIRT_PPI], - cpumask_of(smp_processor_id()), 0xa0); + cpumask_of(smp_processor_id()), GIC_PRI_IRQ); } /* Set up the timer interrupt on this CPU */ diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 87f4298..071280b 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -129,6 +129,28 @@ #define GICH_LR_CPUID_SHIFT 9 #define GICH_VTR_NRLRGS 0x3f +/* + * The minimum GICC_BPR is required to be in the range 0-3. We set + * GICC_BPR to 0 but we must expect that it might be 3. This means we + * can rely on premption between the following ranges: + * 0xf0..0xff + * 0xe0..0xdf + * 0xc0..0xcf + * 0xb0..0xbf + * 0xa0..0xaf + * 0x90..0x9f + * 0x80..0x8f + * + * Priorities within a range will not preempt each other. + * + * A GIC must support a mimimum of 16 priority levels. + */ +#define GIC_PRI_LOWEST 0xf0 +#define GIC_PRI_IRQ 0xa0 +#define GIC_PRI_IPI 0x90 /* IPIs must preempt normal interrupts */ +#define GIC_PRI_HIGHEST 0x80 /* Higher priorities belong to Secure-World */ + + #ifndef __ASSEMBLY__ #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 17 21:44:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Mar 2014 21:44:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPfKX-0004UH-Lo; Mon, 17 Mar 2014 21:44:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPfKH-0004U1-MT for xen-changelog@lists.xensource.com; Mon, 17 Mar 2014 21:44:20 +0000 Received: from [85.158.137.68:62934] by server-15.bemta-3.messagelabs.com id F9/D3-13757-4AC67235; Mon, 17 Mar 2014 21:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1395092643!1206689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14218 invoked from network); 17 Mar 2014 21:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Mar 2014 21:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPfKE-0006w3-Pw for xen-changelog@lists.xensource.com; Mon, 17 Mar 2014 21:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPfKE-00029C-8J for xen-changelog@lists.xensource.com; Mon, 17 Mar 2014 21:44:02 +0000 Date: Mon, 17 Mar 2014 21:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: increase priority of SGIs used as IPIs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8ccfba815c21c5188cfebb800e7c82bbd98b967c Author: Ian Campbell AuthorDate: Mon Mar 17 11:31:02 2014 +0000 Commit: Ian Campbell CommitDate: Mon Mar 17 12:47:48 2014 +0000 xen: arm: increase priority of SGIs used as IPIs Code such as on_selected_cpus expects/requires that an IPI can preempt a processor which is just handling a normal interrupt. Lacking this property can result in a deadlock between two CPUs trying to IPI each other from interrupt context. For the time being there is only two priorities, IRQ and IPI, although it is also conceivable that in the future some IPIs might be higher priority than others. This could be used to implement a better BUG() than we have now, but I haven't tackled that yet. Tested with a debug patch which sends a local IPI from a keyhandler, which is run in serial interrupt context. Signed-off-by: Ian Campbell Acked-by: Julien Grall Cc: Oleksandr Tyshchenko --- xen/arch/arm/gic.c | 22 +++++++++++++++------- xen/arch/arm/time.c | 6 +++--- xen/include/asm-arm/gic.h | 22 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index d028e30..91a2982 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -322,7 +322,8 @@ static void __init gic_dist_init(void) /* Default priority for global interrupts */ for ( i = 32; i < gic.lines; i += 4 ) - GICD[GICD_IPRIORITYR + i / 4] = 0xa0a0a0a0; + GICD[GICD_IPRIORITYR + i / 4] = + GIC_PRI_IRQ<<24 | GIC_PRI_IRQ<<16 | GIC_PRI_IRQ<<8 | GIC_PRI_IRQ; /* Disable all global interrupts */ for ( i = 32; i < gic.lines; i += 32 ) @@ -343,9 +344,14 @@ static void __cpuinit gic_cpu_init(void) * be set up here with the other per-cpu state. */ GICD[GICD_ICENABLER] = 0xffff0000; /* Disable all PPI */ GICD[GICD_ISENABLER] = 0x0000ffff; /* Enable all SGI */ - /* Set PPI and SGI priorities */ - for (i = 0; i < 32; i += 4) - GICD[GICD_IPRIORITYR + i / 4] = 0xa0a0a0a0; + /* Set SGI priorities */ + for (i = 0; i < 16; i += 4) + GICD[GICD_IPRIORITYR + i / 4] = + GIC_PRI_IPI<<24 | GIC_PRI_IPI<<16 | GIC_PRI_IPI<<8 | GIC_PRI_IPI; + /* Set PPI priorities */ + for (i = 16; i < 32; i += 4) + GICD[GICD_IPRIORITYR + i / 4] = + GIC_PRI_IRQ<<24 | GIC_PRI_IRQ<<16 | GIC_PRI_IRQ<<8 | GIC_PRI_IRQ; /* Local settings: interface controller */ GICC[GICC_PMR] = 0xff; /* Don't mask by priority */ @@ -541,7 +547,8 @@ void gic_disable_cpu(void) void gic_route_ppis(void) { /* GIC maintenance */ - gic_route_dt_irq(&gic.maintenance, cpumask_of(smp_processor_id()), 0xa0); + gic_route_dt_irq(&gic.maintenance, cpumask_of(smp_processor_id()), + GIC_PRI_IRQ); /* Route timer interrupt */ route_timer_interrupt(); } @@ -556,7 +563,8 @@ void gic_route_spis(void) if ( (irq = serial_dt_irq(seridx)) == NULL ) continue; - gic_route_dt_irq(irq, cpumask_of(smp_processor_id()), 0xa0); + gic_route_dt_irq(irq, cpumask_of(smp_processor_id()), + GIC_PRI_IRQ); } } @@ -779,7 +787,7 @@ int gic_route_irq_to_guest(struct domain *d, const struct dt_irq *irq, level = dt_irq_is_level_triggered(irq); gic_set_irq_properties(irq->irq, level, cpumask_of(smp_processor_id()), - 0xa0); + GIC_PRI_IRQ); retval = __setup_irq(desc, irq->irq, action); if (retval) { diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 22e94bb..ba281e9 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -222,11 +222,11 @@ static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) void __cpuinit route_timer_interrupt(void) { gic_route_dt_irq(&timer_irq[TIMER_PHYS_NONSECURE_PPI], - cpumask_of(smp_processor_id()), 0xa0); + cpumask_of(smp_processor_id()), GIC_PRI_IRQ); gic_route_dt_irq(&timer_irq[TIMER_HYP_PPI], - cpumask_of(smp_processor_id()), 0xa0); + cpumask_of(smp_processor_id()), GIC_PRI_IRQ); gic_route_dt_irq(&timer_irq[TIMER_VIRT_PPI], - cpumask_of(smp_processor_id()), 0xa0); + cpumask_of(smp_processor_id()), GIC_PRI_IRQ); } /* Set up the timer interrupt on this CPU */ diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 87f4298..071280b 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -129,6 +129,28 @@ #define GICH_LR_CPUID_SHIFT 9 #define GICH_VTR_NRLRGS 0x3f +/* + * The minimum GICC_BPR is required to be in the range 0-3. We set + * GICC_BPR to 0 but we must expect that it might be 3. This means we + * can rely on premption between the following ranges: + * 0xf0..0xff + * 0xe0..0xdf + * 0xc0..0xcf + * 0xb0..0xbf + * 0xa0..0xaf + * 0x90..0x9f + * 0x80..0x8f + * + * Priorities within a range will not preempt each other. + * + * A GIC must support a mimimum of 16 priority levels. + */ +#define GIC_PRI_LOWEST 0xf0 +#define GIC_PRI_IRQ 0xa0 +#define GIC_PRI_IPI 0x90 /* IPIs must preempt normal interrupts */ +#define GIC_PRI_HIGHEST 0x80 /* Higher priorities belong to Secure-World */ + + #ifndef __ASSEMBLY__ #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:11:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq39-0003hb-Rj; Tue, 18 Mar 2014 09:11:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq38-0003gw-EJ for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:06 +0000 Received: from [85.158.143.35:28896] by server-2.bemta-4.messagelabs.com id D3/59-06539-9AD08235; Tue, 18 Mar 2014 09:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1395133863!2134150!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28209 invoked from network); 18 Mar 2014 09:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq35-0004CL-DG for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq35-000696-A6 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:03 +0000 Date: Tue, 18 Mar 2014 09:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: fix RMRR handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd527061770789d8152b1dea68056987b202d87a Author: Jan Beulich AuthorDate: Mon Mar 17 16:45:04 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 17 16:45:04 2014 +0100 VT-d: fix RMRR handling Removing mapped RMRR tracking structures in dma_pte_clear_one() is wrong for two reasons: First, these regions may cover more than a single page. And second, multiple devices (and hence multiple devices assigned to any particular guest) may share a single RMRR (whether assigning such devices to distinct guests is a safe thing to do is another question). Therefore move the removal of the tracking structures into the counterpart function to the one doing the insertion - intel_iommu_remove_device(), and add a reference count to the tracking structure. Further, for the handling of the mappings of the respective memory regions to be correct, RMRRs must not overlap. Add a respective check to acpi_parse_one_rmrr(). And finally, with all of this being VT-d specific, move the cleanup of the list as well as the structure type definition where it belongs - in VT-d specific rather than IOMMU generic code. Note that this doesn't address yet another issue associated with RMRR handling: The purpose of the RMRRs as well as the way the respective IOMMU page table mappings get inserted both suggest that these regions would need to be marked E820_RESERVED in all (HVM?) guests' memory maps, yet nothing like this is being done in hvmloader. (For PV guests this would also seem to be necessary, but may conflict with PV guests possibly assuming there to be just a single E820 entry representing all of its RAM.) Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang --- xen/drivers/passthrough/iommu.c | 10 +--- xen/drivers/passthrough/vtd/dmar.c | 10 ++++ xen/drivers/passthrough/vtd/iommu.c | 92 ++++++++++++++++++++++++----------- xen/include/xen/hvm/iommu.h | 6 -- 4 files changed, 74 insertions(+), 44 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index c70165a..0cf0748 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -412,9 +412,8 @@ static int iommu_populate_page_table(struct domain *d) void iommu_domain_destroy(struct domain *d) { struct hvm_iommu *hd = domain_hvm_iommu(d); - struct list_head *ioport_list, *rmrr_list, *tmp; + struct list_head *ioport_list, *tmp; struct g2m_ioport *ioport; - struct mapped_rmrr *mrmrr; if ( !iommu_enabled || !hd->platform_ops ) return; @@ -428,13 +427,6 @@ void iommu_domain_destroy(struct domain *d) list_del(&ioport->list); xfree(ioport); } - - list_for_each_safe ( rmrr_list, tmp, &hd->mapped_rmrrs ) - { - mrmrr = list_entry(rmrr_list, struct mapped_rmrr, list); - list_del(&mrmrr->list); - xfree(mrmrr); - } } int iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index cb998e2..1152c3a 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -580,6 +580,16 @@ acpi_parse_one_rmrr(struct acpi_dmar_header *header) if ( (ret = acpi_dmar_check_length(header, sizeof(*rmrr))) != 0 ) return ret; + list_for_each_entry(rmrru, &acpi_rmrr_units, list) + if ( base_addr <= rmrru->end_address && rmrru->base_address <= end_addr ) + { + printk(XENLOG_ERR VTDPREFIX + "Overlapping RMRRs [%"PRIx64",%"PRIx64"] and [%"PRIx64",%"PRIx64"]\n", + rmrru->base_address, rmrru->end_address, + base_addr, end_addr); + return -EEXIST; + } + /* This check is here simply to detect when RMRR values are * not properly represented in the system memory map and * inform the user diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index d4be75c..beb3723 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -42,6 +42,12 @@ #include "vtd.h" #include "../ats.h" +struct mapped_rmrr { + struct list_head list; + u64 base, end; + unsigned int count; +}; + /* Possible unfiltered LAPIC/MSI messages from untrusted sources? */ bool_t __read_mostly untrusted_msi; @@ -619,7 +625,6 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr) struct hvm_iommu *hd = domain_hvm_iommu(domain); struct dma_pte *page = NULL, *pte = NULL; u64 pg_maddr; - struct mapped_rmrr *mrmrr; spin_lock(&hd->mapping_lock); /* get last level pte */ @@ -648,21 +653,6 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr) __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K, 1, 1); unmap_vtd_domain_page(page); - - /* if the cleared address is between mapped RMRR region, - * remove the mapped RMRR - */ - spin_lock(&hd->mapping_lock); - list_for_each_entry ( mrmrr, &hd->mapped_rmrrs, list ) - { - if ( addr >= mrmrr->base && addr <= mrmrr->end ) - { - list_del(&mrmrr->list); - xfree(mrmrr); - break; - } - } - spin_unlock(&hd->mapping_lock); } static void iommu_free_pagetable(u64 pt_maddr, int level) @@ -1700,10 +1690,17 @@ static int reassign_device_ownership( static void iommu_domain_teardown(struct domain *d) { struct hvm_iommu *hd = domain_hvm_iommu(d); + struct mapped_rmrr *mrmrr, *tmp; if ( list_empty(&acpi_drhd_units) ) return; + list_for_each_entry_safe ( mrmrr, tmp, &hd->mapped_rmrrs, list ) + { + list_del(&mrmrr->list); + xfree(mrmrr); + } + if ( iommu_use_hap_pt(d) ) return; @@ -1848,14 +1845,17 @@ static int rmrr_identity_mapping(struct domain *d, ASSERT(rmrr->base_address < rmrr->end_address); /* - * No need to acquire hd->mapping_lock, as the only theoretical race is - * with the insertion below (impossible due to holding pcidevs_lock). + * No need to acquire hd->mapping_lock: Both insertion and removal + * get done while holding pcidevs_lock. */ list_for_each_entry( mrmrr, &hd->mapped_rmrrs, list ) { if ( mrmrr->base == rmrr->base_address && mrmrr->end == rmrr->end_address ) + { + ++mrmrr->count; return 0; + } } base = rmrr->base_address & PAGE_MASK_4K; @@ -1876,9 +1876,8 @@ static int rmrr_identity_mapping(struct domain *d, return -ENOMEM; mrmrr->base = rmrr->base_address; mrmrr->end = rmrr->end_address; - spin_lock(&hd->mapping_lock); + mrmrr->count = 1; list_add_tail(&mrmrr->list, &hd->mapped_rmrrs); - spin_unlock(&hd->mapping_lock); return 0; } @@ -1940,17 +1939,52 @@ static int intel_iommu_remove_device(u8 devfn, struct pci_dev *pdev) if ( !pdev->domain ) return -EINVAL; - /* If the device belongs to dom0, and it has RMRR, don't remove it - * from dom0, because BIOS may use RMRR at booting time. - */ - if ( pdev->domain->domain_id == 0 ) + for_each_rmrr_device ( rmrr, bdf, i ) { - for_each_rmrr_device ( rmrr, bdf, i ) + struct hvm_iommu *hd; + struct mapped_rmrr *mrmrr, *tmp; + + if ( rmrr->segment != pdev->seg || + PCI_BUS(bdf) != pdev->bus || + PCI_DEVFN2(bdf) != devfn ) + continue; + + /* + * If the device belongs to dom0, and it has RMRR, don't remove + * it from dom0, because BIOS may use RMRR at booting time. + */ + if ( is_hardware_domain(pdev->domain) ) + return 0; + + hd = domain_hvm_iommu(pdev->domain); + + /* + * No need to acquire hd->mapping_lock: Both insertion and removal + * get done while holding pcidevs_lock. + */ + ASSERT(spin_is_locked(&pcidevs_lock)); + list_for_each_entry_safe ( mrmrr, tmp, &hd->mapped_rmrrs, list ) { - if ( rmrr->segment == pdev->seg && - PCI_BUS(bdf) == pdev->bus && - PCI_DEVFN2(bdf) == devfn ) - return 0; + unsigned long base_pfn, end_pfn; + + if ( rmrr->base_address != mrmrr->base || + rmrr->end_address != mrmrr->end ) + continue; + + if ( --mrmrr->count ) + break; + + base_pfn = (mrmrr->base & PAGE_MASK_4K) >> PAGE_SHIFT_4K; + end_pfn = PAGE_ALIGN_4K(mrmrr->end) >> PAGE_SHIFT_4K; + while ( base_pfn < end_pfn ) + { + if ( intel_iommu_unmap_page(pdev->domain, base_pfn) ) + return -ENXIO; + base_pfn++; + } + + list_del(&mrmrr->list); + xfree(mrmrr); } } diff --git a/xen/include/xen/hvm/iommu.h b/xen/include/xen/hvm/iommu.h index 26539e0..8c98274 100644 --- a/xen/include/xen/hvm/iommu.h +++ b/xen/include/xen/hvm/iommu.h @@ -29,12 +29,6 @@ struct g2m_ioport { unsigned int np; }; -struct mapped_rmrr { - struct list_head list; - u64 base; - u64 end; -}; - struct hvm_iommu { u64 pgd_maddr; /* io page directory machine address */ spinlock_t mapping_lock; /* io page table lock */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:11:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq39-0003hb-Rj; Tue, 18 Mar 2014 09:11:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq38-0003gw-EJ for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:06 +0000 Received: from [85.158.143.35:28896] by server-2.bemta-4.messagelabs.com id D3/59-06539-9AD08235; Tue, 18 Mar 2014 09:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1395133863!2134150!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28209 invoked from network); 18 Mar 2014 09:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq35-0004CL-DG for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq35-000696-A6 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:03 +0000 Date: Tue, 18 Mar 2014 09:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: fix RMRR handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd527061770789d8152b1dea68056987b202d87a Author: Jan Beulich AuthorDate: Mon Mar 17 16:45:04 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 17 16:45:04 2014 +0100 VT-d: fix RMRR handling Removing mapped RMRR tracking structures in dma_pte_clear_one() is wrong for two reasons: First, these regions may cover more than a single page. And second, multiple devices (and hence multiple devices assigned to any particular guest) may share a single RMRR (whether assigning such devices to distinct guests is a safe thing to do is another question). Therefore move the removal of the tracking structures into the counterpart function to the one doing the insertion - intel_iommu_remove_device(), and add a reference count to the tracking structure. Further, for the handling of the mappings of the respective memory regions to be correct, RMRRs must not overlap. Add a respective check to acpi_parse_one_rmrr(). And finally, with all of this being VT-d specific, move the cleanup of the list as well as the structure type definition where it belongs - in VT-d specific rather than IOMMU generic code. Note that this doesn't address yet another issue associated with RMRR handling: The purpose of the RMRRs as well as the way the respective IOMMU page table mappings get inserted both suggest that these regions would need to be marked E820_RESERVED in all (HVM?) guests' memory maps, yet nothing like this is being done in hvmloader. (For PV guests this would also seem to be necessary, but may conflict with PV guests possibly assuming there to be just a single E820 entry representing all of its RAM.) Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang --- xen/drivers/passthrough/iommu.c | 10 +--- xen/drivers/passthrough/vtd/dmar.c | 10 ++++ xen/drivers/passthrough/vtd/iommu.c | 92 ++++++++++++++++++++++++----------- xen/include/xen/hvm/iommu.h | 6 -- 4 files changed, 74 insertions(+), 44 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index c70165a..0cf0748 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -412,9 +412,8 @@ static int iommu_populate_page_table(struct domain *d) void iommu_domain_destroy(struct domain *d) { struct hvm_iommu *hd = domain_hvm_iommu(d); - struct list_head *ioport_list, *rmrr_list, *tmp; + struct list_head *ioport_list, *tmp; struct g2m_ioport *ioport; - struct mapped_rmrr *mrmrr; if ( !iommu_enabled || !hd->platform_ops ) return; @@ -428,13 +427,6 @@ void iommu_domain_destroy(struct domain *d) list_del(&ioport->list); xfree(ioport); } - - list_for_each_safe ( rmrr_list, tmp, &hd->mapped_rmrrs ) - { - mrmrr = list_entry(rmrr_list, struct mapped_rmrr, list); - list_del(&mrmrr->list); - xfree(mrmrr); - } } int iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index cb998e2..1152c3a 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -580,6 +580,16 @@ acpi_parse_one_rmrr(struct acpi_dmar_header *header) if ( (ret = acpi_dmar_check_length(header, sizeof(*rmrr))) != 0 ) return ret; + list_for_each_entry(rmrru, &acpi_rmrr_units, list) + if ( base_addr <= rmrru->end_address && rmrru->base_address <= end_addr ) + { + printk(XENLOG_ERR VTDPREFIX + "Overlapping RMRRs [%"PRIx64",%"PRIx64"] and [%"PRIx64",%"PRIx64"]\n", + rmrru->base_address, rmrru->end_address, + base_addr, end_addr); + return -EEXIST; + } + /* This check is here simply to detect when RMRR values are * not properly represented in the system memory map and * inform the user diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index d4be75c..beb3723 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -42,6 +42,12 @@ #include "vtd.h" #include "../ats.h" +struct mapped_rmrr { + struct list_head list; + u64 base, end; + unsigned int count; +}; + /* Possible unfiltered LAPIC/MSI messages from untrusted sources? */ bool_t __read_mostly untrusted_msi; @@ -619,7 +625,6 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr) struct hvm_iommu *hd = domain_hvm_iommu(domain); struct dma_pte *page = NULL, *pte = NULL; u64 pg_maddr; - struct mapped_rmrr *mrmrr; spin_lock(&hd->mapping_lock); /* get last level pte */ @@ -648,21 +653,6 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr) __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K, 1, 1); unmap_vtd_domain_page(page); - - /* if the cleared address is between mapped RMRR region, - * remove the mapped RMRR - */ - spin_lock(&hd->mapping_lock); - list_for_each_entry ( mrmrr, &hd->mapped_rmrrs, list ) - { - if ( addr >= mrmrr->base && addr <= mrmrr->end ) - { - list_del(&mrmrr->list); - xfree(mrmrr); - break; - } - } - spin_unlock(&hd->mapping_lock); } static void iommu_free_pagetable(u64 pt_maddr, int level) @@ -1700,10 +1690,17 @@ static int reassign_device_ownership( static void iommu_domain_teardown(struct domain *d) { struct hvm_iommu *hd = domain_hvm_iommu(d); + struct mapped_rmrr *mrmrr, *tmp; if ( list_empty(&acpi_drhd_units) ) return; + list_for_each_entry_safe ( mrmrr, tmp, &hd->mapped_rmrrs, list ) + { + list_del(&mrmrr->list); + xfree(mrmrr); + } + if ( iommu_use_hap_pt(d) ) return; @@ -1848,14 +1845,17 @@ static int rmrr_identity_mapping(struct domain *d, ASSERT(rmrr->base_address < rmrr->end_address); /* - * No need to acquire hd->mapping_lock, as the only theoretical race is - * with the insertion below (impossible due to holding pcidevs_lock). + * No need to acquire hd->mapping_lock: Both insertion and removal + * get done while holding pcidevs_lock. */ list_for_each_entry( mrmrr, &hd->mapped_rmrrs, list ) { if ( mrmrr->base == rmrr->base_address && mrmrr->end == rmrr->end_address ) + { + ++mrmrr->count; return 0; + } } base = rmrr->base_address & PAGE_MASK_4K; @@ -1876,9 +1876,8 @@ static int rmrr_identity_mapping(struct domain *d, return -ENOMEM; mrmrr->base = rmrr->base_address; mrmrr->end = rmrr->end_address; - spin_lock(&hd->mapping_lock); + mrmrr->count = 1; list_add_tail(&mrmrr->list, &hd->mapped_rmrrs); - spin_unlock(&hd->mapping_lock); return 0; } @@ -1940,17 +1939,52 @@ static int intel_iommu_remove_device(u8 devfn, struct pci_dev *pdev) if ( !pdev->domain ) return -EINVAL; - /* If the device belongs to dom0, and it has RMRR, don't remove it - * from dom0, because BIOS may use RMRR at booting time. - */ - if ( pdev->domain->domain_id == 0 ) + for_each_rmrr_device ( rmrr, bdf, i ) { - for_each_rmrr_device ( rmrr, bdf, i ) + struct hvm_iommu *hd; + struct mapped_rmrr *mrmrr, *tmp; + + if ( rmrr->segment != pdev->seg || + PCI_BUS(bdf) != pdev->bus || + PCI_DEVFN2(bdf) != devfn ) + continue; + + /* + * If the device belongs to dom0, and it has RMRR, don't remove + * it from dom0, because BIOS may use RMRR at booting time. + */ + if ( is_hardware_domain(pdev->domain) ) + return 0; + + hd = domain_hvm_iommu(pdev->domain); + + /* + * No need to acquire hd->mapping_lock: Both insertion and removal + * get done while holding pcidevs_lock. + */ + ASSERT(spin_is_locked(&pcidevs_lock)); + list_for_each_entry_safe ( mrmrr, tmp, &hd->mapped_rmrrs, list ) { - if ( rmrr->segment == pdev->seg && - PCI_BUS(bdf) == pdev->bus && - PCI_DEVFN2(bdf) == devfn ) - return 0; + unsigned long base_pfn, end_pfn; + + if ( rmrr->base_address != mrmrr->base || + rmrr->end_address != mrmrr->end ) + continue; + + if ( --mrmrr->count ) + break; + + base_pfn = (mrmrr->base & PAGE_MASK_4K) >> PAGE_SHIFT_4K; + end_pfn = PAGE_ALIGN_4K(mrmrr->end) >> PAGE_SHIFT_4K; + while ( base_pfn < end_pfn ) + { + if ( intel_iommu_unmap_page(pdev->domain, base_pfn) ) + return -ENXIO; + base_pfn++; + } + + list_del(&mrmrr->list); + xfree(mrmrr); } } diff --git a/xen/include/xen/hvm/iommu.h b/xen/include/xen/hvm/iommu.h index 26539e0..8c98274 100644 --- a/xen/include/xen/hvm/iommu.h +++ b/xen/include/xen/hvm/iommu.h @@ -29,12 +29,6 @@ struct g2m_ioport { unsigned int np; }; -struct mapped_rmrr { - struct list_head list; - u64 base; - u64 end; -}; - struct hvm_iommu { u64 pgd_maddr; /* io page directory machine address */ spinlock_t mapping_lock; /* io page table lock */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:11:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3J-0003lL-UQ; Tue, 18 Mar 2014 09:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3I-0003kU-GD for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:16 +0000 Received: from [85.158.139.211:43241] by server-8.bemta-5.messagelabs.com id EC/69-11310-3BD08235; Tue, 18 Mar 2014 09:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1395133874!1673939!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5656 invoked from network); 18 Mar 2014 09:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3F-0004CO-Qb for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq3F-00069a-Gg for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:13 +0000 Date: Tue, 18 Mar 2014 09:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/Intel: work around Xeon 7400 series erratum AAI65 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96d1b237ae9b2f2718bb1c59820701f17d3d86e0 Author: Jan Beulich AuthorDate: Mon Mar 17 16:47:22 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 17 16:47:22 2014 +0100 x86/Intel: work around Xeon 7400 series erratum AAI65 Linux commit 40e2d7f9b5dae048789c64672bf3027fbb663ffa ("x86 idle: Repair large-server 50-watt idle-power regression") tells us that this applies not just to the named Xeon 7400 series, but also NHM-EX and WSM-EX; sadly Intel's documentation is so badly searchable that I wasn't able to locate the respective errata (and hence can't quote their numbers here). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/acpi/cpu_idle.c | 3 +++ xen/arch/x86/cpu/intel.c | 7 +++++++ xen/include/asm-x86/cpufeature.h | 1 + 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 597befa..ab86c75 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -296,6 +296,9 @@ void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) unsigned int cpu = smp_processor_id(); s_time_t expires = per_cpu(timer_deadline, cpu); + if ( boot_cpu_has(X86_FEATURE_CLFLUSH_MONITOR) ) + clflush((void *)&mwait_wakeup(cpu)); + __monitor((void *)&mwait_wakeup(cpu), 0, 0); smp_mb(); diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 9e02cf6..e178b5c 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -148,6 +148,9 @@ void __devinit early_intel_workaround(struct cpuinfo_x86 *c) /* * P4 Xeon errata 037 workaround. * Hardware prefetcher may cause stale data to be loaded into the cache. + * + * Xeon 7400 erratum AAI65 (and further newer Xeons) + * MONITOR/MWAIT may have excessive false wakeups */ static void __devinit Intel_errata_workarounds(struct cpuinfo_x86 *c) { @@ -162,6 +165,10 @@ static void __devinit Intel_errata_workarounds(struct cpuinfo_x86 *c) wrmsr (MSR_IA32_MISC_ENABLE, lo, hi); } } + + if (c->x86 == 6 && cpu_has_clflush && + (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47)) + set_bit(X86_FEATURE_CLFLUSH_MONITOR, c->x86_capability); } diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index f38fde4..4bb5c69 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -71,6 +71,7 @@ #define X86_FEATURE_TSC_RELIABLE (3*32+12) /* TSC is known to be reliable */ #define X86_FEATURE_XTOPOLOGY (3*32+13) /* cpu topology enum extensions */ #define X86_FEATURE_CPUID_FAULTING (3*32+14) /* cpuid faulting */ +#define X86_FEATURE_CLFLUSH_MONITOR (3*32+15) /* clflush reqd with monitor */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ #define X86_FEATURE_XMM3 (4*32+ 0) /* Streaming SIMD Extensions-3 */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:11:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3J-0003lL-UQ; Tue, 18 Mar 2014 09:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3I-0003kU-GD for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:16 +0000 Received: from [85.158.139.211:43241] by server-8.bemta-5.messagelabs.com id EC/69-11310-3BD08235; Tue, 18 Mar 2014 09:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1395133874!1673939!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5656 invoked from network); 18 Mar 2014 09:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3F-0004CO-Qb for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq3F-00069a-Gg for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:13 +0000 Date: Tue, 18 Mar 2014 09:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/Intel: work around Xeon 7400 series erratum AAI65 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96d1b237ae9b2f2718bb1c59820701f17d3d86e0 Author: Jan Beulich AuthorDate: Mon Mar 17 16:47:22 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 17 16:47:22 2014 +0100 x86/Intel: work around Xeon 7400 series erratum AAI65 Linux commit 40e2d7f9b5dae048789c64672bf3027fbb663ffa ("x86 idle: Repair large-server 50-watt idle-power regression") tells us that this applies not just to the named Xeon 7400 series, but also NHM-EX and WSM-EX; sadly Intel's documentation is so badly searchable that I wasn't able to locate the respective errata (and hence can't quote their numbers here). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/acpi/cpu_idle.c | 3 +++ xen/arch/x86/cpu/intel.c | 7 +++++++ xen/include/asm-x86/cpufeature.h | 1 + 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 597befa..ab86c75 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -296,6 +296,9 @@ void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) unsigned int cpu = smp_processor_id(); s_time_t expires = per_cpu(timer_deadline, cpu); + if ( boot_cpu_has(X86_FEATURE_CLFLUSH_MONITOR) ) + clflush((void *)&mwait_wakeup(cpu)); + __monitor((void *)&mwait_wakeup(cpu), 0, 0); smp_mb(); diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 9e02cf6..e178b5c 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -148,6 +148,9 @@ void __devinit early_intel_workaround(struct cpuinfo_x86 *c) /* * P4 Xeon errata 037 workaround. * Hardware prefetcher may cause stale data to be loaded into the cache. + * + * Xeon 7400 erratum AAI65 (and further newer Xeons) + * MONITOR/MWAIT may have excessive false wakeups */ static void __devinit Intel_errata_workarounds(struct cpuinfo_x86 *c) { @@ -162,6 +165,10 @@ static void __devinit Intel_errata_workarounds(struct cpuinfo_x86 *c) wrmsr (MSR_IA32_MISC_ENABLE, lo, hi); } } + + if (c->x86 == 6 && cpu_has_clflush && + (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47)) + set_bit(X86_FEATURE_CLFLUSH_MONITOR, c->x86_capability); } diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index f38fde4..4bb5c69 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -71,6 +71,7 @@ #define X86_FEATURE_TSC_RELIABLE (3*32+12) /* TSC is known to be reliable */ #define X86_FEATURE_XTOPOLOGY (3*32+13) /* cpu topology enum extensions */ #define X86_FEATURE_CPUID_FAULTING (3*32+14) /* cpuid faulting */ +#define X86_FEATURE_CLFLUSH_MONITOR (3*32+15) /* clflush reqd with monitor */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ #define X86_FEATURE_XMM3 (4*32+ 0) /* Streaming SIMD Extensions-3 */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:11:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3U-0003pO-14; Tue, 18 Mar 2014 09:11:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3S-0003oe-Pw for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:27 +0000 Received: from [85.158.139.211:56878] by server-17.bemta-5.messagelabs.com id 38/DC-09046-EBD08235; Tue, 18 Mar 2014 09:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1395133884!1691875!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32718 invoked from network); 18 Mar 2014 09:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3Q-0004CU-4L for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq3P-00069w-VB for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:24 +0000 Date: Tue, 18 Mar 2014 09:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: init: Provide a gc later in libxl_ctx_alloc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1f84a51fa92746bb78d8c4d5a907f03eaf52bbe Author: Ian Jackson AuthorDate: Tue Dec 17 15:22:40 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: init: Provide a gc later in libxl_ctx_alloc Provide libxl__gc *gc for the second half of libxl_ctx_alloc. (For the first half of the function, gc is in scope but set to NULL.) This makes it possible to make gc-requiring calls. For example, it makes error logging more convenient. Make use of this by changing the logging calls to use the LOG* convenience macros. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2d29ad2..224697a 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -25,6 +25,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, unsigned flags, xentoollog_logger * lg) { libxl_ctx *ctx = NULL; + libxl__gc gc_buf, *gc = NULL; int rc; if (version != LIBXL_VERSION) { rc = ERROR_VERSION; goto out; } @@ -79,6 +80,9 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, } /* Now ctx is safe for ctx_free; failures simply set rc and "goto out" */ + LIBXL_INIT_GC(gc_buf,ctx); + gc = &gc_buf; + /* Now gc is useable */ rc = libxl__atfork_init(ctx); if (rc) goto out; @@ -88,8 +92,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->xch = xc_interface_open(lg,lg,0); if (!ctx->xch) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno, - "cannot open libxc handle"); + LOGEV(ERROR, errno, "cannot open libxc handle"); rc = ERROR_FAIL; goto out; } @@ -97,8 +100,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, if (!ctx->xsh) ctx->xsh = xs_domain_open(); if (!ctx->xsh) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno, - "cannot connect to xenstore"); + LOGEV(ERROR, errno, "cannot connect to xenstore"); rc = ERROR_FAIL; goto out; } @@ -106,6 +108,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, return 0; out: + if (gc) libxl__free_all(gc); libxl_ctx_free(ctx); *pctx = NULL; return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:11:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3U-0003pO-14; Tue, 18 Mar 2014 09:11:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3S-0003oe-Pw for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:27 +0000 Received: from [85.158.139.211:56878] by server-17.bemta-5.messagelabs.com id 38/DC-09046-EBD08235; Tue, 18 Mar 2014 09:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1395133884!1691875!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32718 invoked from network); 18 Mar 2014 09:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3Q-0004CU-4L for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq3P-00069w-VB for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:24 +0000 Date: Tue, 18 Mar 2014 09:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: init: Provide a gc later in libxl_ctx_alloc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1f84a51fa92746bb78d8c4d5a907f03eaf52bbe Author: Ian Jackson AuthorDate: Tue Dec 17 15:22:40 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: init: Provide a gc later in libxl_ctx_alloc Provide libxl__gc *gc for the second half of libxl_ctx_alloc. (For the first half of the function, gc is in scope but set to NULL.) This makes it possible to make gc-requiring calls. For example, it makes error logging more convenient. Make use of this by changing the logging calls to use the LOG* convenience macros. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2d29ad2..224697a 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -25,6 +25,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, unsigned flags, xentoollog_logger * lg) { libxl_ctx *ctx = NULL; + libxl__gc gc_buf, *gc = NULL; int rc; if (version != LIBXL_VERSION) { rc = ERROR_VERSION; goto out; } @@ -79,6 +80,9 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, } /* Now ctx is safe for ctx_free; failures simply set rc and "goto out" */ + LIBXL_INIT_GC(gc_buf,ctx); + gc = &gc_buf; + /* Now gc is useable */ rc = libxl__atfork_init(ctx); if (rc) goto out; @@ -88,8 +92,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->xch = xc_interface_open(lg,lg,0); if (!ctx->xch) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno, - "cannot open libxc handle"); + LOGEV(ERROR, errno, "cannot open libxc handle"); rc = ERROR_FAIL; goto out; } @@ -97,8 +100,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, if (!ctx->xsh) ctx->xsh = xs_domain_open(); if (!ctx->xsh) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno, - "cannot connect to xenstore"); + LOGEV(ERROR, errno, "cannot connect to xenstore"); rc = ERROR_FAIL; goto out; } @@ -106,6 +108,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, return 0; out: + if (gc) libxl__free_all(gc); libxl_ctx_free(ctx); *pctx = NULL; return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:11:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3f-0003sU-41; Tue, 18 Mar 2014 09:11:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3d-0003rd-DW for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:37 +0000 Received: from [85.158.139.211:31227] by server-2.bemta-5.messagelabs.com id 8C/0D-12074-8CD08235; Tue, 18 Mar 2014 09:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1395133894!1677392!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30101 invoked from network); 18 Mar 2014 09:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3a-0004Ca-ND for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq3a-0006AQ-AF for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:34 +0000 Date: Tue, 18 Mar 2014 09:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: init: libxl__poller_init and _get take gc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit caafd3303d5519a2a47d9bbe9c8faf65a8e956e7 Author: Ian Jackson AuthorDate: Tue Dec 17 15:20:25 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: init: libxl__poller_init and _get take gc Change libxl__poller_init and libxl__poller__get to take a libxl__gc* rather than a libxl_ctx*. The gc is not used for memory allocation but simply to provide the standard local variable "gc" expected by the convenience macros. Doing this makes the error logging more convenient. Hence, convert the logging calls to use the LOG* convenience macros. And consequently, change the call sites, and the function bodies to use CTX rather than ctx. Also convert a call to malloc() (with error check) in libxl__poller_get, to libxl__zalloc (no error check needed). Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_event.c | 21 ++++++++------------- tools/libxl/libxl_internal.h | 4 ++-- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 224697a..0a825df 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -87,7 +87,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = libxl__atfork_init(ctx); if (rc) goto out; - rc = libxl__poller_init(ctx, &ctx->poller_app); + rc = libxl__poller_init(gc, &ctx->poller_app); if (rc) goto out; ctx->xch = xc_interface_open(lg,lg,0); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index ea8c744..3e465af 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1347,13 +1347,13 @@ int libxl__self_pipe_eatall(int fd) * Manipulation of pollers */ -int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) +int libxl__poller_init(libxl__gc *gc, libxl__poller *p) { int rc; p->fd_polls = 0; p->fd_rindices = 0; - rc = libxl__pipe_nonblock(ctx, p->wakeup_pipe); + rc = libxl__pipe_nonblock(CTX, p->wakeup_pipe); if (rc) goto out; return 0; @@ -1370,25 +1370,20 @@ void libxl__poller_dispose(libxl__poller *p) free(p->fd_rindices); } -libxl__poller *libxl__poller_get(libxl_ctx *ctx) +libxl__poller *libxl__poller_get(libxl__gc *gc) { /* must be called with ctx locked */ int rc; - libxl__poller *p = LIBXL_LIST_FIRST(&ctx->pollers_idle); + libxl__poller *p = LIBXL_LIST_FIRST(&CTX->pollers_idle); if (p) { LIBXL_LIST_REMOVE(p, entry); return p; } - p = malloc(sizeof(*p)); - if (!p) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); - return 0; - } - memset(p, 0, sizeof(*p)); + p = libxl__zalloc(NOGC, sizeof(*p)); - rc = libxl__poller_init(ctx, p); + rc = libxl__poller_init(gc, p); if (rc) { free(p); return NULL; @@ -1477,7 +1472,7 @@ int libxl_event_wait(libxl_ctx *ctx, libxl_event **event_r, EGC_INIT(ctx); CTX_LOCK; - poller = libxl__poller_get(ctx); + poller = libxl__poller_get(gc); if (!poller) { rc = ERROR_FAIL; goto out; } for (;;) { @@ -1653,7 +1648,7 @@ libxl__ao *libxl__ao_create(libxl_ctx *ctx, uint32_t domid, if (how) { ao->how = *how; } else { - ao->poller = libxl__poller_get(ctx); + ao->poller = libxl__poller_get(&ao->gc); if (!ao->poller) goto out; } libxl__log(ctx,XTL_DEBUG,-1,file,line,func, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9d17586..b67ed79 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -834,13 +834,13 @@ _hidden void libxl__event_disaster(libxl__egc*, const char *msg, int errnoval, /* Fills in, or disposes of, the resources held by, a poller whose * space the caller has allocated. ctx must be locked. */ -_hidden int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p); +_hidden int libxl__poller_init(libxl__gc *gc, libxl__poller *p); _hidden void libxl__poller_dispose(libxl__poller *p); /* Obtain a fresh poller from malloc or the idle list, and put it * away again afterwards. _get can fail, returning NULL. * ctx must be locked. */ -_hidden libxl__poller *libxl__poller_get(libxl_ctx *ctx); +_hidden libxl__poller *libxl__poller_get(libxl__gc *gc); _hidden void libxl__poller_put(libxl_ctx*, libxl__poller *p /* may be NULL */); /* Notifies whoever is polling using p that they should wake up. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:11:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3f-0003sU-41; Tue, 18 Mar 2014 09:11:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3d-0003rd-DW for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:37 +0000 Received: from [85.158.139.211:31227] by server-2.bemta-5.messagelabs.com id 8C/0D-12074-8CD08235; Tue, 18 Mar 2014 09:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1395133894!1677392!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30101 invoked from network); 18 Mar 2014 09:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3a-0004Ca-ND for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq3a-0006AQ-AF for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:34 +0000 Date: Tue, 18 Mar 2014 09:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: init: libxl__poller_init and _get take gc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit caafd3303d5519a2a47d9bbe9c8faf65a8e956e7 Author: Ian Jackson AuthorDate: Tue Dec 17 15:20:25 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: init: libxl__poller_init and _get take gc Change libxl__poller_init and libxl__poller__get to take a libxl__gc* rather than a libxl_ctx*. The gc is not used for memory allocation but simply to provide the standard local variable "gc" expected by the convenience macros. Doing this makes the error logging more convenient. Hence, convert the logging calls to use the LOG* convenience macros. And consequently, change the call sites, and the function bodies to use CTX rather than ctx. Also convert a call to malloc() (with error check) in libxl__poller_get, to libxl__zalloc (no error check needed). Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_event.c | 21 ++++++++------------- tools/libxl/libxl_internal.h | 4 ++-- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 224697a..0a825df 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -87,7 +87,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = libxl__atfork_init(ctx); if (rc) goto out; - rc = libxl__poller_init(ctx, &ctx->poller_app); + rc = libxl__poller_init(gc, &ctx->poller_app); if (rc) goto out; ctx->xch = xc_interface_open(lg,lg,0); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index ea8c744..3e465af 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1347,13 +1347,13 @@ int libxl__self_pipe_eatall(int fd) * Manipulation of pollers */ -int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) +int libxl__poller_init(libxl__gc *gc, libxl__poller *p) { int rc; p->fd_polls = 0; p->fd_rindices = 0; - rc = libxl__pipe_nonblock(ctx, p->wakeup_pipe); + rc = libxl__pipe_nonblock(CTX, p->wakeup_pipe); if (rc) goto out; return 0; @@ -1370,25 +1370,20 @@ void libxl__poller_dispose(libxl__poller *p) free(p->fd_rindices); } -libxl__poller *libxl__poller_get(libxl_ctx *ctx) +libxl__poller *libxl__poller_get(libxl__gc *gc) { /* must be called with ctx locked */ int rc; - libxl__poller *p = LIBXL_LIST_FIRST(&ctx->pollers_idle); + libxl__poller *p = LIBXL_LIST_FIRST(&CTX->pollers_idle); if (p) { LIBXL_LIST_REMOVE(p, entry); return p; } - p = malloc(sizeof(*p)); - if (!p) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); - return 0; - } - memset(p, 0, sizeof(*p)); + p = libxl__zalloc(NOGC, sizeof(*p)); - rc = libxl__poller_init(ctx, p); + rc = libxl__poller_init(gc, p); if (rc) { free(p); return NULL; @@ -1477,7 +1472,7 @@ int libxl_event_wait(libxl_ctx *ctx, libxl_event **event_r, EGC_INIT(ctx); CTX_LOCK; - poller = libxl__poller_get(ctx); + poller = libxl__poller_get(gc); if (!poller) { rc = ERROR_FAIL; goto out; } for (;;) { @@ -1653,7 +1648,7 @@ libxl__ao *libxl__ao_create(libxl_ctx *ctx, uint32_t domid, if (how) { ao->how = *how; } else { - ao->poller = libxl__poller_get(ctx); + ao->poller = libxl__poller_get(&ao->gc); if (!ao->poller) goto out; } libxl__log(ctx,XTL_DEBUG,-1,file,line,func, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9d17586..b67ed79 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -834,13 +834,13 @@ _hidden void libxl__event_disaster(libxl__egc*, const char *msg, int errnoval, /* Fills in, or disposes of, the resources held by, a poller whose * space the caller has allocated. ctx must be locked. */ -_hidden int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p); +_hidden int libxl__poller_init(libxl__gc *gc, libxl__poller *p); _hidden void libxl__poller_dispose(libxl__poller *p); /* Obtain a fresh poller from malloc or the idle list, and put it * away again afterwards. _get can fail, returning NULL. * ctx must be locked. */ -_hidden libxl__poller *libxl__poller_get(libxl_ctx *ctx); +_hidden libxl__poller *libxl__poller_get(libxl__gc *gc); _hidden void libxl__poller_put(libxl_ctx*, libxl__poller *p /* may be NULL */); /* Notifies whoever is polling using p that they should wake up. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:11:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:11:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3p-0003xg-AC; Tue, 18 Mar 2014 09:11:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3n-0003wl-OO for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:47 +0000 Received: from [85.158.139.211:63154] by server-17.bemta-5.messagelabs.com id AD/AD-09046-3DD08235; Tue, 18 Mar 2014 09:11:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1395133905!1686267!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15516 invoked from network); 18 Mar 2014 09:11:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:11:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3k-0004Cj-VB for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq3k-0006BV-Q5 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:44 +0000 Date: Tue, 18 Mar 2014 09:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: const-correct *_inuse, *_isregistered X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 086b5688d9cddde3bd82d3802948895f4f7786d4 Author: Ian Jackson AuthorDate: Fri Dec 6 16:01:32 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: events: const-correct *_inuse, *_isregistered The comments for libxl__ev_time_isregistered and the corresponding watch function even say that these should be const. Make it so. Also fix libxl__ev_child_inuse and libxl__ev_spawn_inuse. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index b67ed79..9e02861 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -727,7 +727,7 @@ _hidden int libxl__ev_fd_modify(libxl__gc*, libxl__ev_fd *ev, _hidden void libxl__ev_fd_deregister(libxl__gc*, libxl__ev_fd *ev); static inline void libxl__ev_fd_init(libxl__ev_fd *efd) { efd->fd = -1; } -static inline int libxl__ev_fd_isregistered(libxl__ev_fd *efd) +static inline int libxl__ev_fd_isregistered(const libxl__ev_fd *efd) { return efd->fd >= 0; } _hidden int libxl__ev_time_register_rel(libxl__gc*, libxl__ev_time *ev_out, @@ -743,7 +743,7 @@ _hidden int libxl__ev_time_modify_abs(libxl__gc*, libxl__ev_time *ev, _hidden void libxl__ev_time_deregister(libxl__gc*, libxl__ev_time *ev); static inline void libxl__ev_time_init(libxl__ev_time *ev) { ev->func = 0; } -static inline int libxl__ev_time_isregistered(libxl__ev_time *ev) +static inline int libxl__ev_time_isregistered(const libxl__ev_time *ev) { return !!ev->func; } @@ -783,7 +783,7 @@ _hidden pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *childw_out, libxl__ev_child_callback *death); static inline void libxl__ev_child_init(libxl__ev_child *childw_out) { childw_out->pid = -1; } -static inline int libxl__ev_child_inuse(libxl__ev_child *childw_out) +static inline int libxl__ev_child_inuse(const libxl__ev_child *childw_out) { return childw_out->pid >= 0; } /* Useable (only) in the child to once more make the ctx useable for @@ -1225,7 +1225,7 @@ struct libxl__spawn_state { libxl__ev_xswatch xswatch; }; -static inline int libxl__spawn_inuse(libxl__spawn_state *ss) +static inline int libxl__spawn_inuse(const libxl__spawn_state *ss) { return libxl__ev_child_inuse(&ss->mid); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:11:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:11:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3p-0003xg-AC; Tue, 18 Mar 2014 09:11:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3n-0003wl-OO for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:47 +0000 Received: from [85.158.139.211:63154] by server-17.bemta-5.messagelabs.com id AD/AD-09046-3DD08235; Tue, 18 Mar 2014 09:11:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1395133905!1686267!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15516 invoked from network); 18 Mar 2014 09:11:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:11:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3k-0004Cj-VB for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq3k-0006BV-Q5 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:44 +0000 Date: Tue, 18 Mar 2014 09:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: const-correct *_inuse, *_isregistered X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 086b5688d9cddde3bd82d3802948895f4f7786d4 Author: Ian Jackson AuthorDate: Fri Dec 6 16:01:32 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: events: const-correct *_inuse, *_isregistered The comments for libxl__ev_time_isregistered and the corresponding watch function even say that these should be const. Make it so. Also fix libxl__ev_child_inuse and libxl__ev_spawn_inuse. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index b67ed79..9e02861 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -727,7 +727,7 @@ _hidden int libxl__ev_fd_modify(libxl__gc*, libxl__ev_fd *ev, _hidden void libxl__ev_fd_deregister(libxl__gc*, libxl__ev_fd *ev); static inline void libxl__ev_fd_init(libxl__ev_fd *efd) { efd->fd = -1; } -static inline int libxl__ev_fd_isregistered(libxl__ev_fd *efd) +static inline int libxl__ev_fd_isregistered(const libxl__ev_fd *efd) { return efd->fd >= 0; } _hidden int libxl__ev_time_register_rel(libxl__gc*, libxl__ev_time *ev_out, @@ -743,7 +743,7 @@ _hidden int libxl__ev_time_modify_abs(libxl__gc*, libxl__ev_time *ev, _hidden void libxl__ev_time_deregister(libxl__gc*, libxl__ev_time *ev); static inline void libxl__ev_time_init(libxl__ev_time *ev) { ev->func = 0; } -static inline int libxl__ev_time_isregistered(libxl__ev_time *ev) +static inline int libxl__ev_time_isregistered(const libxl__ev_time *ev) { return !!ev->func; } @@ -783,7 +783,7 @@ _hidden pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *childw_out, libxl__ev_child_callback *death); static inline void libxl__ev_child_init(libxl__ev_child *childw_out) { childw_out->pid = -1; } -static inline int libxl__ev_child_inuse(libxl__ev_child *childw_out) +static inline int libxl__ev_child_inuse(const libxl__ev_child *childw_out) { return childw_out->pid >= 0; } /* Useable (only) in the child to once more make the ctx useable for @@ -1225,7 +1225,7 @@ struct libxl__spawn_state { libxl__ev_xswatch xswatch; }; -static inline int libxl__spawn_inuse(libxl__spawn_state *ss) +static inline int libxl__spawn_inuse(const libxl__spawn_state *ss) { return libxl__ev_child_inuse(&ss->mid); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:12:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:12:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3z-00042V-DW; Tue, 18 Mar 2014 09:11:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3x-00041R-IH for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:57 +0000 Received: from [193.109.254.147:17965] by server-16.bemta-14.messagelabs.com id F9/E1-16986-CDD08235; Tue, 18 Mar 2014 09:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1395133915!2378830!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13727 invoked from network); 18 Mar 2014 09:11:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3v-0004Cm-5Y for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq3v-0006Br-2R for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:55 +0000 Date: Tue, 18 Mar 2014 09:11:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Formally document libxl__xs_transaction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6cad324ebb0e84783ddc2af1e5ecacf9f72641ea Author: Ian Jackson AuthorDate: Mon Mar 17 13:21:24 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: Formally document libxl__xs_transaction Provide a more formal description of the semantics of libxl__xs_transaction_start, _commit and _abort, in addition to the usage pattern example. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9e02861..60a39ed 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -626,6 +626,26 @@ int libxl__xs_rm_checked(libxl__gc *gc, xs_transaction_t t, const char *path); * // other cleanups * return rc; * } + * + * Formally the states of *t are: + * + * name value of *t description + * Idle 0 no transaction exists + * Ready non-0 ready for work, nothing done yet + * Busy non-0 writes have been made but we are not finished + * Uncommitted non-0 writes have been made and should be committed + * + * libxl__xs_transaction_start: Idle -> Ready (on error: Idle) + * + * The transaction goes from Ready to Busy, and from Busy to + * Uncommitted, by the use of xenstore read and write operations + * (libxl__xs_..., xs_...) made by libxl__xs_transaction's caller. + * + * libxl__xs_transaction_commit: Ready/Uncommitted -> Idle + * on success (returns 0): xenstore has been updated + * on error (<0) or conflict (+1): updates discarded + * + * libxl__xs_transaction_abort: Any -> Idle (any updates discarded) */ int libxl__xs_transaction_start(libxl__gc *gc, xs_transaction_t *t); int libxl__xs_transaction_commit(libxl__gc *gc, xs_transaction_t *t); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:12:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:12:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3z-00042V-DW; Tue, 18 Mar 2014 09:11:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3x-00041R-IH for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:57 +0000 Received: from [193.109.254.147:17965] by server-16.bemta-14.messagelabs.com id F9/E1-16986-CDD08235; Tue, 18 Mar 2014 09:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1395133915!2378830!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13727 invoked from network); 18 Mar 2014 09:11:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq3v-0004Cm-5Y for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq3v-0006Br-2R for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:11:55 +0000 Date: Tue, 18 Mar 2014 09:11:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Formally document libxl__xs_transaction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6cad324ebb0e84783ddc2af1e5ecacf9f72641ea Author: Ian Jackson AuthorDate: Mon Mar 17 13:21:24 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: Formally document libxl__xs_transaction Provide a more formal description of the semantics of libxl__xs_transaction_start, _commit and _abort, in addition to the usage pattern example. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9e02861..60a39ed 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -626,6 +626,26 @@ int libxl__xs_rm_checked(libxl__gc *gc, xs_transaction_t t, const char *path); * // other cleanups * return rc; * } + * + * Formally the states of *t are: + * + * name value of *t description + * Idle 0 no transaction exists + * Ready non-0 ready for work, nothing done yet + * Busy non-0 writes have been made but we are not finished + * Uncommitted non-0 writes have been made and should be committed + * + * libxl__xs_transaction_start: Idle -> Ready (on error: Idle) + * + * The transaction goes from Ready to Busy, and from Busy to + * Uncommitted, by the use of xenstore read and write operations + * (libxl__xs_..., xs_...) made by libxl__xs_transaction's caller. + * + * libxl__xs_transaction_commit: Ready/Uncommitted -> Idle + * on success (returns 0): xenstore has been updated + * on error (<0) or conflict (+1): updates discarded + * + * libxl__xs_transaction_abort: Any -> Idle (any updates discarded) */ int libxl__xs_transaction_start(libxl__gc *gc, xs_transaction_t *t); int libxl__xs_transaction_commit(libxl__gc *gc, xs_transaction_t *t); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:12:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:12:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4A-00046I-GW; Tue, 18 Mar 2014 09:12:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq48-000450-Du for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:08 +0000 Received: from [85.158.137.68:30536] by server-12.bemta-3.messagelabs.com id 86/54-14831-7ED08235; Tue, 18 Mar 2014 09:12:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1395133925!1281605!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20469 invoked from network); 18 Mar 2014 09:12:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq45-0004DL-Ag for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq45-0006CN-8u for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:05 +0000 Date: Tue, 18 Mar 2014 09:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Provide libxl__xswait_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eeb157e96dc64a2ded81172d4ce3a279c76ab745 Author: Ian Jackson AuthorDate: Thu Dec 5 18:49:12 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: events: Provide libxl__xswait_* This is an ao utility for for conveniently doing a timed wait on xenstore. It handles setting up and cancelling the timeout, and also conveniently reads the key for you. No callers yet in this patch. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v2: Fix doc comments to refer to correct rc values --- tools/libxl/libxl_aoutils.c | 77 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 52 ++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index b4eb6e5..477717b 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -16,6 +16,83 @@ #include "libxl_internal.h" +/*----- xswait -----*/ + +static libxl__ev_xswatch_callback xswait_xswatch_callback; +static libxl__ev_time_callback xswait_timeout_callback; +static void xswait_report_error(libxl__egc*, libxl__xswait_state*, int rc); + +void libxl__xswait_init(libxl__xswait_state *xswa) +{ + libxl__ev_time_init(&xswa->time_ev); + libxl__ev_xswatch_init(&xswa->watch_ev); +} + +void libxl__xswait_stop(libxl__gc *gc, libxl__xswait_state *xswa) +{ + libxl__ev_time_deregister(gc, &xswa->time_ev); + libxl__ev_xswatch_deregister(gc, &xswa->watch_ev); +} + +bool libxl__xswait_inuse(const libxl__xswait_state *xswa) +{ + bool time_inuse = libxl__ev_time_isregistered(&xswa->time_ev); + bool watch_inuse = libxl__ev_xswatch_isregistered(&xswa->watch_ev); + assert(time_inuse == watch_inuse); + return time_inuse; +} + +int libxl__xswait_start(libxl__gc *gc, libxl__xswait_state *xswa) +{ + int rc; + + rc = libxl__ev_time_register_rel(gc, &xswa->time_ev, + xswait_timeout_callback, xswa->timeout_ms); + if (rc) goto err; + + rc = libxl__ev_xswatch_register(gc, &xswa->watch_ev, + xswait_xswatch_callback, xswa->path); + if (rc) goto err; + + return 0; + + err: + libxl__xswait_stop(gc, xswa); + return rc; +} + +void xswait_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *xsw, + const char *watch_path, const char *event_path) +{ + EGC_GC; + libxl__xswait_state *xswa = CONTAINER_OF(xsw, *xswa, watch_ev); + int rc; + const char *data; + + rc = libxl__xs_read_checked(gc, XBT_NULL, xswa->path, &data); + if (rc) { xswait_report_error(egc, xswa, rc); return; } + + xswa->callback(egc, xswa, 0, data); +} + +void xswait_timeout_callback(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) +{ + EGC_GC; + libxl__xswait_state *xswa = CONTAINER_OF(ev, *xswa, time_ev); + LOG(DEBUG, "%s: xswait timeout (path=%s)", xswa->what, xswa->path); + xswait_report_error(egc, xswa, ERROR_TIMEDOUT); +} + +static void xswait_report_error(libxl__egc *egc, libxl__xswait_state *xswa, + int rc) +{ + EGC_GC; + libxl__xswait_stop(gc, xswa); + xswa->callback(egc, xswa, rc, 0); +} + + /*----- data copier -----*/ void libxl__datacopier_init(libxl__datacopier_state *dc) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 60a39ed..a208be7 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1100,6 +1100,58 @@ _hidden int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int num); _hidden int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid); +/*----- xswait: wait for a xenstore node to be suitable -----*/ + +typedef struct libxl__xswait_state libxl__xswait_state; + +/* + * rc describes the circumstances of this callback: + * + * rc==0 + * + * The xenstore path (may have) changed. It has been read for + * you. The result is in data (allocated from the ao gc). + * data may be NULL, which means that the xenstore read gave + * ENOENT. + * + * If you are satisfied, you MUST call libxl__xswait_stop. + * Otherwise, xswait will continue waiting and watching and + * will call you back later. + * + * rc==ERROR_TIMEDOUT + * + * The specified timeout was reached. + * This has NOT been logged (except to the debug log). + * xswait will not continue (but calling libxl__xswait_stop is OK). + * + * rc!=0, !=ERROR_TIMEDOUT + * + * Some other error occurred. + * This HAS been logged. + * xswait will not continue (but calling libxl__xswait_stop is OK). + * + */ +typedef void libxl__xswait_callback(libxl__egc *egc, + libxl__xswait_state *xswa, int rc, const char *data); + +struct libxl__xswait_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + const char *what; /* for error msgs: noun phrase, what we're waiting for */ + const char *path; + int timeout_ms; /* as for poll(2) */ + libxl__xswait_callback *callback; + /* remaining fields are private to xswait */ + libxl__ev_time time_ev; + libxl__ev_xswatch watch_ev; +}; + +void libxl__xswait_init(libxl__xswait_state*); +void libxl__xswait_stop(libxl__gc*, libxl__xswait_state*); /*idempotent*/ +bool libxl__xswait_inuse(const libxl__xswait_state *ss); + +int libxl__xswait_start(libxl__gc*, libxl__xswait_state*); + /* *----- spawn ----- * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:12:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:12:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4A-00046I-GW; Tue, 18 Mar 2014 09:12:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq48-000450-Du for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:08 +0000 Received: from [85.158.137.68:30536] by server-12.bemta-3.messagelabs.com id 86/54-14831-7ED08235; Tue, 18 Mar 2014 09:12:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1395133925!1281605!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20469 invoked from network); 18 Mar 2014 09:12:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq45-0004DL-Ag for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq45-0006CN-8u for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:05 +0000 Date: Tue, 18 Mar 2014 09:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Provide libxl__xswait_* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eeb157e96dc64a2ded81172d4ce3a279c76ab745 Author: Ian Jackson AuthorDate: Thu Dec 5 18:49:12 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: events: Provide libxl__xswait_* This is an ao utility for for conveniently doing a timed wait on xenstore. It handles setting up and cancelling the timeout, and also conveniently reads the key for you. No callers yet in this patch. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v2: Fix doc comments to refer to correct rc values --- tools/libxl/libxl_aoutils.c | 77 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 52 ++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index b4eb6e5..477717b 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -16,6 +16,83 @@ #include "libxl_internal.h" +/*----- xswait -----*/ + +static libxl__ev_xswatch_callback xswait_xswatch_callback; +static libxl__ev_time_callback xswait_timeout_callback; +static void xswait_report_error(libxl__egc*, libxl__xswait_state*, int rc); + +void libxl__xswait_init(libxl__xswait_state *xswa) +{ + libxl__ev_time_init(&xswa->time_ev); + libxl__ev_xswatch_init(&xswa->watch_ev); +} + +void libxl__xswait_stop(libxl__gc *gc, libxl__xswait_state *xswa) +{ + libxl__ev_time_deregister(gc, &xswa->time_ev); + libxl__ev_xswatch_deregister(gc, &xswa->watch_ev); +} + +bool libxl__xswait_inuse(const libxl__xswait_state *xswa) +{ + bool time_inuse = libxl__ev_time_isregistered(&xswa->time_ev); + bool watch_inuse = libxl__ev_xswatch_isregistered(&xswa->watch_ev); + assert(time_inuse == watch_inuse); + return time_inuse; +} + +int libxl__xswait_start(libxl__gc *gc, libxl__xswait_state *xswa) +{ + int rc; + + rc = libxl__ev_time_register_rel(gc, &xswa->time_ev, + xswait_timeout_callback, xswa->timeout_ms); + if (rc) goto err; + + rc = libxl__ev_xswatch_register(gc, &xswa->watch_ev, + xswait_xswatch_callback, xswa->path); + if (rc) goto err; + + return 0; + + err: + libxl__xswait_stop(gc, xswa); + return rc; +} + +void xswait_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *xsw, + const char *watch_path, const char *event_path) +{ + EGC_GC; + libxl__xswait_state *xswa = CONTAINER_OF(xsw, *xswa, watch_ev); + int rc; + const char *data; + + rc = libxl__xs_read_checked(gc, XBT_NULL, xswa->path, &data); + if (rc) { xswait_report_error(egc, xswa, rc); return; } + + xswa->callback(egc, xswa, 0, data); +} + +void xswait_timeout_callback(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) +{ + EGC_GC; + libxl__xswait_state *xswa = CONTAINER_OF(ev, *xswa, time_ev); + LOG(DEBUG, "%s: xswait timeout (path=%s)", xswa->what, xswa->path); + xswait_report_error(egc, xswa, ERROR_TIMEDOUT); +} + +static void xswait_report_error(libxl__egc *egc, libxl__xswait_state *xswa, + int rc) +{ + EGC_GC; + libxl__xswait_stop(gc, xswa); + xswa->callback(egc, xswa, rc, 0); +} + + /*----- data copier -----*/ void libxl__datacopier_init(libxl__datacopier_state *dc) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 60a39ed..a208be7 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1100,6 +1100,58 @@ _hidden int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int num); _hidden int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid); +/*----- xswait: wait for a xenstore node to be suitable -----*/ + +typedef struct libxl__xswait_state libxl__xswait_state; + +/* + * rc describes the circumstances of this callback: + * + * rc==0 + * + * The xenstore path (may have) changed. It has been read for + * you. The result is in data (allocated from the ao gc). + * data may be NULL, which means that the xenstore read gave + * ENOENT. + * + * If you are satisfied, you MUST call libxl__xswait_stop. + * Otherwise, xswait will continue waiting and watching and + * will call you back later. + * + * rc==ERROR_TIMEDOUT + * + * The specified timeout was reached. + * This has NOT been logged (except to the debug log). + * xswait will not continue (but calling libxl__xswait_stop is OK). + * + * rc!=0, !=ERROR_TIMEDOUT + * + * Some other error occurred. + * This HAS been logged. + * xswait will not continue (but calling libxl__xswait_stop is OK). + * + */ +typedef void libxl__xswait_callback(libxl__egc *egc, + libxl__xswait_state *xswa, int rc, const char *data); + +struct libxl__xswait_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + const char *what; /* for error msgs: noun phrase, what we're waiting for */ + const char *path; + int timeout_ms; /* as for poll(2) */ + libxl__xswait_callback *callback; + /* remaining fields are private to xswait */ + libxl__ev_time time_ev; + libxl__ev_xswatch watch_ev; +}; + +void libxl__xswait_init(libxl__xswait_state*); +void libxl__xswait_stop(libxl__gc*, libxl__xswait_state*); /*idempotent*/ +bool libxl__xswait_inuse(const libxl__xswait_state *ss); + +int libxl__xswait_start(libxl__gc*, libxl__xswait_state*); + /* *----- spawn ----- * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:12:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:12:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4T-0004F2-MP; Tue, 18 Mar 2014 09:12:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4S-0004Ea-A2 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:28 +0000 Received: from [85.158.143.35:42578] by server-1.bemta-4.messagelabs.com id AF/18-09853-BFD08235; Tue, 18 Mar 2014 09:12:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1395133945!2818695!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15663 invoked from network); 18 Mar 2014 09:12:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:12:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4P-0004De-LB for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq4P-0006D7-Iv for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:25 +0000 Date: Tue, 18 Mar 2014 09:12:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Use libxl__xswait_* in spawn code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ab7810f87b36830c91c9d322287ade68ed24a24 Author: Ian Jackson AuthorDate: Fri Dec 6 15:31:02 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: events: Use libxl__xswait_* in spawn code Replace open-coded use of ev_time and ev_xswatch with xswait. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_exec.c | 49 ++++++++++++++--------------------------- tools/libxl/libxl_internal.h | 3 +- 2 files changed, 18 insertions(+), 34 deletions(-) diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index b6efa0f..4b012dc 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -257,10 +257,8 @@ err: */ /* Event callbacks. */ -static void spawn_watch_event(libxl__egc *egc, libxl__ev_xswatch *xsw, - const char *watch_path, const char *event_path); -static void spawn_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); +static void spawn_watch_event(libxl__egc *egc, libxl__xswait_state *xswa, + int rc, const char *xsdata); static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, pid_t pid, int status); @@ -274,8 +272,7 @@ static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss); void libxl__spawn_init(libxl__spawn_state *ss) { libxl__ev_child_init(&ss->mid); - libxl__ev_time_init(&ss->timeout); - libxl__ev_xswatch_init(&ss->xswatch); + libxl__xswait_init(&ss->xswait); } int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *ss) @@ -288,12 +285,12 @@ int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *ss) libxl__spawn_init(ss); ss->failed = ss->detaching = 0; - rc = libxl__ev_time_register_rel(gc, &ss->timeout, - spawn_timeout, ss->timeout_ms); - if (rc) goto out_err; - - rc = libxl__ev_xswatch_register(gc, &ss->xswatch, - spawn_watch_event, ss->xspath); + ss->xswait.ao = ao; + ss->xswait.what = GCSPRINTF("%s startup", ss->what); + ss->xswait.path = ss->xspath; + ss->xswait.timeout_ms = ss->timeout_ms; + ss->xswait.callback = spawn_watch_event; + rc = libxl__xswait_start(gc, &ss->xswait); if (rc) goto out_err; pid_t middle = libxl__ev_child_fork(gc, &ss->mid, spawn_middle_death); @@ -350,8 +347,7 @@ int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *ss) static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss) { assert(!libxl__ev_child_inuse(&ss->mid)); - libxl__ev_time_deregister(gc, &ss->timeout); - libxl__ev_xswatch_deregister(gc, &ss->xswatch); + libxl__xswait_stop(gc, &ss->xswait); } static void spawn_detach(libxl__gc *gc, libxl__spawn_state *ss) @@ -362,8 +358,7 @@ static void spawn_detach(libxl__gc *gc, libxl__spawn_state *ss) int r; assert(libxl__ev_child_inuse(&ss->mid)); - libxl__ev_time_deregister(gc, &ss->timeout); - libxl__ev_xswatch_deregister(gc, &ss->xswatch); + libxl__xswait_stop(gc, &ss->xswait); pid_t child = ss->mid.pid; r = kill(child, SIGKILL); @@ -387,25 +382,15 @@ static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss) spawn_detach(gc, ss); } -static void spawn_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) -{ - /* Before event, was Attached. */ - EGC_GC; - libxl__spawn_state *ss = CONTAINER_OF(ev, *ss, timeout); - LOG(ERROR, "%s: startup timed out", ss->what); - spawn_fail(egc, ss); /* must be last */ -} - -static void spawn_watch_event(libxl__egc *egc, libxl__ev_xswatch *xsw, - const char *watch_path, const char *event_path) +static void spawn_watch_event(libxl__egc *egc, libxl__xswait_state *xswa, + int rc, const char *p) { /* On entry, is Attached. */ EGC_GC; - libxl__spawn_state *ss = CONTAINER_OF(xsw, *ss, xswatch); - char *p = libxl__xs_read(gc, 0, ss->xspath); - if (!p && errno != ENOENT) { - LOG(ERROR, "%s: xenstore read of %s failed", ss->what, ss->xspath); + libxl__spawn_state *ss = CONTAINER_OF(xswa, *ss, xswait); + if (rc) { + if (rc == ERROR_TIMEDOUT) + LOG(ERROR, "%s: startup timed out", ss->what); spawn_fail(egc, ss); /* must be last */ return; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a82a43d..0e4859b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1295,8 +1295,7 @@ struct libxl__spawn_state { int detaching; /* we are in Detaching */ int failed; /* might be true whenever we are not Idle */ libxl__ev_child mid; /* always in use whenever we are not Idle */ - libxl__ev_time timeout; - libxl__ev_xswatch xswatch; + libxl__xswait_state xswait; }; static inline int libxl__spawn_inuse(const libxl__spawn_state *ss) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:12:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:12:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4T-0004F2-MP; Tue, 18 Mar 2014 09:12:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4S-0004Ea-A2 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:28 +0000 Received: from [85.158.143.35:42578] by server-1.bemta-4.messagelabs.com id AF/18-09853-BFD08235; Tue, 18 Mar 2014 09:12:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1395133945!2818695!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15663 invoked from network); 18 Mar 2014 09:12:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:12:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4P-0004De-LB for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq4P-0006D7-Iv for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:25 +0000 Date: Tue, 18 Mar 2014 09:12:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Use libxl__xswait_* in spawn code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ab7810f87b36830c91c9d322287ade68ed24a24 Author: Ian Jackson AuthorDate: Fri Dec 6 15:31:02 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: events: Use libxl__xswait_* in spawn code Replace open-coded use of ev_time and ev_xswatch with xswait. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_exec.c | 49 ++++++++++++++--------------------------- tools/libxl/libxl_internal.h | 3 +- 2 files changed, 18 insertions(+), 34 deletions(-) diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index b6efa0f..4b012dc 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -257,10 +257,8 @@ err: */ /* Event callbacks. */ -static void spawn_watch_event(libxl__egc *egc, libxl__ev_xswatch *xsw, - const char *watch_path, const char *event_path); -static void spawn_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); +static void spawn_watch_event(libxl__egc *egc, libxl__xswait_state *xswa, + int rc, const char *xsdata); static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, pid_t pid, int status); @@ -274,8 +272,7 @@ static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss); void libxl__spawn_init(libxl__spawn_state *ss) { libxl__ev_child_init(&ss->mid); - libxl__ev_time_init(&ss->timeout); - libxl__ev_xswatch_init(&ss->xswatch); + libxl__xswait_init(&ss->xswait); } int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *ss) @@ -288,12 +285,12 @@ int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *ss) libxl__spawn_init(ss); ss->failed = ss->detaching = 0; - rc = libxl__ev_time_register_rel(gc, &ss->timeout, - spawn_timeout, ss->timeout_ms); - if (rc) goto out_err; - - rc = libxl__ev_xswatch_register(gc, &ss->xswatch, - spawn_watch_event, ss->xspath); + ss->xswait.ao = ao; + ss->xswait.what = GCSPRINTF("%s startup", ss->what); + ss->xswait.path = ss->xspath; + ss->xswait.timeout_ms = ss->timeout_ms; + ss->xswait.callback = spawn_watch_event; + rc = libxl__xswait_start(gc, &ss->xswait); if (rc) goto out_err; pid_t middle = libxl__ev_child_fork(gc, &ss->mid, spawn_middle_death); @@ -350,8 +347,7 @@ int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *ss) static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss) { assert(!libxl__ev_child_inuse(&ss->mid)); - libxl__ev_time_deregister(gc, &ss->timeout); - libxl__ev_xswatch_deregister(gc, &ss->xswatch); + libxl__xswait_stop(gc, &ss->xswait); } static void spawn_detach(libxl__gc *gc, libxl__spawn_state *ss) @@ -362,8 +358,7 @@ static void spawn_detach(libxl__gc *gc, libxl__spawn_state *ss) int r; assert(libxl__ev_child_inuse(&ss->mid)); - libxl__ev_time_deregister(gc, &ss->timeout); - libxl__ev_xswatch_deregister(gc, &ss->xswatch); + libxl__xswait_stop(gc, &ss->xswait); pid_t child = ss->mid.pid; r = kill(child, SIGKILL); @@ -387,25 +382,15 @@ static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss) spawn_detach(gc, ss); } -static void spawn_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) -{ - /* Before event, was Attached. */ - EGC_GC; - libxl__spawn_state *ss = CONTAINER_OF(ev, *ss, timeout); - LOG(ERROR, "%s: startup timed out", ss->what); - spawn_fail(egc, ss); /* must be last */ -} - -static void spawn_watch_event(libxl__egc *egc, libxl__ev_xswatch *xsw, - const char *watch_path, const char *event_path) +static void spawn_watch_event(libxl__egc *egc, libxl__xswait_state *xswa, + int rc, const char *p) { /* On entry, is Attached. */ EGC_GC; - libxl__spawn_state *ss = CONTAINER_OF(xsw, *ss, xswatch); - char *p = libxl__xs_read(gc, 0, ss->xspath); - if (!p && errno != ENOENT) { - LOG(ERROR, "%s: xenstore read of %s failed", ss->what, ss->xspath); + libxl__spawn_state *ss = CONTAINER_OF(xswa, *ss, xswait); + if (rc) { + if (rc == ERROR_TIMEDOUT) + LOG(ERROR, "%s: startup timed out", ss->what); spawn_fail(egc, ss); /* must be last */ return; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a82a43d..0e4859b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1295,8 +1295,7 @@ struct libxl__spawn_state { int detaching; /* we are in Detaching */ int failed; /* might be true whenever we are not Idle */ libxl__ev_child mid; /* always in use whenever we are not Idle */ - libxl__ev_time timeout; - libxl__ev_xswatch xswatch; + libxl__xswait_state xswait; }; static inline int libxl__spawn_inuse(const libxl__spawn_state *ss) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:12:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:12:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4M-0004Ch-Jd; Tue, 18 Mar 2014 09:12:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4L-0004Bi-AA for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:21 +0000 Received: from [85.158.137.68:40163] by server-15.bemta-3.messagelabs.com id 93/D5-13757-4FD08235; Tue, 18 Mar 2014 09:12:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1395133938!1274572!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24055 invoked from network); 18 Mar 2014 09:12:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:12:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4F-0004DR-FW for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq4F-0006Cl-Db for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:15 +0000 Date: Tue, 18 Mar 2014 09:12:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: libxl__xswait* support @paths X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffb46d64c37f520fac6574e90e263cb21f145c8d Author: Ian Jackson AuthorDate: Fri Mar 14 17:38:38 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: events: libxl__xswait* support @paths Special-case paths starting with '@' in libxl__xswait. Attempting to read these from xenstore gives EINVAL. Callers waiting for (say) @releaseDomain will be checking for some condition which can be observed other than by looking at xenstore. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v3: New patch in this version of the series. --- tools/libxl/libxl_aoutils.c | 8 ++++++-- tools/libxl/libxl_internal.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 477717b..1c9eb9e 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -69,8 +69,12 @@ void xswait_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *xsw, int rc; const char *data; - rc = libxl__xs_read_checked(gc, XBT_NULL, xswa->path, &data); - if (rc) { xswait_report_error(egc, xswa, rc); return; } + if (xswa->path[0] == '@') { + data = 0; + } else { + rc = libxl__xs_read_checked(gc, XBT_NULL, xswa->path, &data); + if (rc) { xswait_report_error(egc, xswa, rc); return; } + } xswa->callback(egc, xswa, 0, data); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a208be7..a82a43d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1130,6 +1130,8 @@ typedef struct libxl__xswait_state libxl__xswait_state; * This HAS been logged. * xswait will not continue (but calling libxl__xswait_stop is OK). * + * xswait.path may start with with '@', in which case no read is done + * and the callback will always get data==0. */ typedef void libxl__xswait_callback(libxl__egc *egc, libxl__xswait_state *xswa, int rc, const char *data); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:12:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:12:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4M-0004Ch-Jd; Tue, 18 Mar 2014 09:12:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4L-0004Bi-AA for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:21 +0000 Received: from [85.158.137.68:40163] by server-15.bemta-3.messagelabs.com id 93/D5-13757-4FD08235; Tue, 18 Mar 2014 09:12:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1395133938!1274572!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24055 invoked from network); 18 Mar 2014 09:12:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:12:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4F-0004DR-FW for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq4F-0006Cl-Db for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:15 +0000 Date: Tue, 18 Mar 2014 09:12:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: libxl__xswait* support @paths X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffb46d64c37f520fac6574e90e263cb21f145c8d Author: Ian Jackson AuthorDate: Fri Mar 14 17:38:38 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: events: libxl__xswait* support @paths Special-case paths starting with '@' in libxl__xswait. Attempting to read these from xenstore gives EINVAL. Callers waiting for (say) @releaseDomain will be checking for some condition which can be observed other than by looking at xenstore. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v3: New patch in this version of the series. --- tools/libxl/libxl_aoutils.c | 8 ++++++-- tools/libxl/libxl_internal.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 477717b..1c9eb9e 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -69,8 +69,12 @@ void xswait_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *xsw, int rc; const char *data; - rc = libxl__xs_read_checked(gc, XBT_NULL, xswa->path, &data); - if (rc) { xswait_report_error(egc, xswa, rc); return; } + if (xswa->path[0] == '@') { + data = 0; + } else { + rc = libxl__xs_read_checked(gc, XBT_NULL, xswa->path, &data); + if (rc) { xswait_report_error(egc, xswa, rc); return; } + } xswa->callback(egc, xswa, 0, data); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a208be7..a82a43d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1130,6 +1130,8 @@ typedef struct libxl__xswait_state libxl__xswait_state; * This HAS been logged. * xswait will not continue (but calling libxl__xswait_stop is OK). * + * xswait.path may start with with '@', in which case no read is done + * and the callback will always get data==0. */ typedef void libxl__xswait_callback(libxl__egc *egc, libxl__xswait_state *xswa, int rc, const char *data); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:12:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:12:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4d-0004Ik-Q0; Tue, 18 Mar 2014 09:12:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4c-0004IF-HK for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:38 +0000 Received: from [85.158.143.35:45704] by server-3.bemta-4.messagelabs.com id 8E/63-13602-50E08235; Tue, 18 Mar 2014 09:12:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1395133955!2134694!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7767 invoked from network); 18 Mar 2014 09:12:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:12:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4Z-0004Dh-Q7 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq4Z-0006DZ-Os for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:35 +0000 Date: Tue, 18 Mar 2014 09:12:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Provide libxl__ev_evtchn* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 66bff9fd492f635021b7119e8528a65ef0bc0647 Author: Ian Jackson AuthorDate: Wed Dec 11 14:06:02 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: events: Provide libxl__ev_evtchn* Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v2: Fix commit message not to refer to libxl_ctx_alloc's gc, done earlier Change type of port in evtchn_fd_callback to evtchn_port_or_error_t Clarify comment about use of ctx->xce. Fix typo in comment. --- tools/libxl/libxl.c | 9 +++ tools/libxl/libxl_event.c | 153 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 48 +++++++++++++ 3 files changed, 210 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0a825df..7b7ffd3 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -60,6 +60,10 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, LIBXL_SLIST_INIT(&ctx->watch_freeslots); libxl__ev_fd_init(&ctx->watch_efd); + ctx->xce = 0; + LIBXL_LIST_INIT(&ctx->evtchns_waiting); + libxl__ev_fd_init(&ctx->evtchn_efd); + LIBXL_TAILQ_INIT(&ctx->death_list); libxl__ev_xswatch_init(&ctx->death_watch); @@ -104,6 +108,8 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = ERROR_FAIL; goto out; } + rc = libxl__ctx_evtchn_init(gc); + *pctx = ctx; return 0; @@ -147,16 +153,19 @@ int libxl_ctx_free(libxl_ctx *ctx) for (i = 0; i < ctx->watch_nslots; i++) assert(!libxl__watch_slot_contents(gc, i)); libxl__ev_fd_deregister(gc, &ctx->watch_efd); + libxl__ev_fd_deregister(gc, &ctx->evtchn_efd); libxl__ev_fd_deregister(gc, &ctx->sigchld_selfpipe_efd); /* Now there should be no more events requested from the application: */ assert(LIBXL_LIST_EMPTY(&ctx->efds)); assert(LIBXL_TAILQ_EMPTY(&ctx->etimes)); + assert(LIBXL_LIST_EMPTY(&ctx->evtchns_waiting)); if (ctx->xch) xc_interface_close(ctx->xch); libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); + if (ctx->xce) xc_evtchn_close(ctx->xce); libxl__poller_dispose(&ctx->poller_app); assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 3e465af..22b1227 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -625,6 +625,159 @@ void libxl__ev_xswatch_deregister(libxl__gc *gc, libxl__ev_xswatch *w) } /* + * evtchn + */ + +static int evtchn_revents_check(libxl__egc *egc, int revents) +{ + EGC_GC; + + if (revents & ~POLLIN) { + LOG(ERROR, "unexpected poll event on event channel fd: %x", revents); + LIBXL__EVENT_DISASTER(egc, + "unexpected poll event on event channel fd", 0, 0); + libxl__ev_fd_deregister(gc, &CTX->evtchn_efd); + return ERROR_FAIL; + } + + assert(revents & POLLIN); + + return 0; +} + +static void evtchn_fd_callback(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents) +{ + EGC_GC; + libxl__ev_evtchn *evev; + int r, rc; + evtchn_port_or_error_t port; + struct pollfd recheck; + + rc = evtchn_revents_check(egc, revents); + if (rc) return; + + for (;;) { + /* Check the fd again. The incoming revent may no longer be + * true, because the libxl ctx lock has not necessarily been + * held continuously since someone noticed the fd. Normally + * this wouldn't be a problem but evtchn devices don't always + * honour O_NONBLOCK (see xenctrl.h). */ + + recheck.fd = fd; + recheck.events = POLLIN; + recheck.revents = 0; + r = poll(&recheck, 1, 0); + DBG("ev_evtchn recheck r=%d revents=%#x", r, recheck.revents); + if (r < 0) { + LIBXL__EVENT_DISASTER(egc, + "unexpected failure polling event channel fd for recheck", + errno, 0); + return; + } + if (r == 0) + break; + rc = evtchn_revents_check(egc, recheck.revents); + if (rc) return; + + /* OK, that's that workaround done. We can actually check for + * work for us to do: */ + + port = xc_evtchn_pending(CTX->xce); + if (port < 0) { + if (errno == EAGAIN) + break; + LIBXL__EVENT_DISASTER(egc, + "unexpected failure fetching occurring event port number from evtchn", + errno, 0); + return; + } + + LIBXL_LIST_FOREACH(evev, &CTX->evtchns_waiting, entry) + if (port == evev->port) + goto found; + /* not found */ + DBG("ev_evtchn port=%d no-one cared", port); + continue; + + found: + DBG("ev_evtchn=%p port=%d signaled", evev, port); + evev->waiting = 0; + LIBXL_LIST_REMOVE(evev, entry); + evev->callback(egc, evev); + } +} + +int libxl__ctx_evtchn_init(libxl__gc *gc) { + xc_evtchn *xce; + int rc, fd; + + if (CTX->xce) + return 0; + + xce = xc_evtchn_open(CTX->lg, 0); + if (!xce) { + LOGE(ERROR,"cannot open libxc evtchn handle"); + rc = ERROR_FAIL; + goto out; + } + + fd = xc_evtchn_fd(xce); + assert(fd >= 0); + + rc = libxl_fd_set_nonblock(CTX, fd, 1); + if (rc) goto out; + + rc = libxl__ev_fd_register(gc, &CTX->evtchn_efd, + evtchn_fd_callback, fd, POLLIN); + if (rc) goto out; + + CTX->xce = xce; + return 0; + + out: + xc_evtchn_close(xce); + return rc; +} + +int libxl__ev_evtchn_wait(libxl__gc *gc, libxl__ev_evtchn *evev) +{ + int r, rc; + + DBG("ev_evtchn=%p port=%d wait (was waiting=%d)", + evev, evev->port, evev->waiting); + + if (evev->waiting) + return 0; + + r = xc_evtchn_unmask(CTX->xce, evev->port); + if (r) { + LOGE(ERROR,"cannot unmask event channel %d",evev->port); + rc = ERROR_FAIL; + goto out; + } + + evev->waiting = 1; + LIBXL_LIST_INSERT_HEAD(&CTX->evtchns_waiting, evev, entry); + return 0; + + out: + return rc; +} + +void libxl__ev_evtchn_cancel(libxl__gc *gc, libxl__ev_evtchn *evev) +{ + DBG("ev_evtchn=%p port=%d cancel (was waiting=%d)", + evev, evev->port, evev->waiting); + + if (!evev->waiting) + return; + + evev->waiting = 0; + LIBXL_LIST_REMOVE(evev, entry); +} + +/* * waiting for device state */ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 0e4859b..1914d1b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -197,6 +197,17 @@ struct libxl__ev_xswatch { uint32_t counterval; }; +typedef struct libxl__ev_evtchn libxl__ev_evtchn; +typedef void libxl__ev_evtchn_callback(libxl__egc *egc, libxl__ev_evtchn*); +struct libxl__ev_evtchn { + /* caller must fill these in, and they must all remain valid */ + libxl__ev_evtchn_callback *callback; + int port; + /* remainder is private for libxl__ev_evtchn_... */ + bool waiting; + LIBXL_LIST_ENTRY(libxl__ev_evtchn) entry; +}; + /* * An entry in the watch_slots table is either: * 1. an entry in the free list, ie NULL or pointer to next free list entry @@ -343,6 +354,10 @@ struct libxl__ctx { uint32_t watch_counter; /* helps disambiguate slot reuse */ libxl__ev_fd watch_efd; + xc_evtchn *xce; /* waiting must be done only with libxl__ev_evtchn* */ + LIBXL_LIST_HEAD(, libxl__ev_evtchn) evtchns_waiting; + libxl__ev_fd evtchn_efd; + LIBXL_TAILQ_HEAD(libxl__evgen_domain_death_list, libxl_evgen_domain_death) death_list /* sorted by domid */, death_reported; @@ -779,6 +794,39 @@ static inline int libxl__ev_xswatch_isregistered(const libxl__ev_xswatch *xw) /* + * The evtchn facility is one-shot per call to libxl__ev_evtchn_wait. + * You should call some suitable xc bind function on (or to obtain) + * the port, then libxl__ev_evtchn_wait. + * + * When the event is signaled then the callback will be made, once. + * Then you must call libxl__ev_evtchn_wait again, if desired. + * + * You must NOT call xc_evtchn_unmask. wait will do that for you. + * + * Calling libxl__ev_evtchn_cancel will arrange for libxl to disregard + * future occurrences of event. Both libxl__ev_evtchn_wait and + * libxl__ev_evtchn_cancel are idempotent. + * + * (Note of course that an event channel becomes signaled when it is + * first bound, so you will get one call to libxl__ev_evtchn_wait + * "right away"; unless you have won a very fast race, the condition + * you were waiting for won't exist yet so when you check for it + * you'll find you need to call wait again.) + * + * You must not wait on the same port twice at once (that is, with + * two separate libxl__ev_evtchn's). + */ +_hidden int libxl__ev_evtchn_wait(libxl__gc*, libxl__ev_evtchn *evev); +_hidden void libxl__ev_evtchn_cancel(libxl__gc *gc, libxl__ev_evtchn *evev); + +static inline void libxl__ev_evtchn_init(libxl__ev_evtchn *evev) + { evev->waiting = 0; } +static inline bool libxl__ev_evtchn_iswaiting(const libxl__ev_evtchn *evev) + { return evev->waiting; } + +_hidden int libxl__ctx_evtchn_init(libxl__gc *gc); /* for libxl_ctx_alloc */ + +/* * For making subprocesses. This is the only permitted mechanism for * code in libxl to do so. * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:12:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:12:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4d-0004Ik-Q0; Tue, 18 Mar 2014 09:12:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4c-0004IF-HK for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:38 +0000 Received: from [85.158.143.35:45704] by server-3.bemta-4.messagelabs.com id 8E/63-13602-50E08235; Tue, 18 Mar 2014 09:12:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1395133955!2134694!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7767 invoked from network); 18 Mar 2014 09:12:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:12:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4Z-0004Dh-Q7 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq4Z-0006DZ-Os for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:35 +0000 Date: Tue, 18 Mar 2014 09:12:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Provide libxl__ev_evtchn* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 66bff9fd492f635021b7119e8528a65ef0bc0647 Author: Ian Jackson AuthorDate: Wed Dec 11 14:06:02 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: events: Provide libxl__ev_evtchn* Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v2: Fix commit message not to refer to libxl_ctx_alloc's gc, done earlier Change type of port in evtchn_fd_callback to evtchn_port_or_error_t Clarify comment about use of ctx->xce. Fix typo in comment. --- tools/libxl/libxl.c | 9 +++ tools/libxl/libxl_event.c | 153 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 48 +++++++++++++ 3 files changed, 210 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0a825df..7b7ffd3 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -60,6 +60,10 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, LIBXL_SLIST_INIT(&ctx->watch_freeslots); libxl__ev_fd_init(&ctx->watch_efd); + ctx->xce = 0; + LIBXL_LIST_INIT(&ctx->evtchns_waiting); + libxl__ev_fd_init(&ctx->evtchn_efd); + LIBXL_TAILQ_INIT(&ctx->death_list); libxl__ev_xswatch_init(&ctx->death_watch); @@ -104,6 +108,8 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = ERROR_FAIL; goto out; } + rc = libxl__ctx_evtchn_init(gc); + *pctx = ctx; return 0; @@ -147,16 +153,19 @@ int libxl_ctx_free(libxl_ctx *ctx) for (i = 0; i < ctx->watch_nslots; i++) assert(!libxl__watch_slot_contents(gc, i)); libxl__ev_fd_deregister(gc, &ctx->watch_efd); + libxl__ev_fd_deregister(gc, &ctx->evtchn_efd); libxl__ev_fd_deregister(gc, &ctx->sigchld_selfpipe_efd); /* Now there should be no more events requested from the application: */ assert(LIBXL_LIST_EMPTY(&ctx->efds)); assert(LIBXL_TAILQ_EMPTY(&ctx->etimes)); + assert(LIBXL_LIST_EMPTY(&ctx->evtchns_waiting)); if (ctx->xch) xc_interface_close(ctx->xch); libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); + if (ctx->xce) xc_evtchn_close(ctx->xce); libxl__poller_dispose(&ctx->poller_app); assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 3e465af..22b1227 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -625,6 +625,159 @@ void libxl__ev_xswatch_deregister(libxl__gc *gc, libxl__ev_xswatch *w) } /* + * evtchn + */ + +static int evtchn_revents_check(libxl__egc *egc, int revents) +{ + EGC_GC; + + if (revents & ~POLLIN) { + LOG(ERROR, "unexpected poll event on event channel fd: %x", revents); + LIBXL__EVENT_DISASTER(egc, + "unexpected poll event on event channel fd", 0, 0); + libxl__ev_fd_deregister(gc, &CTX->evtchn_efd); + return ERROR_FAIL; + } + + assert(revents & POLLIN); + + return 0; +} + +static void evtchn_fd_callback(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents) +{ + EGC_GC; + libxl__ev_evtchn *evev; + int r, rc; + evtchn_port_or_error_t port; + struct pollfd recheck; + + rc = evtchn_revents_check(egc, revents); + if (rc) return; + + for (;;) { + /* Check the fd again. The incoming revent may no longer be + * true, because the libxl ctx lock has not necessarily been + * held continuously since someone noticed the fd. Normally + * this wouldn't be a problem but evtchn devices don't always + * honour O_NONBLOCK (see xenctrl.h). */ + + recheck.fd = fd; + recheck.events = POLLIN; + recheck.revents = 0; + r = poll(&recheck, 1, 0); + DBG("ev_evtchn recheck r=%d revents=%#x", r, recheck.revents); + if (r < 0) { + LIBXL__EVENT_DISASTER(egc, + "unexpected failure polling event channel fd for recheck", + errno, 0); + return; + } + if (r == 0) + break; + rc = evtchn_revents_check(egc, recheck.revents); + if (rc) return; + + /* OK, that's that workaround done. We can actually check for + * work for us to do: */ + + port = xc_evtchn_pending(CTX->xce); + if (port < 0) { + if (errno == EAGAIN) + break; + LIBXL__EVENT_DISASTER(egc, + "unexpected failure fetching occurring event port number from evtchn", + errno, 0); + return; + } + + LIBXL_LIST_FOREACH(evev, &CTX->evtchns_waiting, entry) + if (port == evev->port) + goto found; + /* not found */ + DBG("ev_evtchn port=%d no-one cared", port); + continue; + + found: + DBG("ev_evtchn=%p port=%d signaled", evev, port); + evev->waiting = 0; + LIBXL_LIST_REMOVE(evev, entry); + evev->callback(egc, evev); + } +} + +int libxl__ctx_evtchn_init(libxl__gc *gc) { + xc_evtchn *xce; + int rc, fd; + + if (CTX->xce) + return 0; + + xce = xc_evtchn_open(CTX->lg, 0); + if (!xce) { + LOGE(ERROR,"cannot open libxc evtchn handle"); + rc = ERROR_FAIL; + goto out; + } + + fd = xc_evtchn_fd(xce); + assert(fd >= 0); + + rc = libxl_fd_set_nonblock(CTX, fd, 1); + if (rc) goto out; + + rc = libxl__ev_fd_register(gc, &CTX->evtchn_efd, + evtchn_fd_callback, fd, POLLIN); + if (rc) goto out; + + CTX->xce = xce; + return 0; + + out: + xc_evtchn_close(xce); + return rc; +} + +int libxl__ev_evtchn_wait(libxl__gc *gc, libxl__ev_evtchn *evev) +{ + int r, rc; + + DBG("ev_evtchn=%p port=%d wait (was waiting=%d)", + evev, evev->port, evev->waiting); + + if (evev->waiting) + return 0; + + r = xc_evtchn_unmask(CTX->xce, evev->port); + if (r) { + LOGE(ERROR,"cannot unmask event channel %d",evev->port); + rc = ERROR_FAIL; + goto out; + } + + evev->waiting = 1; + LIBXL_LIST_INSERT_HEAD(&CTX->evtchns_waiting, evev, entry); + return 0; + + out: + return rc; +} + +void libxl__ev_evtchn_cancel(libxl__gc *gc, libxl__ev_evtchn *evev) +{ + DBG("ev_evtchn=%p port=%d cancel (was waiting=%d)", + evev, evev->port, evev->waiting); + + if (!evev->waiting) + return; + + evev->waiting = 0; + LIBXL_LIST_REMOVE(evev, entry); +} + +/* * waiting for device state */ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 0e4859b..1914d1b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -197,6 +197,17 @@ struct libxl__ev_xswatch { uint32_t counterval; }; +typedef struct libxl__ev_evtchn libxl__ev_evtchn; +typedef void libxl__ev_evtchn_callback(libxl__egc *egc, libxl__ev_evtchn*); +struct libxl__ev_evtchn { + /* caller must fill these in, and they must all remain valid */ + libxl__ev_evtchn_callback *callback; + int port; + /* remainder is private for libxl__ev_evtchn_... */ + bool waiting; + LIBXL_LIST_ENTRY(libxl__ev_evtchn) entry; +}; + /* * An entry in the watch_slots table is either: * 1. an entry in the free list, ie NULL or pointer to next free list entry @@ -343,6 +354,10 @@ struct libxl__ctx { uint32_t watch_counter; /* helps disambiguate slot reuse */ libxl__ev_fd watch_efd; + xc_evtchn *xce; /* waiting must be done only with libxl__ev_evtchn* */ + LIBXL_LIST_HEAD(, libxl__ev_evtchn) evtchns_waiting; + libxl__ev_fd evtchn_efd; + LIBXL_TAILQ_HEAD(libxl__evgen_domain_death_list, libxl_evgen_domain_death) death_list /* sorted by domid */, death_reported; @@ -779,6 +794,39 @@ static inline int libxl__ev_xswatch_isregistered(const libxl__ev_xswatch *xw) /* + * The evtchn facility is one-shot per call to libxl__ev_evtchn_wait. + * You should call some suitable xc bind function on (or to obtain) + * the port, then libxl__ev_evtchn_wait. + * + * When the event is signaled then the callback will be made, once. + * Then you must call libxl__ev_evtchn_wait again, if desired. + * + * You must NOT call xc_evtchn_unmask. wait will do that for you. + * + * Calling libxl__ev_evtchn_cancel will arrange for libxl to disregard + * future occurrences of event. Both libxl__ev_evtchn_wait and + * libxl__ev_evtchn_cancel are idempotent. + * + * (Note of course that an event channel becomes signaled when it is + * first bound, so you will get one call to libxl__ev_evtchn_wait + * "right away"; unless you have won a very fast race, the condition + * you were waiting for won't exist yet so when you check for it + * you'll find you need to call wait again.) + * + * You must not wait on the same port twice at once (that is, with + * two separate libxl__ev_evtchn's). + */ +_hidden int libxl__ev_evtchn_wait(libxl__gc*, libxl__ev_evtchn *evev); +_hidden void libxl__ev_evtchn_cancel(libxl__gc *gc, libxl__ev_evtchn *evev); + +static inline void libxl__ev_evtchn_init(libxl__ev_evtchn *evev) + { evev->waiting = 0; } +static inline bool libxl__ev_evtchn_iswaiting(const libxl__ev_evtchn *evev) + { return evev->waiting; } + +_hidden int libxl__ctx_evtchn_init(libxl__gc *gc); /* for libxl_ctx_alloc */ + +/* * For making subprocesses. This is the only permitted mechanism for * code in libxl to do so. * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:12:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:12:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4n-0004N3-Um; Tue, 18 Mar 2014 09:12:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4m-0004MW-V5 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:49 +0000 Received: from [193.109.254.147:9746] by server-8.bemta-14.messagelabs.com id A0/13-01877-01E08235; Tue, 18 Mar 2014 09:12:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1395133966!1668850!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15778 invoked from network); 18 Mar 2014 09:12:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:12:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4j-0004Dk-W8 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq4j-0006ER-TA for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:45 +0000 Date: Tue, 18 Mar 2014 09:12:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: suspend: Rename, improve xc_suspend_evtchn_init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d310a8339c5e7257d046e482a0e84002aa895f3b Author: Ian Jackson AuthorDate: Tue Nov 26 16:33:30 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxc: suspend: Rename, improve xc_suspend_evtchn_init xc_suspend_evtchn_init expects to eat the first event on the xce. If the xce is used for any other purpose then this can break. Document this fact and rename the function to xc_suspend_evtchn_init_exclusive. (I haven't checked the call sites for improper shared use of the xce.) Provide a corresponding xc_suspend_evtchn_init_sane which doesn't try to eat an event, and instead leaves the caller the ability to demultiplex. Also document that xc_await_suspend needs exclusive use of the xce. Signed-off-by: Ian Jackson CC: Stefano Stabellini CC: Shriram Rajagopalan Acked-by: Ian Campbell --- v3: Drop spurious addition of #include --- tools/libxc/xc_suspend.c | 19 +++++++++++++++---- tools/libxc/xenguest.h | 13 ++++++++++++- tools/libxl/libxl_dom.c | 2 +- tools/misc/xen-hptool.c | 2 +- .../python/xen/lowlevel/checkpoint/libcheckpoint.c | 2 +- tools/xcutils/xc_save.c | 2 +- 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/tools/libxc/xc_suspend.c b/tools/libxc/xc_suspend.c index 1ace411..eed3be2 100644 --- a/tools/libxc/xc_suspend.c +++ b/tools/libxc/xc_suspend.c @@ -102,7 +102,7 @@ int xc_suspend_evtchn_release(xc_interface *xch, xc_evtchn *xce, int domid, int return unlock_suspend_event(xch, domid); } -int xc_suspend_evtchn_init(xc_interface *xch, xc_evtchn *xce, int domid, int port) +int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, int domid, int port) { int rc, suspend_evtchn = -1; @@ -121,9 +121,6 @@ int xc_suspend_evtchn_init(xc_interface *xch, xc_evtchn *xce, int domid, int por goto cleanup; } - /* event channel is pending immediately after binding */ - xc_await_suspend(xch, xce, suspend_evtchn); - return suspend_evtchn; cleanup: @@ -132,3 +129,17 @@ cleanup: return -1; } + +int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xc_evtchn *xce, int domid, int port) +{ + int suspend_evtchn; + + suspend_evtchn = xc_suspend_evtchn_init_sane(xch, xce, domid, port); + if (suspend_evtchn < 0) + return suspend_evtchn; + + /* event channel is pending immediately after binding */ + xc_await_suspend(xch, xce, suspend_evtchn); + + return suspend_evtchn; +} diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index a0e30e1..ce5456c 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -256,10 +256,21 @@ int xc_hvm_build_target_mem(xc_interface *xch, int xc_suspend_evtchn_release(xc_interface *xch, xc_evtchn *xce, int domid, int suspend_evtchn); -int xc_suspend_evtchn_init(xc_interface *xch, xc_evtchn *xce, int domid, int port); +/** + * This function eats the initial notification. + * xce must not be used for anything else + */ +int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xc_evtchn *xce, int domid, int port); +/* xce must not be used for anything else */ int xc_await_suspend(xc_interface *xch, xc_evtchn *xce, int suspend_evtchn); +/** + * The port will be signaled immediately after this call + * The caller should check the domain status and look for the next event + */ +int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, int domid, int port); + int xc_get_bit_size(xc_interface *xch, const char *image_name, const char *cmdline, const char *features, int *type); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 55f74b2..4b42856 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1358,7 +1358,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) if (port >= 0) { dss->suspend_eventchn = - xc_suspend_evtchn_init(CTX->xch, dss->xce, dss->domid, port); + xc_suspend_evtchn_init_exclusive(CTX->xch, dss->xce, dss->domid, port); if (dss->suspend_eventchn < 0) LOG(WARN, "Suspend event channel initialization failed"); diff --git a/tools/misc/xen-hptool.c b/tools/misc/xen-hptool.c index f8570f2..1923be9 100644 --- a/tools/misc/xen-hptool.c +++ b/tools/misc/xen-hptool.c @@ -111,7 +111,7 @@ static int suspend_guest(xc_interface *xch, xc_evtchn *xce, int domid, int *evtc fprintf(stderr, "DOM%d: No suspend port, try live migration\n", domid); goto failed; } - suspend_evtchn = xc_suspend_evtchn_init(xch, xce, domid, port); + suspend_evtchn = xc_suspend_evtchn_init_exclusive(xch, xce, domid, port); if (suspend_evtchn < 0) { fprintf(stderr, "Suspend evtchn initialization failed\n"); diff --git a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c index 01c0d47..817d272 100644 --- a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c +++ b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c @@ -360,7 +360,7 @@ static int setup_suspend_evtchn(checkpoint_state* s) return -1; } - s->suspend_evtchn = xc_suspend_evtchn_init(s->xch, s->xce, s->domid, port); + s->suspend_evtchn = xc_suspend_evtchn_init_exclusive(s->xch, s->xce, s->domid, port); if (s->suspend_evtchn < 0) { s->errstr = "failed to bind suspend event channel"; return -1; diff --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c index 654c9c2..aaa09b0 100644 --- a/tools/xcutils/xc_save.c +++ b/tools/xcutils/xc_save.c @@ -199,7 +199,7 @@ main(int argc, char **argv) else { si.suspend_evtchn = - xc_suspend_evtchn_init(si.xch, si.xce, si.domid, port); + xc_suspend_evtchn_init_exclusive(si.xch, si.xce, si.domid, port); if (si.suspend_evtchn < 0) warnx("suspend event channel initialization failed, " -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:12:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:12:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4n-0004N3-Um; Tue, 18 Mar 2014 09:12:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4m-0004MW-V5 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:49 +0000 Received: from [193.109.254.147:9746] by server-8.bemta-14.messagelabs.com id A0/13-01877-01E08235; Tue, 18 Mar 2014 09:12:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1395133966!1668850!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15778 invoked from network); 18 Mar 2014 09:12:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:12:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4j-0004Dk-W8 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq4j-0006ER-TA for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:45 +0000 Date: Tue, 18 Mar 2014 09:12:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: suspend: Rename, improve xc_suspend_evtchn_init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d310a8339c5e7257d046e482a0e84002aa895f3b Author: Ian Jackson AuthorDate: Tue Nov 26 16:33:30 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxc: suspend: Rename, improve xc_suspend_evtchn_init xc_suspend_evtchn_init expects to eat the first event on the xce. If the xce is used for any other purpose then this can break. Document this fact and rename the function to xc_suspend_evtchn_init_exclusive. (I haven't checked the call sites for improper shared use of the xce.) Provide a corresponding xc_suspend_evtchn_init_sane which doesn't try to eat an event, and instead leaves the caller the ability to demultiplex. Also document that xc_await_suspend needs exclusive use of the xce. Signed-off-by: Ian Jackson CC: Stefano Stabellini CC: Shriram Rajagopalan Acked-by: Ian Campbell --- v3: Drop spurious addition of #include --- tools/libxc/xc_suspend.c | 19 +++++++++++++++---- tools/libxc/xenguest.h | 13 ++++++++++++- tools/libxl/libxl_dom.c | 2 +- tools/misc/xen-hptool.c | 2 +- .../python/xen/lowlevel/checkpoint/libcheckpoint.c | 2 +- tools/xcutils/xc_save.c | 2 +- 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/tools/libxc/xc_suspend.c b/tools/libxc/xc_suspend.c index 1ace411..eed3be2 100644 --- a/tools/libxc/xc_suspend.c +++ b/tools/libxc/xc_suspend.c @@ -102,7 +102,7 @@ int xc_suspend_evtchn_release(xc_interface *xch, xc_evtchn *xce, int domid, int return unlock_suspend_event(xch, domid); } -int xc_suspend_evtchn_init(xc_interface *xch, xc_evtchn *xce, int domid, int port) +int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, int domid, int port) { int rc, suspend_evtchn = -1; @@ -121,9 +121,6 @@ int xc_suspend_evtchn_init(xc_interface *xch, xc_evtchn *xce, int domid, int por goto cleanup; } - /* event channel is pending immediately after binding */ - xc_await_suspend(xch, xce, suspend_evtchn); - return suspend_evtchn; cleanup: @@ -132,3 +129,17 @@ cleanup: return -1; } + +int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xc_evtchn *xce, int domid, int port) +{ + int suspend_evtchn; + + suspend_evtchn = xc_suspend_evtchn_init_sane(xch, xce, domid, port); + if (suspend_evtchn < 0) + return suspend_evtchn; + + /* event channel is pending immediately after binding */ + xc_await_suspend(xch, xce, suspend_evtchn); + + return suspend_evtchn; +} diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index a0e30e1..ce5456c 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -256,10 +256,21 @@ int xc_hvm_build_target_mem(xc_interface *xch, int xc_suspend_evtchn_release(xc_interface *xch, xc_evtchn *xce, int domid, int suspend_evtchn); -int xc_suspend_evtchn_init(xc_interface *xch, xc_evtchn *xce, int domid, int port); +/** + * This function eats the initial notification. + * xce must not be used for anything else + */ +int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xc_evtchn *xce, int domid, int port); +/* xce must not be used for anything else */ int xc_await_suspend(xc_interface *xch, xc_evtchn *xce, int suspend_evtchn); +/** + * The port will be signaled immediately after this call + * The caller should check the domain status and look for the next event + */ +int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, int domid, int port); + int xc_get_bit_size(xc_interface *xch, const char *image_name, const char *cmdline, const char *features, int *type); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 55f74b2..4b42856 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1358,7 +1358,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) if (port >= 0) { dss->suspend_eventchn = - xc_suspend_evtchn_init(CTX->xch, dss->xce, dss->domid, port); + xc_suspend_evtchn_init_exclusive(CTX->xch, dss->xce, dss->domid, port); if (dss->suspend_eventchn < 0) LOG(WARN, "Suspend event channel initialization failed"); diff --git a/tools/misc/xen-hptool.c b/tools/misc/xen-hptool.c index f8570f2..1923be9 100644 --- a/tools/misc/xen-hptool.c +++ b/tools/misc/xen-hptool.c @@ -111,7 +111,7 @@ static int suspend_guest(xc_interface *xch, xc_evtchn *xce, int domid, int *evtc fprintf(stderr, "DOM%d: No suspend port, try live migration\n", domid); goto failed; } - suspend_evtchn = xc_suspend_evtchn_init(xch, xce, domid, port); + suspend_evtchn = xc_suspend_evtchn_init_exclusive(xch, xce, domid, port); if (suspend_evtchn < 0) { fprintf(stderr, "Suspend evtchn initialization failed\n"); diff --git a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c index 01c0d47..817d272 100644 --- a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c +++ b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c @@ -360,7 +360,7 @@ static int setup_suspend_evtchn(checkpoint_state* s) return -1; } - s->suspend_evtchn = xc_suspend_evtchn_init(s->xch, s->xce, s->domid, port); + s->suspend_evtchn = xc_suspend_evtchn_init_exclusive(s->xch, s->xce, s->domid, port); if (s->suspend_evtchn < 0) { s->errstr = "failed to bind suspend event channel"; return -1; diff --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c index 654c9c2..aaa09b0 100644 --- a/tools/xcutils/xc_save.c +++ b/tools/xcutils/xc_save.c @@ -199,7 +199,7 @@ main(int argc, char **argv) else { si.suspend_evtchn = - xc_suspend_evtchn_init(si.xch, si.xce, si.domid, port); + xc_suspend_evtchn_init_exclusive(si.xch, si.xce, si.domid, port); if (si.suspend_evtchn < 0) warnx("suspend event channel initialization failed, " -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:13:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:13:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq50-0004TO-Io; Tue, 18 Mar 2014 09:13:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4x-0004Ru-DY for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:59 +0000 Received: from [193.109.254.147:15316] by server-7.bemta-14.messagelabs.com id 74/18-17726-A1E08235; Tue, 18 Mar 2014 09:12:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1395133976!2393207!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13574 invoked from network); 18 Mar 2014 09:12:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:12:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4u-0004Dq-64 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq4u-0006En-4U for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:56 +0000 Date: Tue, 18 Mar 2014 09:12:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: suspend: Fix suspend event channel locking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b0360b76116d9b104798f1f533548d436ca50e6 Author: Ian Jackson AuthorDate: Wed Dec 11 16:29:38 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxc: suspend: Fix suspend event channel locking Use fcntl F_SETLK, rather than writing our pid into a "lock" file. That way if we crash we don't leave the lockfile lying about. Callers now need to keep the fd for our lockfile. (We don't use flock because we don't want anyone who inherits this fd across fork to end up with a handle onto the lock.) While we are here: * Move the lockfile to /var/run/xen * De-duplicate the calculation of the pathname * Compute the buffer size for the pathname so that it will definitely not overrun (and use the computed value everywhere) * Fix various error handling bugs Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell Acked-by: Shriram Rajagopalan --- tools/libxc/xc_suspend.c | 160 +++++++++++++------- tools/libxc/xenguest.h | 16 ++- tools/libxl/libxl_dom.c | 6 +- tools/libxl/libxl_internal.h | 1 + tools/misc/xen-hptool.c | 19 ++- tools/python/xen/lowlevel/checkpoint/checkpoint.h | 2 +- .../python/xen/lowlevel/checkpoint/libcheckpoint.c | 7 +- tools/xcutils/xc_save.c | 8 +- 8 files changed, 150 insertions(+), 69 deletions(-) diff --git a/tools/libxc/xc_suspend.c b/tools/libxc/xc_suspend.c index eed3be2..84ee139 100644 --- a/tools/libxc/xc_suspend.c +++ b/tools/libxc/xc_suspend.c @@ -14,65 +14,115 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include + #include "xc_private.h" #include "xenguest.h" -#define SUSPEND_LOCK_FILE "/var/lib/xen/suspend_evtchn" -static int lock_suspend_event(xc_interface *xch, int domid) +#define SUSPEND_LOCK_FILE "/var/run/xen/suspend-evtchn-%d.lock" + +/* + * locking + */ + +#define ERR(x) do{ \ + ERROR("Can't " #x " lock file for suspend event channel %s: %s\n", \ + suspend_file, strerror(errno)); \ + goto err; \ +}while(0) + +#define SUSPEND_FILE_BUFLEN (sizeof(SUSPEND_LOCK_FILE) + 10) + +static void get_suspend_file(char buf[SUSPEND_FILE_BUFLEN], int domid) { - int fd, rc; - mode_t mask; - char buf[128]; - char suspend_file[256]; - - snprintf(suspend_file, sizeof(suspend_file), "%s_%d_lock.d", - SUSPEND_LOCK_FILE, domid); - mask = umask(022); - fd = open(suspend_file, O_CREAT | O_EXCL | O_RDWR, 0666); - if (fd < 0) - { - ERROR("Can't create lock file for suspend event channel %s\n", - suspend_file); - return -EINVAL; + snprintf(buf, sizeof(buf), SUSPEND_LOCK_FILE, domid); +} + +static int lock_suspend_event(xc_interface *xch, int domid, int *lockfd) +{ + int fd = -1, r; + char suspend_file[SUSPEND_FILE_BUFLEN]; + struct stat ours, theirs; + struct flock fl; + + get_suspend_file(suspend_file, domid); + + *lockfd = -1; + + for (;;) { + if (fd >= 0) + close (fd); + + fd = open(suspend_file, O_CREAT | O_RDWR, 0600); + if (fd < 0) + ERR("create"); + + r = fcntl(fd, F_SETFD, FD_CLOEXEC); + if (r) + ERR("fcntl F_SETFD FD_CLOEXEC"); + + memset(&fl, 0, sizeof(fl)); + fl.l_type = F_WRLCK; + fl.l_whence = SEEK_SET; + fl.l_len = 1; + r = fcntl(fd, F_SETLK, &fl); + if (r) + ERR("fcntl F_SETLK"); + + r = fstat(fd, &ours); + if (r) + ERR("fstat"); + + r = stat(suspend_file, &theirs); + if (r) { + if (errno == ENOENT) + /* try again */ + continue; + ERR("stat"); + } + + if (ours.st_ino != theirs.st_ino) + /* someone else must have removed it while we were locking it */ + continue; + + break; } - umask(mask); - snprintf(buf, sizeof(buf), "%10ld", (long)getpid()); - rc = write_exact(fd, buf, strlen(buf)); - close(fd); + *lockfd = fd; + return 0; - return rc; + err: + if (fd >= 0) + close(fd); + + return -1; } -static int unlock_suspend_event(xc_interface *xch, int domid) +static int unlock_suspend_event(xc_interface *xch, int domid, int *lockfd) { - int fd, pid, n; - char buf[128]; - char suspend_file[256]; + int r; + char suspend_file[SUSPEND_FILE_BUFLEN]; - snprintf(suspend_file, sizeof(suspend_file), "%s_%d_lock.d", - SUSPEND_LOCK_FILE, domid); - fd = open(suspend_file, O_RDWR); + if (*lockfd < 0) + return 0; - if (fd < 0) - return -EINVAL; + get_suspend_file(suspend_file, domid); - n = read(fd, buf, 127); + r = unlink(suspend_file); + if (r) + ERR("unlink"); - close(fd); + r = close(*lockfd); + *lockfd = -1; + if (r) + ERR("close"); - if (n > 0) - { - sscanf(buf, "%d", &pid); - /* We are the owner, so we can simply delete the file */ - if (pid == getpid()) - { - unlink(suspend_file); - return 0; - } - } + err: + if (*lockfd >= 0) + close(*lockfd); - return -EPERM; + return -1; } int xc_await_suspend(xc_interface *xch, xc_evtchn *xce, int suspend_evtchn) @@ -94,20 +144,26 @@ int xc_await_suspend(xc_interface *xch, xc_evtchn *xce, int suspend_evtchn) return 0; } -int xc_suspend_evtchn_release(xc_interface *xch, xc_evtchn *xce, int domid, int suspend_evtchn) +/* Internal callers are allowed to call this with suspend_evtchn<0 + * but *lockfd>0. */ +int xc_suspend_evtchn_release(xc_interface *xch, xc_evtchn *xce, + int domid, int suspend_evtchn, int *lockfd) { if (suspend_evtchn >= 0) xc_evtchn_unbind(xce, suspend_evtchn); - return unlock_suspend_event(xch, domid); + return unlock_suspend_event(xch, domid, lockfd); } -int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, int domid, int port) +int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, + int domid, int port, int *lockfd) { int rc, suspend_evtchn = -1; - if (lock_suspend_event(xch, domid)) - return -EINVAL; + if (lock_suspend_event(xch, domid, lockfd)) { + errno = EINVAL; + goto cleanup; + } suspend_evtchn = xc_evtchn_bind_interdomain(xce, domid, port); if (suspend_evtchn < 0) { @@ -124,17 +180,17 @@ int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, int domid, in return suspend_evtchn; cleanup: - if (suspend_evtchn != -1) - xc_suspend_evtchn_release(xch, xce, domid, suspend_evtchn); + xc_suspend_evtchn_release(xch, xce, domid, suspend_evtchn, lockfd); return -1; } -int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xc_evtchn *xce, int domid, int port) +int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xc_evtchn *xce, + int domid, int port, int *lockfd) { int suspend_evtchn; - suspend_evtchn = xc_suspend_evtchn_init_sane(xch, xce, domid, port); + suspend_evtchn = xc_suspend_evtchn_init_sane(xch, xce, domid, port, lockfd); if (suspend_evtchn < 0) return suspend_evtchn; diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index ce5456c..1f216cd 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -254,13 +254,19 @@ int xc_hvm_build_target_mem(xc_interface *xch, int target, const char *image_name); -int xc_suspend_evtchn_release(xc_interface *xch, xc_evtchn *xce, int domid, int suspend_evtchn); +/* + * Sets *lockfd to -1. + * Has deallocated everything even on error. + */ +int xc_suspend_evtchn_release(xc_interface *xch, xc_evtchn *xce, int domid, int suspend_evtchn, int *lockfd); /** * This function eats the initial notification. * xce must not be used for anything else + * See xc_suspend_evtchn_init_sane re lockfd. */ -int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xc_evtchn *xce, int domid, int port); +int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xc_evtchn *xce, + int domid, int port, int *lockfd); /* xce must not be used for anything else */ int xc_await_suspend(xc_interface *xch, xc_evtchn *xce, int suspend_evtchn); @@ -268,8 +274,12 @@ int xc_await_suspend(xc_interface *xch, xc_evtchn *xce, int suspend_evtchn); /** * The port will be signaled immediately after this call * The caller should check the domain status and look for the next event + * On success, *lockfd will be set to >=0 and *lockfd must be preserved + * and fed to xc_suspend_evtchn_release. (On error *lockfd is + * undefined and xc_suspend_evtchn_release is not allowed.) */ -int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, int domid, int port); +int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, + int domid, int port, int *lockfd); int xc_get_bit_size(xc_interface *xch, const char *image_name, const char *cmdline, diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 4b42856..48a4b8e 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1340,6 +1340,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) | (dss->hvm ? XCFLAGS_HVM : 0); dss->suspend_eventchn = -1; + dss->guest_evtchn_lockfd = -1; dss->guest_responded = 0; dss->dm_savefile = libxl__device_model_savefile(gc, domid); @@ -1358,7 +1359,8 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) if (port >= 0) { dss->suspend_eventchn = - xc_suspend_evtchn_init_exclusive(CTX->xch, dss->xce, dss->domid, port); + xc_suspend_evtchn_init_exclusive(CTX->xch, dss->xce, + dss->domid, port, &dss->guest_evtchn_lockfd); if (dss->suspend_eventchn < 0) LOG(WARN, "Suspend event channel initialization failed"); @@ -1522,7 +1524,7 @@ static void domain_suspend_done(libxl__egc *egc, if (dss->suspend_eventchn > 0) xc_suspend_evtchn_release(CTX->xch, dss->xce, domid, - dss->suspend_eventchn); + dss->suspend_eventchn, &dss->guest_evtchn_lockfd); if (dss->xce != NULL) xc_evtchn_close(dss->xce); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 1914d1b..d15a4b2 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2439,6 +2439,7 @@ struct libxl__domain_suspend_state { /* private */ xc_evtchn *xce; /* event channel handle */ int suspend_eventchn; + int guest_evtchn_lockfd; int hvm; int xcflags; int guest_responded; diff --git a/tools/misc/xen-hptool.c b/tools/misc/xen-hptool.c index 1923be9..8aac51c 100644 --- a/tools/misc/xen-hptool.c +++ b/tools/misc/xen-hptool.c @@ -98,10 +98,13 @@ static int hp_mem_query_func(int argc, char *argv[]) extern int xs_suspend_evtchn_port(int domid); -static int suspend_guest(xc_interface *xch, xc_evtchn *xce, int domid, int *evtchn) +static int suspend_guest(xc_interface *xch, xc_evtchn *xce, int domid, + int *evtchn, int *lockfd) { int port, rc, suspend_evtchn = -1; + *lockfd = -1; + if (!evtchn) return -1; @@ -111,7 +114,8 @@ static int suspend_guest(xc_interface *xch, xc_evtchn *xce, int domid, int *evtc fprintf(stderr, "DOM%d: No suspend port, try live migration\n", domid); goto failed; } - suspend_evtchn = xc_suspend_evtchn_init_exclusive(xch, xce, domid, port); + suspend_evtchn = xc_suspend_evtchn_init_exclusive(xch, xce, domid, + port, lockfd); if (suspend_evtchn < 0) { fprintf(stderr, "Suspend evtchn initialization failed\n"); @@ -134,7 +138,8 @@ static int suspend_guest(xc_interface *xch, xc_evtchn *xce, int domid, int *evtc failed: if (suspend_evtchn != -1) - xc_suspend_evtchn_release(xch, xce, domid, suspend_evtchn); + xc_suspend_evtchn_release(xch, xce, domid, + suspend_evtchn, lockfd); return -1; } @@ -192,7 +197,7 @@ static int hp_mem_offline_func(int argc, char *argv[]) } else if (status & PG_OFFLINE_OWNED) { - int result, suspend_evtchn = -1; + int result, suspend_evtchn = -1, suspend_lockfd = -1; xc_evtchn *xce; xce = xc_evtchn_open(NULL, 0); @@ -204,7 +209,8 @@ static int hp_mem_offline_func(int argc, char *argv[]) } domid = status >> PG_OFFLINE_OWNER_SHIFT; - if (suspend_guest(xch, xce, domid, &suspend_evtchn)) + if (suspend_guest(xch, xce, domid, + &suspend_evtchn, &suspend_lockfd)) { fprintf(stderr, "Failed to suspend guest %d for" " mfn %lx\n", domid, mfn); @@ -230,7 +236,8 @@ static int hp_mem_offline_func(int argc, char *argv[]) mfn, domid); } xc_domain_resume(xch, domid, 1); - xc_suspend_evtchn_release(xch, xce, domid, suspend_evtchn); + xc_suspend_evtchn_release(xch, xce, domid, + suspend_evtchn, &suspend_lockfd); xc_evtchn_close(xce); } break; diff --git a/tools/python/xen/lowlevel/checkpoint/checkpoint.h b/tools/python/xen/lowlevel/checkpoint/checkpoint.h index 187d9d7..2414956 100644 --- a/tools/python/xen/lowlevel/checkpoint/checkpoint.h +++ b/tools/python/xen/lowlevel/checkpoint/checkpoint.h @@ -27,7 +27,7 @@ typedef struct { checkpoint_domtype domtype; int fd; - int suspend_evtchn; + int suspend_evtchn, suspend_lockfd; char* errstr; diff --git a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c index 817d272..74ca062 100644 --- a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c +++ b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c @@ -57,6 +57,7 @@ void checkpoint_init(checkpoint_state* s) s->fd = -1; s->suspend_evtchn = -1; + s->suspend_lockfd = -1; s->errstr = NULL; @@ -360,7 +361,8 @@ static int setup_suspend_evtchn(checkpoint_state* s) return -1; } - s->suspend_evtchn = xc_suspend_evtchn_init_exclusive(s->xch, s->xce, s->domid, port); + s->suspend_evtchn = xc_suspend_evtchn_init_exclusive(s->xch, s->xce, + s->domid, port, &s->suspend_lockfd); if (s->suspend_evtchn < 0) { s->errstr = "failed to bind suspend event channel"; return -1; @@ -377,7 +379,8 @@ static void release_suspend_evtchn(checkpoint_state *s) { /* TODO: teach xen to clean up if port is unbound */ if (s->xce != NULL && s->suspend_evtchn >= 0) { - xc_suspend_evtchn_release(s->xch, s->xce, s->domid, s->suspend_evtchn); + xc_suspend_evtchn_release(s->xch, s->xce, s->domid, + s->suspend_evtchn, &s->suspend_lockfd); s->suspend_evtchn = -1; } } diff --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c index aaa09b0..01adc56 100644 --- a/tools/xcutils/xc_save.c +++ b/tools/xcutils/xc_save.c @@ -164,7 +164,7 @@ int main(int argc, char **argv) { unsigned int maxit, max_f, lflags; - int io_fd, ret, port; + int io_fd, ret, port, suspend_lockfd = -1; struct save_callbacks callbacks; xentoollog_level lvl; xentoollog_logger *l; @@ -199,7 +199,8 @@ main(int argc, char **argv) else { si.suspend_evtchn = - xc_suspend_evtchn_init_exclusive(si.xch, si.xce, si.domid, port); + xc_suspend_evtchn_init_exclusive(si.xch, si.xce, si.domid, + port, &suspend_lockfd); if (si.suspend_evtchn < 0) warnx("suspend event channel initialization failed, " @@ -213,7 +214,8 @@ main(int argc, char **argv) &callbacks, !!(si.flags & XCFLAGS_HVM), 0); if (si.suspend_evtchn > 0) - xc_suspend_evtchn_release(si.xch, si.xce, si.domid, si.suspend_evtchn); + xc_suspend_evtchn_release(si.xch, si.xce, si.domid, + si.suspend_evtchn, &suspend_lockfd); if (si.xce > 0) xc_evtchn_close(si.xce); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:13:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:13:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq50-0004TO-Io; Tue, 18 Mar 2014 09:13:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4x-0004Ru-DY for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:59 +0000 Received: from [193.109.254.147:15316] by server-7.bemta-14.messagelabs.com id 74/18-17726-A1E08235; Tue, 18 Mar 2014 09:12:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1395133976!2393207!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13574 invoked from network); 18 Mar 2014 09:12:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:12:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq4u-0004Dq-64 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq4u-0006En-4U for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:12:56 +0000 Date: Tue, 18 Mar 2014 09:12:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: suspend: Fix suspend event channel locking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b0360b76116d9b104798f1f533548d436ca50e6 Author: Ian Jackson AuthorDate: Wed Dec 11 16:29:38 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxc: suspend: Fix suspend event channel locking Use fcntl F_SETLK, rather than writing our pid into a "lock" file. That way if we crash we don't leave the lockfile lying about. Callers now need to keep the fd for our lockfile. (We don't use flock because we don't want anyone who inherits this fd across fork to end up with a handle onto the lock.) While we are here: * Move the lockfile to /var/run/xen * De-duplicate the calculation of the pathname * Compute the buffer size for the pathname so that it will definitely not overrun (and use the computed value everywhere) * Fix various error handling bugs Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell Acked-by: Shriram Rajagopalan --- tools/libxc/xc_suspend.c | 160 +++++++++++++------- tools/libxc/xenguest.h | 16 ++- tools/libxl/libxl_dom.c | 6 +- tools/libxl/libxl_internal.h | 1 + tools/misc/xen-hptool.c | 19 ++- tools/python/xen/lowlevel/checkpoint/checkpoint.h | 2 +- .../python/xen/lowlevel/checkpoint/libcheckpoint.c | 7 +- tools/xcutils/xc_save.c | 8 +- 8 files changed, 150 insertions(+), 69 deletions(-) diff --git a/tools/libxc/xc_suspend.c b/tools/libxc/xc_suspend.c index eed3be2..84ee139 100644 --- a/tools/libxc/xc_suspend.c +++ b/tools/libxc/xc_suspend.c @@ -14,65 +14,115 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include + #include "xc_private.h" #include "xenguest.h" -#define SUSPEND_LOCK_FILE "/var/lib/xen/suspend_evtchn" -static int lock_suspend_event(xc_interface *xch, int domid) +#define SUSPEND_LOCK_FILE "/var/run/xen/suspend-evtchn-%d.lock" + +/* + * locking + */ + +#define ERR(x) do{ \ + ERROR("Can't " #x " lock file for suspend event channel %s: %s\n", \ + suspend_file, strerror(errno)); \ + goto err; \ +}while(0) + +#define SUSPEND_FILE_BUFLEN (sizeof(SUSPEND_LOCK_FILE) + 10) + +static void get_suspend_file(char buf[SUSPEND_FILE_BUFLEN], int domid) { - int fd, rc; - mode_t mask; - char buf[128]; - char suspend_file[256]; - - snprintf(suspend_file, sizeof(suspend_file), "%s_%d_lock.d", - SUSPEND_LOCK_FILE, domid); - mask = umask(022); - fd = open(suspend_file, O_CREAT | O_EXCL | O_RDWR, 0666); - if (fd < 0) - { - ERROR("Can't create lock file for suspend event channel %s\n", - suspend_file); - return -EINVAL; + snprintf(buf, sizeof(buf), SUSPEND_LOCK_FILE, domid); +} + +static int lock_suspend_event(xc_interface *xch, int domid, int *lockfd) +{ + int fd = -1, r; + char suspend_file[SUSPEND_FILE_BUFLEN]; + struct stat ours, theirs; + struct flock fl; + + get_suspend_file(suspend_file, domid); + + *lockfd = -1; + + for (;;) { + if (fd >= 0) + close (fd); + + fd = open(suspend_file, O_CREAT | O_RDWR, 0600); + if (fd < 0) + ERR("create"); + + r = fcntl(fd, F_SETFD, FD_CLOEXEC); + if (r) + ERR("fcntl F_SETFD FD_CLOEXEC"); + + memset(&fl, 0, sizeof(fl)); + fl.l_type = F_WRLCK; + fl.l_whence = SEEK_SET; + fl.l_len = 1; + r = fcntl(fd, F_SETLK, &fl); + if (r) + ERR("fcntl F_SETLK"); + + r = fstat(fd, &ours); + if (r) + ERR("fstat"); + + r = stat(suspend_file, &theirs); + if (r) { + if (errno == ENOENT) + /* try again */ + continue; + ERR("stat"); + } + + if (ours.st_ino != theirs.st_ino) + /* someone else must have removed it while we were locking it */ + continue; + + break; } - umask(mask); - snprintf(buf, sizeof(buf), "%10ld", (long)getpid()); - rc = write_exact(fd, buf, strlen(buf)); - close(fd); + *lockfd = fd; + return 0; - return rc; + err: + if (fd >= 0) + close(fd); + + return -1; } -static int unlock_suspend_event(xc_interface *xch, int domid) +static int unlock_suspend_event(xc_interface *xch, int domid, int *lockfd) { - int fd, pid, n; - char buf[128]; - char suspend_file[256]; + int r; + char suspend_file[SUSPEND_FILE_BUFLEN]; - snprintf(suspend_file, sizeof(suspend_file), "%s_%d_lock.d", - SUSPEND_LOCK_FILE, domid); - fd = open(suspend_file, O_RDWR); + if (*lockfd < 0) + return 0; - if (fd < 0) - return -EINVAL; + get_suspend_file(suspend_file, domid); - n = read(fd, buf, 127); + r = unlink(suspend_file); + if (r) + ERR("unlink"); - close(fd); + r = close(*lockfd); + *lockfd = -1; + if (r) + ERR("close"); - if (n > 0) - { - sscanf(buf, "%d", &pid); - /* We are the owner, so we can simply delete the file */ - if (pid == getpid()) - { - unlink(suspend_file); - return 0; - } - } + err: + if (*lockfd >= 0) + close(*lockfd); - return -EPERM; + return -1; } int xc_await_suspend(xc_interface *xch, xc_evtchn *xce, int suspend_evtchn) @@ -94,20 +144,26 @@ int xc_await_suspend(xc_interface *xch, xc_evtchn *xce, int suspend_evtchn) return 0; } -int xc_suspend_evtchn_release(xc_interface *xch, xc_evtchn *xce, int domid, int suspend_evtchn) +/* Internal callers are allowed to call this with suspend_evtchn<0 + * but *lockfd>0. */ +int xc_suspend_evtchn_release(xc_interface *xch, xc_evtchn *xce, + int domid, int suspend_evtchn, int *lockfd) { if (suspend_evtchn >= 0) xc_evtchn_unbind(xce, suspend_evtchn); - return unlock_suspend_event(xch, domid); + return unlock_suspend_event(xch, domid, lockfd); } -int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, int domid, int port) +int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, + int domid, int port, int *lockfd) { int rc, suspend_evtchn = -1; - if (lock_suspend_event(xch, domid)) - return -EINVAL; + if (lock_suspend_event(xch, domid, lockfd)) { + errno = EINVAL; + goto cleanup; + } suspend_evtchn = xc_evtchn_bind_interdomain(xce, domid, port); if (suspend_evtchn < 0) { @@ -124,17 +180,17 @@ int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, int domid, in return suspend_evtchn; cleanup: - if (suspend_evtchn != -1) - xc_suspend_evtchn_release(xch, xce, domid, suspend_evtchn); + xc_suspend_evtchn_release(xch, xce, domid, suspend_evtchn, lockfd); return -1; } -int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xc_evtchn *xce, int domid, int port) +int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xc_evtchn *xce, + int domid, int port, int *lockfd) { int suspend_evtchn; - suspend_evtchn = xc_suspend_evtchn_init_sane(xch, xce, domid, port); + suspend_evtchn = xc_suspend_evtchn_init_sane(xch, xce, domid, port, lockfd); if (suspend_evtchn < 0) return suspend_evtchn; diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index ce5456c..1f216cd 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -254,13 +254,19 @@ int xc_hvm_build_target_mem(xc_interface *xch, int target, const char *image_name); -int xc_suspend_evtchn_release(xc_interface *xch, xc_evtchn *xce, int domid, int suspend_evtchn); +/* + * Sets *lockfd to -1. + * Has deallocated everything even on error. + */ +int xc_suspend_evtchn_release(xc_interface *xch, xc_evtchn *xce, int domid, int suspend_evtchn, int *lockfd); /** * This function eats the initial notification. * xce must not be used for anything else + * See xc_suspend_evtchn_init_sane re lockfd. */ -int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xc_evtchn *xce, int domid, int port); +int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xc_evtchn *xce, + int domid, int port, int *lockfd); /* xce must not be used for anything else */ int xc_await_suspend(xc_interface *xch, xc_evtchn *xce, int suspend_evtchn); @@ -268,8 +274,12 @@ int xc_await_suspend(xc_interface *xch, xc_evtchn *xce, int suspend_evtchn); /** * The port will be signaled immediately after this call * The caller should check the domain status and look for the next event + * On success, *lockfd will be set to >=0 and *lockfd must be preserved + * and fed to xc_suspend_evtchn_release. (On error *lockfd is + * undefined and xc_suspend_evtchn_release is not allowed.) */ -int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, int domid, int port); +int xc_suspend_evtchn_init_sane(xc_interface *xch, xc_evtchn *xce, + int domid, int port, int *lockfd); int xc_get_bit_size(xc_interface *xch, const char *image_name, const char *cmdline, diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 4b42856..48a4b8e 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1340,6 +1340,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) | (dss->hvm ? XCFLAGS_HVM : 0); dss->suspend_eventchn = -1; + dss->guest_evtchn_lockfd = -1; dss->guest_responded = 0; dss->dm_savefile = libxl__device_model_savefile(gc, domid); @@ -1358,7 +1359,8 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) if (port >= 0) { dss->suspend_eventchn = - xc_suspend_evtchn_init_exclusive(CTX->xch, dss->xce, dss->domid, port); + xc_suspend_evtchn_init_exclusive(CTX->xch, dss->xce, + dss->domid, port, &dss->guest_evtchn_lockfd); if (dss->suspend_eventchn < 0) LOG(WARN, "Suspend event channel initialization failed"); @@ -1522,7 +1524,7 @@ static void domain_suspend_done(libxl__egc *egc, if (dss->suspend_eventchn > 0) xc_suspend_evtchn_release(CTX->xch, dss->xce, domid, - dss->suspend_eventchn); + dss->suspend_eventchn, &dss->guest_evtchn_lockfd); if (dss->xce != NULL) xc_evtchn_close(dss->xce); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 1914d1b..d15a4b2 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2439,6 +2439,7 @@ struct libxl__domain_suspend_state { /* private */ xc_evtchn *xce; /* event channel handle */ int suspend_eventchn; + int guest_evtchn_lockfd; int hvm; int xcflags; int guest_responded; diff --git a/tools/misc/xen-hptool.c b/tools/misc/xen-hptool.c index 1923be9..8aac51c 100644 --- a/tools/misc/xen-hptool.c +++ b/tools/misc/xen-hptool.c @@ -98,10 +98,13 @@ static int hp_mem_query_func(int argc, char *argv[]) extern int xs_suspend_evtchn_port(int domid); -static int suspend_guest(xc_interface *xch, xc_evtchn *xce, int domid, int *evtchn) +static int suspend_guest(xc_interface *xch, xc_evtchn *xce, int domid, + int *evtchn, int *lockfd) { int port, rc, suspend_evtchn = -1; + *lockfd = -1; + if (!evtchn) return -1; @@ -111,7 +114,8 @@ static int suspend_guest(xc_interface *xch, xc_evtchn *xce, int domid, int *evtc fprintf(stderr, "DOM%d: No suspend port, try live migration\n", domid); goto failed; } - suspend_evtchn = xc_suspend_evtchn_init_exclusive(xch, xce, domid, port); + suspend_evtchn = xc_suspend_evtchn_init_exclusive(xch, xce, domid, + port, lockfd); if (suspend_evtchn < 0) { fprintf(stderr, "Suspend evtchn initialization failed\n"); @@ -134,7 +138,8 @@ static int suspend_guest(xc_interface *xch, xc_evtchn *xce, int domid, int *evtc failed: if (suspend_evtchn != -1) - xc_suspend_evtchn_release(xch, xce, domid, suspend_evtchn); + xc_suspend_evtchn_release(xch, xce, domid, + suspend_evtchn, lockfd); return -1; } @@ -192,7 +197,7 @@ static int hp_mem_offline_func(int argc, char *argv[]) } else if (status & PG_OFFLINE_OWNED) { - int result, suspend_evtchn = -1; + int result, suspend_evtchn = -1, suspend_lockfd = -1; xc_evtchn *xce; xce = xc_evtchn_open(NULL, 0); @@ -204,7 +209,8 @@ static int hp_mem_offline_func(int argc, char *argv[]) } domid = status >> PG_OFFLINE_OWNER_SHIFT; - if (suspend_guest(xch, xce, domid, &suspend_evtchn)) + if (suspend_guest(xch, xce, domid, + &suspend_evtchn, &suspend_lockfd)) { fprintf(stderr, "Failed to suspend guest %d for" " mfn %lx\n", domid, mfn); @@ -230,7 +236,8 @@ static int hp_mem_offline_func(int argc, char *argv[]) mfn, domid); } xc_domain_resume(xch, domid, 1); - xc_suspend_evtchn_release(xch, xce, domid, suspend_evtchn); + xc_suspend_evtchn_release(xch, xce, domid, + suspend_evtchn, &suspend_lockfd); xc_evtchn_close(xce); } break; diff --git a/tools/python/xen/lowlevel/checkpoint/checkpoint.h b/tools/python/xen/lowlevel/checkpoint/checkpoint.h index 187d9d7..2414956 100644 --- a/tools/python/xen/lowlevel/checkpoint/checkpoint.h +++ b/tools/python/xen/lowlevel/checkpoint/checkpoint.h @@ -27,7 +27,7 @@ typedef struct { checkpoint_domtype domtype; int fd; - int suspend_evtchn; + int suspend_evtchn, suspend_lockfd; char* errstr; diff --git a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c index 817d272..74ca062 100644 --- a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c +++ b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c @@ -57,6 +57,7 @@ void checkpoint_init(checkpoint_state* s) s->fd = -1; s->suspend_evtchn = -1; + s->suspend_lockfd = -1; s->errstr = NULL; @@ -360,7 +361,8 @@ static int setup_suspend_evtchn(checkpoint_state* s) return -1; } - s->suspend_evtchn = xc_suspend_evtchn_init_exclusive(s->xch, s->xce, s->domid, port); + s->suspend_evtchn = xc_suspend_evtchn_init_exclusive(s->xch, s->xce, + s->domid, port, &s->suspend_lockfd); if (s->suspend_evtchn < 0) { s->errstr = "failed to bind suspend event channel"; return -1; @@ -377,7 +379,8 @@ static void release_suspend_evtchn(checkpoint_state *s) { /* TODO: teach xen to clean up if port is unbound */ if (s->xce != NULL && s->suspend_evtchn >= 0) { - xc_suspend_evtchn_release(s->xch, s->xce, s->domid, s->suspend_evtchn); + xc_suspend_evtchn_release(s->xch, s->xce, s->domid, + s->suspend_evtchn, &s->suspend_lockfd); s->suspend_evtchn = -1; } } diff --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c index aaa09b0..01adc56 100644 --- a/tools/xcutils/xc_save.c +++ b/tools/xcutils/xc_save.c @@ -164,7 +164,7 @@ int main(int argc, char **argv) { unsigned int maxit, max_f, lflags; - int io_fd, ret, port; + int io_fd, ret, port, suspend_lockfd = -1; struct save_callbacks callbacks; xentoollog_level lvl; xentoollog_logger *l; @@ -199,7 +199,8 @@ main(int argc, char **argv) else { si.suspend_evtchn = - xc_suspend_evtchn_init_exclusive(si.xch, si.xce, si.domid, port); + xc_suspend_evtchn_init_exclusive(si.xch, si.xce, si.domid, + port, &suspend_lockfd); if (si.suspend_evtchn < 0) warnx("suspend event channel initialization failed, " @@ -213,7 +214,8 @@ main(int argc, char **argv) &callbacks, !!(si.flags & XCFLAGS_HVM), 0); if (si.suspend_evtchn > 0) - xc_suspend_evtchn_release(si.xch, si.xce, si.domid, si.suspend_evtchn); + xc_suspend_evtchn_release(si.xch, si.xce, si.domid, + si.suspend_evtchn, &suspend_lockfd); if (si.xce > 0) xc_evtchn_close(si.xce); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:13:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:13:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq58-0004YX-NH; Tue, 18 Mar 2014 09:13:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq57-0004XQ-4Y for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:09 +0000 Received: from [85.158.137.68:53794] by server-1.bemta-3.messagelabs.com id C6/91-11134-42E08235; Tue, 18 Mar 2014 09:13:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1395133986!1271874!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16198 invoked from network); 18 Mar 2014 09:13:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:13:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq54-0004EW-A7 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq54-0006FJ-8n for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:06 +0000 Date: Tue, 18 Mar 2014 09:13:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: trailing ws in libxl_save_msgs_gen.pl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d9cf3b4cc02e4ac635f7ec4480456420960bbb9a Author: Ian Jackson AuthorDate: Tue Mar 11 11:31:32 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: suspend: trailing ws in libxl_save_msgs_gen.pl libxl_save_msgs_gen.pl has some trailing whitespace. This can make git complain annoyingly. Remove the trailing whitespace. (The file also contains tabs. Leave these as they are to avoid a big and intrusive diff.) No functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v3: New patch in v3 of the series. --- tools/libxl/libxl_save_msgs_gen.pl | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl index ee126c7..0dbafca 100755 --- a/tools/libxl/libxl_save_msgs_gen.pl +++ b/tools/libxl/libxl_save_msgs_gen.pl @@ -23,9 +23,9 @@ our @msgs = ( STRING doing_what), 'unsigned long', 'done', 'unsigned long', 'total'] ], - [ 3, 'scxW', "suspend", [] ], - [ 4, 'scxW', "postcopy", [] ], - [ 5, 'scxA', "checkpoint", [] ], + [ 3, 'scxW', "suspend", [] ], + [ 4, 'scxW', "postcopy", [] ], + [ 5, 'scxA', "checkpoint", [] ], [ 6, 'scxA', "switch_qemu_logdirty", [qw(int domid unsigned enable)] ], # toolstack_save done entirely `by hand' @@ -199,7 +199,7 @@ static void BLOCK_put(unsigned char *const buf, uint32_t_put(buf, len, size); bytes_put(buf, len, bytes, size); } - + static void STRING_put(unsigned char *const buf, int *len, const char *string) @@ -209,7 +209,7 @@ static void STRING_put(unsigned char *const buf, assert(slen < (uint32_t)0x40000000); BLOCK_put(buf, len, (const void*)string, slen+1); } - + END foreach my $sr (qw(save restore)) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:13:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:13:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq58-0004YX-NH; Tue, 18 Mar 2014 09:13:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq57-0004XQ-4Y for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:09 +0000 Received: from [85.158.137.68:53794] by server-1.bemta-3.messagelabs.com id C6/91-11134-42E08235; Tue, 18 Mar 2014 09:13:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1395133986!1271874!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16198 invoked from network); 18 Mar 2014 09:13:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:13:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq54-0004EW-A7 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq54-0006FJ-8n for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:06 +0000 Date: Tue, 18 Mar 2014 09:13:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: trailing ws in libxl_save_msgs_gen.pl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d9cf3b4cc02e4ac635f7ec4480456420960bbb9a Author: Ian Jackson AuthorDate: Tue Mar 11 11:31:32 2014 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: suspend: trailing ws in libxl_save_msgs_gen.pl libxl_save_msgs_gen.pl has some trailing whitespace. This can make git complain annoyingly. Remove the trailing whitespace. (The file also contains tabs. Leave these as they are to avoid a big and intrusive diff.) No functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v3: New patch in v3 of the series. --- tools/libxl/libxl_save_msgs_gen.pl | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl index ee126c7..0dbafca 100755 --- a/tools/libxl/libxl_save_msgs_gen.pl +++ b/tools/libxl/libxl_save_msgs_gen.pl @@ -23,9 +23,9 @@ our @msgs = ( STRING doing_what), 'unsigned long', 'done', 'unsigned long', 'total'] ], - [ 3, 'scxW', "suspend", [] ], - [ 4, 'scxW', "postcopy", [] ], - [ 5, 'scxA', "checkpoint", [] ], + [ 3, 'scxW', "suspend", [] ], + [ 4, 'scxW', "postcopy", [] ], + [ 5, 'scxA', "checkpoint", [] ], [ 6, 'scxA', "switch_qemu_logdirty", [qw(int domid unsigned enable)] ], # toolstack_save done entirely `by hand' @@ -199,7 +199,7 @@ static void BLOCK_put(unsigned char *const buf, uint32_t_put(buf, len, size); bytes_put(buf, len, bytes, size); } - + static void STRING_put(unsigned char *const buf, int *len, const char *string) @@ -209,7 +209,7 @@ static void STRING_put(unsigned char *const buf, assert(slen < (uint32_t)0x40000000); BLOCK_put(buf, len, (const void*)string, slen+1); } - + END foreach my $sr (qw(save restore)) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:13:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:13:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5I-0004dn-Ta; Tue, 18 Mar 2014 09:13:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5H-0004ca-3L for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:19 +0000 Received: from [193.109.254.147:21651] by server-1.bemta-14.messagelabs.com id 1D/59-00839-E2E08235; Tue, 18 Mar 2014 09:13:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1395133996!2401892!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10757 invoked from network); 18 Mar 2014 09:13:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:13:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5E-0004Ee-Ef for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq5E-0006Fh-DC for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:16 +0000 Date: Tue, 18 Mar 2014 09:13:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Async libxl__domain_suspend_callback X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b837b0daec4f8a91064d31fbcf55f382f75d361d Author: Ian Jackson AuthorDate: Mon Nov 4 16:27:53 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: suspend: Async libxl__domain_suspend_callback Mark the suspend callback libxl__domain_suspend_callback as asynchronous in the helper stub generator (libxl_save_msgs_gen.pl). We are going to want to provide an asynchronous version of this function to get rid of the usleeps and waiting loops in the suspend code. libxl__domain_suspend_common_callback, the common synchronous core, which used to be provided directly as the callback function for the helper machinery, becomes libxl__domain_suspend_callback_common. It can now take a typesafe parameter. For now, provide two very similar asynchronous wrappers for it (normal, and remus). Each is a simple function which contains only boilerplate, calls the common synchronous core, and returns the asynchronous response. Essentially, we have just moved (in the case of suspend callbacks) the call site of libxl__srm_callout_sendreply. It was in the switch statement in the autogenerated _libxl_save_msgs_callout.c, and is now in the handwritten libxl_dom.c. No functional change. Signed-off-by: Ian Jackson Cc: Shriram Rajagopalan CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Clarify commit message. Fix a misformatted CC in the commit message Do not introduce a whitespace error in libxl_save_msgs_gen.pl v2: Commit message mentions usleeps, not Remus, as motivation. --- tools/libxl/libxl_dom.c | 25 +++++++++++++++++++------ tools/libxl/libxl_internal.h | 2 +- tools/libxl/libxl_save_msgs_gen.pl | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 48a4b8e..1c0f04f 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1020,10 +1020,8 @@ int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid) return 0; } -int libxl__domain_suspend_common_callback(void *user) +int libxl__domain_suspend_callback_common(libxl__domain_suspend_state *dss) { - libxl__save_helper_state *shs = user; - libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); STATE_AO_GC(dss->ao); unsigned long hvm_s_state = 0, hvm_pvdrv = 0; int ret; @@ -1242,12 +1240,27 @@ int libxl__toolstack_save(uint32_t domid, uint8_t **buf, return 0; } +static void libxl__domain_suspend_callback(void *data) +{ + libxl__save_helper_state *shs = data; + libxl__egc *egc = shs->egc; + libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); + + int ok = libxl__domain_suspend_callback_common(dss); + libxl__xc_domain_saverestore_async_callback_done(egc, shs, ok); +} + /*----- remus callbacks -----*/ -static int libxl__remus_domain_suspend_callback(void *data) +static void libxl__remus_domain_suspend_callback(void *data) { + libxl__save_helper_state *shs = data; + libxl__egc *egc = shs->egc; + libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); + /* REMUS TODO: Issue disk and network checkpoint reqs. */ - return libxl__domain_suspend_common_callback(data); + int ok = libxl__domain_suspend_callback_common(dss); + libxl__xc_domain_saverestore_async_callback_done(egc, shs, ok); } static int libxl__remus_domain_resume_callback(void *data) @@ -1373,7 +1386,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) callbacks->postcopy = libxl__remus_domain_resume_callback; callbacks->checkpoint = libxl__remus_domain_checkpoint_callback; } else - callbacks->suspend = libxl__domain_suspend_common_callback; + callbacks->suspend = libxl__domain_suspend_callback; callbacks->switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; dss->shs.callbacks.save.toolstack_save = libxl__toolstack_save; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index d15a4b2..e531dca 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2739,7 +2739,7 @@ _hidden void libxl__xc_domain_save_done(libxl__egc*, void *dss_void, void libxl__xc_domain_saverestore_async_callback_done(libxl__egc *egc, libxl__save_helper_state *shs, int return_value); -_hidden int libxl__domain_suspend_common_callback(void *data); +_hidden int libxl__domain_suspend_callback_common(libxl__domain_suspend_state*); _hidden void libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data); _hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl index 0dbafca..745e2ac 100755 --- a/tools/libxl/libxl_save_msgs_gen.pl +++ b/tools/libxl/libxl_save_msgs_gen.pl @@ -23,7 +23,7 @@ our @msgs = ( STRING doing_what), 'unsigned long', 'done', 'unsigned long', 'total'] ], - [ 3, 'scxW', "suspend", [] ], + [ 3, 'scxA', "suspend", [] ], [ 4, 'scxW', "postcopy", [] ], [ 5, 'scxA', "checkpoint", [] ], [ 6, 'scxA', "switch_qemu_logdirty", [qw(int domid -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:13:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:13:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5I-0004dn-Ta; Tue, 18 Mar 2014 09:13:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5H-0004ca-3L for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:19 +0000 Received: from [193.109.254.147:21651] by server-1.bemta-14.messagelabs.com id 1D/59-00839-E2E08235; Tue, 18 Mar 2014 09:13:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1395133996!2401892!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10757 invoked from network); 18 Mar 2014 09:13:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:13:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5E-0004Ee-Ef for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq5E-0006Fh-DC for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:16 +0000 Date: Tue, 18 Mar 2014 09:13:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Async libxl__domain_suspend_callback X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b837b0daec4f8a91064d31fbcf55f382f75d361d Author: Ian Jackson AuthorDate: Mon Nov 4 16:27:53 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: suspend: Async libxl__domain_suspend_callback Mark the suspend callback libxl__domain_suspend_callback as asynchronous in the helper stub generator (libxl_save_msgs_gen.pl). We are going to want to provide an asynchronous version of this function to get rid of the usleeps and waiting loops in the suspend code. libxl__domain_suspend_common_callback, the common synchronous core, which used to be provided directly as the callback function for the helper machinery, becomes libxl__domain_suspend_callback_common. It can now take a typesafe parameter. For now, provide two very similar asynchronous wrappers for it (normal, and remus). Each is a simple function which contains only boilerplate, calls the common synchronous core, and returns the asynchronous response. Essentially, we have just moved (in the case of suspend callbacks) the call site of libxl__srm_callout_sendreply. It was in the switch statement in the autogenerated _libxl_save_msgs_callout.c, and is now in the handwritten libxl_dom.c. No functional change. Signed-off-by: Ian Jackson Cc: Shriram Rajagopalan CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Clarify commit message. Fix a misformatted CC in the commit message Do not introduce a whitespace error in libxl_save_msgs_gen.pl v2: Commit message mentions usleeps, not Remus, as motivation. --- tools/libxl/libxl_dom.c | 25 +++++++++++++++++++------ tools/libxl/libxl_internal.h | 2 +- tools/libxl/libxl_save_msgs_gen.pl | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 48a4b8e..1c0f04f 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1020,10 +1020,8 @@ int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid) return 0; } -int libxl__domain_suspend_common_callback(void *user) +int libxl__domain_suspend_callback_common(libxl__domain_suspend_state *dss) { - libxl__save_helper_state *shs = user; - libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); STATE_AO_GC(dss->ao); unsigned long hvm_s_state = 0, hvm_pvdrv = 0; int ret; @@ -1242,12 +1240,27 @@ int libxl__toolstack_save(uint32_t domid, uint8_t **buf, return 0; } +static void libxl__domain_suspend_callback(void *data) +{ + libxl__save_helper_state *shs = data; + libxl__egc *egc = shs->egc; + libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); + + int ok = libxl__domain_suspend_callback_common(dss); + libxl__xc_domain_saverestore_async_callback_done(egc, shs, ok); +} + /*----- remus callbacks -----*/ -static int libxl__remus_domain_suspend_callback(void *data) +static void libxl__remus_domain_suspend_callback(void *data) { + libxl__save_helper_state *shs = data; + libxl__egc *egc = shs->egc; + libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); + /* REMUS TODO: Issue disk and network checkpoint reqs. */ - return libxl__domain_suspend_common_callback(data); + int ok = libxl__domain_suspend_callback_common(dss); + libxl__xc_domain_saverestore_async_callback_done(egc, shs, ok); } static int libxl__remus_domain_resume_callback(void *data) @@ -1373,7 +1386,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) callbacks->postcopy = libxl__remus_domain_resume_callback; callbacks->checkpoint = libxl__remus_domain_checkpoint_callback; } else - callbacks->suspend = libxl__domain_suspend_common_callback; + callbacks->suspend = libxl__domain_suspend_callback; callbacks->switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; dss->shs.callbacks.save.toolstack_save = libxl__toolstack_save; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index d15a4b2..e531dca 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2739,7 +2739,7 @@ _hidden void libxl__xc_domain_save_done(libxl__egc*, void *dss_void, void libxl__xc_domain_saverestore_async_callback_done(libxl__egc *egc, libxl__save_helper_state *shs, int return_value); -_hidden int libxl__domain_suspend_common_callback(void *data); +_hidden int libxl__domain_suspend_callback_common(libxl__domain_suspend_state*); _hidden void libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data); _hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl index 0dbafca..745e2ac 100755 --- a/tools/libxl/libxl_save_msgs_gen.pl +++ b/tools/libxl/libxl_save_msgs_gen.pl @@ -23,7 +23,7 @@ our @msgs = ( STRING doing_what), 'unsigned long', 'done', 'unsigned long', 'total'] ], - [ 3, 'scxW', "suspend", [] ], + [ 3, 'scxA', "suspend", [] ], [ 4, 'scxW', "postcopy", [] ], [ 5, 'scxA', "checkpoint", [] ], [ 6, 'scxA', "switch_qemu_logdirty", [qw(int domid -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:13:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:13:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5S-0004ix-0W; Tue, 18 Mar 2014 09:13:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5R-0004iN-EX for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:29 +0000 Received: from [85.158.143.35:53801] by server-2.bemta-4.messagelabs.com id AE/0E-06539-83E08235; Tue, 18 Mar 2014 09:13:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1395134006!2819043!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24811 invoked from network); 18 Mar 2014 09:13:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:13:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5O-0004Ek-JS for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq5O-0006G3-Hk for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:26 +0000 Date: Tue, 18 Mar 2014 09:13:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Async domain_suspend_callback_common X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9e816e079a7f76fa3ba2eedb8ab8e5df4041982f Author: Ian Jackson AuthorDate: Tue Nov 26 15:28:39 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: suspend: Async domain_suspend_callback_common Make domain_suspend_callback_common do its work and then call dss->callback_common_done, rather than simply returning its answer. This is preparatory to abolishing the usleeps in this function and replacing them with use of the event machinery. No functional change. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Remove some trailing whitespace --- tools/libxl/libxl_dom.c | 44 ++++++++++++++++++++++++++++++----------- tools/libxl/libxl_internal.h | 4 ++- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 1c0f04f..bfdb372 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -755,6 +755,10 @@ int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, static void domain_suspend_done(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc); +static void domain_suspend_callback_common_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int ok); +static void remus_domain_suspend_callback_common_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int ok); /*----- complicated callback, called by xc_domain_save -----*/ @@ -1020,7 +1024,9 @@ int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid) return 0; } -int libxl__domain_suspend_callback_common(libxl__domain_suspend_state *dss) +/* calls dss->callback_common_done when done */ +static void domain_suspend_callback_common(libxl__egc *egc, + libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); unsigned long hvm_s_state = 0, hvm_pvdrv = 0; @@ -1043,12 +1049,12 @@ int libxl__domain_suspend_callback_common(libxl__domain_suspend_state *dss) ret = xc_evtchn_notify(dss->xce, dss->suspend_eventchn); if (ret < 0) { LOG(ERROR, "xc_evtchn_notify failed ret=%d", ret); - return 0; + goto err; } ret = xc_await_suspend(CTX->xch, dss->xce, dss->suspend_eventchn); if (ret < 0) { LOG(ERROR, "xc_await_suspend failed ret=%d", ret); - return 0; + goto err; } dss->guest_responded = 1; goto guest_suspended; @@ -1059,7 +1065,7 @@ int libxl__domain_suspend_callback_common(libxl__domain_suspend_state *dss) ret = xc_domain_shutdown(CTX->xch, domid, SHUTDOWN_suspend); if (ret < 0) { LOGE(ERROR, "xc_domain_shutdown failed"); - return 0; + goto err; } /* The guest does not (need to) respond to this sort of request. */ dss->guest_responded = 1; @@ -1113,7 +1119,7 @@ int libxl__domain_suspend_callback_common(libxl__domain_suspend_state *dss) */ if (!strcmp(state, "suspend")) { LOG(ERROR, "guest didn't acknowledge suspend, request cancelled"); - return 0; + goto err; } LOG(DEBUG, "guest acknowledged suspend request"); @@ -1143,17 +1149,19 @@ int libxl__domain_suspend_callback_common(libxl__domain_suspend_state *dss) } LOG(ERROR, "guest did not suspend"); - return 0; + err: + dss->callback_common_done(egc, dss, 0); + return; guest_suspended: if (dss->hvm) { ret = libxl__domain_suspend_device_model(gc, dss); if (ret) { LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", ret); - return 0; + goto err; } } - return 1; + dss->callback_common_done(egc, dss, 1); } static inline char *physmap_path(libxl__gc *gc, uint32_t domid, @@ -1246,8 +1254,14 @@ static void libxl__domain_suspend_callback(void *data) libxl__egc *egc = shs->egc; libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); - int ok = libxl__domain_suspend_callback_common(dss); - libxl__xc_domain_saverestore_async_callback_done(egc, shs, ok); + dss->callback_common_done = domain_suspend_callback_common_done; + domain_suspend_callback_common(egc, dss); +} + +static void domain_suspend_callback_common_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int ok) +{ + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); } /*----- remus callbacks -----*/ @@ -1258,9 +1272,15 @@ static void libxl__remus_domain_suspend_callback(void *data) libxl__egc *egc = shs->egc; libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); + dss->callback_common_done = remus_domain_suspend_callback_common_done; + domain_suspend_callback_common(egc, dss); +} + +static void remus_domain_suspend_callback_common_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int ok) +{ /* REMUS TODO: Issue disk and network checkpoint reqs. */ - int ok = libxl__domain_suspend_callback_common(dss); - libxl__xc_domain_saverestore_async_callback_done(egc, shs, ok); + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); } static int libxl__remus_domain_resume_callback(void *data) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e531dca..923ad27 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2447,6 +2447,8 @@ struct libxl__domain_suspend_state { int interval; /* checkpoint interval (for Remus) */ libxl__save_helper_state shs; libxl__logdirty_switch logdirty; + void (*callback_common_done)(libxl__egc*, + struct libxl__domain_suspend_state*, int ok); /* private for libxl__domain_save_device_model */ libxl__save_device_model_cb *save_dm_callback; libxl__datacopier_state save_dm_datacopier; @@ -2739,7 +2741,7 @@ _hidden void libxl__xc_domain_save_done(libxl__egc*, void *dss_void, void libxl__xc_domain_saverestore_async_callback_done(libxl__egc *egc, libxl__save_helper_state *shs, int return_value); -_hidden int libxl__domain_suspend_callback_common(libxl__domain_suspend_state*); + _hidden void libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data); _hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:13:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:13:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5S-0004ix-0W; Tue, 18 Mar 2014 09:13:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5R-0004iN-EX for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:29 +0000 Received: from [85.158.143.35:53801] by server-2.bemta-4.messagelabs.com id AE/0E-06539-83E08235; Tue, 18 Mar 2014 09:13:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1395134006!2819043!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24811 invoked from network); 18 Mar 2014 09:13:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:13:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5O-0004Ek-JS for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq5O-0006G3-Hk for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:26 +0000 Date: Tue, 18 Mar 2014 09:13:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Async domain_suspend_callback_common X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9e816e079a7f76fa3ba2eedb8ab8e5df4041982f Author: Ian Jackson AuthorDate: Tue Nov 26 15:28:39 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:53:59 2014 +0000 libxl: suspend: Async domain_suspend_callback_common Make domain_suspend_callback_common do its work and then call dss->callback_common_done, rather than simply returning its answer. This is preparatory to abolishing the usleeps in this function and replacing them with use of the event machinery. No functional change. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Remove some trailing whitespace --- tools/libxl/libxl_dom.c | 44 ++++++++++++++++++++++++++++++----------- tools/libxl/libxl_internal.h | 4 ++- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 1c0f04f..bfdb372 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -755,6 +755,10 @@ int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, static void domain_suspend_done(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc); +static void domain_suspend_callback_common_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int ok); +static void remus_domain_suspend_callback_common_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int ok); /*----- complicated callback, called by xc_domain_save -----*/ @@ -1020,7 +1024,9 @@ int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid) return 0; } -int libxl__domain_suspend_callback_common(libxl__domain_suspend_state *dss) +/* calls dss->callback_common_done when done */ +static void domain_suspend_callback_common(libxl__egc *egc, + libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); unsigned long hvm_s_state = 0, hvm_pvdrv = 0; @@ -1043,12 +1049,12 @@ int libxl__domain_suspend_callback_common(libxl__domain_suspend_state *dss) ret = xc_evtchn_notify(dss->xce, dss->suspend_eventchn); if (ret < 0) { LOG(ERROR, "xc_evtchn_notify failed ret=%d", ret); - return 0; + goto err; } ret = xc_await_suspend(CTX->xch, dss->xce, dss->suspend_eventchn); if (ret < 0) { LOG(ERROR, "xc_await_suspend failed ret=%d", ret); - return 0; + goto err; } dss->guest_responded = 1; goto guest_suspended; @@ -1059,7 +1065,7 @@ int libxl__domain_suspend_callback_common(libxl__domain_suspend_state *dss) ret = xc_domain_shutdown(CTX->xch, domid, SHUTDOWN_suspend); if (ret < 0) { LOGE(ERROR, "xc_domain_shutdown failed"); - return 0; + goto err; } /* The guest does not (need to) respond to this sort of request. */ dss->guest_responded = 1; @@ -1113,7 +1119,7 @@ int libxl__domain_suspend_callback_common(libxl__domain_suspend_state *dss) */ if (!strcmp(state, "suspend")) { LOG(ERROR, "guest didn't acknowledge suspend, request cancelled"); - return 0; + goto err; } LOG(DEBUG, "guest acknowledged suspend request"); @@ -1143,17 +1149,19 @@ int libxl__domain_suspend_callback_common(libxl__domain_suspend_state *dss) } LOG(ERROR, "guest did not suspend"); - return 0; + err: + dss->callback_common_done(egc, dss, 0); + return; guest_suspended: if (dss->hvm) { ret = libxl__domain_suspend_device_model(gc, dss); if (ret) { LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", ret); - return 0; + goto err; } } - return 1; + dss->callback_common_done(egc, dss, 1); } static inline char *physmap_path(libxl__gc *gc, uint32_t domid, @@ -1246,8 +1254,14 @@ static void libxl__domain_suspend_callback(void *data) libxl__egc *egc = shs->egc; libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); - int ok = libxl__domain_suspend_callback_common(dss); - libxl__xc_domain_saverestore_async_callback_done(egc, shs, ok); + dss->callback_common_done = domain_suspend_callback_common_done; + domain_suspend_callback_common(egc, dss); +} + +static void domain_suspend_callback_common_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int ok) +{ + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); } /*----- remus callbacks -----*/ @@ -1258,9 +1272,15 @@ static void libxl__remus_domain_suspend_callback(void *data) libxl__egc *egc = shs->egc; libxl__domain_suspend_state *dss = CONTAINER_OF(shs, *dss, shs); + dss->callback_common_done = remus_domain_suspend_callback_common_done; + domain_suspend_callback_common(egc, dss); +} + +static void remus_domain_suspend_callback_common_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int ok) +{ /* REMUS TODO: Issue disk and network checkpoint reqs. */ - int ok = libxl__domain_suspend_callback_common(dss); - libxl__xc_domain_saverestore_async_callback_done(egc, shs, ok); + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); } static int libxl__remus_domain_resume_callback(void *data) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e531dca..923ad27 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2447,6 +2447,8 @@ struct libxl__domain_suspend_state { int interval; /* checkpoint interval (for Remus) */ libxl__save_helper_state shs; libxl__logdirty_switch logdirty; + void (*callback_common_done)(libxl__egc*, + struct libxl__domain_suspend_state*, int ok); /* private for libxl__domain_save_device_model */ libxl__save_device_model_cb *save_dm_callback; libxl__datacopier_state save_dm_datacopier; @@ -2739,7 +2741,7 @@ _hidden void libxl__xc_domain_save_done(libxl__egc*, void *dss_void, void libxl__xc_domain_saverestore_async_callback_done(libxl__egc *egc, libxl__save_helper_state *shs, int return_value); -_hidden int libxl__domain_suspend_callback_common(libxl__domain_suspend_state*); + _hidden void libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data); _hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:13:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:13:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5c-0004oO-3R; Tue, 18 Mar 2014 09:13:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5b-0004nd-Et for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:39 +0000 Received: from [193.109.254.147:59433] by server-8.bemta-14.messagelabs.com id DA/24-01877-24E08235; Tue, 18 Mar 2014 09:13:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1395134016!2389339!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7674 invoked from network); 18 Mar 2014 09:13:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:13:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5Y-0004Eq-NE for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq5Y-0006GT-ME for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:36 +0000 Date: Tue, 18 Mar 2014 09:13:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Reorg domain_suspend_callback_common X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 376f564f123eba262e98c41fbaf4041aaea1f5b1 Author: Ian Jackson AuthorDate: Wed Dec 4 14:58:10 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: Reorg domain_suspend_callback_common Make domain_suspend_callback_common more callback-oriented: * Turn the functionality behind the goto labels "err" and "guest_suspended" into functions which can be called just before "return". * Deindent the "issuing %s suspend request via XenBus control node" branch; it is going to be split up into various functions as the xenstore work becomes callback-based. No functional change. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 158 ++++++++++++++++++++++++++++++---------------- 1 files changed, 103 insertions(+), 55 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index bfdb372..cef62cf 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1024,6 +1024,16 @@ int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid) return 0; } +static void domain_suspend_common_wait_guest(libxl__egc *egc, + libxl__domain_suspend_state *dss); +static void domain_suspend_common_guest_suspended(libxl__egc *egc, + libxl__domain_suspend_state *dss); +static void domain_suspend_common_failed(libxl__egc *egc, + libxl__domain_suspend_state *dss); +static void domain_suspend_common_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, + bool ok); + /* calls dss->callback_common_done when done */ static void domain_suspend_callback_common(libxl__egc *egc, libxl__domain_suspend_state *dss) @@ -1057,7 +1067,8 @@ static void domain_suspend_callback_common(libxl__egc *egc, goto err; } dss->guest_responded = 1; - goto guest_suspended; + domain_suspend_common_guest_suspended(egc, dss); + return; } if (dss->hvm && (!hvm_pvdrv || hvm_s_state)) { @@ -1069,63 +1080,81 @@ static void domain_suspend_callback_common(libxl__egc *egc, } /* The guest does not (need to) respond to this sort of request. */ dss->guest_responded = 1; - } else { - LOG(DEBUG, "issuing %s suspend request via XenBus control node", - dss->hvm ? "PVHVM" : "PV"); + domain_suspend_common_wait_guest(egc, dss); + return; + } - libxl__domain_pvcontrol_write(gc, XBT_NULL, domid, "suspend"); + LOG(DEBUG, "issuing %s suspend request via XenBus control node", + dss->hvm ? "PVHVM" : "PV"); - LOG(DEBUG, "wait for the guest to acknowledge suspend request"); - watchdog = 60; - while (!strcmp(state, "suspend") && watchdog > 0) { - usleep(100000); + libxl__domain_pvcontrol_write(gc, XBT_NULL, domid, "suspend"); - state = libxl__domain_pvcontrol_read(gc, XBT_NULL, domid); - if (!state) state = ""; + LOG(DEBUG, "wait for the guest to acknowledge suspend request"); + watchdog = 60; + while (!strcmp(state, "suspend") && watchdog > 0) { + usleep(100000); - watchdog--; - } + state = libxl__domain_pvcontrol_read(gc, XBT_NULL, domid); + if (!state) state = ""; - /* - * Guest appears to not be responding. Cancel the suspend - * request. - * - * We re-read the suspend node and clear it within a - * transaction in order to handle the case where we race - * against the guest catching up and acknowledging the request - * at the last minute. - */ - if (!strcmp(state, "suspend")) { - LOG(ERROR, "guest didn't acknowledge suspend, cancelling request"); - retry_transaction: - t = xs_transaction_start(CTX->xsh); - - state = libxl__domain_pvcontrol_read(gc, t, domid); - if (!state) state = ""; - - if (!strcmp(state, "suspend")) - libxl__domain_pvcontrol_write(gc, t, domid, ""); - - if (!xs_transaction_end(CTX->xsh, t, 0)) - if (errno == EAGAIN) - goto retry_transaction; + watchdog--; + } - } + /* + * Guest appears to not be responding. Cancel the suspend + * request. + * + * We re-read the suspend node and clear it within a + * transaction in order to handle the case where we race + * against the guest catching up and acknowledging the request + * at the last minute. + */ + if (!strcmp(state, "suspend")) { + LOG(ERROR, "guest didn't acknowledge suspend, cancelling request"); + retry_transaction: + t = xs_transaction_start(CTX->xsh); - /* - * Final check for guest acknowledgement. The guest may have - * acknowledged while we were cancelling the request in which - * case we lost the race while cancelling and should continue. - */ - if (!strcmp(state, "suspend")) { - LOG(ERROR, "guest didn't acknowledge suspend, request cancelled"); - goto err; - } + state = libxl__domain_pvcontrol_read(gc, t, domid); + if (!state) state = ""; + + if (!strcmp(state, "suspend")) + libxl__domain_pvcontrol_write(gc, t, domid, ""); + + if (!xs_transaction_end(CTX->xsh, t, 0)) + if (errno == EAGAIN) + goto retry_transaction; - LOG(DEBUG, "guest acknowledged suspend request"); - dss->guest_responded = 1; } + /* + * Final check for guest acknowledgement. The guest may have + * acknowledged while we were cancelling the request in which + * case we lost the race while cancelling and should continue. + */ + if (!strcmp(state, "suspend")) { + LOG(ERROR, "guest didn't acknowledge suspend, request cancelled"); + goto err; + } + + LOG(DEBUG, "guest acknowledged suspend request"); + dss->guest_responded = 1; + domain_suspend_common_wait_guest(egc,dss); + return; + + err: + domain_suspend_common_failed(egc, dss); +} + +static void domain_suspend_common_wait_guest(libxl__egc *egc, + libxl__domain_suspend_state *dss) +{ + STATE_AO_GC(dss->ao); + int ret; + int watchdog; + + /* Convenience aliases */ + const uint32_t domid = dss->domid; + LOG(DEBUG, "wait for the guest to suspend"); watchdog = 60; while (watchdog > 0) { @@ -1141,7 +1170,8 @@ static void domain_suspend_callback_common(libxl__egc *egc, & XEN_DOMINF_shutdownmask; if (shutdown_reason == SHUTDOWN_suspend) { LOG(DEBUG, "guest has suspended"); - goto guest_suspended; + domain_suspend_common_guest_suspended(egc, dss); + return; } } @@ -1149,19 +1179,37 @@ static void domain_suspend_callback_common(libxl__egc *egc, } LOG(ERROR, "guest did not suspend"); - err: - dss->callback_common_done(egc, dss, 0); - return; + domain_suspend_common_failed(egc, dss); +} + +static void domain_suspend_common_guest_suspended(libxl__egc *egc, + libxl__domain_suspend_state *dss) +{ + STATE_AO_GC(dss->ao); + int ret; - guest_suspended: if (dss->hvm) { ret = libxl__domain_suspend_device_model(gc, dss); if (ret) { LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", ret); - goto err; + domain_suspend_common_failed(egc, dss); + return; } } - dss->callback_common_done(egc, dss, 1); + domain_suspend_common_done(egc, dss, 1); +} + +static void domain_suspend_common_failed(libxl__egc *egc, + libxl__domain_suspend_state *dss) +{ + domain_suspend_common_done(egc, dss, 0); +} + +static void domain_suspend_common_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, + bool ok) +{ + dss->callback_common_done(egc, dss, ok); } static inline char *physmap_path(libxl__gc *gc, uint32_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:13:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:13:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5c-0004oO-3R; Tue, 18 Mar 2014 09:13:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5b-0004nd-Et for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:39 +0000 Received: from [193.109.254.147:59433] by server-8.bemta-14.messagelabs.com id DA/24-01877-24E08235; Tue, 18 Mar 2014 09:13:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1395134016!2389339!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7674 invoked from network); 18 Mar 2014 09:13:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:13:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5Y-0004Eq-NE for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq5Y-0006GT-ME for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:36 +0000 Date: Tue, 18 Mar 2014 09:13:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Reorg domain_suspend_callback_common X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 376f564f123eba262e98c41fbaf4041aaea1f5b1 Author: Ian Jackson AuthorDate: Wed Dec 4 14:58:10 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: Reorg domain_suspend_callback_common Make domain_suspend_callback_common more callback-oriented: * Turn the functionality behind the goto labels "err" and "guest_suspended" into functions which can be called just before "return". * Deindent the "issuing %s suspend request via XenBus control node" branch; it is going to be split up into various functions as the xenstore work becomes callback-based. No functional change. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 158 ++++++++++++++++++++++++++++++---------------- 1 files changed, 103 insertions(+), 55 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index bfdb372..cef62cf 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1024,6 +1024,16 @@ int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid) return 0; } +static void domain_suspend_common_wait_guest(libxl__egc *egc, + libxl__domain_suspend_state *dss); +static void domain_suspend_common_guest_suspended(libxl__egc *egc, + libxl__domain_suspend_state *dss); +static void domain_suspend_common_failed(libxl__egc *egc, + libxl__domain_suspend_state *dss); +static void domain_suspend_common_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, + bool ok); + /* calls dss->callback_common_done when done */ static void domain_suspend_callback_common(libxl__egc *egc, libxl__domain_suspend_state *dss) @@ -1057,7 +1067,8 @@ static void domain_suspend_callback_common(libxl__egc *egc, goto err; } dss->guest_responded = 1; - goto guest_suspended; + domain_suspend_common_guest_suspended(egc, dss); + return; } if (dss->hvm && (!hvm_pvdrv || hvm_s_state)) { @@ -1069,63 +1080,81 @@ static void domain_suspend_callback_common(libxl__egc *egc, } /* The guest does not (need to) respond to this sort of request. */ dss->guest_responded = 1; - } else { - LOG(DEBUG, "issuing %s suspend request via XenBus control node", - dss->hvm ? "PVHVM" : "PV"); + domain_suspend_common_wait_guest(egc, dss); + return; + } - libxl__domain_pvcontrol_write(gc, XBT_NULL, domid, "suspend"); + LOG(DEBUG, "issuing %s suspend request via XenBus control node", + dss->hvm ? "PVHVM" : "PV"); - LOG(DEBUG, "wait for the guest to acknowledge suspend request"); - watchdog = 60; - while (!strcmp(state, "suspend") && watchdog > 0) { - usleep(100000); + libxl__domain_pvcontrol_write(gc, XBT_NULL, domid, "suspend"); - state = libxl__domain_pvcontrol_read(gc, XBT_NULL, domid); - if (!state) state = ""; + LOG(DEBUG, "wait for the guest to acknowledge suspend request"); + watchdog = 60; + while (!strcmp(state, "suspend") && watchdog > 0) { + usleep(100000); - watchdog--; - } + state = libxl__domain_pvcontrol_read(gc, XBT_NULL, domid); + if (!state) state = ""; - /* - * Guest appears to not be responding. Cancel the suspend - * request. - * - * We re-read the suspend node and clear it within a - * transaction in order to handle the case where we race - * against the guest catching up and acknowledging the request - * at the last minute. - */ - if (!strcmp(state, "suspend")) { - LOG(ERROR, "guest didn't acknowledge suspend, cancelling request"); - retry_transaction: - t = xs_transaction_start(CTX->xsh); - - state = libxl__domain_pvcontrol_read(gc, t, domid); - if (!state) state = ""; - - if (!strcmp(state, "suspend")) - libxl__domain_pvcontrol_write(gc, t, domid, ""); - - if (!xs_transaction_end(CTX->xsh, t, 0)) - if (errno == EAGAIN) - goto retry_transaction; + watchdog--; + } - } + /* + * Guest appears to not be responding. Cancel the suspend + * request. + * + * We re-read the suspend node and clear it within a + * transaction in order to handle the case where we race + * against the guest catching up and acknowledging the request + * at the last minute. + */ + if (!strcmp(state, "suspend")) { + LOG(ERROR, "guest didn't acknowledge suspend, cancelling request"); + retry_transaction: + t = xs_transaction_start(CTX->xsh); - /* - * Final check for guest acknowledgement. The guest may have - * acknowledged while we were cancelling the request in which - * case we lost the race while cancelling and should continue. - */ - if (!strcmp(state, "suspend")) { - LOG(ERROR, "guest didn't acknowledge suspend, request cancelled"); - goto err; - } + state = libxl__domain_pvcontrol_read(gc, t, domid); + if (!state) state = ""; + + if (!strcmp(state, "suspend")) + libxl__domain_pvcontrol_write(gc, t, domid, ""); + + if (!xs_transaction_end(CTX->xsh, t, 0)) + if (errno == EAGAIN) + goto retry_transaction; - LOG(DEBUG, "guest acknowledged suspend request"); - dss->guest_responded = 1; } + /* + * Final check for guest acknowledgement. The guest may have + * acknowledged while we were cancelling the request in which + * case we lost the race while cancelling and should continue. + */ + if (!strcmp(state, "suspend")) { + LOG(ERROR, "guest didn't acknowledge suspend, request cancelled"); + goto err; + } + + LOG(DEBUG, "guest acknowledged suspend request"); + dss->guest_responded = 1; + domain_suspend_common_wait_guest(egc,dss); + return; + + err: + domain_suspend_common_failed(egc, dss); +} + +static void domain_suspend_common_wait_guest(libxl__egc *egc, + libxl__domain_suspend_state *dss) +{ + STATE_AO_GC(dss->ao); + int ret; + int watchdog; + + /* Convenience aliases */ + const uint32_t domid = dss->domid; + LOG(DEBUG, "wait for the guest to suspend"); watchdog = 60; while (watchdog > 0) { @@ -1141,7 +1170,8 @@ static void domain_suspend_callback_common(libxl__egc *egc, & XEN_DOMINF_shutdownmask; if (shutdown_reason == SHUTDOWN_suspend) { LOG(DEBUG, "guest has suspended"); - goto guest_suspended; + domain_suspend_common_guest_suspended(egc, dss); + return; } } @@ -1149,19 +1179,37 @@ static void domain_suspend_callback_common(libxl__egc *egc, } LOG(ERROR, "guest did not suspend"); - err: - dss->callback_common_done(egc, dss, 0); - return; + domain_suspend_common_failed(egc, dss); +} + +static void domain_suspend_common_guest_suspended(libxl__egc *egc, + libxl__domain_suspend_state *dss) +{ + STATE_AO_GC(dss->ao); + int ret; - guest_suspended: if (dss->hvm) { ret = libxl__domain_suspend_device_model(gc, dss); if (ret) { LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", ret); - goto err; + domain_suspend_common_failed(egc, dss); + return; } } - dss->callback_common_done(egc, dss, 1); + domain_suspend_common_done(egc, dss, 1); +} + +static void domain_suspend_common_failed(libxl__egc *egc, + libxl__domain_suspend_state *dss) +{ + domain_suspend_common_done(egc, dss, 0); +} + +static void domain_suspend_common_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, + bool ok) +{ + dss->callback_common_done(egc, dss, ok); } static inline char *physmap_path(libxl__gc *gc, uint32_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:13:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:13:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5m-0004t0-6C; Tue, 18 Mar 2014 09:13:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5l-0004sM-CK for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:49 +0000 Received: from [85.158.143.35:50288] by server-2.bemta-4.messagelabs.com id 08/AE-06539-C4E08235; Tue, 18 Mar 2014 09:13:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1395134027!2826500!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22668 invoked from network); 18 Mar 2014 09:13:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:13:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5i-0004Ew-TM for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq5i-0006Hx-QP for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:46 +0000 Date: Tue, 18 Mar 2014 09:13:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: New libxl__domain_pvcontrol_xspath X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 04a194285641dfaf68d07a44b82bef7eba532ddb Author: Ian Jackson AuthorDate: Thu Dec 5 18:27:30 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: New libxl__domain_pvcontrol_xspath Factor out the pv control node xenstore path calculation into libxl__domain_pvcontrol_xspath. This xs path calculation was open coded in libxl__domain_pvcontrol_read and _write. This is undesirable because it duplicates the code and because it makes the path inaccessible to other parts of libxl (which are soon going to want it). No functional change. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl.c | 21 +++++++++++---------- tools/libxl/libxl_internal.h | 1 + 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 7b7ffd3..4ecdbbb 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -894,17 +894,23 @@ int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid) return !!pvdriver; } -char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, - uint32_t domid) +const char *libxl__domain_pvcontrol_xspath(libxl__gc *gc, uint32_t domid) { - const char *shutdown_path; const char *dom_path; dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) return NULL; - shutdown_path = libxl__sprintf(gc, "%s/control/shutdown", dom_path); + return GCSPRINTF("%s/control/shutdown", dom_path); +} + +char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, + uint32_t domid) +{ + const char *shutdown_path; + + shutdown_path = libxl__domain_pvcontrol_xspath(gc, domid); if (!shutdown_path) return NULL; @@ -915,13 +921,8 @@ int libxl__domain_pvcontrol_write(libxl__gc *gc, xs_transaction_t t, uint32_t domid, const char *cmd) { const char *shutdown_path; - const char *dom_path; - - dom_path = libxl__xs_get_dompath(gc, domid); - if (!dom_path) - return ERROR_FAIL; - shutdown_path = libxl__sprintf(gc, "%s/control/shutdown", dom_path); + shutdown_path = libxl__domain_pvcontrol_xspath(gc, domid); if (!shutdown_path) return ERROR_FAIL; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 923ad27..9ec0d0b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -999,6 +999,7 @@ _hidden int libxl__domain_resume(libxl__gc *gc, uint32_t domid, /* returns 0 or 1, or a libxl error code */ _hidden int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid); +_hidden const char *libxl__domain_pvcontrol_xspath(libxl__gc*, uint32_t domid); _hidden char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, uint32_t domid); _hidden int libxl__domain_pvcontrol_write(libxl__gc *gc, xs_transaction_t t, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:13:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:13:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5m-0004t0-6C; Tue, 18 Mar 2014 09:13:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5l-0004sM-CK for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:49 +0000 Received: from [85.158.143.35:50288] by server-2.bemta-4.messagelabs.com id 08/AE-06539-C4E08235; Tue, 18 Mar 2014 09:13:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1395134027!2826500!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22668 invoked from network); 18 Mar 2014 09:13:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:13:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5i-0004Ew-TM for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq5i-0006Hx-QP for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:46 +0000 Date: Tue, 18 Mar 2014 09:13:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: New libxl__domain_pvcontrol_xspath X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 04a194285641dfaf68d07a44b82bef7eba532ddb Author: Ian Jackson AuthorDate: Thu Dec 5 18:27:30 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: New libxl__domain_pvcontrol_xspath Factor out the pv control node xenstore path calculation into libxl__domain_pvcontrol_xspath. This xs path calculation was open coded in libxl__domain_pvcontrol_read and _write. This is undesirable because it duplicates the code and because it makes the path inaccessible to other parts of libxl (which are soon going to want it). No functional change. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl.c | 21 +++++++++++---------- tools/libxl/libxl_internal.h | 1 + 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 7b7ffd3..4ecdbbb 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -894,17 +894,23 @@ int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid) return !!pvdriver; } -char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, - uint32_t domid) +const char *libxl__domain_pvcontrol_xspath(libxl__gc *gc, uint32_t domid) { - const char *shutdown_path; const char *dom_path; dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) return NULL; - shutdown_path = libxl__sprintf(gc, "%s/control/shutdown", dom_path); + return GCSPRINTF("%s/control/shutdown", dom_path); +} + +char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, + uint32_t domid) +{ + const char *shutdown_path; + + shutdown_path = libxl__domain_pvcontrol_xspath(gc, domid); if (!shutdown_path) return NULL; @@ -915,13 +921,8 @@ int libxl__domain_pvcontrol_write(libxl__gc *gc, xs_transaction_t t, uint32_t domid, const char *cmd) { const char *shutdown_path; - const char *dom_path; - - dom_path = libxl__xs_get_dompath(gc, domid); - if (!dom_path) - return ERROR_FAIL; - shutdown_path = libxl__sprintf(gc, "%s/control/shutdown", dom_path); + shutdown_path = libxl__domain_pvcontrol_xspath(gc, domid); if (!shutdown_path) return ERROR_FAIL; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 923ad27..9ec0d0b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -999,6 +999,7 @@ _hidden int libxl__domain_resume(libxl__gc *gc, uint32_t domid, /* returns 0 or 1, or a libxl error code */ _hidden int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid); +_hidden const char *libxl__domain_pvcontrol_xspath(libxl__gc*, uint32_t domid); _hidden char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, uint32_t domid); _hidden int libxl__domain_pvcontrol_write(libxl__gc *gc, xs_transaction_t t, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:14:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:14:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5w-0004yM-BG; Tue, 18 Mar 2014 09:14:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5v-0004xm-Hm for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:59 +0000 Received: from [193.109.254.147:10081] by server-1.bemta-14.messagelabs.com id CF/BA-00839-65E08235; Tue, 18 Mar 2014 09:13:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1395134037!2393545!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21062 invoked from network); 18 Mar 2014 09:13:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:13:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5t-0004F2-1e for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq5s-0006IJ-W8 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:57 +0000 Date: Tue, 18 Mar 2014 09:13:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: New domain_suspend_pvcontrol_acked X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 83c20713bd006220a6cb39af6a764a9f900de3e5 Author: Ian Jackson AuthorDate: Thu Dec 5 18:48:21 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: New domain_suspend_pvcontrol_acked Factor out domain_suspend_pvcontrol_acked. This replaces a bunch of open-coded strcmp()s and makes the code clearer. It also eliminates the need to check for state==NULL each time it's read, because we can check for NULL once before the strcmp. No functional change. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Improve comment re xswatch state ENOENT --- tools/libxl/libxl_dom.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index cef62cf..78f1de7 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1034,6 +1034,12 @@ static void domain_suspend_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, bool ok); +static bool domain_suspend_pvcontrol_acked(const char *state) { + /* any value other than "suspend", including ENOENT (i.e. !state), is OK */ + if (!state) return 1; + return strcmp(state,"suspend"); +} + /* calls dss->callback_common_done when done */ static void domain_suspend_callback_common(libxl__egc *egc, libxl__domain_suspend_state *dss) @@ -1091,11 +1097,10 @@ static void domain_suspend_callback_common(libxl__egc *egc, LOG(DEBUG, "wait for the guest to acknowledge suspend request"); watchdog = 60; - while (!strcmp(state, "suspend") && watchdog > 0) { + while (!domain_suspend_pvcontrol_acked(state) && watchdog > 0) { usleep(100000); state = libxl__domain_pvcontrol_read(gc, XBT_NULL, domid); - if (!state) state = ""; watchdog--; } @@ -1109,21 +1114,19 @@ static void domain_suspend_callback_common(libxl__egc *egc, * against the guest catching up and acknowledging the request * at the last minute. */ - if (!strcmp(state, "suspend")) { + if (!domain_suspend_pvcontrol_acked(state)) { LOG(ERROR, "guest didn't acknowledge suspend, cancelling request"); retry_transaction: t = xs_transaction_start(CTX->xsh); state = libxl__domain_pvcontrol_read(gc, t, domid); - if (!state) state = ""; - if (!strcmp(state, "suspend")) + if (!domain_suspend_pvcontrol_acked(state)) libxl__domain_pvcontrol_write(gc, t, domid, ""); if (!xs_transaction_end(CTX->xsh, t, 0)) if (errno == EAGAIN) goto retry_transaction; - } /* @@ -1131,7 +1134,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, * acknowledged while we were cancelling the request in which * case we lost the race while cancelling and should continue. */ - if (!strcmp(state, "suspend")) { + if (!domain_suspend_pvcontrol_acked(state)) { LOG(ERROR, "guest didn't acknowledge suspend, request cancelled"); goto err; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:14:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:14:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5w-0004yM-BG; Tue, 18 Mar 2014 09:14:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5v-0004xm-Hm for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:59 +0000 Received: from [193.109.254.147:10081] by server-1.bemta-14.messagelabs.com id CF/BA-00839-65E08235; Tue, 18 Mar 2014 09:13:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1395134037!2393545!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21062 invoked from network); 18 Mar 2014 09:13:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:13:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq5t-0004F2-1e for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq5s-0006IJ-W8 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:13:57 +0000 Date: Tue, 18 Mar 2014 09:13:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: New domain_suspend_pvcontrol_acked X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 83c20713bd006220a6cb39af6a764a9f900de3e5 Author: Ian Jackson AuthorDate: Thu Dec 5 18:48:21 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: New domain_suspend_pvcontrol_acked Factor out domain_suspend_pvcontrol_acked. This replaces a bunch of open-coded strcmp()s and makes the code clearer. It also eliminates the need to check for state==NULL each time it's read, because we can check for NULL once before the strcmp. No functional change. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Improve comment re xswatch state ENOENT --- tools/libxl/libxl_dom.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index cef62cf..78f1de7 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1034,6 +1034,12 @@ static void domain_suspend_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, bool ok); +static bool domain_suspend_pvcontrol_acked(const char *state) { + /* any value other than "suspend", including ENOENT (i.e. !state), is OK */ + if (!state) return 1; + return strcmp(state,"suspend"); +} + /* calls dss->callback_common_done when done */ static void domain_suspend_callback_common(libxl__egc *egc, libxl__domain_suspend_state *dss) @@ -1091,11 +1097,10 @@ static void domain_suspend_callback_common(libxl__egc *egc, LOG(DEBUG, "wait for the guest to acknowledge suspend request"); watchdog = 60; - while (!strcmp(state, "suspend") && watchdog > 0) { + while (!domain_suspend_pvcontrol_acked(state) && watchdog > 0) { usleep(100000); state = libxl__domain_pvcontrol_read(gc, XBT_NULL, domid); - if (!state) state = ""; watchdog--; } @@ -1109,21 +1114,19 @@ static void domain_suspend_callback_common(libxl__egc *egc, * against the guest catching up and acknowledging the request * at the last minute. */ - if (!strcmp(state, "suspend")) { + if (!domain_suspend_pvcontrol_acked(state)) { LOG(ERROR, "guest didn't acknowledge suspend, cancelling request"); retry_transaction: t = xs_transaction_start(CTX->xsh); state = libxl__domain_pvcontrol_read(gc, t, domid); - if (!state) state = ""; - if (!strcmp(state, "suspend")) + if (!domain_suspend_pvcontrol_acked(state)) libxl__domain_pvcontrol_write(gc, t, domid, ""); if (!xs_transaction_end(CTX->xsh, t, 0)) if (errno == EAGAIN) goto retry_transaction; - } /* @@ -1131,7 +1134,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, * acknowledged while we were cancelling the request in which * case we lost the race while cancelling and should continue. */ - if (!strcmp(state, "suspend")) { + if (!domain_suspend_pvcontrol_acked(state)) { LOG(ERROR, "guest didn't acknowledge suspend, request cancelled"); goto err; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:14:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:14:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq67-000525-EB; Tue, 18 Mar 2014 09:14:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq65-00051R-RC for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:10 +0000 Received: from [85.158.139.211:58189] by server-11.bemta-5.messagelabs.com id 63/13-30804-16E08235; Tue, 18 Mar 2014 09:14:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1395134047!1676600!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28707 invoked from network); 18 Mar 2014 09:14:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:14:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq63-0004Fb-6g for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq63-0006Is-54 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:07 +0000 Date: Tue, 18 Mar 2014 09:14:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: domain_suspend_callback_common xs errs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62657e313189f9fe86ccd33414a5122de25595a3 Author: Ian Jackson AuthorDate: Thu Dec 5 19:08:34 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: domain_suspend_callback_common xs errs In domain_suspend_callback_common, use libxl__xs_transaction_start in a loop, rather than xs_transaction_start and a goto label. This will improve the error handling, but have no other semantic effect. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 78f1de7..9fec4e7 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1050,6 +1050,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, char *state = "suspend"; int watchdog; xs_transaction_t t; + int rc; /* Convenience aliases */ const uint32_t domid = dss->domid; @@ -1116,17 +1117,19 @@ static void domain_suspend_callback_common(libxl__egc *egc, */ if (!domain_suspend_pvcontrol_acked(state)) { LOG(ERROR, "guest didn't acknowledge suspend, cancelling request"); - retry_transaction: - t = xs_transaction_start(CTX->xsh); + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto err; - state = libxl__domain_pvcontrol_read(gc, t, domid); + state = libxl__domain_pvcontrol_read(gc, t, domid); - if (!domain_suspend_pvcontrol_acked(state)) - libxl__domain_pvcontrol_write(gc, t, domid, ""); + if (!domain_suspend_pvcontrol_acked(state)) + libxl__domain_pvcontrol_write(gc, t, domid, ""); - if (!xs_transaction_end(CTX->xsh, t, 0)) - if (errno == EAGAIN) - goto retry_transaction; + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc<0) goto err; + } } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:14:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:14:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq67-000525-EB; Tue, 18 Mar 2014 09:14:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq65-00051R-RC for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:10 +0000 Received: from [85.158.139.211:58189] by server-11.bemta-5.messagelabs.com id 63/13-30804-16E08235; Tue, 18 Mar 2014 09:14:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1395134047!1676600!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28707 invoked from network); 18 Mar 2014 09:14:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:14:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq63-0004Fb-6g for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq63-0006Is-54 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:07 +0000 Date: Tue, 18 Mar 2014 09:14:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: domain_suspend_callback_common xs errs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62657e313189f9fe86ccd33414a5122de25595a3 Author: Ian Jackson AuthorDate: Thu Dec 5 19:08:34 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: domain_suspend_callback_common xs errs In domain_suspend_callback_common, use libxl__xs_transaction_start in a loop, rather than xs_transaction_start and a goto label. This will improve the error handling, but have no other semantic effect. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 78f1de7..9fec4e7 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1050,6 +1050,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, char *state = "suspend"; int watchdog; xs_transaction_t t; + int rc; /* Convenience aliases */ const uint32_t domid = dss->domid; @@ -1116,17 +1117,19 @@ static void domain_suspend_callback_common(libxl__egc *egc, */ if (!domain_suspend_pvcontrol_acked(state)) { LOG(ERROR, "guest didn't acknowledge suspend, cancelling request"); - retry_transaction: - t = xs_transaction_start(CTX->xsh); + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto err; - state = libxl__domain_pvcontrol_read(gc, t, domid); + state = libxl__domain_pvcontrol_read(gc, t, domid); - if (!domain_suspend_pvcontrol_acked(state)) - libxl__domain_pvcontrol_write(gc, t, domid, ""); + if (!domain_suspend_pvcontrol_acked(state)) + libxl__domain_pvcontrol_write(gc, t, domid, ""); - if (!xs_transaction_end(CTX->xsh, t, 0)) - if (errno == EAGAIN) - goto retry_transaction; + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc<0) goto err; + } } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:14:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:14:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6I-00056x-Gv; Tue, 18 Mar 2014 09:14:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6H-000562-El for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:21 +0000 Received: from [85.158.143.35:61624] by server-2.bemta-4.messagelabs.com id 93/AF-06539-B6E08235; Tue, 18 Mar 2014 09:14:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1395134057!2823867!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26856 invoked from network); 18 Mar 2014 09:14:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:14:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6D-0004Fh-C4 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq6D-0006JG-A2 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:17 +0000 Date: Tue, 18 Mar 2014 09:14:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Async xenstore pvcontrol wait X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d12e4ad65c2bf5c9a8ca2c40295e72f1279036c4 Author: Ian Jackson AuthorDate: Thu Dec 5 18:50:55 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: Async xenstore pvcontrol wait When negotiating guest suspend via the xenstore pvcontrol protocol (ie when the guest does NOT support the evtchn fast suspend protocol): Replace the use of loops and usleep with a call to libxl__xswait. Also, replace the xenstore transaction loop with one using libxl__xs_transaction_start et al. There is not intended to be any semantic change, other than to make the algorithm properly asynchronous. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Add a comment to clarify last minute ack. v3X: Do NOT rename "pvcontrol" xswait state struct to "guest_wait" (because we're NOT going to use it for the event channel based wait too). --- tools/libxl/libxl_dom.c | 94 ++++++++++++++++++++++++++--------------- tools/libxl/libxl_internal.h | 1 + 2 files changed, 60 insertions(+), 35 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 9fec4e7..0c48159 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1028,6 +1028,8 @@ static void domain_suspend_common_wait_guest(libxl__egc *egc, libxl__domain_suspend_state *dss); static void domain_suspend_common_guest_suspended(libxl__egc *egc, libxl__domain_suspend_state *dss); +static void domain_suspend_common_pvcontrol_suspending(libxl__egc *egc, + libxl__xswait_state *xswa, int rc, const char *state); static void domain_suspend_common_failed(libxl__egc *egc, libxl__domain_suspend_state *dss); static void domain_suspend_common_done(libxl__egc *egc, @@ -1047,10 +1049,6 @@ static void domain_suspend_callback_common(libxl__egc *egc, STATE_AO_GC(dss->ao); unsigned long hvm_s_state = 0, hvm_pvdrv = 0; int ret; - char *state = "suspend"; - int watchdog; - xs_transaction_t t; - int rc; /* Convenience aliases */ const uint32_t domid = dss->domid; @@ -1096,59 +1094,82 @@ static void domain_suspend_callback_common(libxl__egc *egc, libxl__domain_pvcontrol_write(gc, XBT_NULL, domid, "suspend"); - LOG(DEBUG, "wait for the guest to acknowledge suspend request"); - watchdog = 60; - while (!domain_suspend_pvcontrol_acked(state) && watchdog > 0) { - usleep(100000); + dss->pvcontrol.path = libxl__domain_pvcontrol_xspath(gc, domid); + if (!dss->pvcontrol.path) goto err; - state = libxl__domain_pvcontrol_read(gc, XBT_NULL, domid); + dss->pvcontrol.ao = ao; + dss->pvcontrol.what = "guest acknowledgement of suspend request"; + dss->pvcontrol.timeout_ms = 60 * 1000; + dss->pvcontrol.callback = domain_suspend_common_pvcontrol_suspending; + libxl__xswait_start(gc, &dss->pvcontrol); + return; - watchdog--; - } + err: + domain_suspend_common_failed(egc, dss); +} - /* - * Guest appears to not be responding. Cancel the suspend - * request. - * - * We re-read the suspend node and clear it within a - * transaction in order to handle the case where we race - * against the guest catching up and acknowledging the request - * at the last minute. - */ - if (!domain_suspend_pvcontrol_acked(state)) { - LOG(ERROR, "guest didn't acknowledge suspend, cancelling request"); +static void domain_suspend_common_pvcontrol_suspending(libxl__egc *egc, + libxl__xswait_state *xswa, int rc, const char *state) +{ + libxl__domain_suspend_state *dss = CONTAINER_OF(xswa, *dss, pvcontrol); + STATE_AO_GC(dss->ao); + xs_transaction_t t = 0; + + if (!rc && !domain_suspend_pvcontrol_acked(state)) + /* keep waiting */ + return; + + libxl__xswait_stop(gc, &dss->pvcontrol); + + if (rc == ERROR_TIMEDOUT) { + /* + * Guest appears to not be responding. Cancel the suspend + * request. + * + * We re-read the suspend node and clear it within a + * transaction in order to handle the case where we race + * against the guest catching up and acknowledging the request + * at the last minute. + */ for (;;) { rc = libxl__xs_transaction_start(gc, &t); if (rc) goto err; - state = libxl__domain_pvcontrol_read(gc, t, domid); + rc = libxl__xs_read_checked(gc, t, xswa->path, &state); + if (rc) goto err; + + if (domain_suspend_pvcontrol_acked(state)) + /* last minute ack */ + break; - if (!domain_suspend_pvcontrol_acked(state)) - libxl__domain_pvcontrol_write(gc, t, domid, ""); + rc = libxl__xs_write_checked(gc, t, xswa->path, ""); + if (rc) goto err; rc = libxl__xs_transaction_commit(gc, &t); - if (!rc) break; + if (!rc) { + LOG(ERROR, + "guest didn't acknowledge suspend, cancelling request"); + goto err; + } if (rc<0) goto err; } - } - - /* - * Final check for guest acknowledgement. The guest may have - * acknowledged while we were cancelling the request in which - * case we lost the race while cancelling and should continue. - */ - if (!domain_suspend_pvcontrol_acked(state)) { - LOG(ERROR, "guest didn't acknowledge suspend, request cancelled"); + } else if (rc) { + /* some error in xswait's read of xenstore, already logged */ goto err; } + assert(domain_suspend_pvcontrol_acked(state)); LOG(DEBUG, "guest acknowledged suspend request"); + + libxl__xs_transaction_abort(gc, &t); dss->guest_responded = 1; domain_suspend_common_wait_guest(egc,dss); return; err: + libxl__xs_transaction_abort(gc, &t); domain_suspend_common_failed(egc, dss); + return; } static void domain_suspend_common_wait_guest(libxl__egc *egc, @@ -1215,6 +1236,8 @@ static void domain_suspend_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, bool ok) { + EGC_GC; + assert(!libxl__xswait_inuse(&dss->pvcontrol)); dss->callback_common_done(egc, dss, ok); } @@ -1400,6 +1423,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) &dss->shs.callbacks.save.a; logdirty_init(&dss->logdirty); + libxl__xswait_init(&dss->pvcontrol); switch (type) { case LIBXL_DOMAIN_TYPE_HVM: { diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9ec0d0b..479edb7 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2444,6 +2444,7 @@ struct libxl__domain_suspend_state { int hvm; int xcflags; int guest_responded; + libxl__xswait_state pvcontrol; const char *dm_savefile; int interval; /* checkpoint interval (for Remus) */ libxl__save_helper_state shs; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:14:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:14:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6I-00056x-Gv; Tue, 18 Mar 2014 09:14:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6H-000562-El for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:21 +0000 Received: from [85.158.143.35:61624] by server-2.bemta-4.messagelabs.com id 93/AF-06539-B6E08235; Tue, 18 Mar 2014 09:14:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1395134057!2823867!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26856 invoked from network); 18 Mar 2014 09:14:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:14:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6D-0004Fh-C4 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq6D-0006JG-A2 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:17 +0000 Date: Tue, 18 Mar 2014 09:14:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Async xenstore pvcontrol wait X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d12e4ad65c2bf5c9a8ca2c40295e72f1279036c4 Author: Ian Jackson AuthorDate: Thu Dec 5 18:50:55 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: Async xenstore pvcontrol wait When negotiating guest suspend via the xenstore pvcontrol protocol (ie when the guest does NOT support the evtchn fast suspend protocol): Replace the use of loops and usleep with a call to libxl__xswait. Also, replace the xenstore transaction loop with one using libxl__xs_transaction_start et al. There is not intended to be any semantic change, other than to make the algorithm properly asynchronous. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Add a comment to clarify last minute ack. v3X: Do NOT rename "pvcontrol" xswait state struct to "guest_wait" (because we're NOT going to use it for the event channel based wait too). --- tools/libxl/libxl_dom.c | 94 ++++++++++++++++++++++++++--------------- tools/libxl/libxl_internal.h | 1 + 2 files changed, 60 insertions(+), 35 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 9fec4e7..0c48159 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1028,6 +1028,8 @@ static void domain_suspend_common_wait_guest(libxl__egc *egc, libxl__domain_suspend_state *dss); static void domain_suspend_common_guest_suspended(libxl__egc *egc, libxl__domain_suspend_state *dss); +static void domain_suspend_common_pvcontrol_suspending(libxl__egc *egc, + libxl__xswait_state *xswa, int rc, const char *state); static void domain_suspend_common_failed(libxl__egc *egc, libxl__domain_suspend_state *dss); static void domain_suspend_common_done(libxl__egc *egc, @@ -1047,10 +1049,6 @@ static void domain_suspend_callback_common(libxl__egc *egc, STATE_AO_GC(dss->ao); unsigned long hvm_s_state = 0, hvm_pvdrv = 0; int ret; - char *state = "suspend"; - int watchdog; - xs_transaction_t t; - int rc; /* Convenience aliases */ const uint32_t domid = dss->domid; @@ -1096,59 +1094,82 @@ static void domain_suspend_callback_common(libxl__egc *egc, libxl__domain_pvcontrol_write(gc, XBT_NULL, domid, "suspend"); - LOG(DEBUG, "wait for the guest to acknowledge suspend request"); - watchdog = 60; - while (!domain_suspend_pvcontrol_acked(state) && watchdog > 0) { - usleep(100000); + dss->pvcontrol.path = libxl__domain_pvcontrol_xspath(gc, domid); + if (!dss->pvcontrol.path) goto err; - state = libxl__domain_pvcontrol_read(gc, XBT_NULL, domid); + dss->pvcontrol.ao = ao; + dss->pvcontrol.what = "guest acknowledgement of suspend request"; + dss->pvcontrol.timeout_ms = 60 * 1000; + dss->pvcontrol.callback = domain_suspend_common_pvcontrol_suspending; + libxl__xswait_start(gc, &dss->pvcontrol); + return; - watchdog--; - } + err: + domain_suspend_common_failed(egc, dss); +} - /* - * Guest appears to not be responding. Cancel the suspend - * request. - * - * We re-read the suspend node and clear it within a - * transaction in order to handle the case where we race - * against the guest catching up and acknowledging the request - * at the last minute. - */ - if (!domain_suspend_pvcontrol_acked(state)) { - LOG(ERROR, "guest didn't acknowledge suspend, cancelling request"); +static void domain_suspend_common_pvcontrol_suspending(libxl__egc *egc, + libxl__xswait_state *xswa, int rc, const char *state) +{ + libxl__domain_suspend_state *dss = CONTAINER_OF(xswa, *dss, pvcontrol); + STATE_AO_GC(dss->ao); + xs_transaction_t t = 0; + + if (!rc && !domain_suspend_pvcontrol_acked(state)) + /* keep waiting */ + return; + + libxl__xswait_stop(gc, &dss->pvcontrol); + + if (rc == ERROR_TIMEDOUT) { + /* + * Guest appears to not be responding. Cancel the suspend + * request. + * + * We re-read the suspend node and clear it within a + * transaction in order to handle the case where we race + * against the guest catching up and acknowledging the request + * at the last minute. + */ for (;;) { rc = libxl__xs_transaction_start(gc, &t); if (rc) goto err; - state = libxl__domain_pvcontrol_read(gc, t, domid); + rc = libxl__xs_read_checked(gc, t, xswa->path, &state); + if (rc) goto err; + + if (domain_suspend_pvcontrol_acked(state)) + /* last minute ack */ + break; - if (!domain_suspend_pvcontrol_acked(state)) - libxl__domain_pvcontrol_write(gc, t, domid, ""); + rc = libxl__xs_write_checked(gc, t, xswa->path, ""); + if (rc) goto err; rc = libxl__xs_transaction_commit(gc, &t); - if (!rc) break; + if (!rc) { + LOG(ERROR, + "guest didn't acknowledge suspend, cancelling request"); + goto err; + } if (rc<0) goto err; } - } - - /* - * Final check for guest acknowledgement. The guest may have - * acknowledged while we were cancelling the request in which - * case we lost the race while cancelling and should continue. - */ - if (!domain_suspend_pvcontrol_acked(state)) { - LOG(ERROR, "guest didn't acknowledge suspend, request cancelled"); + } else if (rc) { + /* some error in xswait's read of xenstore, already logged */ goto err; } + assert(domain_suspend_pvcontrol_acked(state)); LOG(DEBUG, "guest acknowledged suspend request"); + + libxl__xs_transaction_abort(gc, &t); dss->guest_responded = 1; domain_suspend_common_wait_guest(egc,dss); return; err: + libxl__xs_transaction_abort(gc, &t); domain_suspend_common_failed(egc, dss); + return; } static void domain_suspend_common_wait_guest(libxl__egc *egc, @@ -1215,6 +1236,8 @@ static void domain_suspend_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, bool ok) { + EGC_GC; + assert(!libxl__xswait_inuse(&dss->pvcontrol)); dss->callback_common_done(egc, dss, ok); } @@ -1400,6 +1423,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) &dss->shs.callbacks.save.a; logdirty_init(&dss->logdirty); + libxl__xswait_init(&dss->pvcontrol); switch (type) { case LIBXL_DOMAIN_TYPE_HVM: { diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9ec0d0b..479edb7 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2444,6 +2444,7 @@ struct libxl__domain_suspend_state { int hvm; int xcflags; int guest_responded; + libxl__xswait_state pvcontrol; const char *dm_savefile; int interval; /* checkpoint interval (for Remus) */ libxl__save_helper_state shs; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:14:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:14:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6R-0005AC-Jf; Tue, 18 Mar 2014 09:14:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6Q-00059S-Lc for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:30 +0000 Received: from [85.158.137.68:34021] by server-9.bemta-3.messagelabs.com id DD/B4-30063-57E08235; Tue, 18 Mar 2014 09:14:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1395134067!1267590!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10855 invoked from network); 18 Mar 2014 09:14:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:14:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6N-0004Fn-Gv for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq6N-0006Jc-FQ for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:27 +0000 Date: Tue, 18 Mar 2014 09:14:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Abolish usleeps in domain suspend wait X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 926e112b20bd6b928df43c6674404e8353e57915 Author: Ian Jackson AuthorDate: Fri Dec 6 16:12:44 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: Abolish usleeps in domain suspend wait Replace the use of a loop with usleep(). Instead, use a xenstore watch and an event system timeout. (xenstore fires watches on @releaseDomain when a domain shuts down.) The logic which checks for the state of the domain is unchanged, and not ideal, but we will leave that for the next patch. There is not intended to be any semantic change, other than to make the algorithm properly asynchronous and the consequential waiting be on xenstore, rather than polling. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Remove some trailing whitespace Improve commit message. v3X: Do NOT use an xswait instead of separate watch and timeout. --- tools/libxl/libxl_dom.c | 80 ++++++++++++++++++++++++++++++----------- tools/libxl/libxl_internal.h | 2 + 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 0c48159..5d6dcc4 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1028,8 +1028,14 @@ static void domain_suspend_common_wait_guest(libxl__egc *egc, libxl__domain_suspend_state *dss); static void domain_suspend_common_guest_suspended(libxl__egc *egc, libxl__domain_suspend_state *dss); + static void domain_suspend_common_pvcontrol_suspending(libxl__egc *egc, libxl__xswait_state *xswa, int rc, const char *state); +static void suspend_common_wait_guest_watch(libxl__egc *egc, + libxl__ev_xswatch *xsw, const char *watch_path, const char *event_path); +static void suspend_common_wait_guest_timeout(libxl__egc *egc, + libxl__ev_time *ev, const struct timeval *requested_abs); + static void domain_suspend_common_failed(libxl__egc *egc, libxl__domain_suspend_state *dss); static void domain_suspend_common_done(libxl__egc *egc, @@ -1176,36 +1182,59 @@ static void domain_suspend_common_wait_guest(libxl__egc *egc, libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); + int rc; + + LOG(DEBUG, "wait for the guest to suspend"); + + rc = libxl__ev_xswatch_register(gc, &dss->guest_watch, + suspend_common_wait_guest_watch, + "@releaseDomain"); + if (rc) goto err; + + rc = libxl__ev_time_register_rel(gc, &dss->guest_timeout, + suspend_common_wait_guest_timeout, + 60*1000); + if (rc) goto err; + return; + + err: + domain_suspend_common_failed(egc, dss); +} + +static void suspend_common_wait_guest_watch(libxl__egc *egc, + libxl__ev_xswatch *xsw, const char *watch_path, const char *event_path) +{ + libxl__domain_suspend_state *dss = + CONTAINER_OF(xsw, *dss, guest_watch); + STATE_AO_GC(dss->ao); + xc_domaininfo_t info; int ret; - int watchdog; /* Convenience aliases */ const uint32_t domid = dss->domid; - LOG(DEBUG, "wait for the guest to suspend"); - watchdog = 60; - while (watchdog > 0) { - xc_domaininfo_t info; - - usleep(100000); - ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); - if (ret == 1 && info.domain == domid && - (info.flags & XEN_DOMINF_shutdown)) { - int shutdown_reason; - - shutdown_reason = (info.flags >> XEN_DOMINF_shutdownshift) - & XEN_DOMINF_shutdownmask; - if (shutdown_reason == SHUTDOWN_suspend) { - LOG(DEBUG, "guest has suspended"); - domain_suspend_common_guest_suspended(egc, dss); - return; - } + ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); + if (ret == 1 && info.domain == domid && + (info.flags & XEN_DOMINF_shutdown)) { + int shutdown_reason; + + shutdown_reason = (info.flags >> XEN_DOMINF_shutdownshift) + & XEN_DOMINF_shutdownmask; + if (shutdown_reason == SHUTDOWN_suspend) { + LOG(DEBUG, "guest has suspended"); + domain_suspend_common_guest_suspended(egc, dss); + return; } - - watchdog--; } + /* otherwise, keep waiting */ +} - LOG(ERROR, "guest did not suspend"); +static void suspend_common_wait_guest_timeout(libxl__egc *egc, + libxl__ev_time *ev, const struct timeval *requested_abs) +{ + libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, guest_timeout); + STATE_AO_GC(dss->ao); + LOG(ERROR, "guest did not suspend, timed out"); domain_suspend_common_failed(egc, dss); } @@ -1215,6 +1244,9 @@ static void domain_suspend_common_guest_suspended(libxl__egc *egc, STATE_AO_GC(dss->ao); int ret; + libxl__ev_xswatch_deregister(gc, &dss->guest_watch); + libxl__ev_time_deregister(gc, &dss->guest_timeout); + if (dss->hvm) { ret = libxl__domain_suspend_device_model(gc, dss); if (ret) { @@ -1238,6 +1270,8 @@ static void domain_suspend_common_done(libxl__egc *egc, { EGC_GC; assert(!libxl__xswait_inuse(&dss->pvcontrol)); + libxl__ev_xswatch_deregister(gc, &dss->guest_watch); + libxl__ev_time_deregister(gc, &dss->guest_timeout); dss->callback_common_done(egc, dss, ok); } @@ -1424,6 +1458,8 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) logdirty_init(&dss->logdirty); libxl__xswait_init(&dss->pvcontrol); + libxl__ev_xswatch_init(&dss->guest_watch); + libxl__ev_time_init(&dss->guest_timeout); switch (type) { case LIBXL_DOMAIN_TYPE_HVM: { diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 479edb7..a67ea3c 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2445,6 +2445,8 @@ struct libxl__domain_suspend_state { int xcflags; int guest_responded; libxl__xswait_state pvcontrol; + libxl__ev_xswatch guest_watch; + libxl__ev_time guest_timeout; const char *dm_savefile; int interval; /* checkpoint interval (for Remus) */ libxl__save_helper_state shs; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:14:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:14:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6R-0005AC-Jf; Tue, 18 Mar 2014 09:14:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6Q-00059S-Lc for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:30 +0000 Received: from [85.158.137.68:34021] by server-9.bemta-3.messagelabs.com id DD/B4-30063-57E08235; Tue, 18 Mar 2014 09:14:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1395134067!1267590!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10855 invoked from network); 18 Mar 2014 09:14:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:14:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6N-0004Fn-Gv for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq6N-0006Jc-FQ for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:27 +0000 Date: Tue, 18 Mar 2014 09:14:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Abolish usleeps in domain suspend wait X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 926e112b20bd6b928df43c6674404e8353e57915 Author: Ian Jackson AuthorDate: Fri Dec 6 16:12:44 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: Abolish usleeps in domain suspend wait Replace the use of a loop with usleep(). Instead, use a xenstore watch and an event system timeout. (xenstore fires watches on @releaseDomain when a domain shuts down.) The logic which checks for the state of the domain is unchanged, and not ideal, but we will leave that for the next patch. There is not intended to be any semantic change, other than to make the algorithm properly asynchronous and the consequential waiting be on xenstore, rather than polling. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Remove some trailing whitespace Improve commit message. v3X: Do NOT use an xswait instead of separate watch and timeout. --- tools/libxl/libxl_dom.c | 80 ++++++++++++++++++++++++++++++----------- tools/libxl/libxl_internal.h | 2 + 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 0c48159..5d6dcc4 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1028,8 +1028,14 @@ static void domain_suspend_common_wait_guest(libxl__egc *egc, libxl__domain_suspend_state *dss); static void domain_suspend_common_guest_suspended(libxl__egc *egc, libxl__domain_suspend_state *dss); + static void domain_suspend_common_pvcontrol_suspending(libxl__egc *egc, libxl__xswait_state *xswa, int rc, const char *state); +static void suspend_common_wait_guest_watch(libxl__egc *egc, + libxl__ev_xswatch *xsw, const char *watch_path, const char *event_path); +static void suspend_common_wait_guest_timeout(libxl__egc *egc, + libxl__ev_time *ev, const struct timeval *requested_abs); + static void domain_suspend_common_failed(libxl__egc *egc, libxl__domain_suspend_state *dss); static void domain_suspend_common_done(libxl__egc *egc, @@ -1176,36 +1182,59 @@ static void domain_suspend_common_wait_guest(libxl__egc *egc, libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); + int rc; + + LOG(DEBUG, "wait for the guest to suspend"); + + rc = libxl__ev_xswatch_register(gc, &dss->guest_watch, + suspend_common_wait_guest_watch, + "@releaseDomain"); + if (rc) goto err; + + rc = libxl__ev_time_register_rel(gc, &dss->guest_timeout, + suspend_common_wait_guest_timeout, + 60*1000); + if (rc) goto err; + return; + + err: + domain_suspend_common_failed(egc, dss); +} + +static void suspend_common_wait_guest_watch(libxl__egc *egc, + libxl__ev_xswatch *xsw, const char *watch_path, const char *event_path) +{ + libxl__domain_suspend_state *dss = + CONTAINER_OF(xsw, *dss, guest_watch); + STATE_AO_GC(dss->ao); + xc_domaininfo_t info; int ret; - int watchdog; /* Convenience aliases */ const uint32_t domid = dss->domid; - LOG(DEBUG, "wait for the guest to suspend"); - watchdog = 60; - while (watchdog > 0) { - xc_domaininfo_t info; - - usleep(100000); - ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); - if (ret == 1 && info.domain == domid && - (info.flags & XEN_DOMINF_shutdown)) { - int shutdown_reason; - - shutdown_reason = (info.flags >> XEN_DOMINF_shutdownshift) - & XEN_DOMINF_shutdownmask; - if (shutdown_reason == SHUTDOWN_suspend) { - LOG(DEBUG, "guest has suspended"); - domain_suspend_common_guest_suspended(egc, dss); - return; - } + ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); + if (ret == 1 && info.domain == domid && + (info.flags & XEN_DOMINF_shutdown)) { + int shutdown_reason; + + shutdown_reason = (info.flags >> XEN_DOMINF_shutdownshift) + & XEN_DOMINF_shutdownmask; + if (shutdown_reason == SHUTDOWN_suspend) { + LOG(DEBUG, "guest has suspended"); + domain_suspend_common_guest_suspended(egc, dss); + return; } - - watchdog--; } + /* otherwise, keep waiting */ +} - LOG(ERROR, "guest did not suspend"); +static void suspend_common_wait_guest_timeout(libxl__egc *egc, + libxl__ev_time *ev, const struct timeval *requested_abs) +{ + libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, guest_timeout); + STATE_AO_GC(dss->ao); + LOG(ERROR, "guest did not suspend, timed out"); domain_suspend_common_failed(egc, dss); } @@ -1215,6 +1244,9 @@ static void domain_suspend_common_guest_suspended(libxl__egc *egc, STATE_AO_GC(dss->ao); int ret; + libxl__ev_xswatch_deregister(gc, &dss->guest_watch); + libxl__ev_time_deregister(gc, &dss->guest_timeout); + if (dss->hvm) { ret = libxl__domain_suspend_device_model(gc, dss); if (ret) { @@ -1238,6 +1270,8 @@ static void domain_suspend_common_done(libxl__egc *egc, { EGC_GC; assert(!libxl__xswait_inuse(&dss->pvcontrol)); + libxl__ev_xswatch_deregister(gc, &dss->guest_watch); + libxl__ev_time_deregister(gc, &dss->guest_timeout); dss->callback_common_done(egc, dss, ok); } @@ -1424,6 +1458,8 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) logdirty_init(&dss->logdirty); libxl__xswait_init(&dss->pvcontrol); + libxl__ev_xswatch_init(&dss->guest_watch); + libxl__ev_time_init(&dss->guest_timeout); switch (type) { case LIBXL_DOMAIN_TYPE_HVM: { diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 479edb7..a67ea3c 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2445,6 +2445,8 @@ struct libxl__domain_suspend_state { int xcflags; int guest_responded; libxl__xswait_state pvcontrol; + libxl__ev_xswatch guest_watch; + libxl__ev_time guest_timeout; const char *dm_savefile; int interval; /* checkpoint interval (for Remus) */ libxl__save_helper_state shs; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:14:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:14:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6b-0005E4-MX; Tue, 18 Mar 2014 09:14:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6a-0005DM-6O for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:40 +0000 Received: from [85.158.139.211:10289] by server-7.bemta-5.messagelabs.com id 45/C2-20531-F7E08235; Tue, 18 Mar 2014 09:14:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1395134077!1667966!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11300 invoked from network); 18 Mar 2014 09:14:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:14:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6X-0004Ft-LO for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq6X-0006K2-Jf for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:37 +0000 Date: Tue, 18 Mar 2014 09:14:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Fix suspend wait corner cases X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8ae14b99e00cd9a42ab4cd6538de987783f21de1 Author: Ian Jackson AuthorDate: Fri Dec 6 16:40:08 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: Fix suspend wait corner cases When we are waiting for a guest to suspend, this suspend operation would continue to wait (until the timeout) if the guest was destroyed or shut down for another reason, or if xc_domain_getinfolist failed. Handle these cases correctly, as errors. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Remove unwanted error call after a new "goto err". --- tools/libxl/libxl_dom.c | 41 +++++++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 5d6dcc4..28855a1 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1209,24 +1209,41 @@ static void suspend_common_wait_guest_watch(libxl__egc *egc, STATE_AO_GC(dss->ao); xc_domaininfo_t info; int ret; + int shutdown_reason; /* Convenience aliases */ const uint32_t domid = dss->domid; ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); - if (ret == 1 && info.domain == domid && - (info.flags & XEN_DOMINF_shutdown)) { - int shutdown_reason; - - shutdown_reason = (info.flags >> XEN_DOMINF_shutdownshift) - & XEN_DOMINF_shutdownmask; - if (shutdown_reason == SHUTDOWN_suspend) { - LOG(DEBUG, "guest has suspended"); - domain_suspend_common_guest_suspended(egc, dss); - return; - } + if (ret < 0) { + LOGE(ERROR, "unable to check for status of guest %"PRId32"", domid); + goto err; + } + + if (!(ret == 1 && info.domain == domid)) { + LOGE(ERROR, "guest %"PRId32" we were suspending has been destroyed", + domid); + goto err; + } + + if (!(info.flags & XEN_DOMINF_shutdown)) + /* keep waiting */ + return; + + shutdown_reason = (info.flags >> XEN_DOMINF_shutdownshift) + & XEN_DOMINF_shutdownmask; + if (shutdown_reason != SHUTDOWN_suspend) { + LOG(DEBUG, "guest %"PRId32" we were suspending has shut down" + " with unexpected reason code %d", domid, shutdown_reason); + goto err; } - /* otherwise, keep waiting */ + + LOG(DEBUG, "guest has suspended"); + domain_suspend_common_guest_suspended(egc, dss); + return; + + err: + domain_suspend_common_failed(egc, dss); } static void suspend_common_wait_guest_timeout(libxl__egc *egc, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:14:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:14:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6b-0005E4-MX; Tue, 18 Mar 2014 09:14:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6a-0005DM-6O for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:40 +0000 Received: from [85.158.139.211:10289] by server-7.bemta-5.messagelabs.com id 45/C2-20531-F7E08235; Tue, 18 Mar 2014 09:14:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1395134077!1667966!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11300 invoked from network); 18 Mar 2014 09:14:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:14:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6X-0004Ft-LO for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq6X-0006K2-Jf for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:37 +0000 Date: Tue, 18 Mar 2014 09:14:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Fix suspend wait corner cases X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8ae14b99e00cd9a42ab4cd6538de987783f21de1 Author: Ian Jackson AuthorDate: Fri Dec 6 16:40:08 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: Fix suspend wait corner cases When we are waiting for a guest to suspend, this suspend operation would continue to wait (until the timeout) if the guest was destroyed or shut down for another reason, or if xc_domain_getinfolist failed. Handle these cases correctly, as errors. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Remove unwanted error call after a new "goto err". --- tools/libxl/libxl_dom.c | 41 +++++++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 5d6dcc4..28855a1 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1209,24 +1209,41 @@ static void suspend_common_wait_guest_watch(libxl__egc *egc, STATE_AO_GC(dss->ao); xc_domaininfo_t info; int ret; + int shutdown_reason; /* Convenience aliases */ const uint32_t domid = dss->domid; ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); - if (ret == 1 && info.domain == domid && - (info.flags & XEN_DOMINF_shutdown)) { - int shutdown_reason; - - shutdown_reason = (info.flags >> XEN_DOMINF_shutdownshift) - & XEN_DOMINF_shutdownmask; - if (shutdown_reason == SHUTDOWN_suspend) { - LOG(DEBUG, "guest has suspended"); - domain_suspend_common_guest_suspended(egc, dss); - return; - } + if (ret < 0) { + LOGE(ERROR, "unable to check for status of guest %"PRId32"", domid); + goto err; + } + + if (!(ret == 1 && info.domain == domid)) { + LOGE(ERROR, "guest %"PRId32" we were suspending has been destroyed", + domid); + goto err; + } + + if (!(info.flags & XEN_DOMINF_shutdown)) + /* keep waiting */ + return; + + shutdown_reason = (info.flags >> XEN_DOMINF_shutdownshift) + & XEN_DOMINF_shutdownmask; + if (shutdown_reason != SHUTDOWN_suspend) { + LOG(DEBUG, "guest %"PRId32" we were suspending has shut down" + " with unexpected reason code %d", domid, shutdown_reason); + goto err; } - /* otherwise, keep waiting */ + + LOG(DEBUG, "guest has suspended"); + domain_suspend_common_guest_suspended(egc, dss); + return; + + err: + domain_suspend_common_failed(egc, dss); } static void suspend_common_wait_guest_timeout(libxl__egc *egc, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:14:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:14:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6m-0005I9-RY; Tue, 18 Mar 2014 09:14:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6l-0005Ha-1F for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:51 +0000 Received: from [85.158.137.68:20804] by server-5.bemta-3.messagelabs.com id A4/2B-18761-A8E08235; Tue, 18 Mar 2014 09:14:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1395134088!1275500!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15956 invoked from network); 18 Mar 2014 09:14:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:14:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6h-0004Fz-SA for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq6h-0006Ku-PI for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:47 +0000 Date: Tue, 18 Mar 2014 09:14:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Async evtchn wait X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0e78c452ffe86f226d72bc11db1ae11d96db9763 Author: Ian Jackson AuthorDate: Tue Dec 10 17:40:49 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: Async evtchn wait When negotiating guest suspend via the evtchn ("fast") protocol, abolish synchronous wait for domain suspend. If the guest supports the event channel suspend protocol, we used to sit in a loop in xc_await_suspend waiting (perhaps indefinitely) for it to suspend. Instead, use the new libxl event channel event facility. When we see that the event is signaled, we look at the domain to see if it has suspended. (In this patch we do not yet set a timeout; that will come next.) So the suspend operation no longer blocks with the libxl ctx lock held, and instead returns to the event loop. Additionally, domains which signal the event channel themselves, or undergo other state changes, will be handled more correctly. We end up making a few more hypercalls. Also, if we encounter errors setting up the suspend event channel (which should not happen), abort the operation rather than falling back to the xenstore protocol. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Improve commit message. --- tools/libxl/libxl_dom.c | 78 ++++++++++++++++++++++++++--------------- tools/libxl/libxl_internal.h | 3 +- 2 files changed, 50 insertions(+), 31 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 28855a1..87c994c 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1031,8 +1031,12 @@ static void domain_suspend_common_guest_suspended(libxl__egc *egc, static void domain_suspend_common_pvcontrol_suspending(libxl__egc *egc, libxl__xswait_state *xswa, int rc, const char *state); +static void domain_suspend_common_wait_guest_evtchn(libxl__egc *egc, + libxl__ev_evtchn *evev); static void suspend_common_wait_guest_watch(libxl__egc *egc, libxl__ev_xswatch *xsw, const char *watch_path, const char *event_path); +static void suspend_common_wait_guest_check(libxl__egc *egc, + libxl__domain_suspend_state *dss); static void suspend_common_wait_guest_timeout(libxl__egc *egc, libxl__ev_time *ev, const struct timeval *requested_abs); @@ -1054,7 +1058,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, { STATE_AO_GC(dss->ao); unsigned long hvm_s_state = 0, hvm_pvdrv = 0; - int ret; + int ret, rc; /* Convenience aliases */ const uint32_t domid = dss->domid; @@ -1064,21 +1068,19 @@ static void domain_suspend_callback_common(libxl__egc *egc, xc_get_hvm_param(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, &hvm_s_state); } - if ((hvm_s_state == 0) && (dss->suspend_eventchn >= 0)) { + if ((hvm_s_state == 0) && (dss->guest_evtchn.port >= 0)) { LOG(DEBUG, "issuing %s suspend request via event channel", dss->hvm ? "PVHVM" : "PV"); - ret = xc_evtchn_notify(dss->xce, dss->suspend_eventchn); + ret = xc_evtchn_notify(CTX->xce, dss->guest_evtchn.port); if (ret < 0) { LOG(ERROR, "xc_evtchn_notify failed ret=%d", ret); goto err; } - ret = xc_await_suspend(CTX->xch, dss->xce, dss->suspend_eventchn); - if (ret < 0) { - LOG(ERROR, "xc_await_suspend failed ret=%d", ret); - goto err; - } - dss->guest_responded = 1; - domain_suspend_common_guest_suspended(egc, dss); + + dss->guest_evtchn.callback = domain_suspend_common_wait_guest_evtchn; + rc = libxl__ev_evtchn_wait(gc, &dss->guest_evtchn); + if (rc) goto err; + return; } @@ -1114,6 +1116,19 @@ static void domain_suspend_callback_common(libxl__egc *egc, domain_suspend_common_failed(egc, dss); } +static void domain_suspend_common_wait_guest_evtchn(libxl__egc *egc, + libxl__ev_evtchn *evev) +{ + libxl__domain_suspend_state *dss = CONTAINER_OF(evev, *dss, guest_evtchn); + STATE_AO_GC(dss->ao); + /* If we should be done waiting, suspend_common_wait_guest_check + * will end up calling domain_suspend_common_guest_suspended or + * domain_suspend_common_failed, both of which cancel the evtchn + * wait. So re-enable it now. */ + libxl__ev_evtchn_wait(gc, &dss->guest_evtchn); + suspend_common_wait_guest_check(egc, dss); +} + static void domain_suspend_common_pvcontrol_suspending(libxl__egc *egc, libxl__xswait_state *xswa, int rc, const char *state) { @@ -1204,8 +1219,13 @@ static void domain_suspend_common_wait_guest(libxl__egc *egc, static void suspend_common_wait_guest_watch(libxl__egc *egc, libxl__ev_xswatch *xsw, const char *watch_path, const char *event_path) { - libxl__domain_suspend_state *dss = - CONTAINER_OF(xsw, *dss, guest_watch); + libxl__domain_suspend_state *dss = CONTAINER_OF(xsw, *dss, guest_watch); + suspend_common_wait_guest_check(egc, dss); +} + +static void suspend_common_wait_guest_check(libxl__egc *egc, + libxl__domain_suspend_state *dss) +{ STATE_AO_GC(dss->ao); xc_domaininfo_t info; int ret; @@ -1261,6 +1281,7 @@ static void domain_suspend_common_guest_suspended(libxl__egc *egc, STATE_AO_GC(dss->ao); int ret; + libxl__ev_evtchn_cancel(gc, &dss->guest_evtchn); libxl__ev_xswatch_deregister(gc, &dss->guest_watch); libxl__ev_time_deregister(gc, &dss->guest_timeout); @@ -1287,6 +1308,7 @@ static void domain_suspend_common_done(libxl__egc *egc, { EGC_GC; assert(!libxl__xswait_inuse(&dss->pvcontrol)); + libxl__ev_evtchn_cancel(gc, &dss->guest_evtchn); libxl__ev_xswatch_deregister(gc, &dss->guest_watch); libxl__ev_time_deregister(gc, &dss->guest_timeout); dss->callback_common_done(egc, dss, ok); @@ -1475,6 +1497,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) logdirty_init(&dss->logdirty); libxl__xswait_init(&dss->pvcontrol); + libxl__ev_evtchn_init(&dss->guest_evtchn); libxl__ev_xswatch_init(&dss->guest_watch); libxl__ev_time_init(&dss->guest_timeout); @@ -1503,7 +1526,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) | (debug ? XCFLAGS_DEBUG : 0) | (dss->hvm ? XCFLAGS_HVM : 0); - dss->suspend_eventchn = -1; + dss->guest_evtchn.port = -1; dss->guest_evtchn_lockfd = -1; dss->guest_responded = 0; dss->dm_savefile = libxl__device_model_savefile(gc, domid); @@ -1514,20 +1537,17 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) dss->xcflags |= XCFLAGS_CHECKPOINT_COMPRESS; } - dss->xce = xc_evtchn_open(NULL, 0); - if (dss->xce == NULL) - goto out; - else - { - port = xs_suspend_evtchn_port(dss->domid); + port = xs_suspend_evtchn_port(dss->domid); - if (port >= 0) { - dss->suspend_eventchn = - xc_suspend_evtchn_init_exclusive(CTX->xch, dss->xce, + if (port >= 0) { + dss->guest_evtchn.port = + xc_suspend_evtchn_init_exclusive(CTX->xch, CTX->xce, dss->domid, port, &dss->guest_evtchn_lockfd); - if (dss->suspend_eventchn < 0) - LOG(WARN, "Suspend event channel initialization failed"); + if (dss->guest_evtchn.port < 0) { + LOG(WARN, "Suspend event channel initialization failed"); + rc = ERROR_FAIL; + goto out; } } @@ -1686,11 +1706,11 @@ static void domain_suspend_done(libxl__egc *egc, /* Convenience aliases */ const uint32_t domid = dss->domid; - if (dss->suspend_eventchn > 0) - xc_suspend_evtchn_release(CTX->xch, dss->xce, domid, - dss->suspend_eventchn, &dss->guest_evtchn_lockfd); - if (dss->xce != NULL) - xc_evtchn_close(dss->xce); + libxl__ev_evtchn_cancel(gc, &dss->guest_evtchn); + + if (dss->guest_evtchn.port > 0) + xc_suspend_evtchn_release(CTX->xch, CTX->xce, domid, + dss->guest_evtchn.port, &dss->guest_evtchn_lockfd); dss->callback(egc, dss, rc); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a67ea3c..69d2ba8 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2438,8 +2438,7 @@ struct libxl__domain_suspend_state { int debug; const libxl_domain_remus_info *remus; /* private */ - xc_evtchn *xce; /* event channel handle */ - int suspend_eventchn; + libxl__ev_evtchn guest_evtchn; int guest_evtchn_lockfd; int hvm; int xcflags; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:14:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:14:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6m-0005I9-RY; Tue, 18 Mar 2014 09:14:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6l-0005Ha-1F for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:51 +0000 Received: from [85.158.137.68:20804] by server-5.bemta-3.messagelabs.com id A4/2B-18761-A8E08235; Tue, 18 Mar 2014 09:14:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1395134088!1275500!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15956 invoked from network); 18 Mar 2014 09:14:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:14:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6h-0004Fz-SA for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq6h-0006Ku-PI for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:47 +0000 Date: Tue, 18 Mar 2014 09:14:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Async evtchn wait X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0e78c452ffe86f226d72bc11db1ae11d96db9763 Author: Ian Jackson AuthorDate: Tue Dec 10 17:40:49 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: Async evtchn wait When negotiating guest suspend via the evtchn ("fast") protocol, abolish synchronous wait for domain suspend. If the guest supports the event channel suspend protocol, we used to sit in a loop in xc_await_suspend waiting (perhaps indefinitely) for it to suspend. Instead, use the new libxl event channel event facility. When we see that the event is signaled, we look at the domain to see if it has suspended. (In this patch we do not yet set a timeout; that will come next.) So the suspend operation no longer blocks with the libxl ctx lock held, and instead returns to the event loop. Additionally, domains which signal the event channel themselves, or undergo other state changes, will be handled more correctly. We end up making a few more hypercalls. Also, if we encounter errors setting up the suspend event channel (which should not happen), abort the operation rather than falling back to the xenstore protocol. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- v3: Improve commit message. --- tools/libxl/libxl_dom.c | 78 ++++++++++++++++++++++++++--------------- tools/libxl/libxl_internal.h | 3 +- 2 files changed, 50 insertions(+), 31 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 28855a1..87c994c 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1031,8 +1031,12 @@ static void domain_suspend_common_guest_suspended(libxl__egc *egc, static void domain_suspend_common_pvcontrol_suspending(libxl__egc *egc, libxl__xswait_state *xswa, int rc, const char *state); +static void domain_suspend_common_wait_guest_evtchn(libxl__egc *egc, + libxl__ev_evtchn *evev); static void suspend_common_wait_guest_watch(libxl__egc *egc, libxl__ev_xswatch *xsw, const char *watch_path, const char *event_path); +static void suspend_common_wait_guest_check(libxl__egc *egc, + libxl__domain_suspend_state *dss); static void suspend_common_wait_guest_timeout(libxl__egc *egc, libxl__ev_time *ev, const struct timeval *requested_abs); @@ -1054,7 +1058,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, { STATE_AO_GC(dss->ao); unsigned long hvm_s_state = 0, hvm_pvdrv = 0; - int ret; + int ret, rc; /* Convenience aliases */ const uint32_t domid = dss->domid; @@ -1064,21 +1068,19 @@ static void domain_suspend_callback_common(libxl__egc *egc, xc_get_hvm_param(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, &hvm_s_state); } - if ((hvm_s_state == 0) && (dss->suspend_eventchn >= 0)) { + if ((hvm_s_state == 0) && (dss->guest_evtchn.port >= 0)) { LOG(DEBUG, "issuing %s suspend request via event channel", dss->hvm ? "PVHVM" : "PV"); - ret = xc_evtchn_notify(dss->xce, dss->suspend_eventchn); + ret = xc_evtchn_notify(CTX->xce, dss->guest_evtchn.port); if (ret < 0) { LOG(ERROR, "xc_evtchn_notify failed ret=%d", ret); goto err; } - ret = xc_await_suspend(CTX->xch, dss->xce, dss->suspend_eventchn); - if (ret < 0) { - LOG(ERROR, "xc_await_suspend failed ret=%d", ret); - goto err; - } - dss->guest_responded = 1; - domain_suspend_common_guest_suspended(egc, dss); + + dss->guest_evtchn.callback = domain_suspend_common_wait_guest_evtchn; + rc = libxl__ev_evtchn_wait(gc, &dss->guest_evtchn); + if (rc) goto err; + return; } @@ -1114,6 +1116,19 @@ static void domain_suspend_callback_common(libxl__egc *egc, domain_suspend_common_failed(egc, dss); } +static void domain_suspend_common_wait_guest_evtchn(libxl__egc *egc, + libxl__ev_evtchn *evev) +{ + libxl__domain_suspend_state *dss = CONTAINER_OF(evev, *dss, guest_evtchn); + STATE_AO_GC(dss->ao); + /* If we should be done waiting, suspend_common_wait_guest_check + * will end up calling domain_suspend_common_guest_suspended or + * domain_suspend_common_failed, both of which cancel the evtchn + * wait. So re-enable it now. */ + libxl__ev_evtchn_wait(gc, &dss->guest_evtchn); + suspend_common_wait_guest_check(egc, dss); +} + static void domain_suspend_common_pvcontrol_suspending(libxl__egc *egc, libxl__xswait_state *xswa, int rc, const char *state) { @@ -1204,8 +1219,13 @@ static void domain_suspend_common_wait_guest(libxl__egc *egc, static void suspend_common_wait_guest_watch(libxl__egc *egc, libxl__ev_xswatch *xsw, const char *watch_path, const char *event_path) { - libxl__domain_suspend_state *dss = - CONTAINER_OF(xsw, *dss, guest_watch); + libxl__domain_suspend_state *dss = CONTAINER_OF(xsw, *dss, guest_watch); + suspend_common_wait_guest_check(egc, dss); +} + +static void suspend_common_wait_guest_check(libxl__egc *egc, + libxl__domain_suspend_state *dss) +{ STATE_AO_GC(dss->ao); xc_domaininfo_t info; int ret; @@ -1261,6 +1281,7 @@ static void domain_suspend_common_guest_suspended(libxl__egc *egc, STATE_AO_GC(dss->ao); int ret; + libxl__ev_evtchn_cancel(gc, &dss->guest_evtchn); libxl__ev_xswatch_deregister(gc, &dss->guest_watch); libxl__ev_time_deregister(gc, &dss->guest_timeout); @@ -1287,6 +1308,7 @@ static void domain_suspend_common_done(libxl__egc *egc, { EGC_GC; assert(!libxl__xswait_inuse(&dss->pvcontrol)); + libxl__ev_evtchn_cancel(gc, &dss->guest_evtchn); libxl__ev_xswatch_deregister(gc, &dss->guest_watch); libxl__ev_time_deregister(gc, &dss->guest_timeout); dss->callback_common_done(egc, dss, ok); @@ -1475,6 +1497,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) logdirty_init(&dss->logdirty); libxl__xswait_init(&dss->pvcontrol); + libxl__ev_evtchn_init(&dss->guest_evtchn); libxl__ev_xswatch_init(&dss->guest_watch); libxl__ev_time_init(&dss->guest_timeout); @@ -1503,7 +1526,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) | (debug ? XCFLAGS_DEBUG : 0) | (dss->hvm ? XCFLAGS_HVM : 0); - dss->suspend_eventchn = -1; + dss->guest_evtchn.port = -1; dss->guest_evtchn_lockfd = -1; dss->guest_responded = 0; dss->dm_savefile = libxl__device_model_savefile(gc, domid); @@ -1514,20 +1537,17 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) dss->xcflags |= XCFLAGS_CHECKPOINT_COMPRESS; } - dss->xce = xc_evtchn_open(NULL, 0); - if (dss->xce == NULL) - goto out; - else - { - port = xs_suspend_evtchn_port(dss->domid); + port = xs_suspend_evtchn_port(dss->domid); - if (port >= 0) { - dss->suspend_eventchn = - xc_suspend_evtchn_init_exclusive(CTX->xch, dss->xce, + if (port >= 0) { + dss->guest_evtchn.port = + xc_suspend_evtchn_init_exclusive(CTX->xch, CTX->xce, dss->domid, port, &dss->guest_evtchn_lockfd); - if (dss->suspend_eventchn < 0) - LOG(WARN, "Suspend event channel initialization failed"); + if (dss->guest_evtchn.port < 0) { + LOG(WARN, "Suspend event channel initialization failed"); + rc = ERROR_FAIL; + goto out; } } @@ -1686,11 +1706,11 @@ static void domain_suspend_done(libxl__egc *egc, /* Convenience aliases */ const uint32_t domid = dss->domid; - if (dss->suspend_eventchn > 0) - xc_suspend_evtchn_release(CTX->xch, dss->xce, domid, - dss->suspend_eventchn, &dss->guest_evtchn_lockfd); - if (dss->xce != NULL) - xc_evtchn_close(dss->xce); + libxl__ev_evtchn_cancel(gc, &dss->guest_evtchn); + + if (dss->guest_evtchn.port > 0) + xc_suspend_evtchn_release(CTX->xch, CTX->xce, domid, + dss->guest_evtchn.port, &dss->guest_evtchn_lockfd); dss->callback(egc, dss, rc); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a67ea3c..69d2ba8 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2438,8 +2438,7 @@ struct libxl__domain_suspend_state { int debug; const libxl_domain_remus_info *remus; /* private */ - xc_evtchn *xce; /* event channel handle */ - int suspend_eventchn; + libxl__ev_evtchn guest_evtchn; int guest_evtchn_lockfd; int hvm; int xcflags; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:15:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:15:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq70-0005Ly-6S; Tue, 18 Mar 2014 09:15:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6u-0005LZ-Jt for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:15:00 +0000 Received: from [85.158.139.211:18469] by server-10.bemta-5.messagelabs.com id 66/B9-27081-39E08235; Tue, 18 Mar 2014 09:14:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1395134098!1672837!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30981 invoked from network); 18 Mar 2014 09:14:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:14:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6s-0004G5-1b for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq6r-0006LH-Vw for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:58 +0000 Date: Tue, 18 Mar 2014 09:14:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Apply guest timeout in evtchn case X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a03984e7bcdf86c997559416458cc6aebb78e9dd Author: Ian Jackson AuthorDate: Thu Dec 12 19:17:03 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: Apply guest timeout in evtchn case When negotiating guest suspend via the evtchn ("fast") protocol, the guest may still fail to respond. So set the timeout. The existing error path will already properly tear down our (event channel) wait. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 87c994c..36e70b5 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1081,6 +1081,11 @@ static void domain_suspend_callback_common(libxl__egc *egc, rc = libxl__ev_evtchn_wait(gc, &dss->guest_evtchn); if (rc) goto err; + rc = libxl__ev_time_register_rel(gc, &dss->guest_timeout, + suspend_common_wait_guest_timeout, + 60*1000); + if (rc) goto err; + return; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 09:15:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 09:15:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq70-0005Ly-6S; Tue, 18 Mar 2014 09:15:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6u-0005LZ-Jt for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:15:00 +0000 Received: from [85.158.139.211:18469] by server-10.bemta-5.messagelabs.com id 66/B9-27081-39E08235; Tue, 18 Mar 2014 09:14:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1395134098!1672837!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30981 invoked from network); 18 Mar 2014 09:14:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 09:14:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPq6s-0004G5-1b for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WPq6r-0006LH-Vw for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 09:14:58 +0000 Date: Tue, 18 Mar 2014 09:14:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Apply guest timeout in evtchn case X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a03984e7bcdf86c997559416458cc6aebb78e9dd Author: Ian Jackson AuthorDate: Thu Dec 12 19:17:03 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 17 15:54:00 2014 +0000 libxl: suspend: Apply guest timeout in evtchn case When negotiating guest suspend via the evtchn ("fast") protocol, the guest may still fail to respond. So set the timeout. The existing error path will already properly tear down our (event channel) wait. Signed-off-by: Ian Jackson CC: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 87c994c..36e70b5 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1081,6 +1081,11 @@ static void domain_suspend_callback_common(libxl__egc *egc, rc = libxl__ev_evtchn_wait(gc, &dss->guest_evtchn); if (rc) goto err; + rc = libxl__ev_time_register_rel(gc, &dss->guest_timeout, + suspend_common_wait_guest_timeout, + 60*1000); + if (rc) goto err; + return; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 20:11:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 20:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0Lx-00075u-Bi; Tue, 18 Mar 2014 20:11:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0Lq-00075h-0z for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:11 +0000 Received: from [193.109.254.147:49454] by server-10.bemta-14.messagelabs.com id B5/15-04546-958A8235; Tue, 18 Mar 2014 20:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1395173463!2575518!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13238 invoked from network); 18 Mar 2014 20:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 20:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0Ln-0002dx-Jq for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQ0Ln-0001Gs-9F for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:03 +0000 Date: Tue, 18 Mar 2014 20:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: add Kevin Tian to "INTEL(R) VT FOR X86 (VT-X)" part X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b2740609794e9c4067a654335db68544fc54ca7 Author: Kevin Tian AuthorDate: Tue Mar 18 11:51:00 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 18 11:51:00 2014 +0100 MAINTAINERS: add Kevin Tian to "INTEL(R) VT FOR X86 (VT-X)" part Signed-off-by: Kevin Tian Acked-by: Eddie Dong Acked-by: Keir Fraser --- MAINTAINERS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7757cdd..15282ee 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -187,6 +187,7 @@ F: xen/drivers/passthrough/vtd/ INTEL(R) VT FOR X86 (VT-X) M: Jun Nakajima M: Eddie Dong +M: Kevin Tian S: Supported F: xen/arch/x86/hvm/vmx/ F: xen/arch/x86/mm/hap/p2m-ept.c -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 20:11:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 20:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0Lx-00075u-Bi; Tue, 18 Mar 2014 20:11:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0Lq-00075h-0z for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:11 +0000 Received: from [193.109.254.147:49454] by server-10.bemta-14.messagelabs.com id B5/15-04546-958A8235; Tue, 18 Mar 2014 20:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1395173463!2575518!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13238 invoked from network); 18 Mar 2014 20:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 20:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0Ln-0002dx-Jq for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQ0Ln-0001Gs-9F for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:03 +0000 Date: Tue, 18 Mar 2014 20:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: add Kevin Tian to "INTEL(R) VT FOR X86 (VT-X)" part X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b2740609794e9c4067a654335db68544fc54ca7 Author: Kevin Tian AuthorDate: Tue Mar 18 11:51:00 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 18 11:51:00 2014 +0100 MAINTAINERS: add Kevin Tian to "INTEL(R) VT FOR X86 (VT-X)" part Signed-off-by: Kevin Tian Acked-by: Eddie Dong Acked-by: Keir Fraser --- MAINTAINERS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7757cdd..15282ee 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -187,6 +187,7 @@ F: xen/drivers/passthrough/vtd/ INTEL(R) VT FOR X86 (VT-X) M: Jun Nakajima M: Eddie Dong +M: Kevin Tian S: Supported F: xen/arch/x86/hvm/vmx/ F: xen/arch/x86/mm/hap/p2m-ept.c -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 20:11:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 20:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0M1-00076F-Hn; Tue, 18 Mar 2014 20:11:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0M0-000766-4j for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:16 +0000 Received: from [193.109.254.147:53891] by server-1.bemta-14.messagelabs.com id 1A/02-00839-368A8235; Tue, 18 Mar 2014 20:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1395173474!2555406!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21449 invoked from network); 18 Mar 2014 20:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 20:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0Lx-0002e0-T0 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQ0Lx-0001HG-Nj for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:13 +0000 Date: Tue, 18 Mar 2014 20:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: Intel CPU family update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3385bf3aad25082e3bc6ab0e1cbd639512983e4d Author: Jan Beulich AuthorDate: Tue Mar 18 11:51:43 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 18 11:51:43 2014 +0100 x86: Intel CPU family update ... according to revision 49 of the Intel SDM. Signed-off-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/acpi/cpu_idle.c | 3 +++ xen/arch/x86/hvm/vmx/vmx.c | 6 +++++- xen/arch/x86/hvm/vmx/vpmu_core2.c | 4 ++++ 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index ab86c75..6aaa7ab 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -139,6 +139,9 @@ static void do_get_hw_residencies(void *arg) case 0x3F: case 0x45: case 0x46: + /* future */ + case 0x3D: + case 0x4E: GET_PC2_RES(hw_res->pc2); GET_CC7_RES(hw_res->cc7); /* fall through */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 94dc968..94f3db2 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1966,10 +1966,14 @@ static const struct lbr_info *last_branch_msr_get(void) case 58: case 62: /* Haswell */ case 60: case 63: case 69: case 70: + /* future */ + case 61: case 78: return nh_lbr; break; /* Atom */ - case 28: + case 28: case 38: case 39: case 53: case 54: + /* Silvermont */ + case 55: case 74: case 77: case 90: case 93: return at_lbr; break; } diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 8b23afa..3129ebd 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -916,6 +916,10 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) case 0x3f: case 0x45: case 0x46: + + /* future: */ + case 0x3d: + case 0x4e: ret = core2_vpmu_initialise(v, vpmu_flags); if ( !ret ) vpmu->arch_vpmu_ops = &core2_vpmu_ops; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 20:11:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 20:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0M1-00076F-Hn; Tue, 18 Mar 2014 20:11:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0M0-000766-4j for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:16 +0000 Received: from [193.109.254.147:53891] by server-1.bemta-14.messagelabs.com id 1A/02-00839-368A8235; Tue, 18 Mar 2014 20:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1395173474!2555406!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21449 invoked from network); 18 Mar 2014 20:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 20:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0Lx-0002e0-T0 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQ0Lx-0001HG-Nj for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:13 +0000 Date: Tue, 18 Mar 2014 20:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: Intel CPU family update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3385bf3aad25082e3bc6ab0e1cbd639512983e4d Author: Jan Beulich AuthorDate: Tue Mar 18 11:51:43 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 18 11:51:43 2014 +0100 x86: Intel CPU family update ... according to revision 49 of the Intel SDM. Signed-off-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/acpi/cpu_idle.c | 3 +++ xen/arch/x86/hvm/vmx/vmx.c | 6 +++++- xen/arch/x86/hvm/vmx/vpmu_core2.c | 4 ++++ 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index ab86c75..6aaa7ab 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -139,6 +139,9 @@ static void do_get_hw_residencies(void *arg) case 0x3F: case 0x45: case 0x46: + /* future */ + case 0x3D: + case 0x4E: GET_PC2_RES(hw_res->pc2); GET_CC7_RES(hw_res->cc7); /* fall through */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 94dc968..94f3db2 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1966,10 +1966,14 @@ static const struct lbr_info *last_branch_msr_get(void) case 58: case 62: /* Haswell */ case 60: case 63: case 69: case 70: + /* future */ + case 61: case 78: return nh_lbr; break; /* Atom */ - case 28: + case 28: case 38: case 39: case 53: case 54: + /* Silvermont */ + case 55: case 74: case 77: case 90: case 93: return at_lbr; break; } diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 8b23afa..3129ebd 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -916,6 +916,10 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) case 0x3f: case 0x45: case 0x46: + + /* future: */ + case 0x3d: + case 0x4e: ret = core2_vpmu_initialise(v, vpmu_flags); if ( !ret ) vpmu->arch_vpmu_ops = &core2_vpmu_ops; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 20:11:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 20:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0MD-000783-Kq; Tue, 18 Mar 2014 20:11:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0MC-00077R-Sm for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:29 +0000 Received: from [193.109.254.147:54447] by server-10.bemta-14.messagelabs.com id 8D/45-04546-F68A8235; Tue, 18 Mar 2014 20:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1395173484!2575573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15254 invoked from network); 18 Mar 2014 20:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 20:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0M8-0002e3-39 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQ0M8-0001Hc-07 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:24 +0000 Date: Tue, 18 Mar 2014 20:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/idle: update to include further package/core residency MSRs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca57e4c9b8cb02ac8ea0fb474219163fba12bf6f Author: Jan Beulich AuthorDate: Tue Mar 18 11:52:34 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 18 11:52:34 2014 +0100 x86/idle: update to include further package/core residency MSRs With the number of these growing it becomes increasingly desirable to not repeatedly alter the sysctl interface to accommodate them. Replace the explicit listing of numbered states by arrays, unused fields of which will remain untouched by the hypercall. The adjusted sysctl interface at once fixes an unrelated shortcoming of the original one: The "nr" field, specifying the size of the "triggers" and "residencies" arrays, has to be an input (along with being an output), which the previous implementation didn't obey to. Note that the bouncing direction in the libxc interface at once gets corrected to OUT (was BOTH). Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky Acked-by: Keir Fraser Acked-by: Ian Campbell Acked-by: Kevin Tian --- tools/libxc/xc_pm.c | 50 ++++++++++++--------- tools/libxc/xenctrl.h | 13 ++--- tools/misc/xenpm.c | 95 ++++++++++++++++++++++++---------------- xen/arch/x86/acpi/cpu_idle.c | 100 +++++++++++++++++++++++++++++++++--------- xen/include/public/sysctl.h | 13 ++--- 5 files changed, 175 insertions(+), 96 deletions(-) diff --git a/tools/libxc/xc_pm.c b/tools/libxc/xc_pm.c index f7ac40c..e4e0fb9 100644 --- a/tools/libxc/xc_pm.c +++ b/tools/libxc/xc_pm.c @@ -123,45 +123,53 @@ int xc_pm_get_max_cx(xc_interface *xch, int cpuid, int *max_cx) int xc_pm_get_cxstat(xc_interface *xch, int cpuid, struct xc_cx_stat *cxpt) { DECLARE_SYSCTL; - DECLARE_NAMED_HYPERCALL_BOUNCE(triggers, cxpt->triggers, 0, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); - DECLARE_NAMED_HYPERCALL_BOUNCE(residencies, cxpt->residencies, 0, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); - int max_cx, ret; + DECLARE_NAMED_HYPERCALL_BOUNCE(triggers, cxpt->triggers, + cxpt->nr * sizeof(*cxpt->triggers), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_NAMED_HYPERCALL_BOUNCE(residencies, cxpt->residencies, + cxpt->nr * sizeof(*cxpt->residencies), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_NAMED_HYPERCALL_BOUNCE(pc, cxpt->pc, + cxpt->nr_pc * sizeof(*cxpt->pc), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_NAMED_HYPERCALL_BOUNCE(cc, cxpt->cc, + cxpt->nr_cc * sizeof(*cxpt->cc), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + int ret = -1; - if( !cxpt->triggers || !cxpt->residencies ) - return -EINVAL; - - if ( (ret = xc_pm_get_max_cx(xch, cpuid, &max_cx)) ) - goto unlock_0; - - HYPERCALL_BOUNCE_SET_SIZE(triggers, max_cx * sizeof(uint64_t)); - HYPERCALL_BOUNCE_SET_SIZE(residencies, max_cx * sizeof(uint64_t)); - - ret = -1; if ( xc_hypercall_bounce_pre(xch, triggers) ) goto unlock_0; if ( xc_hypercall_bounce_pre(xch, residencies) ) goto unlock_1; + if ( xc_hypercall_bounce_pre(xch, pc) ) + goto unlock_2; + if ( xc_hypercall_bounce_pre(xch, cc) ) + goto unlock_3; sysctl.cmd = XEN_SYSCTL_get_pmstat; sysctl.u.get_pmstat.type = PMSTAT_get_cxstat; sysctl.u.get_pmstat.cpuid = cpuid; + sysctl.u.get_pmstat.u.getcx.nr = cxpt->nr; + sysctl.u.get_pmstat.u.getcx.nr_pc = cxpt->nr_pc; + sysctl.u.get_pmstat.u.getcx.nr_cc = cxpt->nr_cc; set_xen_guest_handle(sysctl.u.get_pmstat.u.getcx.triggers, triggers); set_xen_guest_handle(sysctl.u.get_pmstat.u.getcx.residencies, residencies); + set_xen_guest_handle(sysctl.u.get_pmstat.u.getcx.pc, pc); + set_xen_guest_handle(sysctl.u.get_pmstat.u.getcx.cc, cc); if ( (ret = xc_sysctl(xch, &sysctl)) ) - goto unlock_2; + goto unlock_4; cxpt->nr = sysctl.u.get_pmstat.u.getcx.nr; cxpt->last = sysctl.u.get_pmstat.u.getcx.last; cxpt->idle_time = sysctl.u.get_pmstat.u.getcx.idle_time; - cxpt->pc2 = sysctl.u.get_pmstat.u.getcx.pc2; - cxpt->pc3 = sysctl.u.get_pmstat.u.getcx.pc3; - cxpt->pc6 = sysctl.u.get_pmstat.u.getcx.pc6; - cxpt->pc7 = sysctl.u.get_pmstat.u.getcx.pc7; - cxpt->cc3 = sysctl.u.get_pmstat.u.getcx.cc3; - cxpt->cc6 = sysctl.u.get_pmstat.u.getcx.cc6; - cxpt->cc7 = sysctl.u.get_pmstat.u.getcx.cc7; + cxpt->nr_pc = sysctl.u.get_pmstat.u.getcx.nr_pc; + cxpt->nr_cc = sysctl.u.get_pmstat.u.getcx.nr_cc; +unlock_4: + xc_hypercall_bounce_post(xch, cc); +unlock_3: + xc_hypercall_bounce_post(xch, pc); unlock_2: xc_hypercall_bounce_post(xch, residencies); unlock_1: diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 13f816b..e3a32f2 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -1935,18 +1935,15 @@ int xc_pm_get_pxstat(xc_interface *xch, int cpuid, struct xc_px_stat *pxpt); int xc_pm_reset_pxstat(xc_interface *xch, int cpuid); struct xc_cx_stat { - uint32_t nr; /* entry nr in triggers & residencies, including C0 */ + uint32_t nr; /* entry nr in triggers[]/residencies[], incl C0 */ uint32_t last; /* last Cx state */ uint64_t idle_time; /* idle time from boot */ uint64_t *triggers; /* Cx trigger counts */ uint64_t *residencies; /* Cx residencies */ - uint64_t pc2; - uint64_t pc3; - uint64_t pc6; - uint64_t pc7; - uint64_t cc3; - uint64_t cc6; - uint64_t cc7; + uint32_t nr_pc; /* entry nr in pc[] */ + uint32_t nr_cc; /* entry nr in cc[] */ + uint64_t *pc; /* 1-biased indexing (i.e. excl C0) */ + uint64_t *cc; /* 1-biased indexing (i.e. excl C0) */ }; typedef struct xc_cx_stat xc_cx_stat_t; diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index 2e57f1f..e43924c 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -29,6 +29,9 @@ #include #include +#define MAX_PKG_RESIDENCIES 12 +#define MAX_CORE_RESIDENCIES 8 + #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) static xc_interface *xc_handle; @@ -102,7 +105,7 @@ static void parse_cpuid_and_int(int argc, char *argv[], static void print_cxstat(int cpuid, struct xc_cx_stat *cxstat) { - int i; + unsigned int i; printf("cpu id : %d\n", cpuid); printf("total C-states : %d\n", cxstat->nr); @@ -115,17 +118,14 @@ static void print_cxstat(int cpuid, struct xc_cx_stat *cxstat) printf(" residency [%20"PRIu64" ms]\n", cxstat->residencies[i]/1000000UL); } - printf("pc2 : [%20"PRIu64" ms]\n" - "pc3 : [%20"PRIu64" ms]\n" - "pc6 : [%20"PRIu64" ms]\n" - "pc7 : [%20"PRIu64" ms]\n", - cxstat->pc2/1000000UL, cxstat->pc3/1000000UL, - cxstat->pc6/1000000UL, cxstat->pc7/1000000UL); - printf("cc3 : [%20"PRIu64" ms]\n" - "cc6 : [%20"PRIu64" ms]\n" - "cc7 : [%20"PRIu64" ms]\n", - cxstat->cc3/1000000UL, cxstat->cc6/1000000UL, - cxstat->cc7/1000000UL); + for ( i = 0; i < MAX_PKG_RESIDENCIES && i < cxstat->nr_pc; ++i ) + if ( cxstat->pc[i] ) + printf("pc%d : [%20"PRIu64" ms]\n", i + 1, + cxstat->pc[i] / 1000000UL); + for ( i = 0; i < MAX_CORE_RESIDENCIES && i < cxstat->nr_cc; ++i ) + if ( cxstat->cc[i] ) + printf("cc%d : [%20"PRIu64" ms]\n", i + 1, + cxstat->cc[i] / 1000000UL); printf("\n"); } @@ -145,24 +145,36 @@ static int get_cxstat_by_cpuid(xc_interface *xc_handle, int cpuid, struct xc_cx_ if ( !max_cx_num ) return -ENODEV; - cxstat->triggers = malloc(max_cx_num * sizeof(uint64_t)); - if ( !cxstat->triggers ) - return -ENOMEM; - cxstat->residencies = malloc(max_cx_num * sizeof(uint64_t)); - if ( !cxstat->residencies ) + cxstat->triggers = calloc(max_cx_num, sizeof(*cxstat->triggers)); + cxstat->residencies = calloc(max_cx_num, sizeof(*cxstat->residencies)); + cxstat->pc = calloc(MAX_PKG_RESIDENCIES, sizeof(*cxstat->pc)); + cxstat->cc = calloc(MAX_CORE_RESIDENCIES, sizeof(*cxstat->cc)); + if ( !cxstat->triggers || !cxstat->residencies || + !cxstat->pc || !cxstat->cc ) { + free(cxstat->cc); + free(cxstat->pc); + free(cxstat->residencies); free(cxstat->triggers); return -ENOMEM; } + cxstat->nr = max_cx_num; + cxstat->nr_pc = MAX_PKG_RESIDENCIES; + cxstat->nr_cc = MAX_CORE_RESIDENCIES; + ret = xc_pm_get_cxstat(xc_handle, cpuid, cxstat); if( ret ) { ret = -errno; free(cxstat->triggers); free(cxstat->residencies); + free(cxstat->pc); + free(cxstat->cc); cxstat->triggers = NULL; cxstat->residencies = NULL; + cxstat->pc = NULL; + cxstat->cc = NULL; } return ret; @@ -198,6 +210,8 @@ static int show_cxstat_by_cpuid(xc_interface *xc_handle, int cpuid) free(cxstatinfo.triggers); free(cxstatinfo.residencies); + free(cxstatinfo.pc); + free(cxstatinfo.cc); return 0; } @@ -482,25 +496,26 @@ static void signal_int_handler(int signo) /* print out CC? and PC? */ for ( i = 0; i < socket_nr; i++ ) { + unsigned int n; uint64_t res; + for ( j = 0; j <= info.max_cpu_index; j++ ) { if ( cpu_to_socket[j] == socket_ids[i] ) break; } printf("\nSocket %d\n", socket_ids[i]); - res = cxstat_end[j].pc2 - cxstat_start[j].pc2; - printf("\tPC2\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); - res = cxstat_end[j].pc3 - cxstat_start[j].pc3; - printf("\tPC3\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); - res = cxstat_end[j].pc6 - cxstat_start[j].pc6; - printf("\tPC6\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); - res = cxstat_end[j].pc7 - cxstat_start[j].pc7; - printf("\tPC7\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); + for ( n = 0; n < MAX_PKG_RESIDENCIES; ++n ) + { + if ( n >= cxstat_end[j].nr_pc ) + continue; + res = cxstat_end[j].pc[n]; + if ( n < cxstat_start[j].nr_pc ) + res -= cxstat_start[j].pc[n]; + printf("\tPC%u\t%"PRIu64" ms\t%.2f%%\n", + n + 1, res / 1000000UL, + 100UL * res / (double)sum_cx[j]); + } for ( k = 0; k < core_nr; k++ ) { for ( j = 0; j <= info.max_cpu_index; j++ ) @@ -510,15 +525,17 @@ static void signal_int_handler(int signo) break; } printf("\t Core %d CPU %d\n", core_ids[k], j); - res = cxstat_end[j].cc3 - cxstat_start[j].cc3; - printf("\t\tCC3\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); - res = cxstat_end[j].cc6 - cxstat_start[j].cc6; - printf("\t\tCC6\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); - res = cxstat_end[j].cc7 - cxstat_start[j].cc7; - printf("\t\tCC7\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); + for ( n = 0; n < MAX_CORE_RESIDENCIES; ++n ) + { + if ( n >= cxstat_end[j].nr_cc ) + continue; + res = cxstat_end[j].cc[n]; + if ( n < cxstat_start[j].nr_cc ) + res -= cxstat_start[j].cc[n]; + printf("\t\tCC%u\t%"PRIu64" ms\t%.2f%%\n", + n + 1, res / 1000000UL, + 100UL * res / (double)sum_cx[j]); + } } } } @@ -529,6 +546,8 @@ static void signal_int_handler(int signo) { free(cxstat[i].triggers); free(cxstat[i].residencies); + free(cxstat[i].pc); + free(cxstat[i].cc); free(pxstat[i].trans_pt); free(pxstat[i].pt); } diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 6aaa7ab..d2119e2 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -62,13 +62,17 @@ #define GET_HW_RES_IN_NS(msr, val) \ do { rdmsrl(msr, val); val = tsc_ticks2ns(val); } while( 0 ) -#define GET_PC2_RES(val) GET_HW_RES_IN_NS(0x60D, val) /* SNB only */ +#define GET_PC2_RES(val) GET_HW_RES_IN_NS(0x60D, val) /* SNB onwards */ #define GET_PC3_RES(val) GET_HW_RES_IN_NS(0x3F8, val) #define GET_PC6_RES(val) GET_HW_RES_IN_NS(0x3F9, val) #define GET_PC7_RES(val) GET_HW_RES_IN_NS(0x3FA, val) +#define GET_PC8_RES(val) GET_HW_RES_IN_NS(0x630, val) /* some Haswells only */ +#define GET_PC9_RES(val) GET_HW_RES_IN_NS(0x631, val) /* some Haswells only */ +#define GET_PC10_RES(val) GET_HW_RES_IN_NS(0x632, val) /* some Haswells only */ +#define GET_CC1_RES(val) GET_HW_RES_IN_NS(0x660, val) /* Silvermont only */ #define GET_CC3_RES(val) GET_HW_RES_IN_NS(0x3FC, val) #define GET_CC6_RES(val) GET_HW_RES_IN_NS(0x3FD, val) -#define GET_CC7_RES(val) GET_HW_RES_IN_NS(0x3FE, val) /* SNB only */ +#define GET_CC7_RES(val) GET_HW_RES_IN_NS(0x3FE, val) /* SNB onwards */ static void lapic_timer_nop(void) { } void (*__read_mostly lapic_timer_off)(void); @@ -111,8 +115,13 @@ struct hw_residencies { uint64_t pc2; uint64_t pc3; + uint64_t pc4; uint64_t pc6; uint64_t pc7; + uint64_t pc8; + uint64_t pc9; + uint64_t pc10; + uint64_t cc1; uint64_t cc3; uint64_t cc6; uint64_t cc7; @@ -128,6 +137,12 @@ static void do_get_hw_residencies(void *arg) switch ( c->x86_model ) { + /* 4th generation Intel Core (Haswell) */ + case 0x45: + GET_PC8_RES(hw_res->pc8); + GET_PC9_RES(hw_res->pc9); + GET_PC10_RES(hw_res->pc10); + /* fall through */ /* Sandy bridge */ case 0x2A: case 0x2D: @@ -137,7 +152,6 @@ static void do_get_hw_residencies(void *arg) /* Haswell */ case 0x3C: case 0x3F: - case 0x45: case 0x46: /* future */ case 0x3D: @@ -160,6 +174,22 @@ static void do_get_hw_residencies(void *arg) GET_CC3_RES(hw_res->cc3); GET_CC6_RES(hw_res->cc6); break; + /* various Atoms */ + case 0x27: + GET_PC3_RES(hw_res->pc2); /* abusing GET_PC3_RES */ + GET_PC6_RES(hw_res->pc4); /* abusing GET_PC6_RES */ + GET_PC7_RES(hw_res->pc6); /* abusing GET_PC7_RES */ + break; + /* Silvermont */ + case 0x37: + case 0x4A: + case 0x4D: + case 0x5A: + case 0x5D: + GET_PC7_RES(hw_res->pc6); /* abusing GET_PC7_RES */ + GET_CC1_RES(hw_res->cc1); + GET_CC6_RES(hw_res->cc6); + break; } } @@ -179,10 +209,16 @@ static void print_hw_residencies(uint32_t cpu) get_hw_residencies(cpu, &hw_res); - printk("PC2[%"PRId64"] PC3[%"PRId64"] PC6[%"PRId64"] PC7[%"PRId64"]\n", - hw_res.pc2, hw_res.pc3, hw_res.pc6, hw_res.pc7); - printk("CC3[%"PRId64"] CC6[%"PRId64"] CC7[%"PRId64"]\n", - hw_res.cc3, hw_res.cc6,hw_res.cc7); + printk("PC2[%"PRIu64"] PC%d[%"PRIu64"] PC6[%"PRIu64"] PC7[%"PRIu64"]\n", + hw_res.pc2, + hw_res.pc4 ? 4 : 3, hw_res.pc4 ?: hw_res.pc3, + hw_res.pc6, hw_res.pc7); + if ( hw_res.pc8 | hw_res.pc9 | hw_res.pc10 ) + printk("PC8[%"PRIu64"] PC9[%"PRIu64"] PC10[%"PRIu64"]\n", + hw_res.pc8, hw_res.pc9, hw_res.pc10); + printk("CC%d[%"PRIu64"] CC6[%"PRIu64"] CC7[%"PRIu64"]\n", + hw_res.cc1 ? 1 : 3, hw_res.cc1 ?: hw_res.cc3, + hw_res.cc6, hw_res.cc7); } static char* acpi_cstate_method_name[] = @@ -1100,19 +1136,21 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) struct acpi_processor_power *power = processor_powers[cpuid]; uint64_t idle_usage = 0, idle_res = 0; uint64_t usage[ACPI_PROCESSOR_MAX_POWER], res[ACPI_PROCESSOR_MAX_POWER]; - int i; - struct hw_residencies hw_res; + unsigned int i, nr, nr_pc = 0, nr_cc = 0; if ( power == NULL ) { stat->last = 0; stat->nr = 0; stat->idle_time = 0; + stat->nr_pc = 0; + stat->nr_cc = 0; return 0; } stat->last = power->last_state ? power->last_state->idx : 0; stat->idle_time = get_cpu_idle_time(cpuid); + nr = min(stat->nr, power->count); /* mimic the stat when detail info hasn't been registered by dom0 */ if ( pm_idle_save == NULL ) @@ -1121,14 +1159,14 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) usage[1] = idle_usage = 1; res[1] = idle_res = stat->idle_time; - - memset(&hw_res, 0, sizeof(hw_res)); } else { + struct hw_residencies hw_res; + stat->nr = power->count; - for ( i = 1; i < power->count; i++ ) + for ( i = 1; i < nr; i++ ) { spin_lock_irq(&power->stat_lock); usage[i] = power->states[i].usage; @@ -1140,22 +1178,42 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) } get_hw_residencies(cpuid, &hw_res); + +#define PUT_xC(what, n) do { \ + if ( stat->nr_##what >= n && \ + copy_to_guest_offset(stat->what, n - 1, &hw_res.what##n, 1) ) \ + return -EFAULT; \ + if ( hw_res.what##n ) \ + nr_##what = n; \ + } while ( 0 ) +#define PUT_PC(n) PUT_xC(pc, n) + PUT_PC(2); + PUT_PC(3); + PUT_PC(4); + PUT_PC(6); + PUT_PC(7); + PUT_PC(8); + PUT_PC(9); + PUT_PC(10); +#undef PUT_PC +#define PUT_CC(n) PUT_xC(cc, n) + PUT_CC(1); + PUT_CC(3); + PUT_CC(6); + PUT_CC(7); +#undef PUT_CC +#undef PUT_xC } usage[0] = idle_usage; res[0] = NOW() - idle_res; - if ( copy_to_guest(stat->triggers, usage, stat->nr) || - copy_to_guest(stat->residencies, res, stat->nr) ) + if ( copy_to_guest(stat->triggers, usage, nr) || + copy_to_guest(stat->residencies, res, nr) ) return -EFAULT; - stat->pc2 = hw_res.pc2; - stat->pc3 = hw_res.pc3; - stat->pc6 = hw_res.pc6; - stat->pc7 = hw_res.pc7; - stat->cc3 = hw_res.cc3; - stat->cc6 = hw_res.cc6; - stat->cc7 = hw_res.cc7; + stat->nr_pc = nr_pc; + stat->nr_cc = nr_cc; return 0; } diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 8437d31..8ae6870 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -34,7 +34,7 @@ #include "xen.h" #include "domctl.h" -#define XEN_SYSCTL_INTERFACE_VERSION 0x0000000A +#define XEN_SYSCTL_INTERFACE_VERSION 0x0000000B /* * Read console content from Xen buffer ring. @@ -226,13 +226,10 @@ struct pm_cx_stat { uint64_aligned_t idle_time; /* idle time from boot */ XEN_GUEST_HANDLE_64(uint64) triggers; /* Cx trigger counts */ XEN_GUEST_HANDLE_64(uint64) residencies; /* Cx residencies */ - uint64_aligned_t pc2; - uint64_aligned_t pc3; - uint64_aligned_t pc6; - uint64_aligned_t pc7; - uint64_aligned_t cc3; - uint64_aligned_t cc6; - uint64_aligned_t cc7; + uint32_t nr_pc; /* entry nr in pc[] */ + uint32_t nr_cc; /* entry nr in cc[] */ + XEN_GUEST_HANDLE_64(uint64) pc; /* 1-biased indexing */ + XEN_GUEST_HANDLE_64(uint64) cc; /* 1-biased indexing */ }; struct xen_sysctl_get_pmstat { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 18 20:11:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Mar 2014 20:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0MD-000783-Kq; Tue, 18 Mar 2014 20:11:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0MC-00077R-Sm for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:29 +0000 Received: from [193.109.254.147:54447] by server-10.bemta-14.messagelabs.com id 8D/45-04546-F68A8235; Tue, 18 Mar 2014 20:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1395173484!2575573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15254 invoked from network); 18 Mar 2014 20:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Mar 2014 20:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQ0M8-0002e3-39 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQ0M8-0001Hc-07 for xen-changelog@lists.xensource.com; Tue, 18 Mar 2014 20:11:24 +0000 Date: Tue, 18 Mar 2014 20:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/idle: update to include further package/core residency MSRs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca57e4c9b8cb02ac8ea0fb474219163fba12bf6f Author: Jan Beulich AuthorDate: Tue Mar 18 11:52:34 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 18 11:52:34 2014 +0100 x86/idle: update to include further package/core residency MSRs With the number of these growing it becomes increasingly desirable to not repeatedly alter the sysctl interface to accommodate them. Replace the explicit listing of numbered states by arrays, unused fields of which will remain untouched by the hypercall. The adjusted sysctl interface at once fixes an unrelated shortcoming of the original one: The "nr" field, specifying the size of the "triggers" and "residencies" arrays, has to be an input (along with being an output), which the previous implementation didn't obey to. Note that the bouncing direction in the libxc interface at once gets corrected to OUT (was BOTH). Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky Acked-by: Keir Fraser Acked-by: Ian Campbell Acked-by: Kevin Tian --- tools/libxc/xc_pm.c | 50 ++++++++++++--------- tools/libxc/xenctrl.h | 13 ++--- tools/misc/xenpm.c | 95 ++++++++++++++++++++++++---------------- xen/arch/x86/acpi/cpu_idle.c | 100 +++++++++++++++++++++++++++++++++--------- xen/include/public/sysctl.h | 13 ++--- 5 files changed, 175 insertions(+), 96 deletions(-) diff --git a/tools/libxc/xc_pm.c b/tools/libxc/xc_pm.c index f7ac40c..e4e0fb9 100644 --- a/tools/libxc/xc_pm.c +++ b/tools/libxc/xc_pm.c @@ -123,45 +123,53 @@ int xc_pm_get_max_cx(xc_interface *xch, int cpuid, int *max_cx) int xc_pm_get_cxstat(xc_interface *xch, int cpuid, struct xc_cx_stat *cxpt) { DECLARE_SYSCTL; - DECLARE_NAMED_HYPERCALL_BOUNCE(triggers, cxpt->triggers, 0, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); - DECLARE_NAMED_HYPERCALL_BOUNCE(residencies, cxpt->residencies, 0, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); - int max_cx, ret; + DECLARE_NAMED_HYPERCALL_BOUNCE(triggers, cxpt->triggers, + cxpt->nr * sizeof(*cxpt->triggers), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_NAMED_HYPERCALL_BOUNCE(residencies, cxpt->residencies, + cxpt->nr * sizeof(*cxpt->residencies), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_NAMED_HYPERCALL_BOUNCE(pc, cxpt->pc, + cxpt->nr_pc * sizeof(*cxpt->pc), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_NAMED_HYPERCALL_BOUNCE(cc, cxpt->cc, + cxpt->nr_cc * sizeof(*cxpt->cc), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + int ret = -1; - if( !cxpt->triggers || !cxpt->residencies ) - return -EINVAL; - - if ( (ret = xc_pm_get_max_cx(xch, cpuid, &max_cx)) ) - goto unlock_0; - - HYPERCALL_BOUNCE_SET_SIZE(triggers, max_cx * sizeof(uint64_t)); - HYPERCALL_BOUNCE_SET_SIZE(residencies, max_cx * sizeof(uint64_t)); - - ret = -1; if ( xc_hypercall_bounce_pre(xch, triggers) ) goto unlock_0; if ( xc_hypercall_bounce_pre(xch, residencies) ) goto unlock_1; + if ( xc_hypercall_bounce_pre(xch, pc) ) + goto unlock_2; + if ( xc_hypercall_bounce_pre(xch, cc) ) + goto unlock_3; sysctl.cmd = XEN_SYSCTL_get_pmstat; sysctl.u.get_pmstat.type = PMSTAT_get_cxstat; sysctl.u.get_pmstat.cpuid = cpuid; + sysctl.u.get_pmstat.u.getcx.nr = cxpt->nr; + sysctl.u.get_pmstat.u.getcx.nr_pc = cxpt->nr_pc; + sysctl.u.get_pmstat.u.getcx.nr_cc = cxpt->nr_cc; set_xen_guest_handle(sysctl.u.get_pmstat.u.getcx.triggers, triggers); set_xen_guest_handle(sysctl.u.get_pmstat.u.getcx.residencies, residencies); + set_xen_guest_handle(sysctl.u.get_pmstat.u.getcx.pc, pc); + set_xen_guest_handle(sysctl.u.get_pmstat.u.getcx.cc, cc); if ( (ret = xc_sysctl(xch, &sysctl)) ) - goto unlock_2; + goto unlock_4; cxpt->nr = sysctl.u.get_pmstat.u.getcx.nr; cxpt->last = sysctl.u.get_pmstat.u.getcx.last; cxpt->idle_time = sysctl.u.get_pmstat.u.getcx.idle_time; - cxpt->pc2 = sysctl.u.get_pmstat.u.getcx.pc2; - cxpt->pc3 = sysctl.u.get_pmstat.u.getcx.pc3; - cxpt->pc6 = sysctl.u.get_pmstat.u.getcx.pc6; - cxpt->pc7 = sysctl.u.get_pmstat.u.getcx.pc7; - cxpt->cc3 = sysctl.u.get_pmstat.u.getcx.cc3; - cxpt->cc6 = sysctl.u.get_pmstat.u.getcx.cc6; - cxpt->cc7 = sysctl.u.get_pmstat.u.getcx.cc7; + cxpt->nr_pc = sysctl.u.get_pmstat.u.getcx.nr_pc; + cxpt->nr_cc = sysctl.u.get_pmstat.u.getcx.nr_cc; +unlock_4: + xc_hypercall_bounce_post(xch, cc); +unlock_3: + xc_hypercall_bounce_post(xch, pc); unlock_2: xc_hypercall_bounce_post(xch, residencies); unlock_1: diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 13f816b..e3a32f2 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -1935,18 +1935,15 @@ int xc_pm_get_pxstat(xc_interface *xch, int cpuid, struct xc_px_stat *pxpt); int xc_pm_reset_pxstat(xc_interface *xch, int cpuid); struct xc_cx_stat { - uint32_t nr; /* entry nr in triggers & residencies, including C0 */ + uint32_t nr; /* entry nr in triggers[]/residencies[], incl C0 */ uint32_t last; /* last Cx state */ uint64_t idle_time; /* idle time from boot */ uint64_t *triggers; /* Cx trigger counts */ uint64_t *residencies; /* Cx residencies */ - uint64_t pc2; - uint64_t pc3; - uint64_t pc6; - uint64_t pc7; - uint64_t cc3; - uint64_t cc6; - uint64_t cc7; + uint32_t nr_pc; /* entry nr in pc[] */ + uint32_t nr_cc; /* entry nr in cc[] */ + uint64_t *pc; /* 1-biased indexing (i.e. excl C0) */ + uint64_t *cc; /* 1-biased indexing (i.e. excl C0) */ }; typedef struct xc_cx_stat xc_cx_stat_t; diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index 2e57f1f..e43924c 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -29,6 +29,9 @@ #include #include +#define MAX_PKG_RESIDENCIES 12 +#define MAX_CORE_RESIDENCIES 8 + #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) static xc_interface *xc_handle; @@ -102,7 +105,7 @@ static void parse_cpuid_and_int(int argc, char *argv[], static void print_cxstat(int cpuid, struct xc_cx_stat *cxstat) { - int i; + unsigned int i; printf("cpu id : %d\n", cpuid); printf("total C-states : %d\n", cxstat->nr); @@ -115,17 +118,14 @@ static void print_cxstat(int cpuid, struct xc_cx_stat *cxstat) printf(" residency [%20"PRIu64" ms]\n", cxstat->residencies[i]/1000000UL); } - printf("pc2 : [%20"PRIu64" ms]\n" - "pc3 : [%20"PRIu64" ms]\n" - "pc6 : [%20"PRIu64" ms]\n" - "pc7 : [%20"PRIu64" ms]\n", - cxstat->pc2/1000000UL, cxstat->pc3/1000000UL, - cxstat->pc6/1000000UL, cxstat->pc7/1000000UL); - printf("cc3 : [%20"PRIu64" ms]\n" - "cc6 : [%20"PRIu64" ms]\n" - "cc7 : [%20"PRIu64" ms]\n", - cxstat->cc3/1000000UL, cxstat->cc6/1000000UL, - cxstat->cc7/1000000UL); + for ( i = 0; i < MAX_PKG_RESIDENCIES && i < cxstat->nr_pc; ++i ) + if ( cxstat->pc[i] ) + printf("pc%d : [%20"PRIu64" ms]\n", i + 1, + cxstat->pc[i] / 1000000UL); + for ( i = 0; i < MAX_CORE_RESIDENCIES && i < cxstat->nr_cc; ++i ) + if ( cxstat->cc[i] ) + printf("cc%d : [%20"PRIu64" ms]\n", i + 1, + cxstat->cc[i] / 1000000UL); printf("\n"); } @@ -145,24 +145,36 @@ static int get_cxstat_by_cpuid(xc_interface *xc_handle, int cpuid, struct xc_cx_ if ( !max_cx_num ) return -ENODEV; - cxstat->triggers = malloc(max_cx_num * sizeof(uint64_t)); - if ( !cxstat->triggers ) - return -ENOMEM; - cxstat->residencies = malloc(max_cx_num * sizeof(uint64_t)); - if ( !cxstat->residencies ) + cxstat->triggers = calloc(max_cx_num, sizeof(*cxstat->triggers)); + cxstat->residencies = calloc(max_cx_num, sizeof(*cxstat->residencies)); + cxstat->pc = calloc(MAX_PKG_RESIDENCIES, sizeof(*cxstat->pc)); + cxstat->cc = calloc(MAX_CORE_RESIDENCIES, sizeof(*cxstat->cc)); + if ( !cxstat->triggers || !cxstat->residencies || + !cxstat->pc || !cxstat->cc ) { + free(cxstat->cc); + free(cxstat->pc); + free(cxstat->residencies); free(cxstat->triggers); return -ENOMEM; } + cxstat->nr = max_cx_num; + cxstat->nr_pc = MAX_PKG_RESIDENCIES; + cxstat->nr_cc = MAX_CORE_RESIDENCIES; + ret = xc_pm_get_cxstat(xc_handle, cpuid, cxstat); if( ret ) { ret = -errno; free(cxstat->triggers); free(cxstat->residencies); + free(cxstat->pc); + free(cxstat->cc); cxstat->triggers = NULL; cxstat->residencies = NULL; + cxstat->pc = NULL; + cxstat->cc = NULL; } return ret; @@ -198,6 +210,8 @@ static int show_cxstat_by_cpuid(xc_interface *xc_handle, int cpuid) free(cxstatinfo.triggers); free(cxstatinfo.residencies); + free(cxstatinfo.pc); + free(cxstatinfo.cc); return 0; } @@ -482,25 +496,26 @@ static void signal_int_handler(int signo) /* print out CC? and PC? */ for ( i = 0; i < socket_nr; i++ ) { + unsigned int n; uint64_t res; + for ( j = 0; j <= info.max_cpu_index; j++ ) { if ( cpu_to_socket[j] == socket_ids[i] ) break; } printf("\nSocket %d\n", socket_ids[i]); - res = cxstat_end[j].pc2 - cxstat_start[j].pc2; - printf("\tPC2\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); - res = cxstat_end[j].pc3 - cxstat_start[j].pc3; - printf("\tPC3\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); - res = cxstat_end[j].pc6 - cxstat_start[j].pc6; - printf("\tPC6\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); - res = cxstat_end[j].pc7 - cxstat_start[j].pc7; - printf("\tPC7\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); + for ( n = 0; n < MAX_PKG_RESIDENCIES; ++n ) + { + if ( n >= cxstat_end[j].nr_pc ) + continue; + res = cxstat_end[j].pc[n]; + if ( n < cxstat_start[j].nr_pc ) + res -= cxstat_start[j].pc[n]; + printf("\tPC%u\t%"PRIu64" ms\t%.2f%%\n", + n + 1, res / 1000000UL, + 100UL * res / (double)sum_cx[j]); + } for ( k = 0; k < core_nr; k++ ) { for ( j = 0; j <= info.max_cpu_index; j++ ) @@ -510,15 +525,17 @@ static void signal_int_handler(int signo) break; } printf("\t Core %d CPU %d\n", core_ids[k], j); - res = cxstat_end[j].cc3 - cxstat_start[j].cc3; - printf("\t\tCC3\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); - res = cxstat_end[j].cc6 - cxstat_start[j].cc6; - printf("\t\tCC6\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); - res = cxstat_end[j].cc7 - cxstat_start[j].cc7; - printf("\t\tCC7\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL, - 100UL * res / (double)sum_cx[j]); + for ( n = 0; n < MAX_CORE_RESIDENCIES; ++n ) + { + if ( n >= cxstat_end[j].nr_cc ) + continue; + res = cxstat_end[j].cc[n]; + if ( n < cxstat_start[j].nr_cc ) + res -= cxstat_start[j].cc[n]; + printf("\t\tCC%u\t%"PRIu64" ms\t%.2f%%\n", + n + 1, res / 1000000UL, + 100UL * res / (double)sum_cx[j]); + } } } } @@ -529,6 +546,8 @@ static void signal_int_handler(int signo) { free(cxstat[i].triggers); free(cxstat[i].residencies); + free(cxstat[i].pc); + free(cxstat[i].cc); free(pxstat[i].trans_pt); free(pxstat[i].pt); } diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 6aaa7ab..d2119e2 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -62,13 +62,17 @@ #define GET_HW_RES_IN_NS(msr, val) \ do { rdmsrl(msr, val); val = tsc_ticks2ns(val); } while( 0 ) -#define GET_PC2_RES(val) GET_HW_RES_IN_NS(0x60D, val) /* SNB only */ +#define GET_PC2_RES(val) GET_HW_RES_IN_NS(0x60D, val) /* SNB onwards */ #define GET_PC3_RES(val) GET_HW_RES_IN_NS(0x3F8, val) #define GET_PC6_RES(val) GET_HW_RES_IN_NS(0x3F9, val) #define GET_PC7_RES(val) GET_HW_RES_IN_NS(0x3FA, val) +#define GET_PC8_RES(val) GET_HW_RES_IN_NS(0x630, val) /* some Haswells only */ +#define GET_PC9_RES(val) GET_HW_RES_IN_NS(0x631, val) /* some Haswells only */ +#define GET_PC10_RES(val) GET_HW_RES_IN_NS(0x632, val) /* some Haswells only */ +#define GET_CC1_RES(val) GET_HW_RES_IN_NS(0x660, val) /* Silvermont only */ #define GET_CC3_RES(val) GET_HW_RES_IN_NS(0x3FC, val) #define GET_CC6_RES(val) GET_HW_RES_IN_NS(0x3FD, val) -#define GET_CC7_RES(val) GET_HW_RES_IN_NS(0x3FE, val) /* SNB only */ +#define GET_CC7_RES(val) GET_HW_RES_IN_NS(0x3FE, val) /* SNB onwards */ static void lapic_timer_nop(void) { } void (*__read_mostly lapic_timer_off)(void); @@ -111,8 +115,13 @@ struct hw_residencies { uint64_t pc2; uint64_t pc3; + uint64_t pc4; uint64_t pc6; uint64_t pc7; + uint64_t pc8; + uint64_t pc9; + uint64_t pc10; + uint64_t cc1; uint64_t cc3; uint64_t cc6; uint64_t cc7; @@ -128,6 +137,12 @@ static void do_get_hw_residencies(void *arg) switch ( c->x86_model ) { + /* 4th generation Intel Core (Haswell) */ + case 0x45: + GET_PC8_RES(hw_res->pc8); + GET_PC9_RES(hw_res->pc9); + GET_PC10_RES(hw_res->pc10); + /* fall through */ /* Sandy bridge */ case 0x2A: case 0x2D: @@ -137,7 +152,6 @@ static void do_get_hw_residencies(void *arg) /* Haswell */ case 0x3C: case 0x3F: - case 0x45: case 0x46: /* future */ case 0x3D: @@ -160,6 +174,22 @@ static void do_get_hw_residencies(void *arg) GET_CC3_RES(hw_res->cc3); GET_CC6_RES(hw_res->cc6); break; + /* various Atoms */ + case 0x27: + GET_PC3_RES(hw_res->pc2); /* abusing GET_PC3_RES */ + GET_PC6_RES(hw_res->pc4); /* abusing GET_PC6_RES */ + GET_PC7_RES(hw_res->pc6); /* abusing GET_PC7_RES */ + break; + /* Silvermont */ + case 0x37: + case 0x4A: + case 0x4D: + case 0x5A: + case 0x5D: + GET_PC7_RES(hw_res->pc6); /* abusing GET_PC7_RES */ + GET_CC1_RES(hw_res->cc1); + GET_CC6_RES(hw_res->cc6); + break; } } @@ -179,10 +209,16 @@ static void print_hw_residencies(uint32_t cpu) get_hw_residencies(cpu, &hw_res); - printk("PC2[%"PRId64"] PC3[%"PRId64"] PC6[%"PRId64"] PC7[%"PRId64"]\n", - hw_res.pc2, hw_res.pc3, hw_res.pc6, hw_res.pc7); - printk("CC3[%"PRId64"] CC6[%"PRId64"] CC7[%"PRId64"]\n", - hw_res.cc3, hw_res.cc6,hw_res.cc7); + printk("PC2[%"PRIu64"] PC%d[%"PRIu64"] PC6[%"PRIu64"] PC7[%"PRIu64"]\n", + hw_res.pc2, + hw_res.pc4 ? 4 : 3, hw_res.pc4 ?: hw_res.pc3, + hw_res.pc6, hw_res.pc7); + if ( hw_res.pc8 | hw_res.pc9 | hw_res.pc10 ) + printk("PC8[%"PRIu64"] PC9[%"PRIu64"] PC10[%"PRIu64"]\n", + hw_res.pc8, hw_res.pc9, hw_res.pc10); + printk("CC%d[%"PRIu64"] CC6[%"PRIu64"] CC7[%"PRIu64"]\n", + hw_res.cc1 ? 1 : 3, hw_res.cc1 ?: hw_res.cc3, + hw_res.cc6, hw_res.cc7); } static char* acpi_cstate_method_name[] = @@ -1100,19 +1136,21 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) struct acpi_processor_power *power = processor_powers[cpuid]; uint64_t idle_usage = 0, idle_res = 0; uint64_t usage[ACPI_PROCESSOR_MAX_POWER], res[ACPI_PROCESSOR_MAX_POWER]; - int i; - struct hw_residencies hw_res; + unsigned int i, nr, nr_pc = 0, nr_cc = 0; if ( power == NULL ) { stat->last = 0; stat->nr = 0; stat->idle_time = 0; + stat->nr_pc = 0; + stat->nr_cc = 0; return 0; } stat->last = power->last_state ? power->last_state->idx : 0; stat->idle_time = get_cpu_idle_time(cpuid); + nr = min(stat->nr, power->count); /* mimic the stat when detail info hasn't been registered by dom0 */ if ( pm_idle_save == NULL ) @@ -1121,14 +1159,14 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) usage[1] = idle_usage = 1; res[1] = idle_res = stat->idle_time; - - memset(&hw_res, 0, sizeof(hw_res)); } else { + struct hw_residencies hw_res; + stat->nr = power->count; - for ( i = 1; i < power->count; i++ ) + for ( i = 1; i < nr; i++ ) { spin_lock_irq(&power->stat_lock); usage[i] = power->states[i].usage; @@ -1140,22 +1178,42 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) } get_hw_residencies(cpuid, &hw_res); + +#define PUT_xC(what, n) do { \ + if ( stat->nr_##what >= n && \ + copy_to_guest_offset(stat->what, n - 1, &hw_res.what##n, 1) ) \ + return -EFAULT; \ + if ( hw_res.what##n ) \ + nr_##what = n; \ + } while ( 0 ) +#define PUT_PC(n) PUT_xC(pc, n) + PUT_PC(2); + PUT_PC(3); + PUT_PC(4); + PUT_PC(6); + PUT_PC(7); + PUT_PC(8); + PUT_PC(9); + PUT_PC(10); +#undef PUT_PC +#define PUT_CC(n) PUT_xC(cc, n) + PUT_CC(1); + PUT_CC(3); + PUT_CC(6); + PUT_CC(7); +#undef PUT_CC +#undef PUT_xC } usage[0] = idle_usage; res[0] = NOW() - idle_res; - if ( copy_to_guest(stat->triggers, usage, stat->nr) || - copy_to_guest(stat->residencies, res, stat->nr) ) + if ( copy_to_guest(stat->triggers, usage, nr) || + copy_to_guest(stat->residencies, res, nr) ) return -EFAULT; - stat->pc2 = hw_res.pc2; - stat->pc3 = hw_res.pc3; - stat->pc6 = hw_res.pc6; - stat->pc7 = hw_res.pc7; - stat->cc3 = hw_res.cc3; - stat->cc6 = hw_res.cc6; - stat->cc7 = hw_res.cc7; + stat->nr_pc = nr_pc; + stat->nr_cc = nr_cc; return 0; } diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 8437d31..8ae6870 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -34,7 +34,7 @@ #include "xen.h" #include "domctl.h" -#define XEN_SYSCTL_INTERFACE_VERSION 0x0000000A +#define XEN_SYSCTL_INTERFACE_VERSION 0x0000000B /* * Read console content from Xen buffer ring. @@ -226,13 +226,10 @@ struct pm_cx_stat { uint64_aligned_t idle_time; /* idle time from boot */ XEN_GUEST_HANDLE_64(uint64) triggers; /* Cx trigger counts */ XEN_GUEST_HANDLE_64(uint64) residencies; /* Cx residencies */ - uint64_aligned_t pc2; - uint64_aligned_t pc3; - uint64_aligned_t pc6; - uint64_aligned_t pc7; - uint64_aligned_t cc3; - uint64_aligned_t cc6; - uint64_aligned_t cc7; + uint32_t nr_pc; /* entry nr in pc[] */ + uint32_t nr_cc; /* entry nr in cc[] */ + XEN_GUEST_HANDLE_64(uint64) pc; /* 1-biased indexing */ + XEN_GUEST_HANDLE_64(uint64) cc; /* 1-biased indexing */ }; struct xen_sysctl_get_pmstat { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 08:33:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 08:33:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQBvv-00016V-89; Wed, 19 Mar 2014 08:33:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQBvu-00015z-DJ for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 08:33:06 +0000 Received: from [85.158.139.211:46322] by server-9.bemta-5.messagelabs.com id 90/1E-04350-14659235; Wed, 19 Mar 2014 08:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1395217983!1921868!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10861 invoked from network); 19 Mar 2014 08:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 08:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQBvr-0000YF-4Z for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 08:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQBvq-00070q-Nc for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 08:33:02 +0000 Date: Wed, 19 Mar 2014 08:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xl: do not leak cpupool names. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c60b24d997f5718a26c8d337ad0497c86d2184b7 Author: Ian Campbell AuthorDate: Fri Sep 14 10:02:50 2012 +0100 Commit: Ian Jackson CommitDate: Tue Mar 18 16:06:21 2014 +0000 xl: do not leak cpupool names. Valgrind reports: ==3076== 7 bytes in 1 blocks are definitely lost in loss record 1 of 1 ==3076== at 0x402458C: malloc (vg_replace_malloc.c:270) ==3076== by 0x406F86D: libxl_cpupoolid_to_name (libxl_utils.c:102) ==3076== by 0x8058742: parse_config_data (xl_cmdimpl.c:639) ==3076== by 0x805BD56: create_domain (xl_cmdimpl.c:1838) ==3076== by 0x805DAED: main_create (xl_cmdimpl.c:3903) ==3076== by 0x804D39D: main (xl.c:285) And indeed there are several places where xl uses libxl_cpupoolid_to_name as a boolean to test if the pool name is valid and leaks the name if it is. Introduce an is_valid helper and use that instead. Signed-off-by: Ian Campbell Acked-by: Juergen Gross Committed-by: Ian Campbell (cherry picked from commit 10a194b1c57de7ddc9d4fce07e01f2cd7d0ca26a) --- tools/libxl/libxl_utils.c | 11 +++++++++++ tools/libxl/libxl_utils.h | 1 + tools/libxl/xl_cmdimpl.c | 16 ++++++++-------- tools/libxl/xl_sxp.c | 7 +++++-- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index f7b44a0..55cd299 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -103,6 +103,17 @@ char *libxl_cpupoolid_to_name(libxl_ctx *ctx, uint32_t poolid) return s; } +/* This is a bit horrid but without xs_exists it seems like the only way. */ +int libxl_cpupoolid_is_valid(libxl_ctx *ctx, uint32_t poolid) +{ + int ret; + char *s = libxl_cpupoolid_to_name(ctx, poolid); + + ret = (s != NULL); + free(s); + return ret; +} + char *libxl__cpupoolid_to_name(libxl__gc *gc, uint32_t poolid) { char *s = libxl_cpupoolid_to_name(libxl__gc_owner(gc), poolid); diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 8fee567..83aaac7 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -24,6 +24,7 @@ int libxl_name_to_domid(libxl_ctx *ctx, const char *name, uint32_t *domid); char *libxl_domid_to_name(libxl_ctx *ctx, uint32_t domid); int libxl_name_to_cpupoolid(libxl_ctx *ctx, const char *name, uint32_t *poolid); char *libxl_cpupoolid_to_name(libxl_ctx *ctx, uint32_t poolid); +int libxl_cpupoolid_is_valid(libxl_ctx *ctx, uint32_t poolid); int libxl_get_stubdom_id(libxl_ctx *ctx, int guest_domid); int libxl_is_stubdom(libxl_ctx *ctx, uint32_t domid, uint32_t *target_domid); int libxl_create_logfile(libxl_ctx *ctx, const char *name, char **full_name); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 4af5812..5eadb16 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -636,7 +636,7 @@ static void parse_config_data(const char *config_source, c_info->poolid = -1; cpupool_qualifier_to_cpupoolid(buf, &c_info->poolid, NULL); } - if (!libxl_cpupoolid_to_name(ctx, c_info->poolid)) { + if (!libxl_cpupoolid_is_valid(ctx, c_info->poolid)) { fprintf(stderr, "Illegal pool specified\n"); exit(1); } @@ -4746,7 +4746,7 @@ static int sched_domain_output(libxl_scheduler sched, int (*output)(int), if (cpupool) { if (cpupool_qualifier_to_cpupoolid(cpupool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", cpupool); return -ERROR_FAIL; } @@ -4878,7 +4878,7 @@ int main_sched_credit(int argc, char **argv) if (cpupool) { if (cpupool_qualifier_to_cpupoolid(cpupool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", cpupool); return -ERROR_FAIL; } @@ -6305,7 +6305,7 @@ int main_cpupooldestroy(int argc, char **argv) pool = argv[optind]; if (cpupool_qualifier_to_cpupoolid(pool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", pool); return -ERROR_FAIL; } @@ -6326,7 +6326,7 @@ int main_cpupoolrename(int argc, char **argv) pool = argv[optind++]; if (cpupool_qualifier_to_cpupoolid(pool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", pool); return -ERROR_FAIL; } @@ -6363,7 +6363,7 @@ int main_cpupoolcpuadd(int argc, char **argv) } if (cpupool_qualifier_to_cpupoolid(pool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", pool); return -ERROR_FAIL; } @@ -6407,7 +6407,7 @@ int main_cpupoolcpuremove(int argc, char **argv) } if (cpupool_qualifier_to_cpupoolid(pool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", pool); return -ERROR_FAIL; } @@ -6450,7 +6450,7 @@ int main_cpupoolmigrate(int argc, char **argv) } if (cpupool_qualifier_to_cpupoolid(pool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", pool); return -ERROR_FAIL; } diff --git a/tools/libxl/xl_sxp.c b/tools/libxl/xl_sxp.c index 31f9a93..2d33546 100644 --- a/tools/libxl/xl_sxp.c +++ b/tools/libxl/xl_sxp.c @@ -37,6 +37,7 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config) libxl_domain_create_info *c_info = &d_config->c_info; libxl_domain_build_info *b_info = &d_config->b_info; + char *pool; printf("(domain\n\t(domid %d)\n", domid); printf("\t(create_info)\n"); @@ -54,8 +55,10 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config) } else { printf("\t(uuid )\n"); } - - printf("\t(cpupool %s)\n", libxl_cpupoolid_to_name(ctx, c_info->poolid)); + pool = libxl_cpupoolid_to_name(ctx, c_info->poolid); + if (pool) + printf("\t(cpupool %s)\n", pool); + free(pool); if (c_info->xsdata) printf("\t(xsdata contains data)\n"); else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 08:33:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 08:33:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQBvv-00016V-89; Wed, 19 Mar 2014 08:33:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQBvu-00015z-DJ for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 08:33:06 +0000 Received: from [85.158.139.211:46322] by server-9.bemta-5.messagelabs.com id 90/1E-04350-14659235; Wed, 19 Mar 2014 08:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1395217983!1921868!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10861 invoked from network); 19 Mar 2014 08:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 08:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQBvr-0000YF-4Z for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 08:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQBvq-00070q-Nc for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 08:33:02 +0000 Date: Wed, 19 Mar 2014 08:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xl: do not leak cpupool names. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c60b24d997f5718a26c8d337ad0497c86d2184b7 Author: Ian Campbell AuthorDate: Fri Sep 14 10:02:50 2012 +0100 Commit: Ian Jackson CommitDate: Tue Mar 18 16:06:21 2014 +0000 xl: do not leak cpupool names. Valgrind reports: ==3076== 7 bytes in 1 blocks are definitely lost in loss record 1 of 1 ==3076== at 0x402458C: malloc (vg_replace_malloc.c:270) ==3076== by 0x406F86D: libxl_cpupoolid_to_name (libxl_utils.c:102) ==3076== by 0x8058742: parse_config_data (xl_cmdimpl.c:639) ==3076== by 0x805BD56: create_domain (xl_cmdimpl.c:1838) ==3076== by 0x805DAED: main_create (xl_cmdimpl.c:3903) ==3076== by 0x804D39D: main (xl.c:285) And indeed there are several places where xl uses libxl_cpupoolid_to_name as a boolean to test if the pool name is valid and leaks the name if it is. Introduce an is_valid helper and use that instead. Signed-off-by: Ian Campbell Acked-by: Juergen Gross Committed-by: Ian Campbell (cherry picked from commit 10a194b1c57de7ddc9d4fce07e01f2cd7d0ca26a) --- tools/libxl/libxl_utils.c | 11 +++++++++++ tools/libxl/libxl_utils.h | 1 + tools/libxl/xl_cmdimpl.c | 16 ++++++++-------- tools/libxl/xl_sxp.c | 7 +++++-- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index f7b44a0..55cd299 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -103,6 +103,17 @@ char *libxl_cpupoolid_to_name(libxl_ctx *ctx, uint32_t poolid) return s; } +/* This is a bit horrid but without xs_exists it seems like the only way. */ +int libxl_cpupoolid_is_valid(libxl_ctx *ctx, uint32_t poolid) +{ + int ret; + char *s = libxl_cpupoolid_to_name(ctx, poolid); + + ret = (s != NULL); + free(s); + return ret; +} + char *libxl__cpupoolid_to_name(libxl__gc *gc, uint32_t poolid) { char *s = libxl_cpupoolid_to_name(libxl__gc_owner(gc), poolid); diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 8fee567..83aaac7 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -24,6 +24,7 @@ int libxl_name_to_domid(libxl_ctx *ctx, const char *name, uint32_t *domid); char *libxl_domid_to_name(libxl_ctx *ctx, uint32_t domid); int libxl_name_to_cpupoolid(libxl_ctx *ctx, const char *name, uint32_t *poolid); char *libxl_cpupoolid_to_name(libxl_ctx *ctx, uint32_t poolid); +int libxl_cpupoolid_is_valid(libxl_ctx *ctx, uint32_t poolid); int libxl_get_stubdom_id(libxl_ctx *ctx, int guest_domid); int libxl_is_stubdom(libxl_ctx *ctx, uint32_t domid, uint32_t *target_domid); int libxl_create_logfile(libxl_ctx *ctx, const char *name, char **full_name); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 4af5812..5eadb16 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -636,7 +636,7 @@ static void parse_config_data(const char *config_source, c_info->poolid = -1; cpupool_qualifier_to_cpupoolid(buf, &c_info->poolid, NULL); } - if (!libxl_cpupoolid_to_name(ctx, c_info->poolid)) { + if (!libxl_cpupoolid_is_valid(ctx, c_info->poolid)) { fprintf(stderr, "Illegal pool specified\n"); exit(1); } @@ -4746,7 +4746,7 @@ static int sched_domain_output(libxl_scheduler sched, int (*output)(int), if (cpupool) { if (cpupool_qualifier_to_cpupoolid(cpupool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", cpupool); return -ERROR_FAIL; } @@ -4878,7 +4878,7 @@ int main_sched_credit(int argc, char **argv) if (cpupool) { if (cpupool_qualifier_to_cpupoolid(cpupool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", cpupool); return -ERROR_FAIL; } @@ -6305,7 +6305,7 @@ int main_cpupooldestroy(int argc, char **argv) pool = argv[optind]; if (cpupool_qualifier_to_cpupoolid(pool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", pool); return -ERROR_FAIL; } @@ -6326,7 +6326,7 @@ int main_cpupoolrename(int argc, char **argv) pool = argv[optind++]; if (cpupool_qualifier_to_cpupoolid(pool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", pool); return -ERROR_FAIL; } @@ -6363,7 +6363,7 @@ int main_cpupoolcpuadd(int argc, char **argv) } if (cpupool_qualifier_to_cpupoolid(pool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", pool); return -ERROR_FAIL; } @@ -6407,7 +6407,7 @@ int main_cpupoolcpuremove(int argc, char **argv) } if (cpupool_qualifier_to_cpupoolid(pool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", pool); return -ERROR_FAIL; } @@ -6450,7 +6450,7 @@ int main_cpupoolmigrate(int argc, char **argv) } if (cpupool_qualifier_to_cpupoolid(pool, &poolid, NULL) || - !libxl_cpupoolid_to_name(ctx, poolid)) { + !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool \'%s\'\n", pool); return -ERROR_FAIL; } diff --git a/tools/libxl/xl_sxp.c b/tools/libxl/xl_sxp.c index 31f9a93..2d33546 100644 --- a/tools/libxl/xl_sxp.c +++ b/tools/libxl/xl_sxp.c @@ -37,6 +37,7 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config) libxl_domain_create_info *c_info = &d_config->c_info; libxl_domain_build_info *b_info = &d_config->b_info; + char *pool; printf("(domain\n\t(domid %d)\n", domid); printf("\t(create_info)\n"); @@ -54,8 +55,10 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config) } else { printf("\t(uuid )\n"); } - - printf("\t(cpupool %s)\n", libxl_cpupoolid_to_name(ctx, c_info->poolid)); + pool = libxl_cpupoolid_to_name(ctx, c_info->poolid); + if (pool) + printf("\t(cpupool %s)\n", pool); + free(pool); if (c_info->xsdata) printf("\t(xsdata contains data)\n"); else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:33:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgE-0007ns-Rl; Wed, 19 Mar 2014 12:33:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgA-0007lo-9N for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:09 +0000 Received: from [193.109.254.147:21076] by server-7.bemta-14.messagelabs.com id 3B/34-17726-18E89235; Wed, 19 Mar 2014 12:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1395232383!2010779!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8735 invoked from network); 19 Mar 2014 12:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFg7-0002tW-5K for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFg7-00069r-1h for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:03 +0000 Date: Wed, 19 Mar 2014 12:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Fix buffer length for get_suspend_file X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fe1a6bc7546d006384157b6b004efdd3b9d283c5 Author: Ian Jackson AuthorDate: Tue Mar 18 13:45:25 2014 +0000 Commit: Ian Jackson CommitDate: Tue Mar 18 13:56:47 2014 +0000 libxc: Fix buffer length for get_suspend_file Declaring a formal parameter to have an array type doesn't result in the parameter actually having an array type. The type is "adjusted" to a pointer. (C99 6.9.1(7), 6.7.5.3.) So the use of sizeof in xc_suspend.c:get_suspend_file was wrong. Instead, use the #define. Also get rid of the array size, as it is misleading. Newer versions of gcc warn about the erroneous code: xc_suspend.c:39:25: error: argument to 'sizeof' in 'snprintf' call is the same expression as the destination; did you mean to provide an explicit length? [-Werror=sizeof-pointer-memaccess] Reported-By: Julien Grall Signed-off-by: Ian Jackson CC: Ian Campbell CC: Julien Grall -- v2: Actually change the declaration of buf. --- tools/libxc/xc_suspend.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_suspend.c b/tools/libxc/xc_suspend.c index 84ee139..200d381 100644 --- a/tools/libxc/xc_suspend.c +++ b/tools/libxc/xc_suspend.c @@ -34,9 +34,9 @@ #define SUSPEND_FILE_BUFLEN (sizeof(SUSPEND_LOCK_FILE) + 10) -static void get_suspend_file(char buf[SUSPEND_FILE_BUFLEN], int domid) +static void get_suspend_file(char buf[], int domid) { - snprintf(buf, sizeof(buf), SUSPEND_LOCK_FILE, domid); + snprintf(buf, SUSPEND_FILE_BUFLEN, SUSPEND_LOCK_FILE, domid); } static int lock_suspend_event(xc_interface *xch, int domid, int *lockfd) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:33:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgE-0007ns-Rl; Wed, 19 Mar 2014 12:33:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgA-0007lo-9N for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:09 +0000 Received: from [193.109.254.147:21076] by server-7.bemta-14.messagelabs.com id 3B/34-17726-18E89235; Wed, 19 Mar 2014 12:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1395232383!2010779!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8735 invoked from network); 19 Mar 2014 12:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFg7-0002tW-5K for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFg7-00069r-1h for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:03 +0000 Date: Wed, 19 Mar 2014 12:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Fix buffer length for get_suspend_file X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fe1a6bc7546d006384157b6b004efdd3b9d283c5 Author: Ian Jackson AuthorDate: Tue Mar 18 13:45:25 2014 +0000 Commit: Ian Jackson CommitDate: Tue Mar 18 13:56:47 2014 +0000 libxc: Fix buffer length for get_suspend_file Declaring a formal parameter to have an array type doesn't result in the parameter actually having an array type. The type is "adjusted" to a pointer. (C99 6.9.1(7), 6.7.5.3.) So the use of sizeof in xc_suspend.c:get_suspend_file was wrong. Instead, use the #define. Also get rid of the array size, as it is misleading. Newer versions of gcc warn about the erroneous code: xc_suspend.c:39:25: error: argument to 'sizeof' in 'snprintf' call is the same expression as the destination; did you mean to provide an explicit length? [-Werror=sizeof-pointer-memaccess] Reported-By: Julien Grall Signed-off-by: Ian Jackson CC: Ian Campbell CC: Julien Grall -- v2: Actually change the declaration of buf. --- tools/libxc/xc_suspend.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_suspend.c b/tools/libxc/xc_suspend.c index 84ee139..200d381 100644 --- a/tools/libxc/xc_suspend.c +++ b/tools/libxc/xc_suspend.c @@ -34,9 +34,9 @@ #define SUSPEND_FILE_BUFLEN (sizeof(SUSPEND_LOCK_FILE) + 10) -static void get_suspend_file(char buf[SUSPEND_FILE_BUFLEN], int domid) +static void get_suspend_file(char buf[], int domid) { - snprintf(buf, sizeof(buf), SUSPEND_LOCK_FILE, domid); + snprintf(buf, SUSPEND_FILE_BUFLEN, SUSPEND_LOCK_FILE, domid); } static int lock_suspend_event(xc_interface *xch, int domid, int *lockfd) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgM-0007tH-1j; Wed, 19 Mar 2014 12:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgK-0007rk-CQ for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:16 +0000 Received: from [193.109.254.147:22120] by server-8.bemta-14.messagelabs.com id FB/CF-01877-B8E89235; Wed, 19 Mar 2014 12:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1395232393!2734623!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27613 invoked from network); 19 Mar 2014 12:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgH-0002tZ-BJ for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFgH-0006AF-96 for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:13 +0000 Date: Wed, 19 Mar 2014 12:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: map memory as inner shareable. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec86971a9dd5d677184bde971e227475e2065203 Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:23 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:14 2014 +0000 xen: arm: map memory as inner shareable. The inner shareable domain contains all SMP processors, including different clusters (e.g. big.LITTLE). Therefore this is the correct thing to use for Xen memory mappings. The outer shareable domain is for devices on busses which are coherent and barrier-aware (e.g. AMBA4 AXI with ACE). While the system domain is for things behind bridges which are not. One wrinkle is that Normal memory with attributes Inner Non-cacheable, Outer Non-cacheable (which we call BUFFERABLE) must be mapped Outer Shareable on ARM v7. Therefore change the prototype of mfn_to_xen_entry to take the attribute index so we can DTRT. On ARMv8 the sharability is ignored and considered to always be Outer Shareable. Don't adjust the barriers, flushes etc, those remain as they were (which is more than is now required). I'll change those in a later patch. Many thanks to Leif for explaining the difference between Inner- and Outer-Shareable in words of two or less syllables, I hope I've replicated that explanation properly above! Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 8 ++++---- xen/arch/arm/arm64/head.S | 8 ++++---- xen/arch/arm/mm.c | 34 +++++++++++++++++++--------------- xen/arch/arm/p2m.c | 18 ++++++++++++++++-- xen/include/asm-arm/page.h | 37 ++++++++++++++++++++++++++++++++++--- 5 files changed, 77 insertions(+), 28 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 72cda34..39978cb 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -24,8 +24,8 @@ #define ZIMAGE_MAGIC_NUMBER 0x016f2818 -#define PT_PT 0xe7f /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=1 P=1 */ -#define PT_MEM 0xe7d /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=0 P=1 */ +#define PT_PT 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 P=1 */ +#define PT_MEM 0xf7d /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=0 P=1 */ #define PT_DEV 0xe71 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=0 P=1 */ #define PT_DEV_L3 0xe73 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=1 P=1 */ @@ -224,10 +224,10 @@ cpu_init_done: mcr CP32(r1, HMAIR1) /* Set up the HTCR: - * PT walks use Outer-Shareable accesses, + * PT walks use Inner-Shareable accesses, * PT walks are write-back, write-allocate in both cache levels, * Full 32-bit address space goes through this table. */ - ldr r0, =0x80002500 + ldr r0, =0x80003500 mcr CP32(r0, HTCR) /* Set up the HSCTLR: diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index d151724..9547ef5 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -25,8 +25,8 @@ #include #include -#define PT_PT 0xe7f /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=1 P=1 */ -#define PT_MEM 0xe7d /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=0 P=1 */ +#define PT_PT 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 P=1 */ +#define PT_MEM 0xf7d /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=0 P=1 */ #define PT_DEV 0xe71 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=0 P=1 */ #define PT_DEV_L3 0xe73 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=1 P=1 */ @@ -227,10 +227,10 @@ skip_bss: /* Set up the HTCR: * PASize -- 40 bits / 1TB * Top byte is used - * PT walks use Outer-Shareable accesses, + * PT walks use Inner-Shareable accesses, * PT walks are write-back, write-allocate in both cache levels, * Full 64-bit address space goes through this table. */ - ldr x0, =0x80822500 + ldr x0, =0x80823500 msr tcr_el2, x0 /* Set up the SCTLR_EL2: diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 305879f..b7360b6 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -212,9 +212,8 @@ void dump_hyp_walk(vaddr_t addr) /* Map a 4k page in a fixmap entry */ void set_fixmap(unsigned map, unsigned long mfn, unsigned attributes) { - lpae_t pte = mfn_to_xen_entry(mfn); + lpae_t pte = mfn_to_xen_entry(mfn, attributes); pte.pt.table = 1; /* 4k mappings always have this bit set */ - pte.pt.ai = attributes; pte.pt.xn = 1; write_pte(xen_fixmap + third_table_offset(FIXMAP_ADDR(map)), pte); flush_xen_data_tlb_range_va(FIXMAP_ADDR(map), PAGE_SIZE); @@ -270,7 +269,7 @@ void *map_domain_page(unsigned long mfn) else if ( map[slot].pt.avail == 0 ) { /* Commandeer this 2MB slot */ - pte = mfn_to_xen_entry(slot_mfn); + pte = mfn_to_xen_entry(slot_mfn, WRITEALLOC); pte.pt.avail = 1; write_pte(map + slot, pte); break; @@ -397,7 +396,7 @@ static inline lpae_t pte_of_xenaddr(vaddr_t va) { paddr_t ma = va + phys_offset; unsigned long mfn = ma >> PAGE_SHIFT; - return mfn_to_xen_entry(mfn); + return mfn_to_xen_entry(mfn, WRITEALLOC); } void __init remove_early_mappings(void) @@ -418,6 +417,12 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) lpae_t pte, *p; int i; + /* Map the destination in the boot misc area. */ + dest_va = BOOT_RELOC_VIRT_START; + pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT, WRITEALLOC); + write_pte(xen_second + second_table_offset(dest_va), pte); + flush_xen_data_tlb_range_va(dest_va, SECOND_SIZE); + /* Calculate virt-to-phys offset for the new location */ phys_offset = xen_paddr - (unsigned long) _start; @@ -451,7 +456,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Initialise xen second level entries ... */ /* ... Xen's text etc */ - pte = mfn_to_xen_entry(xen_paddr>>PAGE_SHIFT); + pte = mfn_to_xen_entry(xen_paddr>>PAGE_SHIFT, WRITEALLOC); pte.pt.xn = 0;/* Contains our text mapping! */ xen_second[second_table_offset(XEN_VIRT_START)] = pte; @@ -466,7 +471,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Map the destination in the boot misc area. */ dest_va = BOOT_RELOC_VIRT_START; - pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT); + pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT, WRITEALLOC); write_pte(boot_second + second_table_offset(dest_va), pte); flush_xen_data_tlb_range_va(dest_va, SECOND_SIZE); #ifdef CONFIG_ARM_64 @@ -495,7 +500,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) unsigned long va = XEN_VIRT_START + (i << PAGE_SHIFT); if ( !is_kernel(va) ) break; - pte = mfn_to_xen_entry(mfn); + pte = mfn_to_xen_entry(mfn, WRITEALLOC); pte.pt.table = 1; /* 4k mappings always have this bit set */ if ( is_kernel_text(va) || is_kernel_inittext(va) ) { @@ -565,7 +570,7 @@ int init_secondary_pagetables(int cpu) * domheap mapping pages. */ for ( i = 0; i < DOMHEAP_SECOND_PAGES; i++ ) { - pte = mfn_to_xen_entry(virt_to_mfn(domheap+i*LPAE_ENTRIES)); + pte = mfn_to_xen_entry(virt_to_mfn(domheap+i*LPAE_ENTRIES), WRITEALLOC); pte.pt.table = 1; write_pte(&first[first_table_offset(DOMHEAP_VIRT_START+i*FIRST_SIZE)], pte); } @@ -610,7 +615,7 @@ static void __init create_32mb_mappings(lpae_t *second, count = nr_mfns / LPAE_ENTRIES; p = second + second_linear_offset(virt_offset); - pte = mfn_to_xen_entry(base_mfn); + pte = mfn_to_xen_entry(base_mfn, WRITEALLOC); pte.pt.contig = 1; /* These maps are in 16-entry contiguous chunks. */ for ( i = 0; i < count; i++ ) { @@ -682,13 +687,13 @@ void __init setup_xenheap_mappings(unsigned long base_mfn, else { unsigned long first_mfn = alloc_boot_pages(1, 1); - pte = mfn_to_xen_entry(first_mfn); + pte = mfn_to_xen_entry(first_mfn, WRITEALLOC); pte.pt.table = 1; write_pte(p, pte); first = mfn_to_virt(first_mfn); } - pte = mfn_to_xen_entry(base_mfn); + pte = mfn_to_xen_entry(base_mfn, WRITEALLOC); /* TODO: Set pte.pt.contig when appropriate. */ write_pte(&first[first_table_offset(vaddr)], pte); @@ -724,7 +729,7 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) second = mfn_to_virt(second_base); for ( i = 0; i < nr_second; i++ ) { - pte = mfn_to_xen_entry(second_base + i); + pte = mfn_to_xen_entry(second_base + i, WRITEALLOC); pte.pt.table = 1; write_pte(&xen_first[first_table_offset(FRAMETABLE_VIRT_START)+i], pte); } @@ -776,7 +781,7 @@ static int create_xen_table(lpae_t *entry) if ( p == NULL ) return -ENOMEM; clear_page(p); - pte = mfn_to_xen_entry(virt_to_mfn(p)); + pte = mfn_to_xen_entry(virt_to_mfn(p), WRITEALLOC); pte.pt.table = 1; write_pte(entry, pte); return 0; @@ -822,9 +827,8 @@ static int create_xen_entries(enum xenmap_operation op, addr, mfn); return -EINVAL; } - pte = mfn_to_xen_entry(mfn); + pte = mfn_to_xen_entry(mfn, ai); pte.pt.table = 1; - pte.pt.ai = ai; write_pte(&third[third_table_offset(addr)], pte); break; case REMOVE: diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index d00c882..b9d8ca6 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -145,10 +145,10 @@ static lpae_t mfn_to_p2m_entry(unsigned long mfn, unsigned int mattr, p2m_type_t t) { paddr_t pa = ((paddr_t) mfn) << PAGE_SHIFT; - /* xn and write bit will be defined in the switch */ + /* sh, xn and write bit will be defined in the following switches + * based on mattr and t. */ lpae_t e = (lpae_t) { .p2m.af = 1, - .p2m.sh = LPAE_SH_OUTER, .p2m.read = 1, .p2m.mattr = mattr, .p2m.table = 1, @@ -158,6 +158,20 @@ static lpae_t mfn_to_p2m_entry(unsigned long mfn, unsigned int mattr, BUILD_BUG_ON(p2m_max_real_type > (1 << 4)); + switch (mattr) + { + case MATTR_MEM: + e.p2m.sh = LPAE_SH_INNER; + break; + + case MATTR_DEV: + e.p2m.sh = LPAE_SH_OUTER; + break; + default: + BUG(); + break; + } + switch (t) { case p2m_ram_rw: diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 905beb8..fd22993 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -185,7 +185,7 @@ typedef union { /* Standard entry type that we'll use to build Xen's own pagetables. * We put the same permissions at every level, because they're ignored * by the walker in non-leaf entries. */ -static inline lpae_t mfn_to_xen_entry(unsigned long mfn) +static inline lpae_t mfn_to_xen_entry(unsigned long mfn, unsigned attr) { paddr_t pa = ((paddr_t) mfn) << PAGE_SHIFT; lpae_t e = (lpae_t) { @@ -193,10 +193,9 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn) .xn = 1, /* No need to execute outside .text */ .ng = 1, /* Makes TLB flushes easier */ .af = 1, /* No need for access tracking */ - .sh = LPAE_SH_OUTER, /* Xen mappings are globally coherent */ .ns = 1, /* Hyp mode is in the non-secure world */ .user = 1, /* See below */ - .ai = WRITEALLOC, + .ai = attr, .table = 0, /* Set to 1 for links and 4k maps */ .valid = 1, /* Mappings are present */ }};; @@ -205,6 +204,38 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn) * pagetables un User mode it's OK. If this changes, remember * to update the hard-coded values in head.S too */ + switch ( attr ) + { + case BUFFERABLE: + /* + * ARM ARM: Overlaying the shareability attribute (DDI + * 0406C.b B3-1376 to 1377) + * + * A memory region with a resultant memory type attribute of Normal, + * and a resultant cacheability attribute of Inner Non-cacheable, + * Outer Non-cacheable, must have a resultant shareability attribute + * of Outer Shareable, otherwise shareability is UNPREDICTABLE. + * + * On ARMv8 sharability is ignored and explicitly treated as Outer + * Shareable for Normal Inner Non_cacheable, Outer Non-cacheable. + */ + e.pt.sh = LPAE_SH_OUTER; + break; + case UNCACHED: + case DEV_SHARED: + /* Shareability is ignored for non-Normal memory, Outer is as + * good as anything. + * + * On ARMv8 sharability is ignored and explicitly treated as Outer + * Shareable for any device memory type. + */ + e.pt.sh = LPAE_SH_OUTER; + break; + default: + e.pt.sh = LPAE_SH_INNER; /* Xen mappings are SMP coherent */ + break; + } + ASSERT(!(pa & ~PAGE_MASK)); ASSERT(!(pa & ~PADDR_MASK)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgM-0007tH-1j; Wed, 19 Mar 2014 12:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgK-0007rk-CQ for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:16 +0000 Received: from [193.109.254.147:22120] by server-8.bemta-14.messagelabs.com id FB/CF-01877-B8E89235; Wed, 19 Mar 2014 12:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1395232393!2734623!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27613 invoked from network); 19 Mar 2014 12:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgH-0002tZ-BJ for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFgH-0006AF-96 for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:13 +0000 Date: Wed, 19 Mar 2014 12:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: map memory as inner shareable. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec86971a9dd5d677184bde971e227475e2065203 Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:23 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:14 2014 +0000 xen: arm: map memory as inner shareable. The inner shareable domain contains all SMP processors, including different clusters (e.g. big.LITTLE). Therefore this is the correct thing to use for Xen memory mappings. The outer shareable domain is for devices on busses which are coherent and barrier-aware (e.g. AMBA4 AXI with ACE). While the system domain is for things behind bridges which are not. One wrinkle is that Normal memory with attributes Inner Non-cacheable, Outer Non-cacheable (which we call BUFFERABLE) must be mapped Outer Shareable on ARM v7. Therefore change the prototype of mfn_to_xen_entry to take the attribute index so we can DTRT. On ARMv8 the sharability is ignored and considered to always be Outer Shareable. Don't adjust the barriers, flushes etc, those remain as they were (which is more than is now required). I'll change those in a later patch. Many thanks to Leif for explaining the difference between Inner- and Outer-Shareable in words of two or less syllables, I hope I've replicated that explanation properly above! Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 8 ++++---- xen/arch/arm/arm64/head.S | 8 ++++---- xen/arch/arm/mm.c | 34 +++++++++++++++++++--------------- xen/arch/arm/p2m.c | 18 ++++++++++++++++-- xen/include/asm-arm/page.h | 37 ++++++++++++++++++++++++++++++++++--- 5 files changed, 77 insertions(+), 28 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 72cda34..39978cb 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -24,8 +24,8 @@ #define ZIMAGE_MAGIC_NUMBER 0x016f2818 -#define PT_PT 0xe7f /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=1 P=1 */ -#define PT_MEM 0xe7d /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=0 P=1 */ +#define PT_PT 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 P=1 */ +#define PT_MEM 0xf7d /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=0 P=1 */ #define PT_DEV 0xe71 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=0 P=1 */ #define PT_DEV_L3 0xe73 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=1 P=1 */ @@ -224,10 +224,10 @@ cpu_init_done: mcr CP32(r1, HMAIR1) /* Set up the HTCR: - * PT walks use Outer-Shareable accesses, + * PT walks use Inner-Shareable accesses, * PT walks are write-back, write-allocate in both cache levels, * Full 32-bit address space goes through this table. */ - ldr r0, =0x80002500 + ldr r0, =0x80003500 mcr CP32(r0, HTCR) /* Set up the HSCTLR: diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index d151724..9547ef5 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -25,8 +25,8 @@ #include #include -#define PT_PT 0xe7f /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=1 P=1 */ -#define PT_MEM 0xe7d /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=0 P=1 */ +#define PT_PT 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 P=1 */ +#define PT_MEM 0xf7d /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=0 P=1 */ #define PT_DEV 0xe71 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=0 P=1 */ #define PT_DEV_L3 0xe73 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=1 P=1 */ @@ -227,10 +227,10 @@ skip_bss: /* Set up the HTCR: * PASize -- 40 bits / 1TB * Top byte is used - * PT walks use Outer-Shareable accesses, + * PT walks use Inner-Shareable accesses, * PT walks are write-back, write-allocate in both cache levels, * Full 64-bit address space goes through this table. */ - ldr x0, =0x80822500 + ldr x0, =0x80823500 msr tcr_el2, x0 /* Set up the SCTLR_EL2: diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 305879f..b7360b6 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -212,9 +212,8 @@ void dump_hyp_walk(vaddr_t addr) /* Map a 4k page in a fixmap entry */ void set_fixmap(unsigned map, unsigned long mfn, unsigned attributes) { - lpae_t pte = mfn_to_xen_entry(mfn); + lpae_t pte = mfn_to_xen_entry(mfn, attributes); pte.pt.table = 1; /* 4k mappings always have this bit set */ - pte.pt.ai = attributes; pte.pt.xn = 1; write_pte(xen_fixmap + third_table_offset(FIXMAP_ADDR(map)), pte); flush_xen_data_tlb_range_va(FIXMAP_ADDR(map), PAGE_SIZE); @@ -270,7 +269,7 @@ void *map_domain_page(unsigned long mfn) else if ( map[slot].pt.avail == 0 ) { /* Commandeer this 2MB slot */ - pte = mfn_to_xen_entry(slot_mfn); + pte = mfn_to_xen_entry(slot_mfn, WRITEALLOC); pte.pt.avail = 1; write_pte(map + slot, pte); break; @@ -397,7 +396,7 @@ static inline lpae_t pte_of_xenaddr(vaddr_t va) { paddr_t ma = va + phys_offset; unsigned long mfn = ma >> PAGE_SHIFT; - return mfn_to_xen_entry(mfn); + return mfn_to_xen_entry(mfn, WRITEALLOC); } void __init remove_early_mappings(void) @@ -418,6 +417,12 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) lpae_t pte, *p; int i; + /* Map the destination in the boot misc area. */ + dest_va = BOOT_RELOC_VIRT_START; + pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT, WRITEALLOC); + write_pte(xen_second + second_table_offset(dest_va), pte); + flush_xen_data_tlb_range_va(dest_va, SECOND_SIZE); + /* Calculate virt-to-phys offset for the new location */ phys_offset = xen_paddr - (unsigned long) _start; @@ -451,7 +456,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Initialise xen second level entries ... */ /* ... Xen's text etc */ - pte = mfn_to_xen_entry(xen_paddr>>PAGE_SHIFT); + pte = mfn_to_xen_entry(xen_paddr>>PAGE_SHIFT, WRITEALLOC); pte.pt.xn = 0;/* Contains our text mapping! */ xen_second[second_table_offset(XEN_VIRT_START)] = pte; @@ -466,7 +471,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Map the destination in the boot misc area. */ dest_va = BOOT_RELOC_VIRT_START; - pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT); + pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT, WRITEALLOC); write_pte(boot_second + second_table_offset(dest_va), pte); flush_xen_data_tlb_range_va(dest_va, SECOND_SIZE); #ifdef CONFIG_ARM_64 @@ -495,7 +500,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) unsigned long va = XEN_VIRT_START + (i << PAGE_SHIFT); if ( !is_kernel(va) ) break; - pte = mfn_to_xen_entry(mfn); + pte = mfn_to_xen_entry(mfn, WRITEALLOC); pte.pt.table = 1; /* 4k mappings always have this bit set */ if ( is_kernel_text(va) || is_kernel_inittext(va) ) { @@ -565,7 +570,7 @@ int init_secondary_pagetables(int cpu) * domheap mapping pages. */ for ( i = 0; i < DOMHEAP_SECOND_PAGES; i++ ) { - pte = mfn_to_xen_entry(virt_to_mfn(domheap+i*LPAE_ENTRIES)); + pte = mfn_to_xen_entry(virt_to_mfn(domheap+i*LPAE_ENTRIES), WRITEALLOC); pte.pt.table = 1; write_pte(&first[first_table_offset(DOMHEAP_VIRT_START+i*FIRST_SIZE)], pte); } @@ -610,7 +615,7 @@ static void __init create_32mb_mappings(lpae_t *second, count = nr_mfns / LPAE_ENTRIES; p = second + second_linear_offset(virt_offset); - pte = mfn_to_xen_entry(base_mfn); + pte = mfn_to_xen_entry(base_mfn, WRITEALLOC); pte.pt.contig = 1; /* These maps are in 16-entry contiguous chunks. */ for ( i = 0; i < count; i++ ) { @@ -682,13 +687,13 @@ void __init setup_xenheap_mappings(unsigned long base_mfn, else { unsigned long first_mfn = alloc_boot_pages(1, 1); - pte = mfn_to_xen_entry(first_mfn); + pte = mfn_to_xen_entry(first_mfn, WRITEALLOC); pte.pt.table = 1; write_pte(p, pte); first = mfn_to_virt(first_mfn); } - pte = mfn_to_xen_entry(base_mfn); + pte = mfn_to_xen_entry(base_mfn, WRITEALLOC); /* TODO: Set pte.pt.contig when appropriate. */ write_pte(&first[first_table_offset(vaddr)], pte); @@ -724,7 +729,7 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) second = mfn_to_virt(second_base); for ( i = 0; i < nr_second; i++ ) { - pte = mfn_to_xen_entry(second_base + i); + pte = mfn_to_xen_entry(second_base + i, WRITEALLOC); pte.pt.table = 1; write_pte(&xen_first[first_table_offset(FRAMETABLE_VIRT_START)+i], pte); } @@ -776,7 +781,7 @@ static int create_xen_table(lpae_t *entry) if ( p == NULL ) return -ENOMEM; clear_page(p); - pte = mfn_to_xen_entry(virt_to_mfn(p)); + pte = mfn_to_xen_entry(virt_to_mfn(p), WRITEALLOC); pte.pt.table = 1; write_pte(entry, pte); return 0; @@ -822,9 +827,8 @@ static int create_xen_entries(enum xenmap_operation op, addr, mfn); return -EINVAL; } - pte = mfn_to_xen_entry(mfn); + pte = mfn_to_xen_entry(mfn, ai); pte.pt.table = 1; - pte.pt.ai = ai; write_pte(&third[third_table_offset(addr)], pte); break; case REMOVE: diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index d00c882..b9d8ca6 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -145,10 +145,10 @@ static lpae_t mfn_to_p2m_entry(unsigned long mfn, unsigned int mattr, p2m_type_t t) { paddr_t pa = ((paddr_t) mfn) << PAGE_SHIFT; - /* xn and write bit will be defined in the switch */ + /* sh, xn and write bit will be defined in the following switches + * based on mattr and t. */ lpae_t e = (lpae_t) { .p2m.af = 1, - .p2m.sh = LPAE_SH_OUTER, .p2m.read = 1, .p2m.mattr = mattr, .p2m.table = 1, @@ -158,6 +158,20 @@ static lpae_t mfn_to_p2m_entry(unsigned long mfn, unsigned int mattr, BUILD_BUG_ON(p2m_max_real_type > (1 << 4)); + switch (mattr) + { + case MATTR_MEM: + e.p2m.sh = LPAE_SH_INNER; + break; + + case MATTR_DEV: + e.p2m.sh = LPAE_SH_OUTER; + break; + default: + BUG(); + break; + } + switch (t) { case p2m_ram_rw: diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 905beb8..fd22993 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -185,7 +185,7 @@ typedef union { /* Standard entry type that we'll use to build Xen's own pagetables. * We put the same permissions at every level, because they're ignored * by the walker in non-leaf entries. */ -static inline lpae_t mfn_to_xen_entry(unsigned long mfn) +static inline lpae_t mfn_to_xen_entry(unsigned long mfn, unsigned attr) { paddr_t pa = ((paddr_t) mfn) << PAGE_SHIFT; lpae_t e = (lpae_t) { @@ -193,10 +193,9 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn) .xn = 1, /* No need to execute outside .text */ .ng = 1, /* Makes TLB flushes easier */ .af = 1, /* No need for access tracking */ - .sh = LPAE_SH_OUTER, /* Xen mappings are globally coherent */ .ns = 1, /* Hyp mode is in the non-secure world */ .user = 1, /* See below */ - .ai = WRITEALLOC, + .ai = attr, .table = 0, /* Set to 1 for links and 4k maps */ .valid = 1, /* Mappings are present */ }};; @@ -205,6 +204,38 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn) * pagetables un User mode it's OK. If this changes, remember * to update the hard-coded values in head.S too */ + switch ( attr ) + { + case BUFFERABLE: + /* + * ARM ARM: Overlaying the shareability attribute (DDI + * 0406C.b B3-1376 to 1377) + * + * A memory region with a resultant memory type attribute of Normal, + * and a resultant cacheability attribute of Inner Non-cacheable, + * Outer Non-cacheable, must have a resultant shareability attribute + * of Outer Shareable, otherwise shareability is UNPREDICTABLE. + * + * On ARMv8 sharability is ignored and explicitly treated as Outer + * Shareable for Normal Inner Non_cacheable, Outer Non-cacheable. + */ + e.pt.sh = LPAE_SH_OUTER; + break; + case UNCACHED: + case DEV_SHARED: + /* Shareability is ignored for non-Normal memory, Outer is as + * good as anything. + * + * On ARMv8 sharability is ignored and explicitly treated as Outer + * Shareable for any device memory type. + */ + e.pt.sh = LPAE_SH_OUTER; + break; + default: + e.pt.sh = LPAE_SH_INNER; /* Xen mappings are SMP coherent */ + break; + } + ASSERT(!(pa & ~PAGE_MASK)); ASSERT(!(pa & ~PADDR_MASK)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:33:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:33:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgV-0007zX-5T; Wed, 19 Mar 2014 12:33:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgU-0007yU-7H for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:26 +0000 Received: from [85.158.139.211:57961] by server-17.bemta-5.messagelabs.com id 55/F5-09046-59E89235; Wed, 19 Mar 2014 12:33:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1395232403!2002402!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3732 invoked from network); 19 Mar 2014 12:33:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgR-0002tc-GW for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFgR-0006Ab-Eu for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:23 +0000 Date: Wed, 19 Mar 2014 12:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Only upgrade guest barriers to inner shareable. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6bed3ddd7d060299cf6aede0c478890725a56b7 Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:24 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:26 2014 +0000 xen: arm: Only upgrade guest barriers to inner shareable. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Stefano Stabellini --- xen/arch/arm/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 21c7b26..72fd620 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -75,7 +75,7 @@ void __cpuinit init_traps(void) WRITE_SYSREG((vaddr_t)hyp_traps_vector, VBAR_EL2); /* Setup hypervisor traps */ - WRITE_SYSREG(HCR_PTW|HCR_BSU_OUTER|HCR_AMO|HCR_IMO|HCR_VM|HCR_TWI|HCR_TSC| + WRITE_SYSREG(HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_VM|HCR_TWI|HCR_TSC| HCR_TAC, HCR_EL2); isb(); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:33:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:33:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgV-0007zX-5T; Wed, 19 Mar 2014 12:33:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgU-0007yU-7H for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:26 +0000 Received: from [85.158.139.211:57961] by server-17.bemta-5.messagelabs.com id 55/F5-09046-59E89235; Wed, 19 Mar 2014 12:33:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1395232403!2002402!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3732 invoked from network); 19 Mar 2014 12:33:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgR-0002tc-GW for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFgR-0006Ab-Eu for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:23 +0000 Date: Wed, 19 Mar 2014 12:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Only upgrade guest barriers to inner shareable. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6bed3ddd7d060299cf6aede0c478890725a56b7 Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:24 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:26 2014 +0000 xen: arm: Only upgrade guest barriers to inner shareable. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Stefano Stabellini --- xen/arch/arm/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 21c7b26..72fd620 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -75,7 +75,7 @@ void __cpuinit init_traps(void) WRITE_SYSREG((vaddr_t)hyp_traps_vector, VBAR_EL2); /* Setup hypervisor traps */ - WRITE_SYSREG(HCR_PTW|HCR_BSU_OUTER|HCR_AMO|HCR_IMO|HCR_VM|HCR_TWI|HCR_TSC| + WRITE_SYSREG(HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_VM|HCR_TWI|HCR_TSC| HCR_TAC, HCR_EL2); isb(); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:33:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:33:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgf-000865-9b; Wed, 19 Mar 2014 12:33:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFge-000855-D8 for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:36 +0000 Received: from [85.158.139.211:64826] by server-16.bemta-5.messagelabs.com id 9A/7F-19700-F9E89235; Wed, 19 Mar 2014 12:33:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1395232413!1992532!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16390 invoked from network); 19 Mar 2014 12:33:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:33:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgb-0002to-LK for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFgb-0006B1-KK for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:33 +0000 Date: Wed, 19 Mar 2014 12:33:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: consolidate barrier definitions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b51602fb39653b712f8d102cd9776d0a09b0ee5d Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:25 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:27 2014 +0000 xen: arm: consolidate barrier definitions These are effectively identical on both 32- and 64-bit. The only difference is that they implicit "sy" on 32-bit becomes explicit. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Stefano Stabellini --- xen/include/asm-arm/arm32/system.h | 16 ---------------- xen/include/asm-arm/arm64/system.h | 17 ----------------- xen/include/asm-arm/system.h | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/xen/include/asm-arm/arm32/system.h b/xen/include/asm-arm/arm32/system.h index 60148cb..9f233fe 100644 --- a/xen/include/asm-arm/arm32/system.h +++ b/xen/include/asm-arm/arm32/system.h @@ -2,22 +2,6 @@ #ifndef __ASM_ARM32_SYSTEM_H #define __ASM_ARM32_SYSTEM_H -#define sev() __asm__ __volatile__ ("sev" : : : "memory") -#define wfe() __asm__ __volatile__ ("wfe" : : : "memory") -#define wfi() __asm__ __volatile__ ("wfi" : : : "memory") - -#define isb() __asm__ __volatile__ ("isb" : : : "memory") -#define dsb() __asm__ __volatile__ ("dsb" : : : "memory") -#define dmb() __asm__ __volatile__ ("dmb" : : : "memory") - -#define mb() dsb() -#define rmb() dsb() -#define wmb() mb() - -#define smp_mb() mb() -#define smp_rmb() rmb() -#define smp_wmb() wmb() - extern void __bad_xchg(volatile void *, int); static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size) diff --git a/xen/include/asm-arm/arm64/system.h b/xen/include/asm-arm/arm64/system.h index d7e912f..570af5c 100644 --- a/xen/include/asm-arm/arm64/system.h +++ b/xen/include/asm-arm/arm64/system.h @@ -2,23 +2,6 @@ #ifndef __ASM_ARM64_SYSTEM_H #define __ASM_ARM64_SYSTEM_H -#define sev() asm volatile("sev" : : : "memory") -#define wfe() asm volatile("wfe" : : : "memory") -#define wfi() asm volatile("wfi" : : : "memory") - -#define isb() asm volatile("isb" : : : "memory") -#define dsb() asm volatile("dsb sy" : : : "memory") -#define dmb() asm volatile("dmb sy" : : : "memory") - -#define mb() dsb() -#define rmb() dsb() -#define wmb() mb() - -#define smp_mb() mb() -#define smp_rmb() rmb() -#define smp_wmb() wmb() - - extern void __bad_xchg(volatile void *, int); static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 290d38d..e003624 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -8,6 +8,22 @@ #define nop() \ asm volatile ( "nop" ) +#define sev() asm volatile("sev" : : : "memory") +#define wfe() asm volatile("wfe" : : : "memory") +#define wfi() asm volatile("wfi" : : : "memory") + +#define isb() asm volatile("isb" : : : "memory") +#define dsb() asm volatile("dsb sy" : : : "memory") +#define dmb() asm volatile("dmb sy" : : : "memory") + +#define mb() dsb() +#define rmb() dsb() +#define wmb() mb() + +#define smp_mb() mb() +#define smp_rmb() rmb() +#define smp_wmb() wmb() + #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:33:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:33:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgf-000865-9b; Wed, 19 Mar 2014 12:33:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFge-000855-D8 for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:36 +0000 Received: from [85.158.139.211:64826] by server-16.bemta-5.messagelabs.com id 9A/7F-19700-F9E89235; Wed, 19 Mar 2014 12:33:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1395232413!1992532!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16390 invoked from network); 19 Mar 2014 12:33:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:33:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgb-0002to-LK for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFgb-0006B1-KK for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:33 +0000 Date: Wed, 19 Mar 2014 12:33:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: consolidate barrier definitions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b51602fb39653b712f8d102cd9776d0a09b0ee5d Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:25 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:27 2014 +0000 xen: arm: consolidate barrier definitions These are effectively identical on both 32- and 64-bit. The only difference is that they implicit "sy" on 32-bit becomes explicit. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Stefano Stabellini --- xen/include/asm-arm/arm32/system.h | 16 ---------------- xen/include/asm-arm/arm64/system.h | 17 ----------------- xen/include/asm-arm/system.h | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/xen/include/asm-arm/arm32/system.h b/xen/include/asm-arm/arm32/system.h index 60148cb..9f233fe 100644 --- a/xen/include/asm-arm/arm32/system.h +++ b/xen/include/asm-arm/arm32/system.h @@ -2,22 +2,6 @@ #ifndef __ASM_ARM32_SYSTEM_H #define __ASM_ARM32_SYSTEM_H -#define sev() __asm__ __volatile__ ("sev" : : : "memory") -#define wfe() __asm__ __volatile__ ("wfe" : : : "memory") -#define wfi() __asm__ __volatile__ ("wfi" : : : "memory") - -#define isb() __asm__ __volatile__ ("isb" : : : "memory") -#define dsb() __asm__ __volatile__ ("dsb" : : : "memory") -#define dmb() __asm__ __volatile__ ("dmb" : : : "memory") - -#define mb() dsb() -#define rmb() dsb() -#define wmb() mb() - -#define smp_mb() mb() -#define smp_rmb() rmb() -#define smp_wmb() wmb() - extern void __bad_xchg(volatile void *, int); static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size) diff --git a/xen/include/asm-arm/arm64/system.h b/xen/include/asm-arm/arm64/system.h index d7e912f..570af5c 100644 --- a/xen/include/asm-arm/arm64/system.h +++ b/xen/include/asm-arm/arm64/system.h @@ -2,23 +2,6 @@ #ifndef __ASM_ARM64_SYSTEM_H #define __ASM_ARM64_SYSTEM_H -#define sev() asm volatile("sev" : : : "memory") -#define wfe() asm volatile("wfe" : : : "memory") -#define wfi() asm volatile("wfi" : : : "memory") - -#define isb() asm volatile("isb" : : : "memory") -#define dsb() asm volatile("dsb sy" : : : "memory") -#define dmb() asm volatile("dmb sy" : : : "memory") - -#define mb() dsb() -#define rmb() dsb() -#define wmb() mb() - -#define smp_mb() mb() -#define smp_rmb() rmb() -#define smp_wmb() wmb() - - extern void __bad_xchg(volatile void *, int); static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 290d38d..e003624 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -8,6 +8,22 @@ #define nop() \ asm volatile ( "nop" ) +#define sev() asm volatile("sev" : : : "memory") +#define wfe() asm volatile("wfe" : : : "memory") +#define wfi() asm volatile("wfi" : : : "memory") + +#define isb() asm volatile("isb" : : : "memory") +#define dsb() asm volatile("dsb sy" : : : "memory") +#define dmb() asm volatile("dmb sy" : : : "memory") + +#define mb() dsb() +#define rmb() dsb() +#define wmb() mb() + +#define smp_mb() mb() +#define smp_rmb() rmb() +#define smp_wmb() wmb() + #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:33:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:33:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgp-0008Bn-Cq; Wed, 19 Mar 2014 12:33:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgo-0008BH-Bw for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:46 +0000 Received: from [193.109.254.147:43349] by server-14.bemta-14.messagelabs.com id 16/5B-08195-9AE89235; Wed, 19 Mar 2014 12:33:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1395232423!2717484!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17397 invoked from network); 19 Mar 2014 12:33:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:33:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgl-0002tu-QS for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFgl-0006BN-PM for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:43 +0000 Date: Wed, 19 Mar 2014 12:33:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Use SMP barriers when that is all which is required. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f3002a6878e6695e48b9d6cb1ec3a1fed3cf2ef Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:26 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:27 2014 +0000 xen: arm: Use SMP barriers when that is all which is required. SMP barriers can be used when all we care about is synchronising against other processors. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/mm.c | 2 +- xen/arch/arm/smpboot.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index b7360b6..e9b3f34 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -963,7 +963,7 @@ void share_xen_page_with_guest(struct page_info *page, page->u.inuse.type_info |= PGT_validated | 1; page_set_owner(page, d); - wmb(); /* install valid domain ptr before updating refcnt. */ + smp_wmb(); /* install valid domain ptr before updating refcnt. */ ASSERT((page->count_info & ~PGC_xen_heap) == 0); /* Only add to the allocation list if the domain isn't dying. */ diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index a829957..ce68d34 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -298,12 +298,12 @@ void __cpuinit start_secondary(unsigned long boot_phys_offset, /* Run local notifiers */ notify_cpu_starting(cpuid); - wmb(); + smp_wmb(); /* Now report this CPU is up */ smp_up_cpu = MPIDR_INVALID; cpumask_set_cpu(cpuid, &cpu_online_map); - wmb(); + smp_wmb(); local_irq_enable(); local_abort_enable(); @@ -330,7 +330,7 @@ void __cpu_disable(void) if ( cpu_disable_scheduler(cpu) ) BUG(); - mb(); + smp_mb(); /* Return to caller; eventually the IPI mechanism will unwind and the * scheduler will drop to the idle loop, which will call stop_cpu(). */ @@ -411,10 +411,10 @@ void __cpu_die(unsigned int cpu) process_pending_softirqs(); if ( (++i % 10) == 0 ) printk(KERN_ERR "CPU %u still not dead...\n", cpu); - mb(); + smp_mb(); } cpu_is_dead = 0; - mb(); + smp_mb(); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:33:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:33:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgp-0008Bn-Cq; Wed, 19 Mar 2014 12:33:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgo-0008BH-Bw for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:46 +0000 Received: from [193.109.254.147:43349] by server-14.bemta-14.messagelabs.com id 16/5B-08195-9AE89235; Wed, 19 Mar 2014 12:33:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1395232423!2717484!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17397 invoked from network); 19 Mar 2014 12:33:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:33:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgl-0002tu-QS for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFgl-0006BN-PM for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:43 +0000 Date: Wed, 19 Mar 2014 12:33:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Use SMP barriers when that is all which is required. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f3002a6878e6695e48b9d6cb1ec3a1fed3cf2ef Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:26 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:27 2014 +0000 xen: arm: Use SMP barriers when that is all which is required. SMP barriers can be used when all we care about is synchronising against other processors. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/mm.c | 2 +- xen/arch/arm/smpboot.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index b7360b6..e9b3f34 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -963,7 +963,7 @@ void share_xen_page_with_guest(struct page_info *page, page->u.inuse.type_info |= PGT_validated | 1; page_set_owner(page, d); - wmb(); /* install valid domain ptr before updating refcnt. */ + smp_wmb(); /* install valid domain ptr before updating refcnt. */ ASSERT((page->count_info & ~PGC_xen_heap) == 0); /* Only add to the allocation list if the domain isn't dying. */ diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index a829957..ce68d34 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -298,12 +298,12 @@ void __cpuinit start_secondary(unsigned long boot_phys_offset, /* Run local notifiers */ notify_cpu_starting(cpuid); - wmb(); + smp_wmb(); /* Now report this CPU is up */ smp_up_cpu = MPIDR_INVALID; cpumask_set_cpu(cpuid, &cpu_online_map); - wmb(); + smp_wmb(); local_irq_enable(); local_abort_enable(); @@ -330,7 +330,7 @@ void __cpu_disable(void) if ( cpu_disable_scheduler(cpu) ) BUG(); - mb(); + smp_mb(); /* Return to caller; eventually the IPI mechanism will unwind and the * scheduler will drop to the idle loop, which will call stop_cpu(). */ @@ -411,10 +411,10 @@ void __cpu_die(unsigned int cpu) process_pending_softirqs(); if ( (++i % 10) == 0 ) printk(KERN_ERR "CPU %u still not dead...\n", cpu); - mb(); + smp_mb(); } cpu_is_dead = 0; - mb(); + smp_mb(); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:34:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:34:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgz-0008H3-K8; Wed, 19 Mar 2014 12:33:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgy-0008G7-8o for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:56 +0000 Received: from [85.158.143.35:50764] by server-2.bemta-4.messagelabs.com id 19/93-06539-3BE89235; Wed, 19 Mar 2014 12:33:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1395232434!3187970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25752 invoked from network); 19 Mar 2014 12:33:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:33:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgv-0002u0-Vp for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFgv-0006CS-Tr for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:53 +0000 Date: Wed, 19 Mar 2014 12:33:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Use dmb for smp barriers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49632ebf69e4e24ae24d2a524e91b0cc5e8d5b0e Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:27 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:27 2014 +0000 xen: arm: Use dmb for smp barriers The full power of dsb is not required in this context. Also change wmb() to be dsb() directly instead of indirectly via mb(), for clarity. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/include/asm-arm/system.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index e003624..89c61ef 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -18,11 +18,11 @@ #define mb() dsb() #define rmb() dsb() -#define wmb() mb() +#define wmb() dsb() -#define smp_mb() mb() -#define smp_rmb() rmb() -#define smp_wmb() wmb() +#define smp_mb() dmb() +#define smp_rmb() dmb() +#define smp_wmb() dmb() #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:34:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:34:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgz-0008H3-K8; Wed, 19 Mar 2014 12:33:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgy-0008G7-8o for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:56 +0000 Received: from [85.158.143.35:50764] by server-2.bemta-4.messagelabs.com id 19/93-06539-3BE89235; Wed, 19 Mar 2014 12:33:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1395232434!3187970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25752 invoked from network); 19 Mar 2014 12:33:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:33:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFgv-0002u0-Vp for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFgv-0006CS-Tr for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:33:53 +0000 Date: Wed, 19 Mar 2014 12:33:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Use dmb for smp barriers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49632ebf69e4e24ae24d2a524e91b0cc5e8d5b0e Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:27 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:27 2014 +0000 xen: arm: Use dmb for smp barriers The full power of dsb is not required in this context. Also change wmb() to be dsb() directly instead of indirectly via mb(), for clarity. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/include/asm-arm/system.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index e003624..89c61ef 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -18,11 +18,11 @@ #define mb() dsb() #define rmb() dsb() -#define wmb() mb() +#define wmb() dsb() -#define smp_mb() mb() -#define smp_rmb() rmb() -#define smp_wmb() wmb() +#define smp_mb() dmb() +#define smp_rmb() dmb() +#define smp_wmb() dmb() #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:34:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:34:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhA-0008LV-My; Wed, 19 Mar 2014 12:34:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFh9-0008Kb-4m for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:07 +0000 Received: from [85.158.143.35:55930] by server-2.bemta-4.messagelabs.com id F8/F3-06539-EBE89235; Wed, 19 Mar 2014 12:34:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1395232444!3193673!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25935 invoked from network); 19 Mar 2014 12:34:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:34:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFh6-0002uZ-7G for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFh6-0006Cy-3x for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:04 +0000 Date: Wed, 19 Mar 2014 12:34:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: add scope to dsb and dmb macros X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 292239f05f6877d36ce373b69846aa0793284711 Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:28 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:27 2014 +0000 xen: arm: add scope to dsb and dmb macros Everywhere currently passes "sy"stem, so no actual change. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/arch/arm/domain.c | 2 +- xen/arch/arm/gic.c | 10 +++++----- xen/arch/arm/platforms/vexpress.c | 6 +++--- xen/arch/arm/smpboot.c | 2 +- xen/arch/arm/time.c | 2 +- xen/drivers/video/arm_hdlcd.c | 2 +- xen/include/asm-arm/arm32/flushtlb.h | 16 ++++++++-------- xen/include/asm-arm/arm32/page.h | 4 ++-- xen/include/asm-arm/arm64/page.h | 4 ++-- xen/include/asm-arm/page.h | 8 ++++---- xen/include/asm-arm/system.h | 16 ++++++++-------- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 82a1e79..8834154 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -47,7 +47,7 @@ void idle_loop(void) local_irq_disable(); if ( cpu_is_haltable(smp_processor_id()) ) { - dsb(); + dsb(sy); wfi(); } local_irq_enable(); diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 91a2982..0095b97 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -139,7 +139,7 @@ static void gic_irq_enable(struct irq_desc *desc) spin_lock_irqsave(&desc->lock, flags); spin_lock(&gic.lock); desc->status &= ~IRQ_DISABLED; - dsb(); + dsb(sy); /* Enable routing */ GICD[GICD_ISENABLER + irq / 32] = (1u << (irq % 32)); spin_unlock(&gic.lock); @@ -486,7 +486,7 @@ void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) cpumask_and(&online_mask, cpumask, &cpu_online_map); mask = gic_cpu_mask(&online_mask); - dsb(); + dsb(sy); GICD[GICD_SGIR] = GICD_SGI_TARGET_LIST | (mask<action = new; - dsb(); + dsb(sy); return 0; } diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c index 6132056..8e6a4ea 100644 --- a/xen/arch/arm/platforms/vexpress.c +++ b/xen/arch/arm/platforms/vexpress.c @@ -48,7 +48,7 @@ static inline int vexpress_ctrl_start(uint32_t *syscfg, int write, /* wait for complete flag to be set */ do { stat = syscfg[V2M_SYS_CFGSTAT/4]; - dsb(); + dsb(sy); } while ( !(stat & V2M_SYS_CFG_COMPLETE) ); /* check error status and return error flag if set */ @@ -113,10 +113,10 @@ static void vexpress_reset(void) /* switch to slow mode */ writel(0x3, sp810); - dsb(); isb(); + dsb(sy); isb(); /* writing any value to SCSYSSTAT reg will reset the system */ writel(0x1, sp810 + 4); - dsb(); isb(); + dsb(sy); isb(); iounmap(sp810); } diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index ce68d34..7f28b68 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -341,7 +341,7 @@ void stop_cpu(void) local_irq_disable(); cpu_is_dead = 1; /* Make sure the write happens before we sleep forever */ - dsb(); + dsb(sy); isb(); while ( 1 ) wfi(); diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index ba281e9..8dd4bea 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -260,7 +260,7 @@ void udelay(unsigned long usecs) s_time_t deadline = get_s_time() + 1000 * (s_time_t) usecs; while ( get_s_time() - deadline < 0 ) ; - dsb(); + dsb(sy); isb(); } diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c index 647f22c..e5ad18d 100644 --- a/xen/drivers/video/arm_hdlcd.c +++ b/xen/drivers/video/arm_hdlcd.c @@ -78,7 +78,7 @@ void (*video_puts)(const char *) = vga_noop_puts; static void hdlcd_flush(void) { - dsb(); + dsb(sy); } static int __init get_color_masks(const char* bpp, struct color_masks **masks) diff --git a/xen/include/asm-arm/arm32/flushtlb.h b/xen/include/asm-arm/arm32/flushtlb.h index 7183a07..bbcc82f 100644 --- a/xen/include/asm-arm/arm32/flushtlb.h +++ b/xen/include/asm-arm/arm32/flushtlb.h @@ -4,44 +4,44 @@ /* Flush local TLBs, current VMID only */ static inline void flush_tlb_local(void) { - dsb(); + dsb(sy); WRITE_CP32((uint32_t) 0, TLBIALL); - dsb(); + dsb(sy); isb(); } /* Flush inner shareable TLBs, current VMID only */ static inline void flush_tlb(void) { - dsb(); + dsb(sy); WRITE_CP32((uint32_t) 0, TLBIALLIS); - dsb(); + dsb(sy); isb(); } /* Flush local TLBs, all VMIDs, non-hypervisor mode */ static inline void flush_tlb_all_local(void) { - dsb(); + dsb(sy); WRITE_CP32((uint32_t) 0, TLBIALLNSNH); - dsb(); + dsb(sy); isb(); } /* Flush innershareable TLBs, all VMIDs, non-hypervisor mode */ static inline void flush_tlb_all(void) { - dsb(); + dsb(sy); WRITE_CP32((uint32_t) 0, TLBIALLNSNHIS); - dsb(); + dsb(sy); isb(); } diff --git a/xen/include/asm-arm/arm32/page.h b/xen/include/asm-arm/arm32/page.h index b8221ca..191a108 100644 --- a/xen/include/asm-arm/arm32/page.h +++ b/xen/include/asm-arm/arm32/page.h @@ -67,13 +67,13 @@ static inline void flush_xen_data_tlb(void) static inline void flush_xen_data_tlb_range_va(unsigned long va, unsigned long size) { unsigned long end = va + size; - dsb(); /* Ensure preceding are visible */ + dsb(sy); /* Ensure preceding are visible */ while ( va < end ) { asm volatile(STORE_CP32(0, TLBIMVAH) : : "r" (va) : "memory"); va += PAGE_SIZE; } - dsb(); /* Ensure completion of the TLB flush */ + dsb(sy); /* Ensure completion of the TLB flush */ isb(); } diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index 3352821..20b4c5a 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -60,13 +60,13 @@ static inline void flush_xen_data_tlb(void) static inline void flush_xen_data_tlb_range_va(unsigned long va, unsigned long size) { unsigned long end = va + size; - dsb(); /* Ensure preceding are visible */ + dsb(sy); /* Ensure preceding are visible */ while ( va < end ) { asm volatile("tlbi vae2, %0;" : : "r" (va>>PAGE_SHIFT) : "memory"); va += PAGE_SIZE; } - dsb(); /* Ensure completion of the TLB flush */ + dsb(sy); /* Ensure completion of the TLB flush */ isb(); } diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index fd22993..d18ec2a 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -263,20 +263,20 @@ extern size_t cacheline_bytes; static inline void clean_xen_dcache_va_range(void *p, unsigned long size) { void *end; - dsb(); /* So the CPU issues all writes to the range */ + dsb(sy); /* So the CPU issues all writes to the range */ for ( end = p + size; p < end; p += cacheline_bytes ) asm volatile (__clean_xen_dcache_one(0) : : "r" (p)); - dsb(); /* So we know the flushes happen before continuing */ + dsb(sy); /* So we know the flushes happen before continuing */ } static inline void clean_and_invalidate_xen_dcache_va_range (void *p, unsigned long size) { void *end; - dsb(); /* So the CPU issues all writes to the range */ + dsb(sy); /* So the CPU issues all writes to the range */ for ( end = p + size; p < end; p += cacheline_bytes ) asm volatile (__clean_and_invalidate_xen_dcache_one(0) : : "r" (p)); - dsb(); /* So we know the flushes happen before continuing */ + dsb(sy); /* So we know the flushes happen before continuing */ } /* Macros for flushing a single small item. The predicate is always diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 89c61ef..e1f126a 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -13,16 +13,16 @@ #define wfi() asm volatile("wfi" : : : "memory") #define isb() asm volatile("isb" : : : "memory") -#define dsb() asm volatile("dsb sy" : : : "memory") -#define dmb() asm volatile("dmb sy" : : : "memory") +#define dsb(scope) asm volatile("dsb " #scope : : : "memory") +#define dmb(scope) asm volatile("dmb " #scope : : : "memory") -#define mb() dsb() -#define rmb() dsb() -#define wmb() dsb() +#define mb() dsb(sy) +#define rmb() dsb(sy) +#define wmb() dsb(sy) -#define smp_mb() dmb() -#define smp_rmb() dmb() -#define smp_wmb() dmb() +#define smp_mb() dmb(sy) +#define smp_rmb() dmb(sy) +#define smp_wmb() dmb(sy) #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:34:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:34:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhA-0008LV-My; Wed, 19 Mar 2014 12:34:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFh9-0008Kb-4m for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:07 +0000 Received: from [85.158.143.35:55930] by server-2.bemta-4.messagelabs.com id F8/F3-06539-EBE89235; Wed, 19 Mar 2014 12:34:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1395232444!3193673!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25935 invoked from network); 19 Mar 2014 12:34:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:34:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFh6-0002uZ-7G for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFh6-0006Cy-3x for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:04 +0000 Date: Wed, 19 Mar 2014 12:34:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: add scope to dsb and dmb macros X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 292239f05f6877d36ce373b69846aa0793284711 Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:28 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:27 2014 +0000 xen: arm: add scope to dsb and dmb macros Everywhere currently passes "sy"stem, so no actual change. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/arch/arm/domain.c | 2 +- xen/arch/arm/gic.c | 10 +++++----- xen/arch/arm/platforms/vexpress.c | 6 +++--- xen/arch/arm/smpboot.c | 2 +- xen/arch/arm/time.c | 2 +- xen/drivers/video/arm_hdlcd.c | 2 +- xen/include/asm-arm/arm32/flushtlb.h | 16 ++++++++-------- xen/include/asm-arm/arm32/page.h | 4 ++-- xen/include/asm-arm/arm64/page.h | 4 ++-- xen/include/asm-arm/page.h | 8 ++++---- xen/include/asm-arm/system.h | 16 ++++++++-------- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 82a1e79..8834154 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -47,7 +47,7 @@ void idle_loop(void) local_irq_disable(); if ( cpu_is_haltable(smp_processor_id()) ) { - dsb(); + dsb(sy); wfi(); } local_irq_enable(); diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 91a2982..0095b97 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -139,7 +139,7 @@ static void gic_irq_enable(struct irq_desc *desc) spin_lock_irqsave(&desc->lock, flags); spin_lock(&gic.lock); desc->status &= ~IRQ_DISABLED; - dsb(); + dsb(sy); /* Enable routing */ GICD[GICD_ISENABLER + irq / 32] = (1u << (irq % 32)); spin_unlock(&gic.lock); @@ -486,7 +486,7 @@ void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) cpumask_and(&online_mask, cpumask, &cpu_online_map); mask = gic_cpu_mask(&online_mask); - dsb(); + dsb(sy); GICD[GICD_SGIR] = GICD_SGI_TARGET_LIST | (mask<action = new; - dsb(); + dsb(sy); return 0; } diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c index 6132056..8e6a4ea 100644 --- a/xen/arch/arm/platforms/vexpress.c +++ b/xen/arch/arm/platforms/vexpress.c @@ -48,7 +48,7 @@ static inline int vexpress_ctrl_start(uint32_t *syscfg, int write, /* wait for complete flag to be set */ do { stat = syscfg[V2M_SYS_CFGSTAT/4]; - dsb(); + dsb(sy); } while ( !(stat & V2M_SYS_CFG_COMPLETE) ); /* check error status and return error flag if set */ @@ -113,10 +113,10 @@ static void vexpress_reset(void) /* switch to slow mode */ writel(0x3, sp810); - dsb(); isb(); + dsb(sy); isb(); /* writing any value to SCSYSSTAT reg will reset the system */ writel(0x1, sp810 + 4); - dsb(); isb(); + dsb(sy); isb(); iounmap(sp810); } diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index ce68d34..7f28b68 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -341,7 +341,7 @@ void stop_cpu(void) local_irq_disable(); cpu_is_dead = 1; /* Make sure the write happens before we sleep forever */ - dsb(); + dsb(sy); isb(); while ( 1 ) wfi(); diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index ba281e9..8dd4bea 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -260,7 +260,7 @@ void udelay(unsigned long usecs) s_time_t deadline = get_s_time() + 1000 * (s_time_t) usecs; while ( get_s_time() - deadline < 0 ) ; - dsb(); + dsb(sy); isb(); } diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c index 647f22c..e5ad18d 100644 --- a/xen/drivers/video/arm_hdlcd.c +++ b/xen/drivers/video/arm_hdlcd.c @@ -78,7 +78,7 @@ void (*video_puts)(const char *) = vga_noop_puts; static void hdlcd_flush(void) { - dsb(); + dsb(sy); } static int __init get_color_masks(const char* bpp, struct color_masks **masks) diff --git a/xen/include/asm-arm/arm32/flushtlb.h b/xen/include/asm-arm/arm32/flushtlb.h index 7183a07..bbcc82f 100644 --- a/xen/include/asm-arm/arm32/flushtlb.h +++ b/xen/include/asm-arm/arm32/flushtlb.h @@ -4,44 +4,44 @@ /* Flush local TLBs, current VMID only */ static inline void flush_tlb_local(void) { - dsb(); + dsb(sy); WRITE_CP32((uint32_t) 0, TLBIALL); - dsb(); + dsb(sy); isb(); } /* Flush inner shareable TLBs, current VMID only */ static inline void flush_tlb(void) { - dsb(); + dsb(sy); WRITE_CP32((uint32_t) 0, TLBIALLIS); - dsb(); + dsb(sy); isb(); } /* Flush local TLBs, all VMIDs, non-hypervisor mode */ static inline void flush_tlb_all_local(void) { - dsb(); + dsb(sy); WRITE_CP32((uint32_t) 0, TLBIALLNSNH); - dsb(); + dsb(sy); isb(); } /* Flush innershareable TLBs, all VMIDs, non-hypervisor mode */ static inline void flush_tlb_all(void) { - dsb(); + dsb(sy); WRITE_CP32((uint32_t) 0, TLBIALLNSNHIS); - dsb(); + dsb(sy); isb(); } diff --git a/xen/include/asm-arm/arm32/page.h b/xen/include/asm-arm/arm32/page.h index b8221ca..191a108 100644 --- a/xen/include/asm-arm/arm32/page.h +++ b/xen/include/asm-arm/arm32/page.h @@ -67,13 +67,13 @@ static inline void flush_xen_data_tlb(void) static inline void flush_xen_data_tlb_range_va(unsigned long va, unsigned long size) { unsigned long end = va + size; - dsb(); /* Ensure preceding are visible */ + dsb(sy); /* Ensure preceding are visible */ while ( va < end ) { asm volatile(STORE_CP32(0, TLBIMVAH) : : "r" (va) : "memory"); va += PAGE_SIZE; } - dsb(); /* Ensure completion of the TLB flush */ + dsb(sy); /* Ensure completion of the TLB flush */ isb(); } diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index 3352821..20b4c5a 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -60,13 +60,13 @@ static inline void flush_xen_data_tlb(void) static inline void flush_xen_data_tlb_range_va(unsigned long va, unsigned long size) { unsigned long end = va + size; - dsb(); /* Ensure preceding are visible */ + dsb(sy); /* Ensure preceding are visible */ while ( va < end ) { asm volatile("tlbi vae2, %0;" : : "r" (va>>PAGE_SHIFT) : "memory"); va += PAGE_SIZE; } - dsb(); /* Ensure completion of the TLB flush */ + dsb(sy); /* Ensure completion of the TLB flush */ isb(); } diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index fd22993..d18ec2a 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -263,20 +263,20 @@ extern size_t cacheline_bytes; static inline void clean_xen_dcache_va_range(void *p, unsigned long size) { void *end; - dsb(); /* So the CPU issues all writes to the range */ + dsb(sy); /* So the CPU issues all writes to the range */ for ( end = p + size; p < end; p += cacheline_bytes ) asm volatile (__clean_xen_dcache_one(0) : : "r" (p)); - dsb(); /* So we know the flushes happen before continuing */ + dsb(sy); /* So we know the flushes happen before continuing */ } static inline void clean_and_invalidate_xen_dcache_va_range (void *p, unsigned long size) { void *end; - dsb(); /* So the CPU issues all writes to the range */ + dsb(sy); /* So the CPU issues all writes to the range */ for ( end = p + size; p < end; p += cacheline_bytes ) asm volatile (__clean_and_invalidate_xen_dcache_one(0) : : "r" (p)); - dsb(); /* So we know the flushes happen before continuing */ + dsb(sy); /* So we know the flushes happen before continuing */ } /* Macros for flushing a single small item. The predicate is always diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 89c61ef..e1f126a 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -13,16 +13,16 @@ #define wfi() asm volatile("wfi" : : : "memory") #define isb() asm volatile("isb" : : : "memory") -#define dsb() asm volatile("dsb sy" : : : "memory") -#define dmb() asm volatile("dmb sy" : : : "memory") +#define dsb(scope) asm volatile("dsb " #scope : : : "memory") +#define dmb(scope) asm volatile("dmb " #scope : : : "memory") -#define mb() dsb() -#define rmb() dsb() -#define wmb() dsb() +#define mb() dsb(sy) +#define rmb() dsb(sy) +#define wmb() dsb(sy) -#define smp_mb() dmb() -#define smp_rmb() dmb() -#define smp_wmb() dmb() +#define smp_mb() dmb(sy) +#define smp_rmb() dmb(sy) +#define smp_wmb() dmb(sy) #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:34:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:34:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhK-0008SN-QN; Wed, 19 Mar 2014 12:34:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhJ-0008Qk-4I for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:17 +0000 Received: from [85.158.137.68:34045] by server-8.bemta-3.messagelabs.com id EE/C8-21547-8CE89235; Wed, 19 Mar 2014 12:34:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1395232454!1597789!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25340 invoked from network); 19 Mar 2014 12:34:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:34:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhG-0002uj-Bt for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFhG-0006DN-Au for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:14 +0000 Date: Wed, 19 Mar 2014 12:34:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: weaken SMP barriers to inner shareable. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc62d6285964ebf809864e40d76797ed745523e4 Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:29 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:27 2014 +0000 xen: arm: weaken SMP barriers to inner shareable. Since all processors are in the inner-shareable domain and we map everything that way this is sufficient. The non-SMP barriers remain full system. Although in principle they could become outer shareable barriers for some hardware this would require us to know which class a given device is. Given the small number of device drivers in Xen itself its probably not worth worrying over, although maybe someone will benchmark at some point. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/include/asm-arm/system.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index e1f126a..32ed277 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -20,9 +20,9 @@ #define rmb() dsb(sy) #define wmb() dsb(sy) -#define smp_mb() dmb(sy) -#define smp_rmb() dmb(sy) -#define smp_wmb() dmb(sy) +#define smp_mb() dmb(ish) +#define smp_rmb() dmb(ish) +#define smp_wmb() dmb(ish) #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:34:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:34:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhK-0008SN-QN; Wed, 19 Mar 2014 12:34:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhJ-0008Qk-4I for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:17 +0000 Received: from [85.158.137.68:34045] by server-8.bemta-3.messagelabs.com id EE/C8-21547-8CE89235; Wed, 19 Mar 2014 12:34:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1395232454!1597789!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25340 invoked from network); 19 Mar 2014 12:34:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:34:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhG-0002uj-Bt for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFhG-0006DN-Au for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:14 +0000 Date: Wed, 19 Mar 2014 12:34:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: weaken SMP barriers to inner shareable. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc62d6285964ebf809864e40d76797ed745523e4 Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:29 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:27 2014 +0000 xen: arm: weaken SMP barriers to inner shareable. Since all processors are in the inner-shareable domain and we map everything that way this is sufficient. The non-SMP barriers remain full system. Although in principle they could become outer shareable barriers for some hardware this would require us to know which class a given device is. Given the small number of device drivers in Xen itself its probably not worth worrying over, although maybe someone will benchmark at some point. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/include/asm-arm/system.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index e1f126a..32ed277 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -20,9 +20,9 @@ #define rmb() dsb(sy) #define wmb() dsb(sy) -#define smp_mb() dmb(sy) -#define smp_rmb() dmb(sy) -#define smp_wmb() dmb(sy) +#define smp_mb() dmb(ish) +#define smp_rmb() dmb(ish) +#define smp_wmb() dmb(ish) #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:34:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:34:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhU-00006B-Ut; Wed, 19 Mar 2014 12:34:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhT-0008WO-Cc for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:27 +0000 Received: from [85.158.137.68:44676] by server-4.bemta-3.messagelabs.com id F9/6B-17399-2DE89235; Wed, 19 Mar 2014 12:34:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1395232464!1597840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27348 invoked from network); 19 Mar 2014 12:34:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:34:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhQ-0002up-GL for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFhQ-0006Dj-FL for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:24 +0000 Date: Wed, 19 Mar 2014 12:34:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: use more specific barriers for read and write barriers. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 652302e12e7f189274eae0193527a039808a524c Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:30 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:27 2014 +0000 xen: arm: use more specific barriers for read and write barriers. Note that 32-bit does not provide a load variant of the inner shareable barrier, so that remains a full any-any barrier. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/include/asm-arm/system.h | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 32ed277..7aaaf50 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -17,12 +17,21 @@ #define dmb(scope) asm volatile("dmb " #scope : : : "memory") #define mb() dsb(sy) -#define rmb() dsb(sy) -#define wmb() dsb(sy) +#ifdef CONFIG_ARM_64 +#define rmb() dsb(ld) +#else +#define rmb() dsb(sy) /* 32-bit has no ld variant. */ +#endif +#define wmb() dsb(st) #define smp_mb() dmb(ish) -#define smp_rmb() dmb(ish) -#define smp_wmb() dmb(ish) +#ifdef CONFIG_ARM_64 +#define smp_rmb() dmb(ishld) +#else +#define smp_rmb() dmb(ish) /* 32-bit has no ishld variant. */ +#endif + +#define smp_wmb() dmb(ishst) #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:34:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:34:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhU-00006B-Ut; Wed, 19 Mar 2014 12:34:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhT-0008WO-Cc for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:27 +0000 Received: from [85.158.137.68:44676] by server-4.bemta-3.messagelabs.com id F9/6B-17399-2DE89235; Wed, 19 Mar 2014 12:34:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1395232464!1597840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27348 invoked from network); 19 Mar 2014 12:34:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:34:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhQ-0002up-GL for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFhQ-0006Dj-FL for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:24 +0000 Date: Wed, 19 Mar 2014 12:34:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: use more specific barriers for read and write barriers. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 652302e12e7f189274eae0193527a039808a524c Author: Ian Campbell AuthorDate: Mon Mar 17 14:53:30 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:27 2014 +0000 xen: arm: use more specific barriers for read and write barriers. Note that 32-bit does not provide a load variant of the inner shareable barrier, so that remains a full any-any barrier. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/include/asm-arm/system.h | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 32ed277..7aaaf50 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -17,12 +17,21 @@ #define dmb(scope) asm volatile("dmb " #scope : : : "memory") #define mb() dsb(sy) -#define rmb() dsb(sy) -#define wmb() dsb(sy) +#ifdef CONFIG_ARM_64 +#define rmb() dsb(ld) +#else +#define rmb() dsb(sy) /* 32-bit has no ld variant. */ +#endif +#define wmb() dsb(st) #define smp_mb() dmb(ish) -#define smp_rmb() dmb(ish) -#define smp_wmb() dmb(ish) +#ifdef CONFIG_ARM_64 +#define smp_rmb() dmb(ishld) +#else +#define smp_rmb() dmb(ish) /* 32-bit has no ishld variant. */ +#endif + +#define smp_wmb() dmb(ishst) #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:34:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:34:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhg-0000CW-2Q; Wed, 19 Mar 2014 12:34:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhd-0000Ac-As for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:37 +0000 Received: from [85.158.137.68:41949] by server-11.bemta-3.messagelabs.com id 37/69-19438-CDE89235; Wed, 19 Mar 2014 12:34:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1395232474!1604083!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21153 invoked from network); 19 Mar 2014 12:34:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:34:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFha-0002uv-Kg for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFha-0006E9-J7 for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:34 +0000 Date: Wed, 19 Mar 2014 12:34:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: make stage 2 page tables walks inner-shareable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8200daed053bc7f3dca4ee5b42d9f84934b998d7 Author: Ian Campbell AuthorDate: Mon Mar 17 17:27:40 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:28 2014 +0000 xen: arm: make stage 2 page tables walks inner-shareable The comment was previously incorrect and indicated that these mappings were unshared (00) when in reality the register was set for outer-shareable (01). Clarify ORGN0/IRGN0 in the comments while at it. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/mm.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index e9b3f34..6f1408b 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -378,16 +378,17 @@ void __init arch_init_memory(void) void __cpuinit setup_virt_paging(void) { /* Setup Stage 2 address translation */ - /* SH0=00, ORGN0=IRGN0=01 + /* SH0=11 (Inner-shareable) + * ORGN0=IRGN0=01 (Normal memory, Write-Back Write-Allocate Cacheable) * SL0=01 (Level-1) * ARVv7: T0SZ=(1)1000 = -8 (32-(-8) = 40 bit physical addresses) * ARMv8: T0SZ=01 1000 = 24 (64-24 = 40 bit physical addresses) * PS=010 == 40 bits */ #ifdef CONFIG_ARM_32 - WRITE_SYSREG32(0x80002558, VTCR_EL2); + WRITE_SYSREG32(0x80003558, VTCR_EL2); #else - WRITE_SYSREG32(0x80022558, VTCR_EL2); + WRITE_SYSREG32(0x80023558, VTCR_EL2); #endif isb(); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:34:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:34:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhg-0000CW-2Q; Wed, 19 Mar 2014 12:34:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhd-0000Ac-As for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:37 +0000 Received: from [85.158.137.68:41949] by server-11.bemta-3.messagelabs.com id 37/69-19438-CDE89235; Wed, 19 Mar 2014 12:34:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1395232474!1604083!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21153 invoked from network); 19 Mar 2014 12:34:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:34:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFha-0002uv-Kg for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFha-0006E9-J7 for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:34 +0000 Date: Wed, 19 Mar 2014 12:34:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: make stage 2 page tables walks inner-shareable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8200daed053bc7f3dca4ee5b42d9f84934b998d7 Author: Ian Campbell AuthorDate: Mon Mar 17 17:27:40 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 15:55:28 2014 +0000 xen: arm: make stage 2 page tables walks inner-shareable The comment was previously incorrect and indicated that these mappings were unshared (00) when in reality the register was set for outer-shareable (01). Clarify ORGN0/IRGN0 in the comments while at it. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/mm.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index e9b3f34..6f1408b 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -378,16 +378,17 @@ void __init arch_init_memory(void) void __cpuinit setup_virt_paging(void) { /* Setup Stage 2 address translation */ - /* SH0=00, ORGN0=IRGN0=01 + /* SH0=11 (Inner-shareable) + * ORGN0=IRGN0=01 (Normal memory, Write-Back Write-Allocate Cacheable) * SL0=01 (Level-1) * ARVv7: T0SZ=(1)1000 = -8 (32-(-8) = 40 bit physical addresses) * ARMv8: T0SZ=01 1000 = 24 (64-24 = 40 bit physical addresses) * PS=010 == 40 bits */ #ifdef CONFIG_ARM_32 - WRITE_SYSREG32(0x80002558, VTCR_EL2); + WRITE_SYSREG32(0x80003558, VTCR_EL2); #else - WRITE_SYSREG32(0x80022558, VTCR_EL2); + WRITE_SYSREG32(0x80023558, VTCR_EL2); #endif isb(); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:35:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:35:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhq-0000IX-5R; Wed, 19 Mar 2014 12:34:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFho-0000HB-Dv for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:48 +0000 Received: from [85.158.139.211:32902] by server-2.bemta-5.messagelabs.com id 70/A8-12074-7EE89235; Wed, 19 Mar 2014 12:34:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1395232485!2010407!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25999 invoked from network); 19 Mar 2014 12:34:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:34:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhk-0002v1-QO for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFhk-0006F2-Os for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:44 +0000 Date: Wed, 19 Mar 2014 12:34:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: avoid "PV" terminology X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aef91661e1ef53b1ec156603ca679f1adc7ad97e Author: Ian Campbell AuthorDate: Tue Mar 18 15:53:20 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 17:06:31 2014 +0000 xen: arm: avoid "PV" terminology Xen on ARM guests are neither PV nor HVM, they are just "guests". Avoid the incorrect use of the term pv in the guest type macros. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm64/domain.c | 4 ++-- xen/arch/arm/arm64/domctl.c | 4 ++-- xen/arch/arm/decode.c | 2 +- xen/arch/arm/domain.c | 18 +++++++++--------- xen/arch/arm/domain_build.c | 6 +++--- xen/arch/arm/kernel.c | 8 ++++---- xen/arch/arm/traps.c | 28 ++++++++++++++-------------- xen/arch/arm/vpsci.c | 4 ++-- xen/arch/arm/vtimer.c | 6 +++--- xen/include/asm-arm/domain.h | 12 ++++++------ 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/xen/arch/arm/arm64/domain.c b/xen/arch/arm/arm64/domain.c index 6990a7b..ccba21f 100644 --- a/xen/arch/arm/arm64/domain.c +++ b/xen/arch/arm/arm64/domain.c @@ -29,7 +29,7 @@ void vcpu_regs_hyp_to_user(const struct vcpu *vcpu, { #define C(hyp,user) regs->user = vcpu->arch.cpu_info->guest_cpu_user_regs.hyp ALLREGS; - if ( is_pv32_domain(vcpu->domain) ) + if ( is_32bit_domain(vcpu->domain) ) { ALLREGS32; } @@ -45,7 +45,7 @@ void vcpu_regs_user_to_hyp(struct vcpu *vcpu, { #define C(hyp,user) vcpu->arch.cpu_info->guest_cpu_user_regs.hyp = regs->user ALLREGS; - if ( is_pv32_domain(vcpu->domain) ) + if ( is_32bit_domain(vcpu->domain) ) { ALLREGS32; } diff --git a/xen/arch/arm/arm64/domctl.c b/xen/arch/arm/arm64/domctl.c index e2b4617..41e2562 100644 --- a/xen/arch/arm/arm64/domctl.c +++ b/xen/arch/arm/arm64/domctl.c @@ -35,9 +35,9 @@ long subarch_do_domctl(struct xen_domctl *domctl, struct domain *d, switch ( domctl->u.address_size.size ) { case 32: - return switch_mode(d, DOMAIN_PV32); + return switch_mode(d, DOMAIN_32BIT); case 64: - return switch_mode(d, DOMAIN_PV64); + return switch_mode(d, DOMAIN_64BIT); default: return -EINVAL; } diff --git a/xen/arch/arm/decode.c b/xen/arch/arm/decode.c index 8880c39..9d237f8 100644 --- a/xen/arch/arm/decode.c +++ b/xen/arch/arm/decode.c @@ -151,7 +151,7 @@ bad_thumb: int decode_instruction(const struct cpu_user_regs *regs, struct hsr_dabt *dabt) { - if ( is_pv32_domain(current->domain) && regs->cpsr & PSR_THUMB ) + if ( is_32bit_domain(current->domain) && regs->cpsr & PSR_THUMB ) return decode_thumb(regs->pc, dabt); /* TODO: Handle ARM instruction */ diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 8834154..c787a82 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -74,7 +74,7 @@ static void ctxt_switch_from(struct vcpu *p) /* Arch timer */ virt_timer_save(p); - if ( is_pv32_domain(p->domain) && cpu_has_thumbee ) + if ( is_32bit_domain(p->domain) && cpu_has_thumbee ) { p->arch.teecr = READ_SYSREG32(TEECR32_EL1); p->arch.teehbr = READ_SYSREG32(TEEHBR32_EL1); @@ -92,7 +92,7 @@ static void ctxt_switch_from(struct vcpu *p) p->arch.ttbcr = READ_SYSREG(TCR_EL1); p->arch.ttbr0 = READ_SYSREG64(TTBR0_EL1); p->arch.ttbr1 = READ_SYSREG64(TTBR1_EL1); - if ( is_pv32_domain(p->domain) ) + if ( is_32bit_domain(p->domain) ) p->arch.dacr = READ_SYSREG(DACR32_EL2); p->arch.par = READ_SYSREG64(PAR_EL1); #if defined(CONFIG_ARM_32) @@ -115,7 +115,7 @@ static void ctxt_switch_from(struct vcpu *p) p->arch.esr = READ_SYSREG64(ESR_EL1); #endif - if ( is_pv32_domain(p->domain) ) + if ( is_32bit_domain(p->domain) ) p->arch.ifsr = READ_SYSREG(IFSR32_EL2); p->arch.afsr0 = READ_SYSREG(AFSR0_EL1); p->arch.afsr1 = READ_SYSREG(AFSR1_EL1); @@ -164,7 +164,7 @@ static void ctxt_switch_to(struct vcpu *n) WRITE_SYSREG64(n->arch.esr, ESR_EL1); #endif - if ( is_pv32_domain(n->domain) ) + if ( is_32bit_domain(n->domain) ) WRITE_SYSREG(n->arch.ifsr, IFSR32_EL2); WRITE_SYSREG(n->arch.afsr0, AFSR0_EL1); WRITE_SYSREG(n->arch.afsr1, AFSR1_EL1); @@ -174,7 +174,7 @@ static void ctxt_switch_to(struct vcpu *n) WRITE_SYSREG(n->arch.ttbcr, TCR_EL1); WRITE_SYSREG64(n->arch.ttbr0, TTBR0_EL1); WRITE_SYSREG64(n->arch.ttbr1, TTBR1_EL1); - if ( is_pv32_domain(n->domain) ) + if ( is_32bit_domain(n->domain) ) WRITE_SYSREG(n->arch.dacr, DACR32_EL2); WRITE_SYSREG64(n->arch.par, PAR_EL1); #if defined(CONFIG_ARM_32) @@ -197,7 +197,7 @@ static void ctxt_switch_to(struct vcpu *n) WRITE_SYSREG(n->arch.tpidrro_el0, TPIDRRO_EL0); WRITE_SYSREG(n->arch.tpidr_el1, TPIDR_EL1); - if ( is_pv32_domain(n->domain) && cpu_has_thumbee ) + if ( is_32bit_domain(n->domain) && cpu_has_thumbee ) { WRITE_SYSREG32(n->arch.teecr, TEECR32_EL1); WRITE_SYSREG32(n->arch.teehbr, TEEHBR32_EL1); @@ -214,7 +214,7 @@ static void ctxt_switch_to(struct vcpu *n) isb(); - if ( is_pv32_domain(n->domain) ) + if ( is_32bit_domain(n->domain) ) hcr &= ~HCR_RW; else hcr |= HCR_RW; @@ -257,7 +257,7 @@ static void continue_new_vcpu(struct vcpu *prev) if ( is_idle_vcpu(current) ) reset_stack_and_jump(idle_loop); - else if is_pv32_domain(current->domain) + else if is_32bit_domain(current->domain) /* check_wakeup_from_wait(); */ reset_stack_and_jump(return_to_new_vcpu32); else @@ -616,7 +616,7 @@ int arch_set_info_guest( struct vcpu_guest_context *ctxt = c.nat; struct vcpu_guest_core_regs *regs = &c.nat->user_regs; - if ( is_pv32_domain(v->domain) ) + if ( is_32bit_domain(v->domain) ) { if ( !is_guest_pv32_psr(regs->cpsr) ) return -EINVAL; diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 5ca2f15..d3345bf 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -507,7 +507,7 @@ static int make_cpus_node(const struct domain *d, void *fdt, return res; } - if ( is_pv64_domain(d) ) + if ( is_64bit_domain(d) ) { res = fdt_property_string(fdt, "enable-method", "psci"); if ( res ) @@ -1024,7 +1024,7 @@ int construct_dom0(struct domain *d) p2m_load_VTTBR(d); #ifdef CONFIG_ARM_64 d->arch.type = kinfo.type; - if ( is_pv32_domain(d) ) + if ( is_32bit_domain(d) ) WRITE_SYSREG(READ_SYSREG(HCR_EL2) & ~HCR_RW, HCR_EL2); else WRITE_SYSREG(READ_SYSREG(HCR_EL2) | HCR_RW, HCR_EL2); @@ -1048,7 +1048,7 @@ int construct_dom0(struct domain *d) regs->pc = (register_t)kinfo.entry; - if ( is_pv32_domain(d) ) + if ( is_32bit_domain(d) ) { regs->cpsr = PSR_GUEST32_INIT; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 1e3107d..c6c41ba 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -209,7 +209,7 @@ static int kernel_try_zimage64_prepare(struct kernel_info *info, info->entry = info->zimage.load_addr; info->load = kernel_zimage_load; - info->type = DOMAIN_PV64; + info->type = DOMAIN_64BIT; return 0; } @@ -281,7 +281,7 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, info->load = kernel_zimage_load; #ifdef CONFIG_ARM_64 - info->type = DOMAIN_PV32; + info->type = DOMAIN_32BIT; #endif return 0; @@ -329,9 +329,9 @@ static int kernel_try_elf_prepare(struct kernel_info *info, #ifdef CONFIG_ARM_64 if ( elf_32bit(&info->elf.elf) ) - info->type = DOMAIN_PV32; + info->type = DOMAIN_32BIT; else if ( elf_64bit(&info->elf.elf) ) - info->type = DOMAIN_PV64; + info->type = DOMAIN_64BIT; else { printk("Unknown ELF class\n"); diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 72fd620..da89597 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -294,7 +294,7 @@ static void inject_undef32_exception(struct cpu_user_regs *regs) /* Saved PC points to the instruction past the faulting instruction. */ uint32_t return_offset = is_thumb ? 2 : 4; - BUG_ON( !is_pv32_domain(current->domain) ); + BUG_ON( !is_32bit_domain(current->domain) ); /* Update processor mode */ cpsr_switch_mode(regs, PSR_MODE_UND); @@ -322,7 +322,7 @@ static void inject_abt32_exception(struct cpu_user_regs *regs, uint32_t return_offset = is_thumb ? 4 : 0; register_t fsr; - BUG_ON( !is_pv32_domain(current->domain) ); + BUG_ON( !is_32bit_domain(current->domain) ); cpsr_switch_mode(regs, PSR_MODE_ABT); @@ -392,7 +392,7 @@ static void inject_undef64_exception(struct cpu_user_regs *regs, int instr_len) .ec = HSR_EC_UNKNOWN, }; - BUG_ON( is_pv32_domain(current->domain) ); + BUG_ON( is_32bit_domain(current->domain) ); regs->spsr_el1 = regs->cpsr; regs->elr_el1 = regs->pc; @@ -429,7 +429,7 @@ static void inject_abt64_exception(struct cpu_user_regs *regs, esr.ec = prefetch ? HSR_EC_INSTR_ABORT_CURR_EL : HSR_EC_DATA_ABORT_CURR_EL; - BUG_ON( is_pv32_domain(current->domain) ); + BUG_ON( is_32bit_domain(current->domain) ); regs->spsr_el1 = regs->cpsr; regs->elr_el1 = regs->pc; @@ -462,7 +462,7 @@ static void inject_iabt_exception(struct cpu_user_regs *regs, register_t addr, int instr_len) { - if ( is_pv32_domain(current->domain) ) + if ( is_32bit_domain(current->domain) ) inject_pabt32_exception(regs, addr); #ifdef CONFIG_ARM_64 else @@ -474,7 +474,7 @@ static void inject_dabt_exception(struct cpu_user_regs *regs, register_t addr, int instr_len) { - if ( is_pv32_domain(current->domain) ) + if ( is_32bit_domain(current->domain) ) inject_dabt32_exception(regs, addr); #ifdef CONFIG_ARM_64 else @@ -679,10 +679,10 @@ static void _show_registers(struct cpu_user_regs *regs, if ( guest_mode ) { - if ( is_pv32_domain(v->domain) ) + if ( is_32bit_domain(v->domain) ) show_registers_32(regs, ctxt, guest_mode, v); #ifdef CONFIG_ARM_64 - else if ( is_pv64_domain(v->domain) ) + else if ( is_64bit_domain(v->domain) ) show_registers_64(regs, ctxt, guest_mode, v); #endif } @@ -1230,7 +1230,7 @@ static int check_conditional_instr(struct cpu_user_regs *regs, union hsr hsr) { unsigned long it; - BUG_ON( !is_pv32_domain(current->domain) || !(cpsr&PSR_THUMB) ); + BUG_ON( !is_32bit_domain(current->domain) || !(cpsr&PSR_THUMB) ); it = ( (cpsr >> (10-2)) & 0xfc) | ((cpsr >> 25) & 0x3 ); @@ -1255,10 +1255,10 @@ static void advance_pc(struct cpu_user_regs *regs, union hsr hsr) unsigned long itbits, cond, cpsr = regs->cpsr; /* PSR_IT_MASK bits can only be set for 32-bit processors in Thumb mode. */ - BUG_ON( (!is_pv32_domain(current->domain)||!(cpsr&PSR_THUMB)) + BUG_ON( (!is_32bit_domain(current->domain)||!(cpsr&PSR_THUMB)) && (cpsr&PSR_IT_MASK) ); - if ( is_pv32_domain(current->domain) && (cpsr&PSR_IT_MASK) ) + if ( is_32bit_domain(current->domain) && (cpsr&PSR_IT_MASK) ) { /* The ITSTATE[7:0] block is contained in CPSR[15:10],CPSR[26:25] * @@ -1563,12 +1563,12 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) advance_pc(regs, hsr); break; case HSR_EC_CP15_32: - if ( ! is_pv32_domain(current->domain) ) + if ( ! is_32bit_domain(current->domain) ) goto bad_trap; do_cp15_32(regs, hsr); break; case HSR_EC_CP15_64: - if ( ! is_pv32_domain(current->domain) ) + if ( ! is_32bit_domain(current->domain) ) goto bad_trap; do_cp15_64(regs, hsr); break; @@ -1598,7 +1598,7 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) inject_undef64_exception(regs, hsr.len); break; case HSR_EC_SYSREG: - if ( is_pv32_domain(current->domain) ) + if ( is_32bit_domain(current->domain) ) goto bad_trap; do_sysreg(regs, hsr); break; diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index c82884f..1ceb8cb 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -33,7 +33,7 @@ int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) return PSCI_EINVAL; /* THUMB set is not allowed with 64-bit domain */ - if ( is_pv64_domain(d) && is_thumb ) + if ( is_64bit_domain(d) && is_thumb ) return PSCI_EINVAL; if ( (ctxt = alloc_vcpu_guest_context()) == NULL ) @@ -47,7 +47,7 @@ int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) ctxt->ttbr0 = 0; ctxt->ttbr1 = 0; ctxt->ttbcr = 0; /* Defined Reset Value */ - if ( is_pv32_domain(d) ) + if ( is_32bit_domain(d) ) ctxt->user_regs.cpsr = PSR_GUEST32_INIT; #ifdef CONFIG_ARM_64 else diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index e325f78..3d6a721 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -266,16 +266,16 @@ int vtimer_emulate(struct cpu_user_regs *regs, union hsr hsr) switch (hsr.ec) { case HSR_EC_CP15_32: - if ( !is_pv32_domain(current->domain) ) + if ( !is_32bit_domain(current->domain) ) return 0; return vtimer_emulate_cp32(regs, hsr); case HSR_EC_CP15_64: - if ( !is_pv32_domain(current->domain) ) + if ( !is_32bit_domain(current->domain) ) return 0; return vtimer_emulate_cp64(regs, hsr); #ifdef CONFIG_ARM_64 case HSR_EC_SYSREG: - if ( is_pv32_domain(current->domain) ) + if ( is_32bit_domain(current->domain) ) return 0; return vtimer_emulate_sysreg(regs, hsr); #endif diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index bc20a15..28c359a 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -76,14 +76,14 @@ struct hvm_domain #ifdef CONFIG_ARM_64 enum domain_type { - DOMAIN_PV32, - DOMAIN_PV64, + DOMAIN_32BIT, + DOMAIN_64BIT, }; -#define is_pv32_domain(d) ((d)->arch.type == DOMAIN_PV32) -#define is_pv64_domain(d) ((d)->arch.type == DOMAIN_PV64) +#define is_32bit_domain(d) ((d)->arch.type == DOMAIN_32BIT) +#define is_64bit_domain(d) ((d)->arch.type == DOMAIN_64BIT) #else -#define is_pv32_domain(d) (1) -#define is_pv64_domain(d) (0) +#define is_32bit_domain(d) (1) +#define is_64bit_domain(d) (0) #endif extern int dom0_11_mapping; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:35:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:35:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhq-0000IX-5R; Wed, 19 Mar 2014 12:34:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFho-0000HB-Dv for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:48 +0000 Received: from [85.158.139.211:32902] by server-2.bemta-5.messagelabs.com id 70/A8-12074-7EE89235; Wed, 19 Mar 2014 12:34:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1395232485!2010407!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25999 invoked from network); 19 Mar 2014 12:34:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:34:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhk-0002v1-QO for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFhk-0006F2-Os for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:44 +0000 Date: Wed, 19 Mar 2014 12:34:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: avoid "PV" terminology X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aef91661e1ef53b1ec156603ca679f1adc7ad97e Author: Ian Campbell AuthorDate: Tue Mar 18 15:53:20 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 17:06:31 2014 +0000 xen: arm: avoid "PV" terminology Xen on ARM guests are neither PV nor HVM, they are just "guests". Avoid the incorrect use of the term pv in the guest type macros. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm64/domain.c | 4 ++-- xen/arch/arm/arm64/domctl.c | 4 ++-- xen/arch/arm/decode.c | 2 +- xen/arch/arm/domain.c | 18 +++++++++--------- xen/arch/arm/domain_build.c | 6 +++--- xen/arch/arm/kernel.c | 8 ++++---- xen/arch/arm/traps.c | 28 ++++++++++++++-------------- xen/arch/arm/vpsci.c | 4 ++-- xen/arch/arm/vtimer.c | 6 +++--- xen/include/asm-arm/domain.h | 12 ++++++------ 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/xen/arch/arm/arm64/domain.c b/xen/arch/arm/arm64/domain.c index 6990a7b..ccba21f 100644 --- a/xen/arch/arm/arm64/domain.c +++ b/xen/arch/arm/arm64/domain.c @@ -29,7 +29,7 @@ void vcpu_regs_hyp_to_user(const struct vcpu *vcpu, { #define C(hyp,user) regs->user = vcpu->arch.cpu_info->guest_cpu_user_regs.hyp ALLREGS; - if ( is_pv32_domain(vcpu->domain) ) + if ( is_32bit_domain(vcpu->domain) ) { ALLREGS32; } @@ -45,7 +45,7 @@ void vcpu_regs_user_to_hyp(struct vcpu *vcpu, { #define C(hyp,user) vcpu->arch.cpu_info->guest_cpu_user_regs.hyp = regs->user ALLREGS; - if ( is_pv32_domain(vcpu->domain) ) + if ( is_32bit_domain(vcpu->domain) ) { ALLREGS32; } diff --git a/xen/arch/arm/arm64/domctl.c b/xen/arch/arm/arm64/domctl.c index e2b4617..41e2562 100644 --- a/xen/arch/arm/arm64/domctl.c +++ b/xen/arch/arm/arm64/domctl.c @@ -35,9 +35,9 @@ long subarch_do_domctl(struct xen_domctl *domctl, struct domain *d, switch ( domctl->u.address_size.size ) { case 32: - return switch_mode(d, DOMAIN_PV32); + return switch_mode(d, DOMAIN_32BIT); case 64: - return switch_mode(d, DOMAIN_PV64); + return switch_mode(d, DOMAIN_64BIT); default: return -EINVAL; } diff --git a/xen/arch/arm/decode.c b/xen/arch/arm/decode.c index 8880c39..9d237f8 100644 --- a/xen/arch/arm/decode.c +++ b/xen/arch/arm/decode.c @@ -151,7 +151,7 @@ bad_thumb: int decode_instruction(const struct cpu_user_regs *regs, struct hsr_dabt *dabt) { - if ( is_pv32_domain(current->domain) && regs->cpsr & PSR_THUMB ) + if ( is_32bit_domain(current->domain) && regs->cpsr & PSR_THUMB ) return decode_thumb(regs->pc, dabt); /* TODO: Handle ARM instruction */ diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 8834154..c787a82 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -74,7 +74,7 @@ static void ctxt_switch_from(struct vcpu *p) /* Arch timer */ virt_timer_save(p); - if ( is_pv32_domain(p->domain) && cpu_has_thumbee ) + if ( is_32bit_domain(p->domain) && cpu_has_thumbee ) { p->arch.teecr = READ_SYSREG32(TEECR32_EL1); p->arch.teehbr = READ_SYSREG32(TEEHBR32_EL1); @@ -92,7 +92,7 @@ static void ctxt_switch_from(struct vcpu *p) p->arch.ttbcr = READ_SYSREG(TCR_EL1); p->arch.ttbr0 = READ_SYSREG64(TTBR0_EL1); p->arch.ttbr1 = READ_SYSREG64(TTBR1_EL1); - if ( is_pv32_domain(p->domain) ) + if ( is_32bit_domain(p->domain) ) p->arch.dacr = READ_SYSREG(DACR32_EL2); p->arch.par = READ_SYSREG64(PAR_EL1); #if defined(CONFIG_ARM_32) @@ -115,7 +115,7 @@ static void ctxt_switch_from(struct vcpu *p) p->arch.esr = READ_SYSREG64(ESR_EL1); #endif - if ( is_pv32_domain(p->domain) ) + if ( is_32bit_domain(p->domain) ) p->arch.ifsr = READ_SYSREG(IFSR32_EL2); p->arch.afsr0 = READ_SYSREG(AFSR0_EL1); p->arch.afsr1 = READ_SYSREG(AFSR1_EL1); @@ -164,7 +164,7 @@ static void ctxt_switch_to(struct vcpu *n) WRITE_SYSREG64(n->arch.esr, ESR_EL1); #endif - if ( is_pv32_domain(n->domain) ) + if ( is_32bit_domain(n->domain) ) WRITE_SYSREG(n->arch.ifsr, IFSR32_EL2); WRITE_SYSREG(n->arch.afsr0, AFSR0_EL1); WRITE_SYSREG(n->arch.afsr1, AFSR1_EL1); @@ -174,7 +174,7 @@ static void ctxt_switch_to(struct vcpu *n) WRITE_SYSREG(n->arch.ttbcr, TCR_EL1); WRITE_SYSREG64(n->arch.ttbr0, TTBR0_EL1); WRITE_SYSREG64(n->arch.ttbr1, TTBR1_EL1); - if ( is_pv32_domain(n->domain) ) + if ( is_32bit_domain(n->domain) ) WRITE_SYSREG(n->arch.dacr, DACR32_EL2); WRITE_SYSREG64(n->arch.par, PAR_EL1); #if defined(CONFIG_ARM_32) @@ -197,7 +197,7 @@ static void ctxt_switch_to(struct vcpu *n) WRITE_SYSREG(n->arch.tpidrro_el0, TPIDRRO_EL0); WRITE_SYSREG(n->arch.tpidr_el1, TPIDR_EL1); - if ( is_pv32_domain(n->domain) && cpu_has_thumbee ) + if ( is_32bit_domain(n->domain) && cpu_has_thumbee ) { WRITE_SYSREG32(n->arch.teecr, TEECR32_EL1); WRITE_SYSREG32(n->arch.teehbr, TEEHBR32_EL1); @@ -214,7 +214,7 @@ static void ctxt_switch_to(struct vcpu *n) isb(); - if ( is_pv32_domain(n->domain) ) + if ( is_32bit_domain(n->domain) ) hcr &= ~HCR_RW; else hcr |= HCR_RW; @@ -257,7 +257,7 @@ static void continue_new_vcpu(struct vcpu *prev) if ( is_idle_vcpu(current) ) reset_stack_and_jump(idle_loop); - else if is_pv32_domain(current->domain) + else if is_32bit_domain(current->domain) /* check_wakeup_from_wait(); */ reset_stack_and_jump(return_to_new_vcpu32); else @@ -616,7 +616,7 @@ int arch_set_info_guest( struct vcpu_guest_context *ctxt = c.nat; struct vcpu_guest_core_regs *regs = &c.nat->user_regs; - if ( is_pv32_domain(v->domain) ) + if ( is_32bit_domain(v->domain) ) { if ( !is_guest_pv32_psr(regs->cpsr) ) return -EINVAL; diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 5ca2f15..d3345bf 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -507,7 +507,7 @@ static int make_cpus_node(const struct domain *d, void *fdt, return res; } - if ( is_pv64_domain(d) ) + if ( is_64bit_domain(d) ) { res = fdt_property_string(fdt, "enable-method", "psci"); if ( res ) @@ -1024,7 +1024,7 @@ int construct_dom0(struct domain *d) p2m_load_VTTBR(d); #ifdef CONFIG_ARM_64 d->arch.type = kinfo.type; - if ( is_pv32_domain(d) ) + if ( is_32bit_domain(d) ) WRITE_SYSREG(READ_SYSREG(HCR_EL2) & ~HCR_RW, HCR_EL2); else WRITE_SYSREG(READ_SYSREG(HCR_EL2) | HCR_RW, HCR_EL2); @@ -1048,7 +1048,7 @@ int construct_dom0(struct domain *d) regs->pc = (register_t)kinfo.entry; - if ( is_pv32_domain(d) ) + if ( is_32bit_domain(d) ) { regs->cpsr = PSR_GUEST32_INIT; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 1e3107d..c6c41ba 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -209,7 +209,7 @@ static int kernel_try_zimage64_prepare(struct kernel_info *info, info->entry = info->zimage.load_addr; info->load = kernel_zimage_load; - info->type = DOMAIN_PV64; + info->type = DOMAIN_64BIT; return 0; } @@ -281,7 +281,7 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, info->load = kernel_zimage_load; #ifdef CONFIG_ARM_64 - info->type = DOMAIN_PV32; + info->type = DOMAIN_32BIT; #endif return 0; @@ -329,9 +329,9 @@ static int kernel_try_elf_prepare(struct kernel_info *info, #ifdef CONFIG_ARM_64 if ( elf_32bit(&info->elf.elf) ) - info->type = DOMAIN_PV32; + info->type = DOMAIN_32BIT; else if ( elf_64bit(&info->elf.elf) ) - info->type = DOMAIN_PV64; + info->type = DOMAIN_64BIT; else { printk("Unknown ELF class\n"); diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 72fd620..da89597 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -294,7 +294,7 @@ static void inject_undef32_exception(struct cpu_user_regs *regs) /* Saved PC points to the instruction past the faulting instruction. */ uint32_t return_offset = is_thumb ? 2 : 4; - BUG_ON( !is_pv32_domain(current->domain) ); + BUG_ON( !is_32bit_domain(current->domain) ); /* Update processor mode */ cpsr_switch_mode(regs, PSR_MODE_UND); @@ -322,7 +322,7 @@ static void inject_abt32_exception(struct cpu_user_regs *regs, uint32_t return_offset = is_thumb ? 4 : 0; register_t fsr; - BUG_ON( !is_pv32_domain(current->domain) ); + BUG_ON( !is_32bit_domain(current->domain) ); cpsr_switch_mode(regs, PSR_MODE_ABT); @@ -392,7 +392,7 @@ static void inject_undef64_exception(struct cpu_user_regs *regs, int instr_len) .ec = HSR_EC_UNKNOWN, }; - BUG_ON( is_pv32_domain(current->domain) ); + BUG_ON( is_32bit_domain(current->domain) ); regs->spsr_el1 = regs->cpsr; regs->elr_el1 = regs->pc; @@ -429,7 +429,7 @@ static void inject_abt64_exception(struct cpu_user_regs *regs, esr.ec = prefetch ? HSR_EC_INSTR_ABORT_CURR_EL : HSR_EC_DATA_ABORT_CURR_EL; - BUG_ON( is_pv32_domain(current->domain) ); + BUG_ON( is_32bit_domain(current->domain) ); regs->spsr_el1 = regs->cpsr; regs->elr_el1 = regs->pc; @@ -462,7 +462,7 @@ static void inject_iabt_exception(struct cpu_user_regs *regs, register_t addr, int instr_len) { - if ( is_pv32_domain(current->domain) ) + if ( is_32bit_domain(current->domain) ) inject_pabt32_exception(regs, addr); #ifdef CONFIG_ARM_64 else @@ -474,7 +474,7 @@ static void inject_dabt_exception(struct cpu_user_regs *regs, register_t addr, int instr_len) { - if ( is_pv32_domain(current->domain) ) + if ( is_32bit_domain(current->domain) ) inject_dabt32_exception(regs, addr); #ifdef CONFIG_ARM_64 else @@ -679,10 +679,10 @@ static void _show_registers(struct cpu_user_regs *regs, if ( guest_mode ) { - if ( is_pv32_domain(v->domain) ) + if ( is_32bit_domain(v->domain) ) show_registers_32(regs, ctxt, guest_mode, v); #ifdef CONFIG_ARM_64 - else if ( is_pv64_domain(v->domain) ) + else if ( is_64bit_domain(v->domain) ) show_registers_64(regs, ctxt, guest_mode, v); #endif } @@ -1230,7 +1230,7 @@ static int check_conditional_instr(struct cpu_user_regs *regs, union hsr hsr) { unsigned long it; - BUG_ON( !is_pv32_domain(current->domain) || !(cpsr&PSR_THUMB) ); + BUG_ON( !is_32bit_domain(current->domain) || !(cpsr&PSR_THUMB) ); it = ( (cpsr >> (10-2)) & 0xfc) | ((cpsr >> 25) & 0x3 ); @@ -1255,10 +1255,10 @@ static void advance_pc(struct cpu_user_regs *regs, union hsr hsr) unsigned long itbits, cond, cpsr = regs->cpsr; /* PSR_IT_MASK bits can only be set for 32-bit processors in Thumb mode. */ - BUG_ON( (!is_pv32_domain(current->domain)||!(cpsr&PSR_THUMB)) + BUG_ON( (!is_32bit_domain(current->domain)||!(cpsr&PSR_THUMB)) && (cpsr&PSR_IT_MASK) ); - if ( is_pv32_domain(current->domain) && (cpsr&PSR_IT_MASK) ) + if ( is_32bit_domain(current->domain) && (cpsr&PSR_IT_MASK) ) { /* The ITSTATE[7:0] block is contained in CPSR[15:10],CPSR[26:25] * @@ -1563,12 +1563,12 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) advance_pc(regs, hsr); break; case HSR_EC_CP15_32: - if ( ! is_pv32_domain(current->domain) ) + if ( ! is_32bit_domain(current->domain) ) goto bad_trap; do_cp15_32(regs, hsr); break; case HSR_EC_CP15_64: - if ( ! is_pv32_domain(current->domain) ) + if ( ! is_32bit_domain(current->domain) ) goto bad_trap; do_cp15_64(regs, hsr); break; @@ -1598,7 +1598,7 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) inject_undef64_exception(regs, hsr.len); break; case HSR_EC_SYSREG: - if ( is_pv32_domain(current->domain) ) + if ( is_32bit_domain(current->domain) ) goto bad_trap; do_sysreg(regs, hsr); break; diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index c82884f..1ceb8cb 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -33,7 +33,7 @@ int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) return PSCI_EINVAL; /* THUMB set is not allowed with 64-bit domain */ - if ( is_pv64_domain(d) && is_thumb ) + if ( is_64bit_domain(d) && is_thumb ) return PSCI_EINVAL; if ( (ctxt = alloc_vcpu_guest_context()) == NULL ) @@ -47,7 +47,7 @@ int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) ctxt->ttbr0 = 0; ctxt->ttbr1 = 0; ctxt->ttbcr = 0; /* Defined Reset Value */ - if ( is_pv32_domain(d) ) + if ( is_32bit_domain(d) ) ctxt->user_regs.cpsr = PSR_GUEST32_INIT; #ifdef CONFIG_ARM_64 else diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index e325f78..3d6a721 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -266,16 +266,16 @@ int vtimer_emulate(struct cpu_user_regs *regs, union hsr hsr) switch (hsr.ec) { case HSR_EC_CP15_32: - if ( !is_pv32_domain(current->domain) ) + if ( !is_32bit_domain(current->domain) ) return 0; return vtimer_emulate_cp32(regs, hsr); case HSR_EC_CP15_64: - if ( !is_pv32_domain(current->domain) ) + if ( !is_32bit_domain(current->domain) ) return 0; return vtimer_emulate_cp64(regs, hsr); #ifdef CONFIG_ARM_64 case HSR_EC_SYSREG: - if ( is_pv32_domain(current->domain) ) + if ( is_32bit_domain(current->domain) ) return 0; return vtimer_emulate_sysreg(regs, hsr); #endif diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index bc20a15..28c359a 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -76,14 +76,14 @@ struct hvm_domain #ifdef CONFIG_ARM_64 enum domain_type { - DOMAIN_PV32, - DOMAIN_PV64, + DOMAIN_32BIT, + DOMAIN_64BIT, }; -#define is_pv32_domain(d) ((d)->arch.type == DOMAIN_PV32) -#define is_pv64_domain(d) ((d)->arch.type == DOMAIN_PV64) +#define is_32bit_domain(d) ((d)->arch.type == DOMAIN_32BIT) +#define is_64bit_domain(d) ((d)->arch.type == DOMAIN_64BIT) #else -#define is_pv32_domain(d) (1) -#define is_pv64_domain(d) (0) +#define is_32bit_domain(d) (1) +#define is_64bit_domain(d) (0) #endif extern int dom0_11_mapping; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:35:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:35:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhy-0000NO-DO; Wed, 19 Mar 2014 12:34:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhx-0000MW-PA for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:57 +0000 Received: from [85.158.139.211:22008] by server-1.bemta-5.messagelabs.com id 15/7B-10259-0FE89235; Wed, 19 Mar 2014 12:34:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1395232495!2007920!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11054 invoked from network); 19 Mar 2014 12:34:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:34:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhu-0002vB-WA for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFhu-0006FP-UE for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:54 +0000 Date: Wed, 19 Mar 2014 12:34:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: fixup a couple of coding style issues X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0975b715bb89f0e2868e7031fc6b90e9eb7f750 Author: Ian Campbell AuthorDate: Tue Mar 18 15:53:21 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 17:06:36 2014 +0000 xen: arm: fixup a couple of coding style issues The if in domain.c was only syntactically valid because the macro happened to contain enclosing braces. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain.c | 2 +- xen/arch/arm/traps.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index c787a82..46ee486 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -257,7 +257,7 @@ static void continue_new_vcpu(struct vcpu *prev) if ( is_idle_vcpu(current) ) reset_stack_and_jump(idle_loop); - else if is_32bit_domain(current->domain) + else if ( is_32bit_domain(current->domain) ) /* check_wakeup_from_wait(); */ reset_stack_and_jump(return_to_new_vcpu32); else diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index da89597..ec43e65 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1563,12 +1563,12 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) advance_pc(regs, hsr); break; case HSR_EC_CP15_32: - if ( ! is_32bit_domain(current->domain) ) + if ( !is_32bit_domain(current->domain) ) goto bad_trap; do_cp15_32(regs, hsr); break; case HSR_EC_CP15_64: - if ( ! is_32bit_domain(current->domain) ) + if ( !is_32bit_domain(current->domain) ) goto bad_trap; do_cp15_64(regs, hsr); break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 12:35:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 12:35:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhy-0000NO-DO; Wed, 19 Mar 2014 12:34:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhx-0000MW-PA for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:57 +0000 Received: from [85.158.139.211:22008] by server-1.bemta-5.messagelabs.com id 15/7B-10259-0FE89235; Wed, 19 Mar 2014 12:34:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1395232495!2007920!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11054 invoked from network); 19 Mar 2014 12:34:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 12:34:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFhu-0002vB-WA for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQFhu-0006FP-UE for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 12:34:54 +0000 Date: Wed, 19 Mar 2014 12:34:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: fixup a couple of coding style issues X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0975b715bb89f0e2868e7031fc6b90e9eb7f750 Author: Ian Campbell AuthorDate: Tue Mar 18 15:53:21 2014 +0000 Commit: Ian Campbell CommitDate: Tue Mar 18 17:06:36 2014 +0000 xen: arm: fixup a couple of coding style issues The if in domain.c was only syntactically valid because the macro happened to contain enclosing braces. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain.c | 2 +- xen/arch/arm/traps.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index c787a82..46ee486 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -257,7 +257,7 @@ static void continue_new_vcpu(struct vcpu *prev) if ( is_idle_vcpu(current) ) reset_stack_and_jump(idle_loop); - else if is_32bit_domain(current->domain) + else if ( is_32bit_domain(current->domain) ) /* check_wakeup_from_wait(); */ reset_stack_and_jump(return_to_new_vcpu32); else diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index da89597..ec43e65 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1563,12 +1563,12 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) advance_pc(regs, hsr); break; case HSR_EC_CP15_32: - if ( ! is_32bit_domain(current->domain) ) + if ( !is_32bit_domain(current->domain) ) goto bad_trap; do_cp15_32(regs, hsr); break; case HSR_EC_CP15_64: - if ( ! is_32bit_domain(current->domain) ) + if ( !is_32bit_domain(current->domain) ) goto bad_trap; do_cp15_64(regs, hsr); break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 22:44:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 22:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQPDX-0008KD-Pe; Wed, 19 Mar 2014 22:44:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQPDU-0008Jn-Ik for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 22:44:08 +0000 Received: from [85.158.143.35:26554] by server-1.bemta-4.messagelabs.com id 13/89-09853-4BD1A235; Wed, 19 Mar 2014 22:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1395269042!3340907!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27817 invoked from network); 19 Mar 2014 22:44:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 22:44:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQPDO-0000vO-La for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 22:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQPDO-0007p9-HH for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 22:44:02 +0000 Date: Wed, 19 Mar 2014 22:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: libxl_list_domain: fix typo in error message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ac1b0a4559a4cc7f3d89cb858e335bbbcc7f1e35 Author: Julien Grall AuthorDate: Tue Mar 18 20:40:49 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 19 11:04:23 2014 +0000 tools/libxl: libxl_list_domain: fix typo in error message Signed-off-by: Julien Grall Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4ecdbbb..30b0b06 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -566,7 +566,7 @@ libxl_dominfo * libxl_list_domain(libxl_ctx *ctx, int *nb_domain_out) ret = xc_domain_getinfolist(ctx->xch, 0, 1024, info); if (ret<0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting domain info list"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list"); free(ptr); return NULL; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 19 22:44:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Mar 2014 22:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQPDX-0008KD-Pe; Wed, 19 Mar 2014 22:44:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQPDU-0008Jn-Ik for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 22:44:08 +0000 Received: from [85.158.143.35:26554] by server-1.bemta-4.messagelabs.com id 13/89-09853-4BD1A235; Wed, 19 Mar 2014 22:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1395269042!3340907!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27817 invoked from network); 19 Mar 2014 22:44:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2014 22:44:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQPDO-0000vO-La for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 22:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQPDO-0007p9-HH for xen-changelog@lists.xensource.com; Wed, 19 Mar 2014 22:44:02 +0000 Date: Wed, 19 Mar 2014 22:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: libxl_list_domain: fix typo in error message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ac1b0a4559a4cc7f3d89cb858e335bbbcc7f1e35 Author: Julien Grall AuthorDate: Tue Mar 18 20:40:49 2014 +0000 Commit: Ian Campbell CommitDate: Wed Mar 19 11:04:23 2014 +0000 tools/libxl: libxl_list_domain: fix typo in error message Signed-off-by: Julien Grall Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4ecdbbb..30b0b06 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -566,7 +566,7 @@ libxl_dominfo * libxl_list_domain(libxl_ctx *ctx, int *nb_domain_out) ret = xc_domain_getinfolist(ctx->xch, 0, 1024, info); if (ret<0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting domain info list"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list"); free(ptr); return NULL; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:00:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxa-0002xo-Oq; Thu, 20 Mar 2014 07:00:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxZ-0002xc-GC for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:13 +0000 Received: from [85.158.143.35:8076] by server-3.bemta-4.messagelabs.com id 94/87-13602-CF19A235; Thu, 20 Mar 2014 07:00:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1395298811!3404487!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16819 invoked from network); 20 Mar 2014 07:00:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:00:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxX-0004W4-3U for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWxQ-0006DB-CI for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:10 +0000 Date: Thu, 20 Mar 2014 07:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/console: reset tty when xenconsole fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 111931f36885874103d65685ab15ea3d25d93da7 Author: Ian Jackson AuthorDate: Mon Feb 24 15:16:19 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:37:19 2014 +0000 tools/console: reset tty when xenconsole fails If xenconsole (the client program) fails, it calls err. This would previously neglect to reset the user's terminal to sanity. Use atexit to do so. This routinely happens in Xen 4.4 RC5 with pygrub because libxl writes the value "" to the tty xenstore key when using xenconsole. After this patch this just results in a harmless error message. Reported-by: M A Young Signed-off-by: Ian Jackson CC: M A Young CC: Ian Campbell Acked-by: George Dunlap Acked-by: Ian Campbell --- v2: Fix whitespace error (reintroduce hard tab) Fix commit message not to claim ignorance about root cause --- tools/console/client/main.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index eb6a1a9..7ce4f24 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -257,6 +257,13 @@ typedef enum { CONSOLE_SERIAL, } console_type; +static struct termios stdin_old_attr; + +static void restore_term_stdin(void) +{ + restore_term(STDIN_FILENO, &stdin_old_attr); +} + int main(int argc, char **argv) { struct termios attr; @@ -383,9 +390,9 @@ int main(int argc, char **argv) } init_term(spty, &attr); - init_term(STDIN_FILENO, &attr); + init_term(STDIN_FILENO, &stdin_old_attr); + atexit(restore_term_stdin); /* if this fails, oh dear */ console_loop(spty, xs, path); - restore_term(STDIN_FILENO, &attr); free(path); free(dom_path); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:00:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxa-0002xo-Oq; Thu, 20 Mar 2014 07:00:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxZ-0002xc-GC for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:13 +0000 Received: from [85.158.143.35:8076] by server-3.bemta-4.messagelabs.com id 94/87-13602-CF19A235; Thu, 20 Mar 2014 07:00:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1395298811!3404487!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16819 invoked from network); 20 Mar 2014 07:00:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:00:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxX-0004W4-3U for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWxQ-0006DB-CI for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:10 +0000 Date: Thu, 20 Mar 2014 07:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/console: reset tty when xenconsole fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 111931f36885874103d65685ab15ea3d25d93da7 Author: Ian Jackson AuthorDate: Mon Feb 24 15:16:19 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:37:19 2014 +0000 tools/console: reset tty when xenconsole fails If xenconsole (the client program) fails, it calls err. This would previously neglect to reset the user's terminal to sanity. Use atexit to do so. This routinely happens in Xen 4.4 RC5 with pygrub because libxl writes the value "" to the tty xenstore key when using xenconsole. After this patch this just results in a harmless error message. Reported-by: M A Young Signed-off-by: Ian Jackson CC: M A Young CC: Ian Campbell Acked-by: George Dunlap Acked-by: Ian Campbell --- v2: Fix whitespace error (reintroduce hard tab) Fix commit message not to claim ignorance about root cause --- tools/console/client/main.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index eb6a1a9..7ce4f24 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -257,6 +257,13 @@ typedef enum { CONSOLE_SERIAL, } console_type; +static struct termios stdin_old_attr; + +static void restore_term_stdin(void) +{ + restore_term(STDIN_FILENO, &stdin_old_attr); +} + int main(int argc, char **argv) { struct termios attr; @@ -383,9 +390,9 @@ int main(int argc, char **argv) } init_term(spty, &attr); - init_term(STDIN_FILENO, &attr); + init_term(STDIN_FILENO, &stdin_old_attr); + atexit(restore_term_stdin); /* if this fails, oh dear */ console_loop(spty, xs, path); - restore_term(STDIN_FILENO, &attr); free(path); free(dom_path); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:00:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:00:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxk-0002yQ-Ux; Thu, 20 Mar 2014 07:00:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxj-0002yA-V0 for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:24 +0000 Received: from [85.158.143.35:61245] by server-1.bemta-4.messagelabs.com id 0F/13-09853-7029A235; Thu, 20 Mar 2014 07:00:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1395298821!3395533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18985 invoked from network); 20 Mar 2014 07:00:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxh-0004W7-Bj for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWxh-0006T4-6o for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:21 +0000 Date: Thu, 20 Mar 2014 07:00:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/console: xenconsole tolerate tty errors X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 39ba2989b10b6a1852e253b204eb010f8e7026f1 Author: Ian Jackson AuthorDate: Thu Feb 27 17:46:49 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:37:19 2014 +0000 tools/console: xenconsole tolerate tty errors Since 28d386fc4341 (XSA-57), libxl writes an empty value for the console tty node, with read-only permission for the guest, when setting up pv console "frontends". (The actual tty value is later set by xenconsoled.) Writing an empty node is not strictly necessary to stop the frontend from writing dangerous values here, but it is a good belt-and-braces approach. Unfortunately this confuses xenconsole. It reads the empty value, and tries to open it as the tty. xenconsole then exits. Fix this by having xenconsole treat an empty value the same way as no value at all. Also, make the error opening the tty be nonfatal: we just print a warning, but do not exit. I think this is helpful in theoretical situations where xenconsole is racing with libxl and/or xenconsoled. Signed-off-by: Ian Jackson Acked-by: Ian Campbell CC: George Dunlap --- v2: Combine two conditions and move the free --- tools/console/client/main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index 7ce4f24..f4c783b 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -114,12 +114,12 @@ static int get_pty_fd(struct xs_handle *xs, char *path, int seconds) /* We only watch for one thing, so no need to * disambiguate: just read the pty path */ pty_path = xs_read(xs, XBT_NULL, path, &len); - if (pty_path != NULL) { + if (pty_path != NULL && pty_path[0] != '\0') { pty_fd = open(pty_path, O_RDWR | O_NOCTTY); if (pty_fd == -1) - err(errno, "Could not open tty `%s'", pty_path); - free(pty_path); + warn("Could not open tty `%s'", pty_path); } + free(pty_path); } } while (pty_fd == -1 && (now = time(NULL)) < start + seconds); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:00:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:00:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxk-0002yQ-Ux; Thu, 20 Mar 2014 07:00:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxj-0002yA-V0 for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:24 +0000 Received: from [85.158.143.35:61245] by server-1.bemta-4.messagelabs.com id 0F/13-09853-7029A235; Thu, 20 Mar 2014 07:00:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1395298821!3395533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18985 invoked from network); 20 Mar 2014 07:00:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxh-0004W7-Bj for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWxh-0006T4-6o for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:21 +0000 Date: Thu, 20 Mar 2014 07:00:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/console: xenconsole tolerate tty errors X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 39ba2989b10b6a1852e253b204eb010f8e7026f1 Author: Ian Jackson AuthorDate: Thu Feb 27 17:46:49 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:37:19 2014 +0000 tools/console: xenconsole tolerate tty errors Since 28d386fc4341 (XSA-57), libxl writes an empty value for the console tty node, with read-only permission for the guest, when setting up pv console "frontends". (The actual tty value is later set by xenconsoled.) Writing an empty node is not strictly necessary to stop the frontend from writing dangerous values here, but it is a good belt-and-braces approach. Unfortunately this confuses xenconsole. It reads the empty value, and tries to open it as the tty. xenconsole then exits. Fix this by having xenconsole treat an empty value the same way as no value at all. Also, make the error opening the tty be nonfatal: we just print a warning, but do not exit. I think this is helpful in theoretical situations where xenconsole is racing with libxl and/or xenconsoled. Signed-off-by: Ian Jackson Acked-by: Ian Campbell CC: George Dunlap --- v2: Combine two conditions and move the free --- tools/console/client/main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index 7ce4f24..f4c783b 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -114,12 +114,12 @@ static int get_pty_fd(struct xs_handle *xs, char *path, int seconds) /* We only watch for one thing, so no need to * disambiguate: just read the pty path */ pty_path = xs_read(xs, XBT_NULL, path, &len); - if (pty_path != NULL) { + if (pty_path != NULL && pty_path[0] != '\0') { pty_fd = open(pty_path, O_RDWR | O_NOCTTY); if (pty_fd == -1) - err(errno, "Could not open tty `%s'", pty_path); - free(pty_path); + warn("Could not open tty `%s'", pty_path); } + free(pty_path); } } while (pty_fd == -1 && (now = time(NULL)) < start + seconds); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:00:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:00:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxv-0002zo-2j; Thu, 20 Mar 2014 07:00:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxu-0002zI-9C for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:34 +0000 Received: from [85.158.139.211:59317] by server-1.bemta-5.messagelabs.com id 08/28-10259-1129A235; Thu, 20 Mar 2014 07:00:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1395298831!2193207!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29842 invoked from network); 20 Mar 2014 07:00:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:00:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxr-0004WA-I1 for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWxr-0006Tu-FW for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:31 +0000 Date: Thu, 20 Mar 2014 07:00:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Make libxl_exec tolerate foofd<=2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 162f0185f7d5bb9ac84ebd511921c50e7dbe870d Author: Ian Jackson AuthorDate: Tue Mar 18 17:04:36 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:40:24 2014 +0000 libxl: Make libxl_exec tolerate foofd<=2 Make passing 0, 1, or 2 as stdinfd, stdoutfd or stderrfd work properly. Also, document the meaning of the fd arguments. Signed-off-by: Ian Jackson CC: Roger Pau Monne CC: Vasiliy Tolstov Acked-by: Ian Campbell --- tools/libxl/libxl_exec.c | 6 +++--- tools/libxl/libxl_internal.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index 4b012dc..478b4c2 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -77,11 +77,11 @@ void libxl__exec(libxl__gc *gc, int stdinfd, int stdoutfd, int stderrfd, if (stderrfd != -1) dup2(stderrfd, STDERR_FILENO); - if (stdinfd != -1) + if (stdinfd > 2) close(stdinfd); - if (stdoutfd != -1 && stdoutfd != stdinfd) + if (stdoutfd > 2 && stdoutfd != stdinfd) close(stdoutfd); - if (stderrfd != -1 && stderrfd != stdinfd && stderrfd != stdoutfd) + if (stderrfd > 2 && stderrfd != stdinfd && stderrfd != stdoutfd) close(stderrfd); check_open_fds(arg0); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 69d2ba8..17890ef 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1418,6 +1418,11 @@ _hidden int libxl__xenstore_child_wait_deprecated(libxl__gc *gc, * * The last entry of the array always has to be NULL. * + * stdinfd, stdoutfd, stderrfd will be dup2'd onto the corresponding + * fd in the child, if they are not -1. The original copy of the + * descriptor will be closed in the child (unless it's 0, 1 or 2 + * ie the source descriptor is itself stdin, stdout or stderr). + * * Logs errors, never returns. */ _hidden void libxl__exec(libxl__gc *gc, int stdinfd, int stdoutfd, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:00:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:00:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxv-0002zo-2j; Thu, 20 Mar 2014 07:00:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxu-0002zI-9C for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:34 +0000 Received: from [85.158.139.211:59317] by server-1.bemta-5.messagelabs.com id 08/28-10259-1129A235; Thu, 20 Mar 2014 07:00:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1395298831!2193207!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29842 invoked from network); 20 Mar 2014 07:00:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:00:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWxr-0004WA-I1 for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWxr-0006Tu-FW for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:31 +0000 Date: Thu, 20 Mar 2014 07:00:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Make libxl_exec tolerate foofd<=2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 162f0185f7d5bb9ac84ebd511921c50e7dbe870d Author: Ian Jackson AuthorDate: Tue Mar 18 17:04:36 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:40:24 2014 +0000 libxl: Make libxl_exec tolerate foofd<=2 Make passing 0, 1, or 2 as stdinfd, stdoutfd or stderrfd work properly. Also, document the meaning of the fd arguments. Signed-off-by: Ian Jackson CC: Roger Pau Monne CC: Vasiliy Tolstov Acked-by: Ian Campbell --- tools/libxl/libxl_exec.c | 6 +++--- tools/libxl/libxl_internal.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index 4b012dc..478b4c2 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -77,11 +77,11 @@ void libxl__exec(libxl__gc *gc, int stdinfd, int stdoutfd, int stderrfd, if (stderrfd != -1) dup2(stderrfd, STDERR_FILENO); - if (stdinfd != -1) + if (stdinfd > 2) close(stdinfd); - if (stdoutfd != -1 && stdoutfd != stdinfd) + if (stdoutfd > 2 && stdoutfd != stdinfd) close(stdoutfd); - if (stderrfd != -1 && stderrfd != stdinfd && stderrfd != stdoutfd) + if (stderrfd > 2 && stderrfd != stdinfd && stderrfd != stdoutfd) close(stderrfd); check_open_fds(arg0); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 69d2ba8..17890ef 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1418,6 +1418,11 @@ _hidden int libxl__xenstore_child_wait_deprecated(libxl__gc *gc, * * The last entry of the array always has to be NULL. * + * stdinfd, stdoutfd, stderrfd will be dup2'd onto the corresponding + * fd in the child, if they are not -1. The original copy of the + * descriptor will be closed in the child (unless it's 0, 1 or 2 + * ie the source descriptor is itself stdin, stdout or stderr). + * * Logs errors, never returns. */ _hidden void libxl__exec(libxl__gc *gc, int stdinfd, int stdoutfd, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:00:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:00:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWy7-00031w-8f; Thu, 20 Mar 2014 07:00:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWy5-00031n-Qo for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:45 +0000 Received: from [85.158.143.35:6270] by server-2.bemta-4.messagelabs.com id 60/35-06539-D129A235; Thu, 20 Mar 2014 07:00:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1395298843!3384571!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18250 invoked from network); 20 Mar 2014 07:00:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:00:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWy3-0004WJ-Df for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWy1-0006UY-LD for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:43 +0000 Date: Thu, 20 Mar 2014 07:00:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: hotplug scripts: stdout >& stderr X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0505417067910820798==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0505417067910820798== Content-Type: text/plain commit 609a23a0ae5d7deb4d3e90c95de60ca25c9e7bf2 Author: Ian Jackson AuthorDate: Tue Mar 18 16:33:06 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:40:24 2014 +0000 libxl: hotplug scripts: stdout >& stderr Plumb hotplug scripts' stdout to stderr. That way if they print anything (which really they shouldn't), it won't get mixed up with the application's stdout. (Eg, perhaps with an xl migration stream...) Signed-off-by: Ian Jackson CC: Roger Pau Monné CC: Vasiliy Tolstov Acked-by: Ian Campbell --- tools/libxl/libxl_device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index ba7d100..90f76b7 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -1031,7 +1031,7 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) if (!pid) { /* child */ - libxl__exec(gc, -1, -1, -1, args[0], args, env); + libxl__exec(gc, -1, 2, -1, args[0], args, env); /* notreached */ abort(); } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0505417067910820798== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============0505417067910820798==-- From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:00:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:00:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWy7-00031w-8f; Thu, 20 Mar 2014 07:00:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWy5-00031n-Qo for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:45 +0000 Received: from [85.158.143.35:6270] by server-2.bemta-4.messagelabs.com id 60/35-06539-D129A235; Thu, 20 Mar 2014 07:00:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1395298843!3384571!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18250 invoked from network); 20 Mar 2014 07:00:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:00:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWy3-0004WJ-Df for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWy1-0006UY-LD for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:43 +0000 Date: Thu, 20 Mar 2014 07:00:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: hotplug scripts: stdout >& stderr X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0505417067910820798==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0505417067910820798== Content-Type: text/plain commit 609a23a0ae5d7deb4d3e90c95de60ca25c9e7bf2 Author: Ian Jackson AuthorDate: Tue Mar 18 16:33:06 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:40:24 2014 +0000 libxl: hotplug scripts: stdout >& stderr Plumb hotplug scripts' stdout to stderr. That way if they print anything (which really they shouldn't), it won't get mixed up with the application's stdout. (Eg, perhaps with an xl migration stream...) Signed-off-by: Ian Jackson CC: Roger Pau Monné CC: Vasiliy Tolstov Acked-by: Ian Campbell --- tools/libxl/libxl_device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index ba7d100..90f76b7 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -1031,7 +1031,7 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) if (!pid) { /* child */ - libxl__exec(gc, -1, -1, -1, args[0], args, env); + libxl__exec(gc, -1, 2, -1, args[0], args, env); /* notreached */ abort(); } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0505417067910820798== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============0505417067910820798==-- From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:01:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:01:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyH-00033u-Bk; Thu, 20 Mar 2014 07:00:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyF-00033S-UY for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:56 +0000 Received: from [85.158.143.35:20890] by server-2.bemta-4.messagelabs.com id 41/85-06539-7229A235; Thu, 20 Mar 2014 07:00:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1395298853!3362906!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9845 invoked from network); 20 Mar 2014 07:00:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:00:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyD-0004WQ-IE for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWyD-0006V4-HD for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:53 +0000 Date: Thu, 20 Mar 2014 07:00:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: hotplug scripts: stdin < /dev/null X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25c07931d570cd012472e378078f11a6db57f091 Author: Ian Jackson AuthorDate: Tue Mar 18 16:37:18 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:40:24 2014 +0000 libxl: hotplug scripts: stdin < /dev/null Give hotplug scripts /dev/null for stdin. That way if they try read anything anything (which really they shouldn't), nothing odd will happen. Signed-off-by: Ian Jackson CC: Roger Pau Monne CC: Vasiliy Tolstov Acked-by: Ian Campbell --- tools/libxl/libxl_device.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 90f76b7..fa99f77 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -956,7 +956,7 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) char *be_path = libxl__device_backend_path(gc, aodev->dev); char **args = NULL, **env = NULL; int rc = 0; - int hotplug; + int hotplug, nullfd = -1; pid_t pid; uint32_t domid; @@ -1021,6 +1021,13 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) aodev->what = GCSPRINTF("%s %s", args[0], args[1]); LOG(DEBUG, "calling hotplug script: %s %s", args[0], args[1]); + nullfd = open("/dev/null", O_RDONLY); + if (nullfd < 0) { + LOG(ERROR, "unable to open /dev/null for hotplug script"); + rc = ERROR_FAIL; + goto out; + } + /* fork and execute hotplug script */ pid = libxl__ev_child_fork(gc, &aodev->child, device_hotplug_child_death_cb); if (pid == -1) { @@ -1031,16 +1038,18 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) if (!pid) { /* child */ - libxl__exec(gc, -1, 2, -1, args[0], args, env); + libxl__exec(gc, nullfd, 2, -1, args[0], args, env); /* notreached */ abort(); } + close(nullfd); assert(libxl__ev_child_inuse(&aodev->child)); return; out: + if (nullfd >= 0) close(nullfd); aodev->rc = rc; device_hotplug_done(egc, aodev); return; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:01:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:01:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyH-00033u-Bk; Thu, 20 Mar 2014 07:00:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyF-00033S-UY for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:56 +0000 Received: from [85.158.143.35:20890] by server-2.bemta-4.messagelabs.com id 41/85-06539-7229A235; Thu, 20 Mar 2014 07:00:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1395298853!3362906!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9845 invoked from network); 20 Mar 2014 07:00:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:00:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyD-0004WQ-IE for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWyD-0006V4-HD for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:00:53 +0000 Date: Thu, 20 Mar 2014 07:00:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: hotplug scripts: stdin < /dev/null X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25c07931d570cd012472e378078f11a6db57f091 Author: Ian Jackson AuthorDate: Tue Mar 18 16:37:18 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:40:24 2014 +0000 libxl: hotplug scripts: stdin < /dev/null Give hotplug scripts /dev/null for stdin. That way if they try read anything anything (which really they shouldn't), nothing odd will happen. Signed-off-by: Ian Jackson CC: Roger Pau Monne CC: Vasiliy Tolstov Acked-by: Ian Campbell --- tools/libxl/libxl_device.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 90f76b7..fa99f77 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -956,7 +956,7 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) char *be_path = libxl__device_backend_path(gc, aodev->dev); char **args = NULL, **env = NULL; int rc = 0; - int hotplug; + int hotplug, nullfd = -1; pid_t pid; uint32_t domid; @@ -1021,6 +1021,13 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) aodev->what = GCSPRINTF("%s %s", args[0], args[1]); LOG(DEBUG, "calling hotplug script: %s %s", args[0], args[1]); + nullfd = open("/dev/null", O_RDONLY); + if (nullfd < 0) { + LOG(ERROR, "unable to open /dev/null for hotplug script"); + rc = ERROR_FAIL; + goto out; + } + /* fork and execute hotplug script */ pid = libxl__ev_child_fork(gc, &aodev->child, device_hotplug_child_death_cb); if (pid == -1) { @@ -1031,16 +1038,18 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) if (!pid) { /* child */ - libxl__exec(gc, -1, 2, -1, args[0], args, env); + libxl__exec(gc, nullfd, 2, -1, args[0], args, env); /* notreached */ abort(); } + close(nullfd); assert(libxl__ev_child_inuse(&aodev->child)); return; out: + if (nullfd >= 0) close(nullfd); aodev->rc = rc; device_hotplug_done(egc, aodev); return; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:01:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:01:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyV-00036v-Fa; Thu, 20 Mar 2014 07:01:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyT-00036c-Of for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:09 +0000 Received: from [85.158.139.211:65035] by server-6.bemta-5.messagelabs.com id 71/83-19576-5329A235; Thu, 20 Mar 2014 07:01:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1395298863!404891!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26457 invoked from network); 20 Mar 2014 07:01:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:01:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyN-0004Wy-Nj for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWyN-0006Vd-LQ for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:03 +0000 Date: Thu, 20 Mar 2014 07:01:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentoollog: provide XTL_STDIOSTREAM_PROGRESS_USE_CR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d25bffafb5c0fdacf2e40a89a0a22b57e18789d Author: Ian Jackson AuthorDate: Tue Jan 7 18:07:30 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:42:13 2014 +0000 xentoollog: provide XTL_STDIOSTREAM_PROGRESS_USE_CR Provide flags XTL_STDIOSTREAM_PROGRESS_USE_CR XTL_STDIOSTREAM_PROGRESS_NO_CR to allow the caller to force, or disable, the use of \r-based overwriting of progress messages. In the implementation, rename the variable "tty" to "progress_use_cr". Signed-off-by: Ian Jackson CC: Olaf Hering Acked-by: Ian Campbell --- tools/libxc/xentoollog.h | 8 +++++--- tools/libxc/xtl_logger_stdio.c | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xentoollog.h b/tools/libxc/xentoollog.h index 6d36dd9..85d3da9 100644 --- a/tools/libxc/xentoollog.h +++ b/tools/libxc/xentoollog.h @@ -65,9 +65,11 @@ struct xentoollog_logger { /*---------- facilities for consuming log messages ----------*/ -#define XTL_STDIOSTREAM_SHOW_PID 01u -#define XTL_STDIOSTREAM_SHOW_DATE 02u -#define XTL_STDIOSTREAM_HIDE_PROGRESS 04u +#define XTL_STDIOSTREAM_SHOW_PID 001u +#define XTL_STDIOSTREAM_SHOW_DATE 002u +#define XTL_STDIOSTREAM_HIDE_PROGRESS 004u +#define XTL_STDIOSTREAM_PROGRESS_USE_CR 010u /* default is to */ +#define XTL_STDIOSTREAM_PROGRESS_NO_CR 020u /* use \r to ttys */ typedef struct xentoollog_logger_stdiostream xentoollog_logger_stdiostream; diff --git a/tools/libxc/xtl_logger_stdio.c b/tools/libxc/xtl_logger_stdio.c index aa5501f..47ee257 100644 --- a/tools/libxc/xtl_logger_stdio.c +++ b/tools/libxc/xtl_logger_stdio.c @@ -28,6 +28,7 @@ #include #include #include +#include struct xentoollog_logger_stdiostream { xentoollog_logger vtable; @@ -35,7 +36,7 @@ struct xentoollog_logger_stdiostream { xentoollog_level min_level; unsigned flags; int progress_erase_len, progress_last_percent; - int tty; + bool progress_use_cr; }; static void progress_erase(xentoollog_logger_stdiostream *lg) { @@ -119,7 +120,7 @@ static void stdiostream_progress(struct xentoollog_logger *logger_in, lg->progress_last_percent = percent; - if (!lg->tty) { + if (!lg->progress_use_cr) { stdiostream_message(logger_in, this_level, context, "%s: %lu/%lu %3d%%", doing_what, done, total, percent); @@ -167,7 +168,18 @@ xentoollog_logger_stdiostream *xtl_createlogger_stdiostream newlogger.f = f; newlogger.min_level = min_level; newlogger.flags = flags; - newlogger.tty = isatty(fileno(newlogger.f)) > 0; + + switch (flags & (XTL_STDIOSTREAM_PROGRESS_USE_CR | + XTL_STDIOSTREAM_PROGRESS_NO_CR)) { + case XTL_STDIOSTREAM_PROGRESS_USE_CR: newlogger.progress_use_cr = 1; break; + case XTL_STDIOSTREAM_PROGRESS_NO_CR: newlogger.progress_use_cr = 0; break; + case 0: + newlogger.progress_use_cr = isatty(fileno(newlogger.f)) > 0; + break; + default: + errno = EINVAL; + return 0; + } if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:01:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:01:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyV-00036v-Fa; Thu, 20 Mar 2014 07:01:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyT-00036c-Of for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:09 +0000 Received: from [85.158.139.211:65035] by server-6.bemta-5.messagelabs.com id 71/83-19576-5329A235; Thu, 20 Mar 2014 07:01:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1395298863!404891!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26457 invoked from network); 20 Mar 2014 07:01:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:01:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyN-0004Wy-Nj for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWyN-0006Vd-LQ for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:03 +0000 Date: Thu, 20 Mar 2014 07:01:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentoollog: provide XTL_STDIOSTREAM_PROGRESS_USE_CR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d25bffafb5c0fdacf2e40a89a0a22b57e18789d Author: Ian Jackson AuthorDate: Tue Jan 7 18:07:30 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:42:13 2014 +0000 xentoollog: provide XTL_STDIOSTREAM_PROGRESS_USE_CR Provide flags XTL_STDIOSTREAM_PROGRESS_USE_CR XTL_STDIOSTREAM_PROGRESS_NO_CR to allow the caller to force, or disable, the use of \r-based overwriting of progress messages. In the implementation, rename the variable "tty" to "progress_use_cr". Signed-off-by: Ian Jackson CC: Olaf Hering Acked-by: Ian Campbell --- tools/libxc/xentoollog.h | 8 +++++--- tools/libxc/xtl_logger_stdio.c | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xentoollog.h b/tools/libxc/xentoollog.h index 6d36dd9..85d3da9 100644 --- a/tools/libxc/xentoollog.h +++ b/tools/libxc/xentoollog.h @@ -65,9 +65,11 @@ struct xentoollog_logger { /*---------- facilities for consuming log messages ----------*/ -#define XTL_STDIOSTREAM_SHOW_PID 01u -#define XTL_STDIOSTREAM_SHOW_DATE 02u -#define XTL_STDIOSTREAM_HIDE_PROGRESS 04u +#define XTL_STDIOSTREAM_SHOW_PID 001u +#define XTL_STDIOSTREAM_SHOW_DATE 002u +#define XTL_STDIOSTREAM_HIDE_PROGRESS 004u +#define XTL_STDIOSTREAM_PROGRESS_USE_CR 010u /* default is to */ +#define XTL_STDIOSTREAM_PROGRESS_NO_CR 020u /* use \r to ttys */ typedef struct xentoollog_logger_stdiostream xentoollog_logger_stdiostream; diff --git a/tools/libxc/xtl_logger_stdio.c b/tools/libxc/xtl_logger_stdio.c index aa5501f..47ee257 100644 --- a/tools/libxc/xtl_logger_stdio.c +++ b/tools/libxc/xtl_logger_stdio.c @@ -28,6 +28,7 @@ #include #include #include +#include struct xentoollog_logger_stdiostream { xentoollog_logger vtable; @@ -35,7 +36,7 @@ struct xentoollog_logger_stdiostream { xentoollog_level min_level; unsigned flags; int progress_erase_len, progress_last_percent; - int tty; + bool progress_use_cr; }; static void progress_erase(xentoollog_logger_stdiostream *lg) { @@ -119,7 +120,7 @@ static void stdiostream_progress(struct xentoollog_logger *logger_in, lg->progress_last_percent = percent; - if (!lg->tty) { + if (!lg->progress_use_cr) { stdiostream_message(logger_in, this_level, context, "%s: %lu/%lu %3d%%", doing_what, done, total, percent); @@ -167,7 +168,18 @@ xentoollog_logger_stdiostream *xtl_createlogger_stdiostream newlogger.f = f; newlogger.min_level = min_level; newlogger.flags = flags; - newlogger.tty = isatty(fileno(newlogger.f)) > 0; + + switch (flags & (XTL_STDIOSTREAM_PROGRESS_USE_CR | + XTL_STDIOSTREAM_PROGRESS_NO_CR)) { + case XTL_STDIOSTREAM_PROGRESS_USE_CR: newlogger.progress_use_cr = 1; break; + case XTL_STDIOSTREAM_PROGRESS_NO_CR: newlogger.progress_use_cr = 0; break; + case 0: + newlogger.progress_use_cr = isatty(fileno(newlogger.f)) > 0; + break; + default: + errno = EINVAL; + return 0; + } if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:01:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:01:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyd-00038v-WD; Thu, 20 Mar 2014 07:01:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWya-00038I-SX for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:17 +0000 Received: from [85.158.137.68:5695] by server-6.bemta-3.messagelabs.com id 98/C2-00470-C329A235; Thu, 20 Mar 2014 07:01:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1395298874!1764796!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16811 invoked from network); 20 Mar 2014 07:01:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:01:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyX-0004X1-Tv for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWyX-0006Wk-Rb for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:13 +0000 Date: Thu, 20 Mar 2014 07:01:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: New -t option ("tty") to force \r-based messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 01f78a81ae56220dd496a61185ba5dfae30dc2fe Author: Ian Jackson AuthorDate: Tue Jan 7 18:19:18 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:42:13 2014 +0000 xl: New -t option ("tty") to force \r-based messages Provide a new xl global option -t which passes XTL_STDIOSTREAM_PROGRESS_USE_CR to xentoollog. Signed-off-by: Ian Jackson CC: Olaf Hering Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 6 ++++++ tools/libxl/xl.c | 9 +++++++-- tools/libxl/xl.h | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index e7b9de2..f7ceaa8 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -81,6 +81,12 @@ Force execution: xl will refuse to run some commands if it detects that xend is also running, this option will force the execution of those commands, even though it is unsafe. +=item B<-t> + +Always use carriage-return-based overwriting for printing progress +messages without scrolling the screen. Without -t, this is done only +if stderr is a tty. + =back =head1 DOMAIN SUBCOMMANDS diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index 657610b..7fdc155 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -48,6 +48,7 @@ char *default_gatewaydev = NULL; char *default_vifbackend = NULL; enum output_format default_output_format = OUTPUT_FORMAT_JSON; int claim_mode = 1; +bool progress_use_cr = 0; static xentoollog_level minmsglevel = XTL_PROGRESS; @@ -292,7 +293,7 @@ int main(int argc, char **argv) int config_len = 0; const char *locks[] = XEND_LOCK; - while ((opt = getopt(argc, argv, "+vfN")) >= 0) { + while ((opt = getopt(argc, argv, "+vftN")) >= 0) { switch (opt) { case 'v': if (minmsglevel > 0) minmsglevel--; @@ -303,6 +304,9 @@ int main(int argc, char **argv) case 'f': force_execution = 1; break; + case 't': + progress_use_cr = 1; + break; default: fprintf(stderr, "unknown global option\n"); exit(2); @@ -317,7 +321,8 @@ int main(int argc, char **argv) } opterr = 0; - logger = xtl_createlogger_stdiostream(stderr, minmsglevel, 0); + logger = xtl_createlogger_stdiostream(stderr, minmsglevel, + (progress_use_cr ? XTL_STDIOSTREAM_PROGRESS_USE_CR : 0)); if (!logger) exit(1); atexit(xl_ctx_free); diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index f188708..1a71234 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -152,6 +152,7 @@ extern int autoballoon; extern int run_hotplug_scripts; extern int dryrun_only; extern int claim_mode; +extern bool progress_use_cr; extern char *lockfile; extern char *default_vifscript; extern char *default_bridge; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:01:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:01:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyv-0003Cl-G0; Thu, 20 Mar 2014 07:01:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyt-0003C6-5c for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:35 +0000 Received: from [193.109.254.147:64506] by server-7.bemta-14.messagelabs.com id A9/F0-17726-E429A235; Thu, 20 Mar 2014 07:01:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1395298886!2894188!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32609 invoked from network); 20 Mar 2014 07:01:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:01:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyi-0004X5-5z for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWyi-0006Xc-18 for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:24 +0000 Date: Thu, 20 Mar 2014 07:01:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: migration: pass -t to xl migrate-receive X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e70a980f67dd1dac3dae812ba6055f8fe742bb78 Author: Ian Jackson AuthorDate: Tue Jan 7 18:23:04 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:42:13 2014 +0000 xl: migration: pass -t to xl migrate-receive If we ourselves are using cr-based overwriting for logging to stderr, pass -t to the migration receiver so that it knows to do the same (since its stderr is normally the pipe from sshd). This requires, of course, that the receiver support that option. This is OK from a compatibility point of view because we support migration to newer, but not necessarily to older, versions. (If unsupported backwards migration is still desired the use of -s "" allows the remote invocation rune to be overridden by a command of one's choice.) This fixes a regression introduced in 2f80ac9c0e8f, where migration messages from the receiver would not use of the overwriting protocol. CC: Olaf Hering Acked-by: Ian Campbell Signed-off-by: Ian Jackson --- tools/libxl/xl_cmdimpl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 6b1ebfa..d52b933 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4110,11 +4110,14 @@ int main_migrate(int argc, char **argv) domid = find_domain(argv[optind]); host = argv[optind + 1]; + bool pass_tty_arg = progress_use_cr || (isatty(2) > 0); + if (!ssh_command[0]) { rune= host; } else { - if (asprintf(&rune, "exec %s %s xl migrate-receive%s%s", + if (asprintf(&rune, "exec %s %s xl%s migrate-receive%s%s", ssh_command, host, + pass_tty_arg ? " -t" : "", daemonize ? "" : " -e", debug ? " -d" : "") < 0) return 1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:01:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:01:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWz7-0003Ee-3b; Thu, 20 Mar 2014 07:01:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWz4-0003EI-Qs for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:47 +0000 Received: from [85.158.143.35:16614] by server-2.bemta-4.messagelabs.com id B6/C6-06539-A529A235; Thu, 20 Mar 2014 07:01:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1395298904!2692746!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1667 invoked from network); 20 Mar 2014 07:01:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:01:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWz2-0004XD-H2 for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWz2-0006ZN-En for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:44 +0000 Date: Thu, 20 Mar 2014 07:01:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: multidev: Clarify internal API doc comment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b3c0519e019de3fcd993913ab48c327daec35115 Author: Ian Jackson AuthorDate: Wed Jan 15 14:33:21 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:42:13 2014 +0000 libxl: multidev: Clarify internal API doc comment Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 17890ef..b3a200d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2082,7 +2082,8 @@ struct libxl__ao_device { * multidev->callback = ... * Then zero or more times * libxl__multidev_prepare - * libal__initiate_device_{remove/addition}. + * libxl__initiate_device_{remove/addition} + * (or some other thing which will eventually call aodev->callback) * Finally, once * libxl__multidev_prepared * which will result (perhaps reentrantly) in one call to callback(). -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:01:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:01:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyw-0003D5-PG; Thu, 20 Mar 2014 07:01:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyu-0003CZ-UU for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:37 +0000 Received: from [193.109.254.147:5864] by server-4.bemta-14.messagelabs.com id BE/0D-02781-0529A235; Thu, 20 Mar 2014 07:01:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1395298894!2195948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14828 invoked from network); 20 Mar 2014 07:01:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:01:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWys-0004XA-BZ for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWys-0006YY-96 for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:34 +0000 Date: Thu, 20 Mar 2014 07:01:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Pass -v options on to migration receiver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af0fd50fd8517673cd962e751b0216f2af44fad7 Author: Ian Jackson AuthorDate: Tue Jan 7 18:40:05 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:42:13 2014 +0000 xl: Pass -v options on to migration receiver Compute a -v option to pass to the migration receiver. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: Use minmsglevel_default to initialise minmsglevel. --- tools/libxl/xl.c | 2 +- tools/libxl/xl.h | 2 ++ tools/libxl/xl_cmdimpl.c | 14 +++++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index 7fdc155..1d157fe 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -50,7 +50,7 @@ enum output_format default_output_format = OUTPUT_FORMAT_JSON; int claim_mode = 1; bool progress_use_cr = 0; -static xentoollog_level minmsglevel = XTL_PROGRESS; +xentoollog_level minmsglevel = minmsglevel_default; /* Get autoballoon option based on presence of dom0_mem Xen command line option. */ diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 1a71234..280d39c 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -153,6 +153,8 @@ extern int run_hotplug_scripts; extern int dryrun_only; extern int claim_mode; extern bool progress_use_cr; +extern xentoollog_level minmsglevel; +#define minmsglevel_default XTL_PROGRESS extern char *lockfile; extern char *default_vifscript; extern char *default_bridge; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index d52b933..8990020 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4115,9 +4115,21 @@ int main_migrate(int argc, char **argv) if (!ssh_command[0]) { rune= host; } else { - if (asprintf(&rune, "exec %s %s xl%s migrate-receive%s%s", + char verbose_buf[minmsglevel_default+3]; + int verbose_len; + verbose_buf[0] = ' '; + verbose_buf[1] = '-'; + memset(verbose_buf+2, 'v', minmsglevel_default); + verbose_buf[sizeof(verbose_buf)-1] = 0; + if (minmsglevel == minmsglevel_default) { + verbose_len = 0; + } else { + verbose_len = (minmsglevel_default - minmsglevel) + 2; + } + if (asprintf(&rune, "exec %s %s xl%s%.*s migrate-receive%s%s", ssh_command, host, pass_tty_arg ? " -t" : "", + verbose_len, verbose_buf, daemonize ? "" : " -e", debug ? " -d" : "") < 0) return 1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:01:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:01:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyw-0003D5-PG; Thu, 20 Mar 2014 07:01:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyu-0003CZ-UU for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:37 +0000 Received: from [193.109.254.147:5864] by server-4.bemta-14.messagelabs.com id BE/0D-02781-0529A235; Thu, 20 Mar 2014 07:01:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1395298894!2195948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14828 invoked from network); 20 Mar 2014 07:01:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:01:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWys-0004XA-BZ for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWys-0006YY-96 for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:34 +0000 Date: Thu, 20 Mar 2014 07:01:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Pass -v options on to migration receiver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af0fd50fd8517673cd962e751b0216f2af44fad7 Author: Ian Jackson AuthorDate: Tue Jan 7 18:40:05 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:42:13 2014 +0000 xl: Pass -v options on to migration receiver Compute a -v option to pass to the migration receiver. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: Use minmsglevel_default to initialise minmsglevel. --- tools/libxl/xl.c | 2 +- tools/libxl/xl.h | 2 ++ tools/libxl/xl_cmdimpl.c | 14 +++++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index 7fdc155..1d157fe 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -50,7 +50,7 @@ enum output_format default_output_format = OUTPUT_FORMAT_JSON; int claim_mode = 1; bool progress_use_cr = 0; -static xentoollog_level minmsglevel = XTL_PROGRESS; +xentoollog_level minmsglevel = minmsglevel_default; /* Get autoballoon option based on presence of dom0_mem Xen command line option. */ diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 1a71234..280d39c 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -153,6 +153,8 @@ extern int run_hotplug_scripts; extern int dryrun_only; extern int claim_mode; extern bool progress_use_cr; +extern xentoollog_level minmsglevel; +#define minmsglevel_default XTL_PROGRESS extern char *lockfile; extern char *default_vifscript; extern char *default_bridge; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index d52b933..8990020 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4115,9 +4115,21 @@ int main_migrate(int argc, char **argv) if (!ssh_command[0]) { rune= host; } else { - if (asprintf(&rune, "exec %s %s xl%s migrate-receive%s%s", + char verbose_buf[minmsglevel_default+3]; + int verbose_len; + verbose_buf[0] = ' '; + verbose_buf[1] = '-'; + memset(verbose_buf+2, 'v', minmsglevel_default); + verbose_buf[sizeof(verbose_buf)-1] = 0; + if (minmsglevel == minmsglevel_default) { + verbose_len = 0; + } else { + verbose_len = (minmsglevel_default - minmsglevel) + 2; + } + if (asprintf(&rune, "exec %s %s xl%s%.*s migrate-receive%s%s", ssh_command, host, pass_tty_arg ? " -t" : "", + verbose_len, verbose_buf, daemonize ? "" : " -e", debug ? " -d" : "") < 0) return 1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:01:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:01:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyv-0003Cl-G0; Thu, 20 Mar 2014 07:01:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyt-0003C6-5c for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:35 +0000 Received: from [193.109.254.147:64506] by server-7.bemta-14.messagelabs.com id A9/F0-17726-E429A235; Thu, 20 Mar 2014 07:01:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1395298886!2894188!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32609 invoked from network); 20 Mar 2014 07:01:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:01:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyi-0004X5-5z for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWyi-0006Xc-18 for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:24 +0000 Date: Thu, 20 Mar 2014 07:01:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: migration: pass -t to xl migrate-receive X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e70a980f67dd1dac3dae812ba6055f8fe742bb78 Author: Ian Jackson AuthorDate: Tue Jan 7 18:23:04 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:42:13 2014 +0000 xl: migration: pass -t to xl migrate-receive If we ourselves are using cr-based overwriting for logging to stderr, pass -t to the migration receiver so that it knows to do the same (since its stderr is normally the pipe from sshd). This requires, of course, that the receiver support that option. This is OK from a compatibility point of view because we support migration to newer, but not necessarily to older, versions. (If unsupported backwards migration is still desired the use of -s "" allows the remote invocation rune to be overridden by a command of one's choice.) This fixes a regression introduced in 2f80ac9c0e8f, where migration messages from the receiver would not use of the overwriting protocol. CC: Olaf Hering Acked-by: Ian Campbell Signed-off-by: Ian Jackson --- tools/libxl/xl_cmdimpl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 6b1ebfa..d52b933 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4110,11 +4110,14 @@ int main_migrate(int argc, char **argv) domid = find_domain(argv[optind]); host = argv[optind + 1]; + bool pass_tty_arg = progress_use_cr || (isatty(2) > 0); + if (!ssh_command[0]) { rune= host; } else { - if (asprintf(&rune, "exec %s %s xl migrate-receive%s%s", + if (asprintf(&rune, "exec %s %s xl%s migrate-receive%s%s", ssh_command, host, + pass_tty_arg ? " -t" : "", daemonize ? "" : " -e", debug ? " -d" : "") < 0) return 1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:01:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:01:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWz7-0003Ee-3b; Thu, 20 Mar 2014 07:01:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWz4-0003EI-Qs for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:47 +0000 Received: from [85.158.143.35:16614] by server-2.bemta-4.messagelabs.com id B6/C6-06539-A529A235; Thu, 20 Mar 2014 07:01:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1395298904!2692746!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1667 invoked from network); 20 Mar 2014 07:01:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:01:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWz2-0004XD-H2 for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWz2-0006ZN-En for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:44 +0000 Date: Thu, 20 Mar 2014 07:01:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: multidev: Clarify internal API doc comment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b3c0519e019de3fcd993913ab48c327daec35115 Author: Ian Jackson AuthorDate: Wed Jan 15 14:33:21 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:42:13 2014 +0000 libxl: multidev: Clarify internal API doc comment Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 17890ef..b3a200d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2082,7 +2082,8 @@ struct libxl__ao_device { * multidev->callback = ... * Then zero or more times * libxl__multidev_prepare - * libal__initiate_device_{remove/addition}. + * libxl__initiate_device_{remove/addition} + * (or some other thing which will eventually call aodev->callback) * Finally, once * libxl__multidev_prepared * which will result (perhaps reentrantly) in one call to callback(). -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 20 07:01:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Mar 2014 07:01:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyd-00038v-WD; Thu, 20 Mar 2014 07:01:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWya-00038I-SX for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:17 +0000 Received: from [85.158.137.68:5695] by server-6.bemta-3.messagelabs.com id 98/C2-00470-C329A235; Thu, 20 Mar 2014 07:01:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1395298874!1764796!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16811 invoked from network); 20 Mar 2014 07:01:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 20 Mar 2014 07:01:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQWyX-0004X1-Tv for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WQWyX-0006Wk-Rb for xen-changelog@lists.xensource.com; Thu, 20 Mar 2014 07:01:13 +0000 Date: Thu, 20 Mar 2014 07:01:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: New -t option ("tty") to force \r-based messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 01f78a81ae56220dd496a61185ba5dfae30dc2fe Author: Ian Jackson AuthorDate: Tue Jan 7 18:19:18 2014 +0000 Commit: Ian Jackson CommitDate: Wed Mar 19 13:42:13 2014 +0000 xl: New -t option ("tty") to force \r-based messages Provide a new xl global option -t which passes XTL_STDIOSTREAM_PROGRESS_USE_CR to xentoollog. Signed-off-by: Ian Jackson CC: Olaf Hering Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 6 ++++++ tools/libxl/xl.c | 9 +++++++-- tools/libxl/xl.h | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index e7b9de2..f7ceaa8 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -81,6 +81,12 @@ Force execution: xl will refuse to run some commands if it detects that xend is also running, this option will force the execution of those commands, even though it is unsafe. +=item B<-t> + +Always use carriage-return-based overwriting for printing progress +messages without scrolling the screen. Without -t, this is done only +if stderr is a tty. + =back =head1 DOMAIN SUBCOMMANDS diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index 657610b..7fdc155 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -48,6 +48,7 @@ char *default_gatewaydev = NULL; char *default_vifbackend = NULL; enum output_format default_output_format = OUTPUT_FORMAT_JSON; int claim_mode = 1; +bool progress_use_cr = 0; static xentoollog_level minmsglevel = XTL_PROGRESS; @@ -292,7 +293,7 @@ int main(int argc, char **argv) int config_len = 0; const char *locks[] = XEND_LOCK; - while ((opt = getopt(argc, argv, "+vfN")) >= 0) { + while ((opt = getopt(argc, argv, "+vftN")) >= 0) { switch (opt) { case 'v': if (minmsglevel > 0) minmsglevel--; @@ -303,6 +304,9 @@ int main(int argc, char **argv) case 'f': force_execution = 1; break; + case 't': + progress_use_cr = 1; + break; default: fprintf(stderr, "unknown global option\n"); exit(2); @@ -317,7 +321,8 @@ int main(int argc, char **argv) } opterr = 0; - logger = xtl_createlogger_stdiostream(stderr, minmsglevel, 0); + logger = xtl_createlogger_stdiostream(stderr, minmsglevel, + (progress_use_cr ? XTL_STDIOSTREAM_PROGRESS_USE_CR : 0)); if (!logger) exit(1); atexit(xl_ctx_free); diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index f188708..1a71234 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -152,6 +152,7 @@ extern int autoballoon; extern int run_hotplug_scripts; extern int dryrun_only; extern int claim_mode; +extern bool progress_use_cr; extern char *lockfile; extern char *default_vifscript; extern char *default_bridge; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:44:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9c-0007n3-JL; Sat, 22 Mar 2014 14:44:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9a-0007mh-NH for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:06 +0000 Received: from [85.158.137.68:6359] by server-13.bemta-3.messagelabs.com id 0C/C9-18692-5B1AD235; Sat, 22 Mar 2014 14:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1395499443!2310287!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11659 invoked from network); 22 Mar 2014 14:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9X-0002T7-Fw for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRN9X-0005YZ-9F for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:03 +0000 Date: Sat, 22 Mar 2014 14:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: kernel: Don't hardcode flash address X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 188948f625bd5ac32f6ef503a52e4fcac72ac1c4 Author: Julien Grall AuthorDate: Mon Mar 17 14:05:51 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:09:21 2014 +0000 xen/arm: kernel: Don't hardcode flash address Xen is loaded either by U-boot or the bootwrapper. Both of them correctly set xen multiboot module for the kernel in the device tree. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/kernel.c | 29 ++++++++++------------------- xen/arch/arm/kernel.h | 1 - 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index c6c41ba..93e5167 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -16,10 +16,6 @@ #include "kernel.h" -/* Store kernel in first 8M of flash */ -#define KERNEL_FLASH_ADDRESS 0x00000000UL -#define KERNEL_FLASH_SIZE 0x00800000UL - #define ZIMAGE32_MAGIC_OFFSET 0x24 #define ZIMAGE32_START_OFFSET 0x28 #define ZIMAGE32_END_OFFSET 0x2c @@ -124,7 +120,6 @@ static void kernel_zimage_load(struct kernel_info *info) { paddr_t load_addr = info->zimage.load_addr; paddr_t paddr = info->zimage.kernel_addr; - paddr_t attr = info->load_attr; paddr_t len = info->zimage.len; unsigned long offs; @@ -150,7 +145,7 @@ static void kernel_zimage_load(struct kernel_info *info) dst = map_domain_page(ma>>PAGE_SHIFT); - copy_from_paddr(dst + s, paddr + offs, l, attr); + copy_from_paddr(dst + s, paddr + offs, l, BUFFERABLE); unmap_domain_page(dst); offs += l; @@ -316,7 +311,7 @@ static int kernel_try_elf_prepare(struct kernel_info *info, if ( info->kernel_img == NULL ) panic("Cannot allocate temporary buffer for kernel"); - copy_from_paddr(info->kernel_img, addr, size, info->load_attr); + copy_from_paddr(info->kernel_img, addr, size, BUFFERABLE); if ( (rc = elf_init(&info->elf.elf, info->kernel_img, size )) != 0 ) goto err; @@ -367,21 +362,17 @@ int kernel_prepare(struct kernel_info *info) paddr_t start, size; - if ( early_info.modules.nr_mods < MOD_KERNEL ) - { - printk("No boot modules found, trying flash\n"); - start = KERNEL_FLASH_ADDRESS; - size = KERNEL_FLASH_SIZE; - info->load_attr = DEV_SHARED; - } - else + start = early_info.modules.module[MOD_KERNEL].start; + size = early_info.modules.module[MOD_KERNEL].size; + + if ( !size ) { - printk("Loading kernel from boot module %d\n", MOD_KERNEL); - start = early_info.modules.module[MOD_KERNEL].start; - size = early_info.modules.module[MOD_KERNEL].size; - info->load_attr = BUFFERABLE; + printk(XENLOG_ERR "Missing kernel boot module?\n"); + return -ENOENT; } + printk("Loading kernel from boot module %d\n", MOD_KERNEL); + #ifdef CONFIG_ARM_64 rc = kernel_try_zimage64_prepare(info, start, size); if (rc < 0) diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h index b48c2c9..ad2956b 100644 --- a/xen/arch/arm/kernel.h +++ b/xen/arch/arm/kernel.h @@ -40,7 +40,6 @@ struct kernel_info { }; void (*load)(struct kernel_info *info); - int load_attr; }; int kernel_prepare(struct kernel_info *info); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:44:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9c-0007n3-JL; Sat, 22 Mar 2014 14:44:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9a-0007mh-NH for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:06 +0000 Received: from [85.158.137.68:6359] by server-13.bemta-3.messagelabs.com id 0C/C9-18692-5B1AD235; Sat, 22 Mar 2014 14:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1395499443!2310287!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11659 invoked from network); 22 Mar 2014 14:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9X-0002T7-Fw for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRN9X-0005YZ-9F for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:03 +0000 Date: Sat, 22 Mar 2014 14:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: kernel: Don't hardcode flash address X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 188948f625bd5ac32f6ef503a52e4fcac72ac1c4 Author: Julien Grall AuthorDate: Mon Mar 17 14:05:51 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:09:21 2014 +0000 xen/arm: kernel: Don't hardcode flash address Xen is loaded either by U-boot or the bootwrapper. Both of them correctly set xen multiboot module for the kernel in the device tree. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/kernel.c | 29 ++++++++++------------------- xen/arch/arm/kernel.h | 1 - 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index c6c41ba..93e5167 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -16,10 +16,6 @@ #include "kernel.h" -/* Store kernel in first 8M of flash */ -#define KERNEL_FLASH_ADDRESS 0x00000000UL -#define KERNEL_FLASH_SIZE 0x00800000UL - #define ZIMAGE32_MAGIC_OFFSET 0x24 #define ZIMAGE32_START_OFFSET 0x28 #define ZIMAGE32_END_OFFSET 0x2c @@ -124,7 +120,6 @@ static void kernel_zimage_load(struct kernel_info *info) { paddr_t load_addr = info->zimage.load_addr; paddr_t paddr = info->zimage.kernel_addr; - paddr_t attr = info->load_attr; paddr_t len = info->zimage.len; unsigned long offs; @@ -150,7 +145,7 @@ static void kernel_zimage_load(struct kernel_info *info) dst = map_domain_page(ma>>PAGE_SHIFT); - copy_from_paddr(dst + s, paddr + offs, l, attr); + copy_from_paddr(dst + s, paddr + offs, l, BUFFERABLE); unmap_domain_page(dst); offs += l; @@ -316,7 +311,7 @@ static int kernel_try_elf_prepare(struct kernel_info *info, if ( info->kernel_img == NULL ) panic("Cannot allocate temporary buffer for kernel"); - copy_from_paddr(info->kernel_img, addr, size, info->load_attr); + copy_from_paddr(info->kernel_img, addr, size, BUFFERABLE); if ( (rc = elf_init(&info->elf.elf, info->kernel_img, size )) != 0 ) goto err; @@ -367,21 +362,17 @@ int kernel_prepare(struct kernel_info *info) paddr_t start, size; - if ( early_info.modules.nr_mods < MOD_KERNEL ) - { - printk("No boot modules found, trying flash\n"); - start = KERNEL_FLASH_ADDRESS; - size = KERNEL_FLASH_SIZE; - info->load_attr = DEV_SHARED; - } - else + start = early_info.modules.module[MOD_KERNEL].start; + size = early_info.modules.module[MOD_KERNEL].size; + + if ( !size ) { - printk("Loading kernel from boot module %d\n", MOD_KERNEL); - start = early_info.modules.module[MOD_KERNEL].start; - size = early_info.modules.module[MOD_KERNEL].size; - info->load_attr = BUFFERABLE; + printk(XENLOG_ERR "Missing kernel boot module?\n"); + return -ENOENT; } + printk("Loading kernel from boot module %d\n", MOD_KERNEL); + #ifdef CONFIG_ARM_64 rc = kernel_try_zimage64_prepare(info, start, size); if (rc < 0) diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h index b48c2c9..ad2956b 100644 --- a/xen/arch/arm/kernel.h +++ b/xen/arch/arm/kernel.h @@ -40,7 +40,6 @@ struct kernel_info { }; void (*load)(struct kernel_info *info); - int load_attr; }; int kernel_prepare(struct kernel_info *info); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9m-0007pc-Mz; Sat, 22 Mar 2014 14:44:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9l-0007pA-HU for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:17 +0000 Received: from [85.158.139.211:18525] by server-1.bemta-5.messagelabs.com id 37/E4-10259-0C1AD235; Sat, 22 Mar 2014 14:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1395499454!2707476!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29124 invoked from network); 22 Mar 2014 14:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9h-0002TA-QM for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRN9h-0005ZT-KM for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:13 +0000 Date: Sat, 22 Mar 2014 14:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove the parameter "attrindx" in copy_from_paddr X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 013b85543df7404fcc61747d930728e0ffa5f5e7 Author: Julien Grall AuthorDate: Mon Mar 17 14:05:52 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:01 2014 +0000 xen/arm: Remove the parameter "attrindx" in copy_from_paddr copy_from_paddr is only used with BUFFERABLE, there is some place where DEV_SHARED was used by mistake. The parameter "attrindx" can be safely remove and let copy_from_paddr to map every page with BUFFERABLE attribute. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/kernel.c | 15 +++++++-------- xen/arch/arm/setup.c | 4 ++-- xen/include/asm-arm/setup.h | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index d3345bf..c9dda0e 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -976,7 +976,7 @@ static void initrd_load(struct kernel_info *kinfo) dst = map_domain_page(ma>>PAGE_SHIFT); - copy_from_paddr(dst + s, paddr + offs, l, BUFFERABLE); + copy_from_paddr(dst + s, paddr + offs, l); unmap_domain_page(dst); offs += l; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 93e5167..ae86772 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -40,7 +40,7 @@ struct minimal_dtb_header { * @paddr: source physical address * @len: length to copy */ -void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx) +void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len) { void *src = (void *)FIXMAP_ADDR(FIXMAP_MISC); @@ -52,7 +52,7 @@ void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx) s = paddr & (PAGE_SIZE-1); l = min(PAGE_SIZE - s, len); - set_fixmap(FIXMAP_MISC, p, attrindx); + set_fixmap(FIXMAP_MISC, p, BUFFERABLE); memcpy(dst, src + s, l); clean_xen_dcache_va_range(dst, l); @@ -145,7 +145,7 @@ static void kernel_zimage_load(struct kernel_info *info) dst = map_domain_page(ma>>PAGE_SHIFT); - copy_from_paddr(dst + s, paddr + offs, l, BUFFERABLE); + copy_from_paddr(dst + s, paddr + offs, l); unmap_domain_page(dst); offs += l; @@ -178,7 +178,7 @@ static int kernel_try_zimage64_prepare(struct kernel_info *info, if ( size < sizeof(zimage) ) return -EINVAL; - copy_from_paddr(&zimage, addr, sizeof(zimage), DEV_SHARED); + copy_from_paddr(&zimage, addr, sizeof(zimage)); if ( zimage.magic0 != ZIMAGE64_MAGIC_V0 && zimage.magic1 != ZIMAGE64_MAGIC_V1 ) @@ -223,7 +223,7 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, if ( size < ZIMAGE32_HEADER_LEN ) return -EINVAL; - copy_from_paddr(zimage, addr, sizeof(zimage), DEV_SHARED); + copy_from_paddr(zimage, addr, sizeof(zimage)); if (zimage[ZIMAGE32_MAGIC_OFFSET/4] != ZIMAGE32_MAGIC) return -EINVAL; @@ -239,8 +239,7 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, */ if ( addr + end - start + sizeof(dtb_hdr) <= size ) { - copy_from_paddr(&dtb_hdr, addr + end - start, - sizeof(dtb_hdr), DEV_SHARED); + copy_from_paddr(&dtb_hdr, addr + end - start, sizeof(dtb_hdr)); if (be32_to_cpu(dtb_hdr.magic) == DTB_MAGIC) { end += be32_to_cpu(dtb_hdr.total_size); @@ -311,7 +310,7 @@ static int kernel_try_elf_prepare(struct kernel_info *info, if ( info->kernel_img == NULL ) panic("Cannot allocate temporary buffer for kernel"); - copy_from_paddr(info->kernel_img, addr, size, BUFFERABLE); + copy_from_paddr(info->kernel_img, addr, size); if ( (rc = elf_init(&info->elf.elf, info->kernel_img, size )) != 0 ) goto err; diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 4a3016a..d59e7f8 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -491,7 +491,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) /* Copy the DTB. */ fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); - copy_from_paddr(fdt, dtb_paddr, dtb_size, BUFFERABLE); + copy_from_paddr(fdt, dtb_paddr, dtb_size); device_tree_flattened = fdt; /* Add non-xenheap memory */ @@ -628,7 +628,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) /* Copy the DTB. */ fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); - copy_from_paddr(fdt, dtb_paddr, dtb_size, BUFFERABLE); + copy_from_paddr(fdt, dtb_paddr, dtb_size); device_tree_flattened = fdt; setup_frametable_mappings(ram_start, ram_end); diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 44a3b4d..b09f688 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -5,7 +5,7 @@ void arch_init_memory(void); -void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx); +void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); void arch_get_xen_caps(xen_capabilities_info_t *info); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9m-0007pc-Mz; Sat, 22 Mar 2014 14:44:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9l-0007pA-HU for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:17 +0000 Received: from [85.158.139.211:18525] by server-1.bemta-5.messagelabs.com id 37/E4-10259-0C1AD235; Sat, 22 Mar 2014 14:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1395499454!2707476!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29124 invoked from network); 22 Mar 2014 14:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9h-0002TA-QM for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRN9h-0005ZT-KM for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:13 +0000 Date: Sat, 22 Mar 2014 14:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove the parameter "attrindx" in copy_from_paddr X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 013b85543df7404fcc61747d930728e0ffa5f5e7 Author: Julien Grall AuthorDate: Mon Mar 17 14:05:52 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:01 2014 +0000 xen/arm: Remove the parameter "attrindx" in copy_from_paddr copy_from_paddr is only used with BUFFERABLE, there is some place where DEV_SHARED was used by mistake. The parameter "attrindx" can be safely remove and let copy_from_paddr to map every page with BUFFERABLE attribute. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/kernel.c | 15 +++++++-------- xen/arch/arm/setup.c | 4 ++-- xen/include/asm-arm/setup.h | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index d3345bf..c9dda0e 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -976,7 +976,7 @@ static void initrd_load(struct kernel_info *kinfo) dst = map_domain_page(ma>>PAGE_SHIFT); - copy_from_paddr(dst + s, paddr + offs, l, BUFFERABLE); + copy_from_paddr(dst + s, paddr + offs, l); unmap_domain_page(dst); offs += l; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 93e5167..ae86772 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -40,7 +40,7 @@ struct minimal_dtb_header { * @paddr: source physical address * @len: length to copy */ -void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx) +void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len) { void *src = (void *)FIXMAP_ADDR(FIXMAP_MISC); @@ -52,7 +52,7 @@ void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx) s = paddr & (PAGE_SIZE-1); l = min(PAGE_SIZE - s, len); - set_fixmap(FIXMAP_MISC, p, attrindx); + set_fixmap(FIXMAP_MISC, p, BUFFERABLE); memcpy(dst, src + s, l); clean_xen_dcache_va_range(dst, l); @@ -145,7 +145,7 @@ static void kernel_zimage_load(struct kernel_info *info) dst = map_domain_page(ma>>PAGE_SHIFT); - copy_from_paddr(dst + s, paddr + offs, l, BUFFERABLE); + copy_from_paddr(dst + s, paddr + offs, l); unmap_domain_page(dst); offs += l; @@ -178,7 +178,7 @@ static int kernel_try_zimage64_prepare(struct kernel_info *info, if ( size < sizeof(zimage) ) return -EINVAL; - copy_from_paddr(&zimage, addr, sizeof(zimage), DEV_SHARED); + copy_from_paddr(&zimage, addr, sizeof(zimage)); if ( zimage.magic0 != ZIMAGE64_MAGIC_V0 && zimage.magic1 != ZIMAGE64_MAGIC_V1 ) @@ -223,7 +223,7 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, if ( size < ZIMAGE32_HEADER_LEN ) return -EINVAL; - copy_from_paddr(zimage, addr, sizeof(zimage), DEV_SHARED); + copy_from_paddr(zimage, addr, sizeof(zimage)); if (zimage[ZIMAGE32_MAGIC_OFFSET/4] != ZIMAGE32_MAGIC) return -EINVAL; @@ -239,8 +239,7 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, */ if ( addr + end - start + sizeof(dtb_hdr) <= size ) { - copy_from_paddr(&dtb_hdr, addr + end - start, - sizeof(dtb_hdr), DEV_SHARED); + copy_from_paddr(&dtb_hdr, addr + end - start, sizeof(dtb_hdr)); if (be32_to_cpu(dtb_hdr.magic) == DTB_MAGIC) { end += be32_to_cpu(dtb_hdr.total_size); @@ -311,7 +310,7 @@ static int kernel_try_elf_prepare(struct kernel_info *info, if ( info->kernel_img == NULL ) panic("Cannot allocate temporary buffer for kernel"); - copy_from_paddr(info->kernel_img, addr, size, BUFFERABLE); + copy_from_paddr(info->kernel_img, addr, size); if ( (rc = elf_init(&info->elf.elf, info->kernel_img, size )) != 0 ) goto err; diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 4a3016a..d59e7f8 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -491,7 +491,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) /* Copy the DTB. */ fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); - copy_from_paddr(fdt, dtb_paddr, dtb_size, BUFFERABLE); + copy_from_paddr(fdt, dtb_paddr, dtb_size); device_tree_flattened = fdt; /* Add non-xenheap memory */ @@ -628,7 +628,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) /* Copy the DTB. */ fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); - copy_from_paddr(fdt, dtb_paddr, dtb_size, BUFFERABLE); + copy_from_paddr(fdt, dtb_paddr, dtb_size); device_tree_flattened = fdt; setup_frametable_mappings(ram_start, ram_end); diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 44a3b4d..b09f688 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -5,7 +5,7 @@ void arch_init_memory(void); -void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx); +void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); void arch_get_xen_caps(xen_capabilities_info_t *info); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9v-0007rp-Q2; Sat, 22 Mar 2014 14:44:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9u-0007rP-N6 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:26 +0000 Received: from [85.158.143.35:5817] by server-3.bemta-4.messagelabs.com id 22/EC-13602-9C1AD235; Sat, 22 Mar 2014 14:44:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1395499464!3952497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10492 invoked from network); 22 Mar 2014 14:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9s-0002TD-2i for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRN9r-0005Zp-TE for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:23 +0000 Date: Sat, 22 Mar 2014 14:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Correctly define size_t X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be5d66adb4bf2fc750e910cfa9b14b0701eae5fc Author: Julien Grall AuthorDate: Mon Mar 17 14:05:53 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:12 2014 +0000 xen/arm: Correctly define size_t Flask code use %zu to print size_t variable. On ARM, size_t always defined to unsigned long which make ARM build failed. Fix it by using __SIZE_TYPE__. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/types.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/include/asm-arm/types.h b/xen/include/asm-arm/types.h index 6875a62..183f3e0 100644 --- a/xen/include/asm-arm/types.h +++ b/xen/include/asm-arm/types.h @@ -55,7 +55,11 @@ typedef u64 register_t; #define PRIregister "lx" #endif +#if defined(__SIZE_TYPE__) +typedef __SIZE_TYPE__ size_t; +#else typedef unsigned long size_t; +#endif typedef char bool_t; #define test_and_set_bool(b) xchg(&(b), 1) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9v-0007rp-Q2; Sat, 22 Mar 2014 14:44:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9u-0007rP-N6 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:26 +0000 Received: from [85.158.143.35:5817] by server-3.bemta-4.messagelabs.com id 22/EC-13602-9C1AD235; Sat, 22 Mar 2014 14:44:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1395499464!3952497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10492 invoked from network); 22 Mar 2014 14:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRN9s-0002TD-2i for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRN9r-0005Zp-TE for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:23 +0000 Date: Sat, 22 Mar 2014 14:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Correctly define size_t X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be5d66adb4bf2fc750e910cfa9b14b0701eae5fc Author: Julien Grall AuthorDate: Mon Mar 17 14:05:53 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:12 2014 +0000 xen/arm: Correctly define size_t Flask code use %zu to print size_t variable. On ARM, size_t always defined to unsigned long which make ARM build failed. Fix it by using __SIZE_TYPE__. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/types.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/include/asm-arm/types.h b/xen/include/asm-arm/types.h index 6875a62..183f3e0 100644 --- a/xen/include/asm-arm/types.h +++ b/xen/include/asm-arm/types.h @@ -55,7 +55,11 @@ typedef u64 register_t; #define PRIregister "lx" #endif +#if defined(__SIZE_TYPE__) +typedef __SIZE_TYPE__ size_t; +#else typedef unsigned long size_t; +#endif typedef char bool_t; #define test_and_set_bool(b) xchg(&(b), 1) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:44:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNA5-0007uf-Sf; Sat, 22 Mar 2014 14:44:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNA4-0007uH-Mg for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:36 +0000 Received: from [85.158.143.35:8139] by server-2.bemta-4.messagelabs.com id 5D/FF-06539-4D1AD235; Sat, 22 Mar 2014 14:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1395499474!3977009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28286 invoked from network); 22 Mar 2014 14:44:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNA2-0002TM-8m for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNA2-0005aF-6z for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:34 +0000 Date: Sat, 22 Mar 2014 14:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: next_module: Skip module if the size is 0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c84e6224f5c9788cf8356cc2aad32b4a12d9834e Author: Julien Grall AuthorDate: Mon Mar 17 14:05:54 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:12 2014 +0000 xen/arm: next_module: Skip module if the size is 0 When the the module size is 0, it means that the module was not provided by the user. It can happen, if the user choose to boot without initrd. In this case, both fields (start and size) are zeroed. Therefore, next_module will return 0 every time if there is other non-zero module after this one. This can happen when the XSM module is added. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/setup.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d59e7f8..215ec24 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -284,6 +284,9 @@ static paddr_t __init next_module(paddr_t s, paddr_t *end) paddr_t mod_s = mi->module[i].start; paddr_t mod_e = mod_s + mi->module[i].size; + if ( !mi->module[i].size ) + continue; + if ( mod_s < s ) continue; if ( mod_s > lowest ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:44:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNA5-0007uf-Sf; Sat, 22 Mar 2014 14:44:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNA4-0007uH-Mg for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:36 +0000 Received: from [85.158.143.35:8139] by server-2.bemta-4.messagelabs.com id 5D/FF-06539-4D1AD235; Sat, 22 Mar 2014 14:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1395499474!3977009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28286 invoked from network); 22 Mar 2014 14:44:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNA2-0002TM-8m for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNA2-0005aF-6z for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:34 +0000 Date: Sat, 22 Mar 2014 14:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: next_module: Skip module if the size is 0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c84e6224f5c9788cf8356cc2aad32b4a12d9834e Author: Julien Grall AuthorDate: Mon Mar 17 14:05:54 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:12 2014 +0000 xen/arm: next_module: Skip module if the size is 0 When the the module size is 0, it means that the module was not provided by the user. It can happen, if the user choose to boot without initrd. In this case, both fields (start and size) are zeroed. Therefore, next_module will return 0 every time if there is other non-zero module after this one. This can happen when the XSM module is added. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/setup.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d59e7f8..215ec24 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -284,6 +284,9 @@ static paddr_t __init next_module(paddr_t s, paddr_t *end) paddr_t mod_s = mi->module[i].start; paddr_t mod_e = mod_s + mi->module[i].size; + if ( !mi->module[i].size ) + continue; + if ( mod_s < s ) continue; if ( mod_s > lowest ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAH-0007y2-VV; Sat, 22 Mar 2014 14:44:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAG-0007xZ-1k for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:48 +0000 Received: from [85.158.139.211:60407] by server-4.bemta-5.messagelabs.com id 74/97-30750-FD1AD235; Sat, 22 Mar 2014 14:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1395499484!2671167!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28026 invoked from network); 22 Mar 2014 14:44:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:44:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAC-0002TV-EN for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNAC-0005ad-DC for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:44 +0000 Date: Sat, 22 Mar 2014 14:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: xsm functions for PCI passthrough is not x86 specific X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47894a7b4bb2abc16dcbac6f7117c866e50dd9ca Author: Julien Grall AuthorDate: Mon Mar 17 14:05:55 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:13 2014 +0000 xen/xsm: xsm functions for PCI passthrough is not x86 specific Protect xsm functions for PCI passthrough by HAS_PASSTHROUGH && HAS_PCI Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian campbell --- xen/include/xsm/dummy.h | 3 + xen/include/xsm/xsm.h | 4 + xen/xsm/dummy.c | 2 + xen/xsm/flask/hooks.c | 143 ++++++++++++++++++++++++---------------------- 4 files changed, 84 insertions(+), 68 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 3bcd941..76f9280 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -317,6 +317,7 @@ static XSM_INLINE int xsm_set_pod_target(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } +#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) static XSM_INLINE int xsm_get_device_group(XSM_DEFAULT_ARG uint32_t machine_bdf) { XSM_ASSERT_ACTION(XSM_HOOK); @@ -341,6 +342,8 @@ static XSM_INLINE int xsm_deassign_device(XSM_DEFAULT_ARG struct domain *d, uint return xsm_default_action(action, current->domain, d); } +#endif /* HAS_PASSTHROUGH && HAS_PCI */ + static XSM_INLINE int xsm_resource_plug_core(XSM_DEFAULT_VOID) { XSM_ASSERT_ACTION(XSM_HOOK); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index de9cf86..11218b6 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -111,10 +111,12 @@ struct xsm_operations { int (*iomem_mapping) (struct domain *d, uint64_t s, uint64_t e, uint8_t allow); int (*pci_config_permission) (struct domain *d, uint32_t machine_bdf, uint16_t start, uint16_t end, uint8_t access); +#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) int (*get_device_group) (uint32_t machine_bdf); int (*test_assign_device) (uint32_t machine_bdf); int (*assign_device) (struct domain *d, uint32_t machine_bdf); int (*deassign_device) (struct domain *d, uint32_t machine_bdf); +#endif int (*resource_plug_core) (void); int (*resource_unplug_core) (void); @@ -427,6 +429,7 @@ static inline int xsm_pci_config_permission (xsm_default_t def, struct domain *d return xsm_ops->pci_config_permission(d, machine_bdf, start, end, access); } +#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) static inline int xsm_get_device_group(xsm_default_t def, uint32_t machine_bdf) { return xsm_ops->get_device_group(machine_bdf); @@ -446,6 +449,7 @@ static inline int xsm_deassign_device(xsm_default_t def, struct domain *d, uint3 { return xsm_ops->deassign_device(d, machine_bdf); } +#endif /* HAS_PASSTHROUGH && HAS_PCI) */ static inline int xsm_resource_plug_pci (xsm_default_t def, uint32_t machine_bdf) { diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 3fe4c59..627edcc 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -85,10 +85,12 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, iomem_mapping); set_to_dummy_if_null(ops, pci_config_permission); +#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) set_to_dummy_if_null(ops, get_device_group); set_to_dummy_if_null(ops, test_assign_device); set_to_dummy_if_null(ops, assign_device); set_to_dummy_if_null(ops, deassign_device); +#endif set_to_dummy_if_null(ops, resource_plug_core); set_to_dummy_if_null(ops, resource_unplug_core); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 96276ac..7329f31 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1102,6 +1102,72 @@ static int flask_hvm_param_nested(struct domain *d) return current_has_perm(d, SECCLASS_HVM, HVM__NESTED); } +#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +static int flask_get_device_group(uint32_t machine_bdf) +{ + u32 rsid; + int rc = -EPERM; + + rc = security_device_sid(machine_bdf, &rsid); + if ( rc ) + return rc; + + return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__STAT_DEVICE, NULL); +} + +static int flask_test_assign_device(uint32_t machine_bdf) +{ + u32 rsid; + int rc = -EPERM; + + rc = security_device_sid(machine_bdf, &rsid); + if ( rc ) + return rc; + + return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__STAT_DEVICE, NULL); +} + +static int flask_assign_device(struct domain *d, uint32_t machine_bdf) +{ + u32 dsid, rsid; + int rc = -EPERM; + struct avc_audit_data ad; + + rc = current_has_perm(d, SECCLASS_RESOURCE, RESOURCE__ADD); + if ( rc ) + return rc; + + rc = security_device_sid(machine_bdf, &rsid); + if ( rc ) + return rc; + + AVC_AUDIT_DATA_INIT(&ad, DEV); + ad.device = (unsigned long) machine_bdf; + rc = avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__ADD_DEVICE, &ad); + if ( rc ) + return rc; + + dsid = domain_sid(d); + return avc_has_perm(dsid, rsid, SECCLASS_RESOURCE, RESOURCE__USE, &ad); +} + +static int flask_deassign_device(struct domain *d, uint32_t machine_bdf) +{ + u32 rsid; + int rc = -EPERM; + + rc = current_has_perm(d, SECCLASS_RESOURCE, RESOURCE__REMOVE); + if ( rc ) + return rc; + + rc = security_device_sid(machine_bdf, &rsid); + if ( rc ) + return rc; + + return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__REMOVE_DEVICE, NULL); +} +#endif /* HAS_PASSTHROUGH && HAS_PCI */ + #ifdef CONFIG_X86 static int flask_shadow_control(struct domain *d, uint32_t op) { @@ -1355,70 +1421,6 @@ static int flask_priv_mapping(struct domain *d, struct domain *t) return domain_has_perm(d, t, SECCLASS_MMU, MMU__TARGET_HACK); } -static int flask_get_device_group(uint32_t machine_bdf) -{ - u32 rsid; - int rc = -EPERM; - - rc = security_device_sid(machine_bdf, &rsid); - if ( rc ) - return rc; - - return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__STAT_DEVICE, NULL); -} - -static int flask_test_assign_device(uint32_t machine_bdf) -{ - u32 rsid; - int rc = -EPERM; - - rc = security_device_sid(machine_bdf, &rsid); - if ( rc ) - return rc; - - return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__STAT_DEVICE, NULL); -} - -static int flask_assign_device(struct domain *d, uint32_t machine_bdf) -{ - u32 dsid, rsid; - int rc = -EPERM; - struct avc_audit_data ad; - - rc = current_has_perm(d, SECCLASS_RESOURCE, RESOURCE__ADD); - if ( rc ) - return rc; - - rc = security_device_sid(machine_bdf, &rsid); - if ( rc ) - return rc; - - AVC_AUDIT_DATA_INIT(&ad, DEV); - ad.device = (unsigned long) machine_bdf; - rc = avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__ADD_DEVICE, &ad); - if ( rc ) - return rc; - - dsid = domain_sid(d); - return avc_has_perm(dsid, rsid, SECCLASS_RESOURCE, RESOURCE__USE, &ad); -} - -static int flask_deassign_device(struct domain *d, uint32_t machine_bdf) -{ - u32 rsid; - int rc = -EPERM; - - rc = current_has_perm(d, SECCLASS_RESOURCE, RESOURCE__REMOVE); - if ( rc ) - return rc; - - rc = security_device_sid(machine_bdf, &rsid); - if ( rc ) - return rc; - - return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__REMOVE_DEVICE, NULL); -} - static int flask_bind_pt_irq (struct domain *d, struct xen_domctl_bind_pt_irq *bind) { u32 dsid, rsid; @@ -1540,6 +1542,14 @@ static struct xsm_operations flask_ops = { .add_to_physmap = flask_add_to_physmap, .remove_from_physmap = flask_remove_from_physmap, + +#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) + .get_device_group = flask_get_device_group, + .test_assign_device = flask_test_assign_device, + .assign_device = flask_assign_device, + .deassign_device = flask_deassign_device, +#endif + #ifdef CONFIG_X86 .shadow_control = flask_shadow_control, .hvm_set_pci_intx_level = flask_hvm_set_pci_intx_level, @@ -1557,15 +1567,12 @@ static struct xsm_operations flask_ops = { .mmuext_op = flask_mmuext_op, .update_va_mapping = flask_update_va_mapping, .priv_mapping = flask_priv_mapping, - .get_device_group = flask_get_device_group, - .test_assign_device = flask_test_assign_device, - .assign_device = flask_assign_device, - .deassign_device = flask_deassign_device, .bind_pt_irq = flask_bind_pt_irq, .unbind_pt_irq = flask_unbind_pt_irq, .ioport_permission = flask_ioport_permission, .ioport_mapping = flask_ioport_mapping, #endif + #ifdef CONFIG_ARM .map_gmfn_foreign = flask_map_gmfn_foreign, #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAH-0007y2-VV; Sat, 22 Mar 2014 14:44:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAG-0007xZ-1k for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:48 +0000 Received: from [85.158.139.211:60407] by server-4.bemta-5.messagelabs.com id 74/97-30750-FD1AD235; Sat, 22 Mar 2014 14:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1395499484!2671167!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28026 invoked from network); 22 Mar 2014 14:44:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:44:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAC-0002TV-EN for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNAC-0005ad-DC for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:44 +0000 Date: Sat, 22 Mar 2014 14:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: xsm functions for PCI passthrough is not x86 specific X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47894a7b4bb2abc16dcbac6f7117c866e50dd9ca Author: Julien Grall AuthorDate: Mon Mar 17 14:05:55 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:13 2014 +0000 xen/xsm: xsm functions for PCI passthrough is not x86 specific Protect xsm functions for PCI passthrough by HAS_PASSTHROUGH && HAS_PCI Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian campbell --- xen/include/xsm/dummy.h | 3 + xen/include/xsm/xsm.h | 4 + xen/xsm/dummy.c | 2 + xen/xsm/flask/hooks.c | 143 ++++++++++++++++++++++++---------------------- 4 files changed, 84 insertions(+), 68 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 3bcd941..76f9280 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -317,6 +317,7 @@ static XSM_INLINE int xsm_set_pod_target(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } +#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) static XSM_INLINE int xsm_get_device_group(XSM_DEFAULT_ARG uint32_t machine_bdf) { XSM_ASSERT_ACTION(XSM_HOOK); @@ -341,6 +342,8 @@ static XSM_INLINE int xsm_deassign_device(XSM_DEFAULT_ARG struct domain *d, uint return xsm_default_action(action, current->domain, d); } +#endif /* HAS_PASSTHROUGH && HAS_PCI */ + static XSM_INLINE int xsm_resource_plug_core(XSM_DEFAULT_VOID) { XSM_ASSERT_ACTION(XSM_HOOK); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index de9cf86..11218b6 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -111,10 +111,12 @@ struct xsm_operations { int (*iomem_mapping) (struct domain *d, uint64_t s, uint64_t e, uint8_t allow); int (*pci_config_permission) (struct domain *d, uint32_t machine_bdf, uint16_t start, uint16_t end, uint8_t access); +#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) int (*get_device_group) (uint32_t machine_bdf); int (*test_assign_device) (uint32_t machine_bdf); int (*assign_device) (struct domain *d, uint32_t machine_bdf); int (*deassign_device) (struct domain *d, uint32_t machine_bdf); +#endif int (*resource_plug_core) (void); int (*resource_unplug_core) (void); @@ -427,6 +429,7 @@ static inline int xsm_pci_config_permission (xsm_default_t def, struct domain *d return xsm_ops->pci_config_permission(d, machine_bdf, start, end, access); } +#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) static inline int xsm_get_device_group(xsm_default_t def, uint32_t machine_bdf) { return xsm_ops->get_device_group(machine_bdf); @@ -446,6 +449,7 @@ static inline int xsm_deassign_device(xsm_default_t def, struct domain *d, uint3 { return xsm_ops->deassign_device(d, machine_bdf); } +#endif /* HAS_PASSTHROUGH && HAS_PCI) */ static inline int xsm_resource_plug_pci (xsm_default_t def, uint32_t machine_bdf) { diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 3fe4c59..627edcc 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -85,10 +85,12 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, iomem_mapping); set_to_dummy_if_null(ops, pci_config_permission); +#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) set_to_dummy_if_null(ops, get_device_group); set_to_dummy_if_null(ops, test_assign_device); set_to_dummy_if_null(ops, assign_device); set_to_dummy_if_null(ops, deassign_device); +#endif set_to_dummy_if_null(ops, resource_plug_core); set_to_dummy_if_null(ops, resource_unplug_core); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 96276ac..7329f31 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1102,6 +1102,72 @@ static int flask_hvm_param_nested(struct domain *d) return current_has_perm(d, SECCLASS_HVM, HVM__NESTED); } +#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +static int flask_get_device_group(uint32_t machine_bdf) +{ + u32 rsid; + int rc = -EPERM; + + rc = security_device_sid(machine_bdf, &rsid); + if ( rc ) + return rc; + + return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__STAT_DEVICE, NULL); +} + +static int flask_test_assign_device(uint32_t machine_bdf) +{ + u32 rsid; + int rc = -EPERM; + + rc = security_device_sid(machine_bdf, &rsid); + if ( rc ) + return rc; + + return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__STAT_DEVICE, NULL); +} + +static int flask_assign_device(struct domain *d, uint32_t machine_bdf) +{ + u32 dsid, rsid; + int rc = -EPERM; + struct avc_audit_data ad; + + rc = current_has_perm(d, SECCLASS_RESOURCE, RESOURCE__ADD); + if ( rc ) + return rc; + + rc = security_device_sid(machine_bdf, &rsid); + if ( rc ) + return rc; + + AVC_AUDIT_DATA_INIT(&ad, DEV); + ad.device = (unsigned long) machine_bdf; + rc = avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__ADD_DEVICE, &ad); + if ( rc ) + return rc; + + dsid = domain_sid(d); + return avc_has_perm(dsid, rsid, SECCLASS_RESOURCE, RESOURCE__USE, &ad); +} + +static int flask_deassign_device(struct domain *d, uint32_t machine_bdf) +{ + u32 rsid; + int rc = -EPERM; + + rc = current_has_perm(d, SECCLASS_RESOURCE, RESOURCE__REMOVE); + if ( rc ) + return rc; + + rc = security_device_sid(machine_bdf, &rsid); + if ( rc ) + return rc; + + return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__REMOVE_DEVICE, NULL); +} +#endif /* HAS_PASSTHROUGH && HAS_PCI */ + #ifdef CONFIG_X86 static int flask_shadow_control(struct domain *d, uint32_t op) { @@ -1355,70 +1421,6 @@ static int flask_priv_mapping(struct domain *d, struct domain *t) return domain_has_perm(d, t, SECCLASS_MMU, MMU__TARGET_HACK); } -static int flask_get_device_group(uint32_t machine_bdf) -{ - u32 rsid; - int rc = -EPERM; - - rc = security_device_sid(machine_bdf, &rsid); - if ( rc ) - return rc; - - return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__STAT_DEVICE, NULL); -} - -static int flask_test_assign_device(uint32_t machine_bdf) -{ - u32 rsid; - int rc = -EPERM; - - rc = security_device_sid(machine_bdf, &rsid); - if ( rc ) - return rc; - - return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__STAT_DEVICE, NULL); -} - -static int flask_assign_device(struct domain *d, uint32_t machine_bdf) -{ - u32 dsid, rsid; - int rc = -EPERM; - struct avc_audit_data ad; - - rc = current_has_perm(d, SECCLASS_RESOURCE, RESOURCE__ADD); - if ( rc ) - return rc; - - rc = security_device_sid(machine_bdf, &rsid); - if ( rc ) - return rc; - - AVC_AUDIT_DATA_INIT(&ad, DEV); - ad.device = (unsigned long) machine_bdf; - rc = avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__ADD_DEVICE, &ad); - if ( rc ) - return rc; - - dsid = domain_sid(d); - return avc_has_perm(dsid, rsid, SECCLASS_RESOURCE, RESOURCE__USE, &ad); -} - -static int flask_deassign_device(struct domain *d, uint32_t machine_bdf) -{ - u32 rsid; - int rc = -EPERM; - - rc = current_has_perm(d, SECCLASS_RESOURCE, RESOURCE__REMOVE); - if ( rc ) - return rc; - - rc = security_device_sid(machine_bdf, &rsid); - if ( rc ) - return rc; - - return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__REMOVE_DEVICE, NULL); -} - static int flask_bind_pt_irq (struct domain *d, struct xen_domctl_bind_pt_irq *bind) { u32 dsid, rsid; @@ -1540,6 +1542,14 @@ static struct xsm_operations flask_ops = { .add_to_physmap = flask_add_to_physmap, .remove_from_physmap = flask_remove_from_physmap, + +#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) + .get_device_group = flask_get_device_group, + .test_assign_device = flask_test_assign_device, + .assign_device = flask_assign_device, + .deassign_device = flask_deassign_device, +#endif + #ifdef CONFIG_X86 .shadow_control = flask_shadow_control, .hvm_set_pci_intx_level = flask_hvm_set_pci_intx_level, @@ -1557,15 +1567,12 @@ static struct xsm_operations flask_ops = { .mmuext_op = flask_mmuext_op, .update_va_mapping = flask_update_va_mapping, .priv_mapping = flask_priv_mapping, - .get_device_group = flask_get_device_group, - .test_assign_device = flask_test_assign_device, - .assign_device = flask_assign_device, - .deassign_device = flask_deassign_device, .bind_pt_irq = flask_bind_pt_irq, .unbind_pt_irq = flask_unbind_pt_irq, .ioport_permission = flask_ioport_permission, .ioport_mapping = flask_ioport_mapping, #endif + #ifdef CONFIG_ARM .map_gmfn_foreign = flask_map_gmfn_foreign, #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAS-00080t-3k; Sat, 22 Mar 2014 14:45:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAP-00080Z-Tw for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:58 +0000 Received: from [85.158.139.211:60723] by server-14.bemta-5.messagelabs.com id F7/26-15696-9E1AD235; Sat, 22 Mar 2014 14:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1395499494!2677772!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 503 invoked from network); 22 Mar 2014 14:44:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:44:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAM-0002Tb-Jo for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNAM-0005az-IP for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:54 +0000 Date: Sat, 22 Mar 2014 14:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: xsm_do_mca is x86 specific X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f30dc3719d203560b385414c0064dbe5ba0a9147 Author: Julien Grall AuthorDate: Mon Mar 17 14:05:56 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:13 2014 +0000 xen/xsm: xsm_do_mca is x86 specific xsm_do_mca is only used by x86. Only define the function for x86 to avoid usage on ARM. Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/include/xsm/dummy.h | 12 ++++++------ xen/include/xsm/xsm.h | 12 ++++++------ xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 76f9280..e722155 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -140,12 +140,6 @@ static XSM_INLINE int xsm_readconsole(XSM_DEFAULT_ARG uint32_t clear) return xsm_default_action(action, current->domain, NULL); } -static XSM_INLINE int xsm_do_mca(XSM_DEFAULT_VOID) -{ - XSM_ASSERT_ACTION(XSM_PRIV); - return xsm_default_action(action, current->domain, NULL); -} - static XSM_INLINE int xsm_alloc_security_domain(struct domain *d) { return 0; @@ -496,6 +490,12 @@ static XSM_INLINE int xsm_hvm_param_nested(XSM_DEFAULT_ARG struct domain *d) } #ifdef CONFIG_X86 +static XSM_INLINE int xsm_do_mca(XSM_DEFAULT_VOID) +{ + XSM_ASSERT_ACTION(XSM_PRIV); + return xsm_default_action(action, current->domain, NULL); +} + static XSM_INLINE int xsm_shadow_control(XSM_DEFAULT_ARG struct domain *d, uint32_t op) { XSM_ASSERT_ACTION(XSM_HOOK); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 11218b6..15acb3b 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -61,7 +61,6 @@ struct xsm_operations { int (*domctl) (struct domain *d, int cmd); int (*sysctl) (int cmd); int (*readconsole) (uint32_t clear); - int (*do_mca) (void); int (*evtchn_unbound) (struct domain *d, struct evtchn *chn, domid_t id2); int (*evtchn_interdomain) (struct domain *d1, struct evtchn *chn1, @@ -139,6 +138,7 @@ struct xsm_operations { int (*hvm_param_nested) (struct domain *d); #ifdef CONFIG_X86 + int (*do_mca) (void); int (*shadow_control) (struct domain *d, uint32_t op); int (*hvm_set_pci_intx_level) (struct domain *d); int (*hvm_set_isa_irq_level) (struct domain *d); @@ -223,11 +223,6 @@ static inline int xsm_readconsole (xsm_default_t def, uint32_t clear) return xsm_ops->readconsole(clear); } -static inline int xsm_do_mca(xsm_default_t def) -{ - return xsm_ops->do_mca(); -} - static inline int xsm_evtchn_unbound (xsm_default_t def, struct domain *d1, struct evtchn *chn, domid_t id2) { @@ -524,6 +519,11 @@ static inline int xsm_hvm_param_nested (xsm_default_t def, struct domain *d) } #ifdef CONFIG_X86 +static inline int xsm_do_mca(xsm_default_t def) +{ + return xsm_ops->do_mca(); +} + static inline int xsm_shadow_control (xsm_default_t def, struct domain *d, uint32_t op) { return xsm_ops->shadow_control(d, op); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 627edcc..b79e10f 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -38,7 +38,6 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, domctl); set_to_dummy_if_null(ops, sysctl); set_to_dummy_if_null(ops, readconsole); - set_to_dummy_if_null(ops, do_mca); set_to_dummy_if_null(ops, evtchn_unbound); set_to_dummy_if_null(ops, evtchn_interdomain); @@ -115,6 +114,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, remove_from_physmap); #ifdef CONFIG_X86 + set_to_dummy_if_null(ops, do_mca); set_to_dummy_if_null(ops, shadow_control); set_to_dummy_if_null(ops, hvm_set_pci_intx_level); set_to_dummy_if_null(ops, hvm_set_isa_irq_level); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 7329f31..65343f3 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -798,11 +798,6 @@ static int flask_readconsole(uint32_t clear) return domain_has_xen(current->domain, perms); } -static int flask_do_mca(void) -{ - return domain_has_xen(current->domain, XEN__MCA_OP); -} - static inline u32 resource_to_perm(uint8_t access) { if ( access ) @@ -1169,6 +1164,11 @@ static int flask_deassign_device(struct domain *d, uint32_t machine_bdf) #endif /* HAS_PASSTHROUGH && HAS_PCI */ #ifdef CONFIG_X86 +static int flask_do_mca(void) +{ + return domain_has_xen(current->domain, XEN__MCA_OP); +} + static int flask_shadow_control(struct domain *d, uint32_t op) { u32 perm; @@ -1472,7 +1472,6 @@ static struct xsm_operations flask_ops = { .domctl = flask_domctl, .sysctl = flask_sysctl, .readconsole = flask_readconsole, - .do_mca = flask_do_mca, .evtchn_unbound = flask_evtchn_unbound, .evtchn_interdomain = flask_evtchn_interdomain, @@ -1551,6 +1550,7 @@ static struct xsm_operations flask_ops = { #endif #ifdef CONFIG_X86 + .do_mca = flask_do_mca, .shadow_control = flask_shadow_control, .hvm_set_pci_intx_level = flask_hvm_set_pci_intx_level, .hvm_set_isa_irq_level = flask_hvm_set_isa_irq_level, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAS-00080t-3k; Sat, 22 Mar 2014 14:45:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAP-00080Z-Tw for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:58 +0000 Received: from [85.158.139.211:60723] by server-14.bemta-5.messagelabs.com id F7/26-15696-9E1AD235; Sat, 22 Mar 2014 14:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1395499494!2677772!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 503 invoked from network); 22 Mar 2014 14:44:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:44:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAM-0002Tb-Jo for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNAM-0005az-IP for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:44:54 +0000 Date: Sat, 22 Mar 2014 14:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: xsm_do_mca is x86 specific X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f30dc3719d203560b385414c0064dbe5ba0a9147 Author: Julien Grall AuthorDate: Mon Mar 17 14:05:56 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:13 2014 +0000 xen/xsm: xsm_do_mca is x86 specific xsm_do_mca is only used by x86. Only define the function for x86 to avoid usage on ARM. Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/include/xsm/dummy.h | 12 ++++++------ xen/include/xsm/xsm.h | 12 ++++++------ xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 76f9280..e722155 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -140,12 +140,6 @@ static XSM_INLINE int xsm_readconsole(XSM_DEFAULT_ARG uint32_t clear) return xsm_default_action(action, current->domain, NULL); } -static XSM_INLINE int xsm_do_mca(XSM_DEFAULT_VOID) -{ - XSM_ASSERT_ACTION(XSM_PRIV); - return xsm_default_action(action, current->domain, NULL); -} - static XSM_INLINE int xsm_alloc_security_domain(struct domain *d) { return 0; @@ -496,6 +490,12 @@ static XSM_INLINE int xsm_hvm_param_nested(XSM_DEFAULT_ARG struct domain *d) } #ifdef CONFIG_X86 +static XSM_INLINE int xsm_do_mca(XSM_DEFAULT_VOID) +{ + XSM_ASSERT_ACTION(XSM_PRIV); + return xsm_default_action(action, current->domain, NULL); +} + static XSM_INLINE int xsm_shadow_control(XSM_DEFAULT_ARG struct domain *d, uint32_t op) { XSM_ASSERT_ACTION(XSM_HOOK); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 11218b6..15acb3b 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -61,7 +61,6 @@ struct xsm_operations { int (*domctl) (struct domain *d, int cmd); int (*sysctl) (int cmd); int (*readconsole) (uint32_t clear); - int (*do_mca) (void); int (*evtchn_unbound) (struct domain *d, struct evtchn *chn, domid_t id2); int (*evtchn_interdomain) (struct domain *d1, struct evtchn *chn1, @@ -139,6 +138,7 @@ struct xsm_operations { int (*hvm_param_nested) (struct domain *d); #ifdef CONFIG_X86 + int (*do_mca) (void); int (*shadow_control) (struct domain *d, uint32_t op); int (*hvm_set_pci_intx_level) (struct domain *d); int (*hvm_set_isa_irq_level) (struct domain *d); @@ -223,11 +223,6 @@ static inline int xsm_readconsole (xsm_default_t def, uint32_t clear) return xsm_ops->readconsole(clear); } -static inline int xsm_do_mca(xsm_default_t def) -{ - return xsm_ops->do_mca(); -} - static inline int xsm_evtchn_unbound (xsm_default_t def, struct domain *d1, struct evtchn *chn, domid_t id2) { @@ -524,6 +519,11 @@ static inline int xsm_hvm_param_nested (xsm_default_t def, struct domain *d) } #ifdef CONFIG_X86 +static inline int xsm_do_mca(xsm_default_t def) +{ + return xsm_ops->do_mca(); +} + static inline int xsm_shadow_control (xsm_default_t def, struct domain *d, uint32_t op) { return xsm_ops->shadow_control(d, op); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 627edcc..b79e10f 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -38,7 +38,6 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, domctl); set_to_dummy_if_null(ops, sysctl); set_to_dummy_if_null(ops, readconsole); - set_to_dummy_if_null(ops, do_mca); set_to_dummy_if_null(ops, evtchn_unbound); set_to_dummy_if_null(ops, evtchn_interdomain); @@ -115,6 +114,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, remove_from_physmap); #ifdef CONFIG_X86 + set_to_dummy_if_null(ops, do_mca); set_to_dummy_if_null(ops, shadow_control); set_to_dummy_if_null(ops, hvm_set_pci_intx_level); set_to_dummy_if_null(ops, hvm_set_isa_irq_level); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 7329f31..65343f3 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -798,11 +798,6 @@ static int flask_readconsole(uint32_t clear) return domain_has_xen(current->domain, perms); } -static int flask_do_mca(void) -{ - return domain_has_xen(current->domain, XEN__MCA_OP); -} - static inline u32 resource_to_perm(uint8_t access) { if ( access ) @@ -1169,6 +1164,11 @@ static int flask_deassign_device(struct domain *d, uint32_t machine_bdf) #endif /* HAS_PASSTHROUGH && HAS_PCI */ #ifdef CONFIG_X86 +static int flask_do_mca(void) +{ + return domain_has_xen(current->domain, XEN__MCA_OP); +} + static int flask_shadow_control(struct domain *d, uint32_t op) { u32 perm; @@ -1472,7 +1472,6 @@ static struct xsm_operations flask_ops = { .domctl = flask_domctl, .sysctl = flask_sysctl, .readconsole = flask_readconsole, - .do_mca = flask_do_mca, .evtchn_unbound = flask_evtchn_unbound, .evtchn_interdomain = flask_evtchn_interdomain, @@ -1551,6 +1550,7 @@ static struct xsm_operations flask_ops = { #endif #ifdef CONFIG_X86 + .do_mca = flask_do_mca, .shadow_control = flask_shadow_control, .hvm_set_pci_intx_level = flask_hvm_set_pci_intx_level, .hvm_set_isa_irq_level = flask_hvm_set_isa_irq_level, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAd-00083s-6T; Sat, 22 Mar 2014 14:45:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAb-00083R-Ru for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:09 +0000 Received: from [193.109.254.147:59541] by server-10.bemta-14.messagelabs.com id C2/82-04546-5F1AD235; Sat, 22 Mar 2014 14:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1395499505!3472572!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27260 invoked from network); 22 Mar 2014 14:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAW-0002Uc-R4 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNAW-0005ba-OB for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:04 +0000 Date: Sat, 22 Mar 2014 14:45:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: flask: Fix compilation when CONFIG_COMPAT=n X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8e80eb95ec4e20e62f2ad7ab645b7c71191afd64 Author: Julien Grall AuthorDate: Mon Mar 17 14:05:57 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:13 2014 +0000 xen/xsm: flask: Fix compilation when CONFIG_COMPAT=n The commit f7d29f7b "flask: add compat mode guest support" introduces build breakage on ARM when XSM is enabled. It's because ARM doesn't use compat mode. flask_op.c:794:34: fatal error: compat/event_channel.h: No such file or directory #include Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/flask_op.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 3b84679..9dd9081 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -785,7 +785,7 @@ ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) return rv; } -#ifndef COMPAT +#if defined(CONFIG_COMPAT) && !defined(COMPAT) #undef _copy_to_guest #define _copy_to_guest copy_to_compat #undef _copy_from_guest -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAd-00083s-6T; Sat, 22 Mar 2014 14:45:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAb-00083R-Ru for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:09 +0000 Received: from [193.109.254.147:59541] by server-10.bemta-14.messagelabs.com id C2/82-04546-5F1AD235; Sat, 22 Mar 2014 14:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1395499505!3472572!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27260 invoked from network); 22 Mar 2014 14:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAW-0002Uc-R4 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNAW-0005ba-OB for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:04 +0000 Date: Sat, 22 Mar 2014 14:45:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: flask: Fix compilation when CONFIG_COMPAT=n X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8e80eb95ec4e20e62f2ad7ab645b7c71191afd64 Author: Julien Grall AuthorDate: Mon Mar 17 14:05:57 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:13 2014 +0000 xen/xsm: flask: Fix compilation when CONFIG_COMPAT=n The commit f7d29f7b "flask: add compat mode guest support" introduces build breakage on ARM when XSM is enabled. It's because ARM doesn't use compat mode. flask_op.c:794:34: fatal error: compat/event_channel.h: No such file or directory #include Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/flask_op.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 3b84679..9dd9081 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -785,7 +785,7 @@ ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) return rv; } -#ifndef COMPAT +#if defined(CONFIG_COMPAT) && !defined(COMPAT) #undef _copy_to_guest #define _copy_to_guest copy_to_compat #undef _copy_from_guest -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAu-00087V-DE; Sat, 22 Mar 2014 14:45:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAt-00087L-Vh for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:28 +0000 Received: from [85.158.143.35:49578] by server-3.bemta-4.messagelabs.com id 22/3D-13602-702AD235; Sat, 22 Mar 2014 14:45:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1395499525!3961250!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2004 invoked from network); 22 Mar 2014 14:45:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:45:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAr-0002Uo-A4 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNAr-0005d6-5t for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:25 +0000 Date: Sat, 22 Mar 2014 14:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: flask: MSI is PCI specific X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e19ec6c49b72574e4a12b8f30f78306e69328cb4 Author: Julien Grall AuthorDate: Mon Mar 17 14:05:59 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:26 2014 +0000 xen/xsm: flask: MSI is PCI specific MSI is not yet support on ARM and will break the compilation when XSM_ENABLE=y. Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/hooks.c | 72 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 52 insertions(+), 20 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 65343f3..56c7645 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -19,7 +19,9 @@ #include #include #include +#ifdef HAS_PCI #include +#endif #include #include #include @@ -100,7 +102,6 @@ static int domain_has_xen(struct domain *d, u32 perms) static int get_irq_sid(int irq, u32 *sid, struct avc_audit_data *ad) { - struct irq_desc *desc = irq_to_desc(irq); if ( irq >= nr_irqs || irq < 0 ) return -EINVAL; if ( irq < nr_static_irqs ) { @@ -110,15 +111,21 @@ static int get_irq_sid(int irq, u32 *sid, struct avc_audit_data *ad) } return security_irq_sid(irq, sid); } - if ( desc->msi_desc && desc->msi_desc->dev ) { - struct pci_dev *dev = desc->msi_desc->dev; - u32 sbdf = (dev->seg << 16) | (dev->bus << 8) | dev->devfn; - if (ad) { - AVC_AUDIT_DATA_INIT(ad, DEV); - ad->device = sbdf; +#ifdef HAS_PCI + { + struct irq_desc *desc = irq_to_desc(irq); + if ( desc->msi_desc && desc->msi_desc->dev ) { + struct pci_dev *dev = desc->msi_desc->dev; + u32 sbdf = (dev->seg << 16) | (dev->bus << 8) | dev->devfn; + if (ad) { + AVC_AUDIT_DATA_INIT(ad, DEV); + ad->device = sbdf; + } + return security_device_sid(sbdf, sid); } - return security_device_sid(sbdf, sid); } +#endif + if (ad) { AVC_AUDIT_DATA_INIT(ad, IRQ); ad->irq = irq; @@ -825,21 +832,34 @@ static int flask_map_domain_pirq (struct domain *d) return current_has_perm(d, SECCLASS_RESOURCE, RESOURCE__ADD); } +static int flask_map_domain_msi (struct domain *d, int irq, void *data, + u32 *sid, struct avc_audit_data *ad) +{ +#ifdef HAS_PCI + struct msi_info *msi = data; + + u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; + AVC_AUDIT_DATA_INIT(ad, DEV); + ad->device = machine_bdf; + + return security_device_sid(machine_bdf, sid); +#else + return -EINVAL; +#endif +} + static int flask_map_domain_irq (struct domain *d, int irq, void *data) { u32 sid, dsid; int rc = -EPERM; - struct msi_info *msi = data; struct avc_audit_data ad; - if ( irq >= nr_static_irqs && msi ) { - u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; - AVC_AUDIT_DATA_INIT(&ad, DEV); - ad.device = machine_bdf; - rc = security_device_sid(machine_bdf, &sid); + if ( irq >= nr_static_irqs && data ) { + rc = flask_map_domain_msi(d, irq, data, &sid, &ad); } else { rc = get_irq_sid(irq, &sid, &ad); } + if ( rc ) return rc; @@ -858,18 +878,30 @@ static int flask_unmap_domain_pirq (struct domain *d) return current_has_perm(d, SECCLASS_RESOURCE, RESOURCE__REMOVE); } +static int flask_unmap_domain_msi (struct domain *d, int irq, void *data, + u32 *sid, struct avc_audit_data *ad) +{ +#ifdef HAS_PCI + struct msi_info *msi = data; + u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; + + AVC_AUDIT_DATA_INIT(ad, DEV); + ad->device = machine_bdf; + + return security_device_sid(machine_bdf, sid); +#else + return -EINVAL; +#endif +} + static int flask_unmap_domain_irq (struct domain *d, int irq, void *data) { u32 sid; int rc = -EPERM; - struct msi_info *msi = data; struct avc_audit_data ad; - if ( irq >= nr_static_irqs && msi ) { - u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; - AVC_AUDIT_DATA_INIT(&ad, DEV); - ad.device = machine_bdf; - rc = security_device_sid(machine_bdf, &sid); + if ( irq >= nr_static_irqs && data ) { + rc = flask_unmap_domain_msi(d, irq, data, &sid, &ad); } else { rc = get_irq_sid(irq, &sid, &ad); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAu-00087V-DE; Sat, 22 Mar 2014 14:45:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAt-00087L-Vh for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:28 +0000 Received: from [85.158.143.35:49578] by server-3.bemta-4.messagelabs.com id 22/3D-13602-702AD235; Sat, 22 Mar 2014 14:45:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1395499525!3961250!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2004 invoked from network); 22 Mar 2014 14:45:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:45:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAr-0002Uo-A4 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNAr-0005d6-5t for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:25 +0000 Date: Sat, 22 Mar 2014 14:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: flask: MSI is PCI specific X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e19ec6c49b72574e4a12b8f30f78306e69328cb4 Author: Julien Grall AuthorDate: Mon Mar 17 14:05:59 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:26 2014 +0000 xen/xsm: flask: MSI is PCI specific MSI is not yet support on ARM and will break the compilation when XSM_ENABLE=y. Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/hooks.c | 72 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 52 insertions(+), 20 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 65343f3..56c7645 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -19,7 +19,9 @@ #include #include #include +#ifdef HAS_PCI #include +#endif #include #include #include @@ -100,7 +102,6 @@ static int domain_has_xen(struct domain *d, u32 perms) static int get_irq_sid(int irq, u32 *sid, struct avc_audit_data *ad) { - struct irq_desc *desc = irq_to_desc(irq); if ( irq >= nr_irqs || irq < 0 ) return -EINVAL; if ( irq < nr_static_irqs ) { @@ -110,15 +111,21 @@ static int get_irq_sid(int irq, u32 *sid, struct avc_audit_data *ad) } return security_irq_sid(irq, sid); } - if ( desc->msi_desc && desc->msi_desc->dev ) { - struct pci_dev *dev = desc->msi_desc->dev; - u32 sbdf = (dev->seg << 16) | (dev->bus << 8) | dev->devfn; - if (ad) { - AVC_AUDIT_DATA_INIT(ad, DEV); - ad->device = sbdf; +#ifdef HAS_PCI + { + struct irq_desc *desc = irq_to_desc(irq); + if ( desc->msi_desc && desc->msi_desc->dev ) { + struct pci_dev *dev = desc->msi_desc->dev; + u32 sbdf = (dev->seg << 16) | (dev->bus << 8) | dev->devfn; + if (ad) { + AVC_AUDIT_DATA_INIT(ad, DEV); + ad->device = sbdf; + } + return security_device_sid(sbdf, sid); } - return security_device_sid(sbdf, sid); } +#endif + if (ad) { AVC_AUDIT_DATA_INIT(ad, IRQ); ad->irq = irq; @@ -825,21 +832,34 @@ static int flask_map_domain_pirq (struct domain *d) return current_has_perm(d, SECCLASS_RESOURCE, RESOURCE__ADD); } +static int flask_map_domain_msi (struct domain *d, int irq, void *data, + u32 *sid, struct avc_audit_data *ad) +{ +#ifdef HAS_PCI + struct msi_info *msi = data; + + u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; + AVC_AUDIT_DATA_INIT(ad, DEV); + ad->device = machine_bdf; + + return security_device_sid(machine_bdf, sid); +#else + return -EINVAL; +#endif +} + static int flask_map_domain_irq (struct domain *d, int irq, void *data) { u32 sid, dsid; int rc = -EPERM; - struct msi_info *msi = data; struct avc_audit_data ad; - if ( irq >= nr_static_irqs && msi ) { - u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; - AVC_AUDIT_DATA_INIT(&ad, DEV); - ad.device = machine_bdf; - rc = security_device_sid(machine_bdf, &sid); + if ( irq >= nr_static_irqs && data ) { + rc = flask_map_domain_msi(d, irq, data, &sid, &ad); } else { rc = get_irq_sid(irq, &sid, &ad); } + if ( rc ) return rc; @@ -858,18 +878,30 @@ static int flask_unmap_domain_pirq (struct domain *d) return current_has_perm(d, SECCLASS_RESOURCE, RESOURCE__REMOVE); } +static int flask_unmap_domain_msi (struct domain *d, int irq, void *data, + u32 *sid, struct avc_audit_data *ad) +{ +#ifdef HAS_PCI + struct msi_info *msi = data; + u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; + + AVC_AUDIT_DATA_INIT(ad, DEV); + ad->device = machine_bdf; + + return security_device_sid(machine_bdf, sid); +#else + return -EINVAL; +#endif +} + static int flask_unmap_domain_irq (struct domain *d, int irq, void *data) { u32 sid; int rc = -EPERM; - struct msi_info *msi = data; struct avc_audit_data ad; - if ( irq >= nr_static_irqs && msi ) { - u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; - AVC_AUDIT_DATA_INIT(&ad, DEV); - ad.device = machine_bdf; - rc = security_device_sid(machine_bdf, &sid); + if ( irq >= nr_static_irqs && data ) { + rc = flask_unmap_domain_msi(d, irq, data, &sid, &ad); } else { rc = get_irq_sid(irq, &sid, &ad); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNB4-00088u-Fs; Sat, 22 Mar 2014 14:45:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNB3-00088j-Qx for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:37 +0000 Received: from [193.109.254.147:40967] by server-12.bemta-14.messagelabs.com id A9/49-27473-112AD235; Sat, 22 Mar 2014 14:45:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1395499535!3465669!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9601 invoked from network); 22 Mar 2014 14:45:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:45:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNB1-0002Ur-Dr for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNB1-0005dW-Cq for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:35 +0000 Date: Sat, 22 Mar 2014 14:45:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: flask: flask_copying_string is taking a XEN_GUEST_HANDLE as first param X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3abbf0d1051d916c111b066aff1f0051af9af571 Author: Julien Grall AuthorDate: Mon Mar 17 14:06:00 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:38 2014 +0000 xen/xsm: flask: flask_copying_string is taking a XEN_GUEST_HANDLE as first param Rather than x86, on ARM XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are not compatible. This will result to a compilation failure on ARM when XSM will be enabled. Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/flask_op.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 9dd9081..85a615b 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -76,7 +76,7 @@ static int domain_has_security(struct domain *d, u32 perms) perms, NULL); } -static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, +static int flask_copyin_string(XEN_GUEST_HANDLE(char) u_buf, char **buf, size_t size, size_t max_size) { char *tmp; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAl-00085y-9G; Sat, 22 Mar 2014 14:45:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAk-00085U-EO for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:18 +0000 Received: from [85.158.137.68:12375] by server-8.bemta-3.messagelabs.com id 00/E9-21547-DF1AD235; Sat, 22 Mar 2014 14:45:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1395499515!2232168!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27927 invoked from network); 22 Mar 2014 14:45:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAh-0002Ui-1D for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNAg-0005ck-Tx for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:14 +0000 Date: Sat, 22 Mar 2014 14:45:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: flask: Rename variable "bool" in "b" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 17822abf74ac7f029f55439584b13173e1d13225 Author: Julien Grall AuthorDate: Mon Mar 17 14:05:58 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:26 2014 +0000 xen/xsm: flask: Rename variable "bool" in "b" On ARM, the compilation is failing with the following error: In file included from flask_op.c:21:0: ./include/conditional.h:24:43: error: two or more data types in declaration specifiers ./include/conditional.h:25:42: error: two or more data types in declaration specifiers Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/include/conditional.h | 4 ++-- xen/xsm/flask/ss/services.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/xsm/flask/include/conditional.h b/xen/xsm/flask/include/conditional.h index 043cfd8..9055340 100644 --- a/xen/xsm/flask/include/conditional.h +++ b/xen/xsm/flask/include/conditional.h @@ -21,7 +21,7 @@ int security_set_bools(int len, int *values); int security_find_bool(const char *name); -char *security_get_bool_name(unsigned int bool); -int security_get_bool_value(unsigned int bool); +char *security_get_bool_name(unsigned int b); +int security_get_bool_value(unsigned int b); #endif diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index aebbec7..59234ff 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1958,7 +1958,7 @@ out: return rc; } -int security_get_bool_value(unsigned int bool) +int security_get_bool_value(unsigned int b) { int rc = 0; unsigned int len; @@ -1966,19 +1966,19 @@ int security_get_bool_value(unsigned int bool) POLICY_RDLOCK; len = policydb.p_bools.nprim; - if ( bool >= len ) + if ( b >= len ) { rc = -ENOENT; goto out; } - rc = policydb.bool_val_to_struct[bool]->state; + rc = policydb.bool_val_to_struct[b]->state; out: POLICY_RDUNLOCK; return rc; } -char *security_get_bool_name(unsigned int bool) +char *security_get_bool_name(unsigned int b) { unsigned int len; char *rv = NULL; @@ -1986,16 +1986,16 @@ char *security_get_bool_name(unsigned int bool) POLICY_RDLOCK; len = policydb.p_bools.nprim; - if ( bool >= len ) + if ( b >= len ) { goto out; } - len = strlen(policydb.p_bool_val_to_name[bool]) + 1; + len = strlen(policydb.p_bool_val_to_name[b]) + 1; rv = xmalloc_array(char, len); if ( !rv ) goto out; - memcpy(rv, policydb.p_bool_val_to_name[bool], len); + memcpy(rv, policydb.p_bool_val_to_name[b], len); out: POLICY_RDUNLOCK; return rv; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNB4-00088u-Fs; Sat, 22 Mar 2014 14:45:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNB3-00088j-Qx for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:37 +0000 Received: from [193.109.254.147:40967] by server-12.bemta-14.messagelabs.com id A9/49-27473-112AD235; Sat, 22 Mar 2014 14:45:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1395499535!3465669!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9601 invoked from network); 22 Mar 2014 14:45:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:45:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNB1-0002Ur-Dr for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNB1-0005dW-Cq for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:35 +0000 Date: Sat, 22 Mar 2014 14:45:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: flask: flask_copying_string is taking a XEN_GUEST_HANDLE as first param X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3abbf0d1051d916c111b066aff1f0051af9af571 Author: Julien Grall AuthorDate: Mon Mar 17 14:06:00 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:38 2014 +0000 xen/xsm: flask: flask_copying_string is taking a XEN_GUEST_HANDLE as first param Rather than x86, on ARM XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are not compatible. This will result to a compilation failure on ARM when XSM will be enabled. Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/flask_op.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 9dd9081..85a615b 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -76,7 +76,7 @@ static int domain_has_security(struct domain *d, u32 perms) perms, NULL); } -static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, +static int flask_copyin_string(XEN_GUEST_HANDLE(char) u_buf, char **buf, size_t size, size_t max_size) { char *tmp; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAl-00085y-9G; Sat, 22 Mar 2014 14:45:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAk-00085U-EO for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:18 +0000 Received: from [85.158.137.68:12375] by server-8.bemta-3.messagelabs.com id 00/E9-21547-DF1AD235; Sat, 22 Mar 2014 14:45:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1395499515!2232168!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27927 invoked from network); 22 Mar 2014 14:45:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNAh-0002Ui-1D for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNAg-0005ck-Tx for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:14 +0000 Date: Sat, 22 Mar 2014 14:45:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: flask: Rename variable "bool" in "b" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 17822abf74ac7f029f55439584b13173e1d13225 Author: Julien Grall AuthorDate: Mon Mar 17 14:05:58 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:26 2014 +0000 xen/xsm: flask: Rename variable "bool" in "b" On ARM, the compilation is failing with the following error: In file included from flask_op.c:21:0: ./include/conditional.h:24:43: error: two or more data types in declaration specifiers ./include/conditional.h:25:42: error: two or more data types in declaration specifiers Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/include/conditional.h | 4 ++-- xen/xsm/flask/ss/services.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/xsm/flask/include/conditional.h b/xen/xsm/flask/include/conditional.h index 043cfd8..9055340 100644 --- a/xen/xsm/flask/include/conditional.h +++ b/xen/xsm/flask/include/conditional.h @@ -21,7 +21,7 @@ int security_set_bools(int len, int *values); int security_find_bool(const char *name); -char *security_get_bool_name(unsigned int bool); -int security_get_bool_value(unsigned int bool); +char *security_get_bool_name(unsigned int b); +int security_get_bool_value(unsigned int b); #endif diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index aebbec7..59234ff 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1958,7 +1958,7 @@ out: return rc; } -int security_get_bool_value(unsigned int bool) +int security_get_bool_value(unsigned int b) { int rc = 0; unsigned int len; @@ -1966,19 +1966,19 @@ int security_get_bool_value(unsigned int bool) POLICY_RDLOCK; len = policydb.p_bools.nprim; - if ( bool >= len ) + if ( b >= len ) { rc = -ENOENT; goto out; } - rc = policydb.bool_val_to_struct[bool]->state; + rc = policydb.bool_val_to_struct[b]->state; out: POLICY_RDUNLOCK; return rc; } -char *security_get_bool_name(unsigned int bool) +char *security_get_bool_name(unsigned int b) { unsigned int len; char *rv = NULL; @@ -1986,16 +1986,16 @@ char *security_get_bool_name(unsigned int bool) POLICY_RDLOCK; len = policydb.p_bools.nprim; - if ( bool >= len ) + if ( b >= len ) { goto out; } - len = strlen(policydb.p_bool_val_to_name[bool]) + 1; + len = strlen(policydb.p_bool_val_to_name[b]) + 1; rv = xmalloc_array(char, len); if ( !rv ) goto out; - memcpy(rv, policydb.p_bool_val_to_name[bool], len); + memcpy(rv, policydb.p_bool_val_to_name[b], len); out: POLICY_RDUNLOCK; return rv; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBF-0008Aa-Jb; Sat, 22 Mar 2014 14:45:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBF-0008AK-32 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:49 +0000 Received: from [85.158.137.68:40551] by server-9.bemta-3.messagelabs.com id EE/D6-30063-C12AD235; Sat, 22 Mar 2014 14:45:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1395499546!2291894!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14218 invoked from network); 22 Mar 2014 14:45:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:45:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBB-0002Uu-Jk for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNBB-0005ds-IU for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:45 +0000 Date: Sat, 22 Mar 2014 14:45:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: flask: Add missing header in hooks.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 952125757787839bad89c8e7f661a962c9f9cbe4 Author: Julien Grall AuthorDate: Mon Mar 17 14:06:01 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:38 2014 +0000 xen/xsm: flask: Add missing header in hooks.c nr_static_irqs and nr_irqs is defined in asm/irq.h (on both x86 and ARM). Include directly the header in hooks.c to avoid compilation failure on ARM. Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/hooks.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 56c7645..ba719de 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:45:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:45:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBF-0008Aa-Jb; Sat, 22 Mar 2014 14:45:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBF-0008AK-32 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:49 +0000 Received: from [85.158.137.68:40551] by server-9.bemta-3.messagelabs.com id EE/D6-30063-C12AD235; Sat, 22 Mar 2014 14:45:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1395499546!2291894!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14218 invoked from network); 22 Mar 2014 14:45:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:45:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBB-0002Uu-Jk for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNBB-0005ds-IU for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:45 +0000 Date: Sat, 22 Mar 2014 14:45:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: flask: Add missing header in hooks.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 952125757787839bad89c8e7f661a962c9f9cbe4 Author: Julien Grall AuthorDate: Mon Mar 17 14:06:01 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:10:38 2014 +0000 xen/xsm: flask: Add missing header in hooks.c nr_static_irqs and nr_irqs is defined in asm/irq.h (on both x86 and ARM). Include directly the header in hooks.c to avoid compilation failure on ARM. Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/hooks.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 56c7645..ba719de 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:46:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:46:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBP-0008CS-MW; Sat, 22 Mar 2014 14:45:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBO-0008C3-HM for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:58 +0000 Received: from [193.109.254.147:4311] by server-8.bemta-14.messagelabs.com id 8F/DE-01877-522AD235; Sat, 22 Mar 2014 14:45:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1395499556!3474382!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24726 invoked from network); 22 Mar 2014 14:45:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:45:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBL-0002V0-Q5 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNBL-0005eE-Ni for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:55 +0000 Date: Sat, 22 Mar 2014 14:45:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: set READ_THREAD_STACKSIZE to a sane value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5747173160884706218==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5747173160884706218== Content-Type: text/plain commit da6a0e86d6a079102abdd0858a19f1e1fae584fc Author: Roger Pau Monne AuthorDate: Fri Mar 7 13:22:58 2014 +0100 Commit: Ian Campbell CommitDate: Fri Mar 21 11:25:26 2014 +0000 xenstore: set READ_THREAD_STACKSIZE to a sane value On FreeBSD PTHREAD_STACK_MIN is 2048 by default, which is obviously too low. Set the default back to the previous value (16 * 1024), or if that's too low set it to PTHREAD_STACK_MIN. Signed-off-by: Roger Pau Monné Acked-by: Ian Campbell Cc: Ian Jackson --- tools/xenstore/xs.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c index dd03a85..968141d 100644 --- a/tools/xenstore/xs.c +++ b/tools/xenstore/xs.c @@ -724,7 +724,10 @@ bool xs_watch(struct xs_handle *h, const char *path, const char *token) struct iovec iov[2]; #ifdef USE_PTHREAD -#define READ_THREAD_STACKSIZE PTHREAD_STACK_MIN +#define DEFAULT_THREAD_STACKSIZE (16 * 1024) +#define READ_THREAD_STACKSIZE \ + ((DEFAULT_THREAD_STACKSIZE < PTHREAD_STACK_MIN) ? \ + PTHREAD_STACK_MIN : DEFAULT_THREAD_STACKSIZE) /* We dynamically create a reader thread on demand. */ mutex_lock(&h->request_mutex); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5747173160884706218== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============5747173160884706218==-- From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:46:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:46:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBP-0008CS-MW; Sat, 22 Mar 2014 14:45:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBO-0008C3-HM for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:58 +0000 Received: from [193.109.254.147:4311] by server-8.bemta-14.messagelabs.com id 8F/DE-01877-522AD235; Sat, 22 Mar 2014 14:45:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1395499556!3474382!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24726 invoked from network); 22 Mar 2014 14:45:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:45:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBL-0002V0-Q5 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNBL-0005eE-Ni for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:45:55 +0000 Date: Sat, 22 Mar 2014 14:45:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: set READ_THREAD_STACKSIZE to a sane value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5747173160884706218==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5747173160884706218== Content-Type: text/plain commit da6a0e86d6a079102abdd0858a19f1e1fae584fc Author: Roger Pau Monne AuthorDate: Fri Mar 7 13:22:58 2014 +0100 Commit: Ian Campbell CommitDate: Fri Mar 21 11:25:26 2014 +0000 xenstore: set READ_THREAD_STACKSIZE to a sane value On FreeBSD PTHREAD_STACK_MIN is 2048 by default, which is obviously too low. Set the default back to the previous value (16 * 1024), or if that's too low set it to PTHREAD_STACK_MIN. Signed-off-by: Roger Pau Monné Acked-by: Ian Campbell Cc: Ian Jackson --- tools/xenstore/xs.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c index dd03a85..968141d 100644 --- a/tools/xenstore/xs.c +++ b/tools/xenstore/xs.c @@ -724,7 +724,10 @@ bool xs_watch(struct xs_handle *h, const char *path, const char *token) struct iovec iov[2]; #ifdef USE_PTHREAD -#define READ_THREAD_STACKSIZE PTHREAD_STACK_MIN +#define DEFAULT_THREAD_STACKSIZE (16 * 1024) +#define READ_THREAD_STACKSIZE \ + ((DEFAULT_THREAD_STACKSIZE < PTHREAD_STACK_MIN) ? \ + PTHREAD_STACK_MIN : DEFAULT_THREAD_STACKSIZE) /* We dynamically create a reader thread on demand. */ mutex_lock(&h->request_mutex); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5747173160884706218== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============5747173160884706218==-- From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:46:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:46:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBZ-0008Eg-Qx; Sat, 22 Mar 2014 14:46:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBY-0008EA-ND for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:08 +0000 Received: from [85.158.143.35:14975] by server-2.bemta-4.messagelabs.com id 67/70-06539-F22AD235; Sat, 22 Mar 2014 14:46:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1395499566!3992068!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3538 invoked from network); 22 Mar 2014 14:46:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:46:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBV-0002Vi-V9 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNBV-0005ek-Tw for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:05 +0000 Date: Sat, 22 Mar 2014 14:46:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xen-access: don't use libxc internals directly. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a14fad221adcb6b738e0aef10afee8ca17a4b05c Author: Tim Deegan AuthorDate: Wed Mar 19 11:35:35 2014 +0100 Commit: Ian Campbell CommitDate: Fri Mar 21 11:27:19 2014 +0000 tools/xen-access: don't use libxc internals directly. Signed-off-by: Tim Deegan Acked-by: Ian Campbell Tested-by: Aravindh Puthiyaparambil --- tools/tests/xen-access/xen-access.c | 43 ++++++---------------------------- 1 files changed, 8 insertions(+), 35 deletions(-) diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c index b00c05a..f6522a1 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/tests/xen-access/xen-access.c @@ -26,23 +26,24 @@ * DEALINGS IN THE SOFTWARE. */ +#include #include #include #include #include +#include #include #include #include +#include #include -#include -#include +#include #include -//#if 0 -#undef DPRINTF #define DPRINTF(a, b...) fprintf(stderr, a, ## b) -//#endif +#define ERROR(a, b...) fprintf(stderr, a "\n", ## b) +#define PERROR(a, b...) fprintf(stderr, a ": %s\n", ## b, strerror(errno)) /* Spinlock and mem event definitions */ @@ -104,17 +105,9 @@ typedef struct mem_event { spinlock_t ring_lock; } mem_event_t; -typedef struct xc_platform_info { - unsigned long max_mfn; - unsigned long hvirt_start; - unsigned int pt_levels; - unsigned int guest_width; -} xc_platform_info_t; - typedef struct xenaccess { xc_interface *xc_handle; - xc_platform_info_t *platform_info; xc_domaininfo_t *domain_info; mem_event_t mem_event; @@ -178,7 +171,7 @@ int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) /* Tear down domain xenaccess in Xen */ if ( xenaccess->mem_event.ring_page ) - munmap(xenaccess->mem_event.ring_page, PAGE_SIZE); + munmap(xenaccess->mem_event.ring_page, XC_PAGE_SIZE); if ( mem_access_enable ) { @@ -219,7 +212,6 @@ int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) } xenaccess->xc_handle = NULL; - free(xenaccess->platform_info); free(xenaccess->domain_info); free(xenaccess); @@ -328,32 +320,13 @@ xenaccess_t *xenaccess_init(xc_interface **xch_r, domid_t domain_id) SHARED_RING_INIT((mem_event_sring_t *)xenaccess->mem_event.ring_page); BACK_RING_INIT(&xenaccess->mem_event.back_ring, (mem_event_sring_t *)xenaccess->mem_event.ring_page, - PAGE_SIZE); + XC_PAGE_SIZE); /* Now that the ring is set, remove it from the guest's physmap */ if ( xc_domain_decrease_reservation_exact(xch, xenaccess->mem_event.domain_id, 1, 0, &ring_pfn) ) PERROR("Failed to remove ring from guest physmap"); - /* Get platform info */ - xenaccess->platform_info = malloc(sizeof(xc_platform_info_t)); - if ( xenaccess->platform_info == NULL ) - { - ERROR("Error allocating memory for platform info"); - goto err; - } - - rc = get_platform_info(xenaccess->xc_handle, domain_id, - &xenaccess->platform_info->max_mfn, - &xenaccess->platform_info->hvirt_start, - &xenaccess->platform_info->pt_levels, - &xenaccess->platform_info->guest_width); - if ( rc != 1 ) - { - ERROR("Error getting platform info"); - goto err; - } - /* Get domaininfo */ xenaccess->domain_info = malloc(sizeof(xc_domaininfo_t)); if ( xenaccess->domain_info == NULL ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:46:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:46:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBZ-0008Eg-Qx; Sat, 22 Mar 2014 14:46:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBY-0008EA-ND for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:08 +0000 Received: from [85.158.143.35:14975] by server-2.bemta-4.messagelabs.com id 67/70-06539-F22AD235; Sat, 22 Mar 2014 14:46:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1395499566!3992068!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3538 invoked from network); 22 Mar 2014 14:46:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:46:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBV-0002Vi-V9 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNBV-0005ek-Tw for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:05 +0000 Date: Sat, 22 Mar 2014 14:46:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xen-access: don't use libxc internals directly. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a14fad221adcb6b738e0aef10afee8ca17a4b05c Author: Tim Deegan AuthorDate: Wed Mar 19 11:35:35 2014 +0100 Commit: Ian Campbell CommitDate: Fri Mar 21 11:27:19 2014 +0000 tools/xen-access: don't use libxc internals directly. Signed-off-by: Tim Deegan Acked-by: Ian Campbell Tested-by: Aravindh Puthiyaparambil --- tools/tests/xen-access/xen-access.c | 43 ++++++---------------------------- 1 files changed, 8 insertions(+), 35 deletions(-) diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c index b00c05a..f6522a1 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/tests/xen-access/xen-access.c @@ -26,23 +26,24 @@ * DEALINGS IN THE SOFTWARE. */ +#include #include #include #include #include +#include #include #include #include +#include #include -#include -#include +#include #include -//#if 0 -#undef DPRINTF #define DPRINTF(a, b...) fprintf(stderr, a, ## b) -//#endif +#define ERROR(a, b...) fprintf(stderr, a "\n", ## b) +#define PERROR(a, b...) fprintf(stderr, a ": %s\n", ## b, strerror(errno)) /* Spinlock and mem event definitions */ @@ -104,17 +105,9 @@ typedef struct mem_event { spinlock_t ring_lock; } mem_event_t; -typedef struct xc_platform_info { - unsigned long max_mfn; - unsigned long hvirt_start; - unsigned int pt_levels; - unsigned int guest_width; -} xc_platform_info_t; - typedef struct xenaccess { xc_interface *xc_handle; - xc_platform_info_t *platform_info; xc_domaininfo_t *domain_info; mem_event_t mem_event; @@ -178,7 +171,7 @@ int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) /* Tear down domain xenaccess in Xen */ if ( xenaccess->mem_event.ring_page ) - munmap(xenaccess->mem_event.ring_page, PAGE_SIZE); + munmap(xenaccess->mem_event.ring_page, XC_PAGE_SIZE); if ( mem_access_enable ) { @@ -219,7 +212,6 @@ int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) } xenaccess->xc_handle = NULL; - free(xenaccess->platform_info); free(xenaccess->domain_info); free(xenaccess); @@ -328,32 +320,13 @@ xenaccess_t *xenaccess_init(xc_interface **xch_r, domid_t domain_id) SHARED_RING_INIT((mem_event_sring_t *)xenaccess->mem_event.ring_page); BACK_RING_INIT(&xenaccess->mem_event.back_ring, (mem_event_sring_t *)xenaccess->mem_event.ring_page, - PAGE_SIZE); + XC_PAGE_SIZE); /* Now that the ring is set, remove it from the guest's physmap */ if ( xc_domain_decrease_reservation_exact(xch, xenaccess->mem_event.domain_id, 1, 0, &ring_pfn) ) PERROR("Failed to remove ring from guest physmap"); - /* Get platform info */ - xenaccess->platform_info = malloc(sizeof(xc_platform_info_t)); - if ( xenaccess->platform_info == NULL ) - { - ERROR("Error allocating memory for platform info"); - goto err; - } - - rc = get_platform_info(xenaccess->xc_handle, domain_id, - &xenaccess->platform_info->max_mfn, - &xenaccess->platform_info->hvirt_start, - &xenaccess->platform_info->pt_levels, - &xenaccess->platform_info->guest_width); - if ( rc != 1 ) - { - ERROR("Error getting platform info"); - goto err; - } - /* Get domaininfo */ xenaccess->domain_info = malloc(sizeof(xc_domaininfo_t)); if ( xenaccess->domain_info == NULL ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:46:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:46:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBj-0008GI-Tn; Sat, 22 Mar 2014 14:46:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBi-0008G5-LJ for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:18 +0000 Received: from [193.109.254.147:4868] by server-3.bemta-14.messagelabs.com id 1F/3B-22179-932AD235; Sat, 22 Mar 2014 14:46:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1395499576!3433802!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15889 invoked from network); 22 Mar 2014 14:46:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:46:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBg-0002Vo-4h for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNBg-0005ff-2f for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:16 +0000 Date: Sat, 22 Mar 2014 14:46:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Guard correctly asm-arm/platforms/exynos5.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 771b032d1ffd41b55e63cb9395c38562dd310e84 Author: Julien Grall AuthorDate: Wed Mar 19 21:27:49 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:29:28 2014 +0000 xen/arm: Guard correctly asm-arm/platforms/exynos5.h Fix compilation with clang 3.5: /local/home/julien/works/arndale/xen/xen/include/asm/platforms/exynos5.h:1:9: error: '__ASM_ARM_PLATFORMS_EXYNOS5_H' is used as a header guard here, followed by #define of a different macro [-Werror,-Wheader-guard] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /local/home/julien/works/arndale/xen/xen/include/asm/platforms/exynos5.h:2:9: note: '__ASM_ASM_PLATFORMS_EXYSNO5_H' is defined here; did you mean '__ASM_ARM_PLATFORMS_EXYNOS5_H'? ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ __ASM_ARM_PLATFORMS_EXYNOS5_H Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/platforms/exynos5.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/platforms/exynos5.h b/xen/include/asm-arm/platforms/exynos5.h index af30608..ea941e7 100644 --- a/xen/include/asm-arm/platforms/exynos5.h +++ b/xen/include/asm-arm/platforms/exynos5.h @@ -1,5 +1,5 @@ #ifndef __ASM_ARM_PLATFORMS_EXYNOS5_H -#define __ASM_ASM_PLATFORMS_EXYSNO5_H +#define __ASM_ARM_PLATFORMS_EXYNOS5_H #define EXYNOS5_MCT_BASE 0x101c0000 #define EXYNOS5_MCT_G_TCON 0x240 /* Relative to MCT_BASE */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:46:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:46:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBj-0008GI-Tn; Sat, 22 Mar 2014 14:46:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBi-0008G5-LJ for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:18 +0000 Received: from [193.109.254.147:4868] by server-3.bemta-14.messagelabs.com id 1F/3B-22179-932AD235; Sat, 22 Mar 2014 14:46:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1395499576!3433802!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15889 invoked from network); 22 Mar 2014 14:46:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:46:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBg-0002Vo-4h for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNBg-0005ff-2f for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:16 +0000 Date: Sat, 22 Mar 2014 14:46:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Guard correctly asm-arm/platforms/exynos5.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 771b032d1ffd41b55e63cb9395c38562dd310e84 Author: Julien Grall AuthorDate: Wed Mar 19 21:27:49 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:29:28 2014 +0000 xen/arm: Guard correctly asm-arm/platforms/exynos5.h Fix compilation with clang 3.5: /local/home/julien/works/arndale/xen/xen/include/asm/platforms/exynos5.h:1:9: error: '__ASM_ARM_PLATFORMS_EXYNOS5_H' is used as a header guard here, followed by #define of a different macro [-Werror,-Wheader-guard] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /local/home/julien/works/arndale/xen/xen/include/asm/platforms/exynos5.h:2:9: note: '__ASM_ASM_PLATFORMS_EXYSNO5_H' is defined here; did you mean '__ASM_ARM_PLATFORMS_EXYNOS5_H'? ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ __ASM_ARM_PLATFORMS_EXYNOS5_H Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/platforms/exynos5.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/platforms/exynos5.h b/xen/include/asm-arm/platforms/exynos5.h index af30608..ea941e7 100644 --- a/xen/include/asm-arm/platforms/exynos5.h +++ b/xen/include/asm-arm/platforms/exynos5.h @@ -1,5 +1,5 @@ #ifndef __ASM_ARM_PLATFORMS_EXYNOS5_H -#define __ASM_ASM_PLATFORMS_EXYSNO5_H +#define __ASM_ARM_PLATFORMS_EXYNOS5_H #define EXYNOS5_MCT_BASE 0x101c0000 #define EXYNOS5_MCT_G_TCON 0x240 /* Relative to MCT_BASE */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:46:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:46:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBu-0008II-16; Sat, 22 Mar 2014 14:46:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBs-0008I0-VN for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:29 +0000 Received: from [85.158.143.35:53732] by server-2.bemta-4.messagelabs.com id 11/90-06539-442AD235; Sat, 22 Mar 2014 14:46:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1395499586!3952732!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15137 invoked from network); 22 Mar 2014 14:46:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:46:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBq-0002Vu-9l for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNBq-0005g4-8q for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:26 +0000 Date: Sat, 22 Mar 2014 14:46:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minios (blkfront): Add more information on block error X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8bdd98744d678fc1ff8c7462c088e9fdee055ca2 Author: Samuel Thibault AuthorDate: Thu Mar 20 13:10:22 2014 +0100 Commit: Ian Campbell CommitDate: Fri Mar 21 11:49:23 2014 +0000 minios (blkfront): Add more information on block error This notably prints the offset and size of the block operation in error. Signed-off-by: Samuel Thibault Acked-by: Ian Campbell --- extras/mini-os/blkfront.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index 62a32c5..59e576f 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -509,15 +509,19 @@ moretodo: aiocbp = (void*) (uintptr_t) rsp->id; status = rsp->status; - if (status != BLKIF_RSP_OKAY) - printk("block error %d for op %d\n", status, rsp->operation); - switch (rsp->operation) { case BLKIF_OP_READ: case BLKIF_OP_WRITE: { int j; + if (status != BLKIF_RSP_OKAY) + printk("%s error %d on %s at offset %llu, num bytes %llu\n", + rsp->operation == BLKIF_OP_READ?"read":"write", + status, aiocbp->aio_dev->nodename, + (unsigned long long) aiocbp->aio_offset, + (unsigned long long) aiocbp->aio_nbytes); + for (j = 0; j < aiocbp->n; j++) gnttab_end_access(aiocbp->gref[j]); @@ -525,11 +529,17 @@ moretodo: } case BLKIF_OP_WRITE_BARRIER: + if (status != BLKIF_RSP_OKAY) + printk("write barrier error %d\n", status); + break; case BLKIF_OP_FLUSH_DISKCACHE: + if (status != BLKIF_RSP_OKAY) + printk("flush error %d\n", status); break; default: - printk("unrecognized block operation %d response\n", rsp->operation); + printk("unrecognized block operation %d response (status %d)\n", rsp->operation, status); + break; } dev->ring.rsp_cons = ++cons; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:46:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:46:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBu-0008II-16; Sat, 22 Mar 2014 14:46:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBs-0008I0-VN for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:29 +0000 Received: from [85.158.143.35:53732] by server-2.bemta-4.messagelabs.com id 11/90-06539-442AD235; Sat, 22 Mar 2014 14:46:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1395499586!3952732!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15137 invoked from network); 22 Mar 2014 14:46:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:46:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNBq-0002Vu-9l for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNBq-0005g4-8q for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:26 +0000 Date: Sat, 22 Mar 2014 14:46:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minios (blkfront): Add more information on block error X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8bdd98744d678fc1ff8c7462c088e9fdee055ca2 Author: Samuel Thibault AuthorDate: Thu Mar 20 13:10:22 2014 +0100 Commit: Ian Campbell CommitDate: Fri Mar 21 11:49:23 2014 +0000 minios (blkfront): Add more information on block error This notably prints the offset and size of the block operation in error. Signed-off-by: Samuel Thibault Acked-by: Ian Campbell --- extras/mini-os/blkfront.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index 62a32c5..59e576f 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -509,15 +509,19 @@ moretodo: aiocbp = (void*) (uintptr_t) rsp->id; status = rsp->status; - if (status != BLKIF_RSP_OKAY) - printk("block error %d for op %d\n", status, rsp->operation); - switch (rsp->operation) { case BLKIF_OP_READ: case BLKIF_OP_WRITE: { int j; + if (status != BLKIF_RSP_OKAY) + printk("%s error %d on %s at offset %llu, num bytes %llu\n", + rsp->operation == BLKIF_OP_READ?"read":"write", + status, aiocbp->aio_dev->nodename, + (unsigned long long) aiocbp->aio_offset, + (unsigned long long) aiocbp->aio_nbytes); + for (j = 0; j < aiocbp->n; j++) gnttab_end_access(aiocbp->gref[j]); @@ -525,11 +529,17 @@ moretodo: } case BLKIF_OP_WRITE_BARRIER: + if (status != BLKIF_RSP_OKAY) + printk("write barrier error %d\n", status); + break; case BLKIF_OP_FLUSH_DISKCACHE: + if (status != BLKIF_RSP_OKAY) + printk("flush error %d\n", status); break; default: - printk("unrecognized block operation %d response\n", rsp->operation); + printk("unrecognized block operation %d response (status %d)\n", rsp->operation, status); + break; } dev->ring.rsp_cons = ++cons; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:46:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:46:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNC5-0008K4-3k; Sat, 22 Mar 2014 14:46:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNC3-0008Jn-AG for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:39 +0000 Received: from [85.158.139.211:34181] by server-16.bemta-5.messagelabs.com id C2/73-19700-E42AD235; Sat, 22 Mar 2014 14:46:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1395499596!2719777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5816 invoked from network); 22 Mar 2014 14:46:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:46:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNC0-0002W0-En for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNC0-0005gU-DL for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:36 +0000 Date: Sat, 22 Mar 2014 14:46:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: domain_vgic_init: Check xzalloc_* return X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a34f6affe799cf493640b58a794132d213288ba3 Author: Julien Grall AuthorDate: Thu Mar 20 13:51:26 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:49:23 2014 +0000 xen/arm: domain_vgic_init: Check xzalloc_* return The allocations for shared_irqs and pending_irqs are not checked and use later. This may lead to a Xen segfault if the hypervisor run out of memory. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 553411d..9fc9586 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -89,8 +89,17 @@ int domain_vgic_init(struct domain *d) d->arch.vgic.shared_irqs = xzalloc_array(struct vgic_irq_rank, DOMAIN_NR_RANKS(d)); + if ( d->arch.vgic.shared_irqs == NULL ) + return -ENOMEM; + d->arch.vgic.pending_irqs = xzalloc_array(struct pending_irq, d->arch.vgic.nr_lines); + if ( d->arch.vgic.pending_irqs == NULL ) + { + xfree(d->arch.vgic.shared_irqs); + return -ENOMEM; + } + for (i=0; iarch.vgic.nr_lines; i++) { INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].inflight); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:46:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:46:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNC5-0008K4-3k; Sat, 22 Mar 2014 14:46:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNC3-0008Jn-AG for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:39 +0000 Received: from [85.158.139.211:34181] by server-16.bemta-5.messagelabs.com id C2/73-19700-E42AD235; Sat, 22 Mar 2014 14:46:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1395499596!2719777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5816 invoked from network); 22 Mar 2014 14:46:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:46:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNC0-0002W0-En for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNC0-0005gU-DL for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:36 +0000 Date: Sat, 22 Mar 2014 14:46:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: domain_vgic_init: Check xzalloc_* return X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a34f6affe799cf493640b58a794132d213288ba3 Author: Julien Grall AuthorDate: Thu Mar 20 13:51:26 2014 +0000 Commit: Ian Campbell CommitDate: Fri Mar 21 11:49:23 2014 +0000 xen/arm: domain_vgic_init: Check xzalloc_* return The allocations for shared_irqs and pending_irqs are not checked and use later. This may lead to a Xen segfault if the hypervisor run out of memory. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 553411d..9fc9586 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -89,8 +89,17 @@ int domain_vgic_init(struct domain *d) d->arch.vgic.shared_irqs = xzalloc_array(struct vgic_irq_rank, DOMAIN_NR_RANKS(d)); + if ( d->arch.vgic.shared_irqs == NULL ) + return -ENOMEM; + d->arch.vgic.pending_irqs = xzalloc_array(struct pending_irq, d->arch.vgic.nr_lines); + if ( d->arch.vgic.pending_irqs == NULL ) + { + xfree(d->arch.vgic.shared_irqs); + return -ENOMEM; + } + for (i=0; iarch.vgic.nr_lines; i++) { INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].inflight); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:46:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:46:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCE-0008LK-6L; Sat, 22 Mar 2014 14:46:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCD-0008LA-5n for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:49 +0000 Received: from [85.158.143.35:54339] by server-3.bemta-4.messagelabs.com id DD/9D-13602-852AD235; Sat, 22 Mar 2014 14:46:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1395499606!3991210!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13544 invoked from network); 22 Mar 2014 14:46:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:46:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCA-0002W6-Ku for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNCA-0005gq-J7 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:46 +0000 Date: Sat, 22 Mar 2014 14:46:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: fix --enable-xenapi typo error X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 41992839cd7ebc35f7106017e9685df890a3326a Author: Yixun Lan (dlan) AuthorDate: Fri Mar 21 06:44:16 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 21 11:49:23 2014 +0000 tools: fix --enable-xenapi typo error typo in tools/configure.ac cause --enable-xenapi does not works lead to variables XML2_CONFIG, CURL_CONFIG not set Signed-off-by: Yixun Lan (dlan) Acked-by: Ian Campbell --- tools/configure | 2 +- tools/configure.ac | 2 +- tools/libxen/Makefile | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/configure b/tools/configure index e974c5d..5c2fa14 100755 --- a/tools/configure +++ b/tools/configure @@ -4702,7 +4702,7 @@ if test x"${PERL}" = x"no" then as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5 fi -if test "x$xapi" = "xy"; then : +if test "x$xenapi" = "xy"; then : # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 diff --git a/tools/configure.ac b/tools/configure.ac index 884d63d..a62faf8 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -151,7 +151,7 @@ AC_PROG_INSTALL AC_PATH_PROG([BISON], [bison]) AC_PATH_PROG([FLEX], [flex]) AX_PATH_PROG_OR_FAIL([PERL], [perl]) -AS_IF([test "x$xapi" = "xy"], [ +AS_IF([test "x$xenapi" = "xy"], [ AX_PATH_PROG_OR_FAIL([CURL], [curl-config]) AX_PATH_PROG_OR_FAIL([XML], [xml2-config]) ]) diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile index b66f0bc..262412d 100644 --- a/tools/libxen/Makefile +++ b/tools/libxen/Makefile @@ -22,12 +22,15 @@ MAJOR = 1.0 MINOR = 0 CFLAGS += -Iinclude \ - $(shell $(XML2_CONFIG) --cflags) \ - $(shell $(CURL_CONFIG) --cflags) \ -fPIC +ifeq ($(LIBXENAPI_BINDINGS),y) +CFLAGS += $(shell $(XML2_CONFIG) --cflags) \ + $(shell $(CURL_CONFIG) --cflags) + LDFLAGS += $(shell $(XML2_CONFIG) --libs) \ $(shell $(CURL_CONFIG) --libs) +endif LIBXENAPI_HDRS = $(wildcard include/xen/api/*.h) include/xen/api/xen_all.h LIBXENAPI_OBJS = $(patsubst %.c, %.o, $(wildcard src/*.c)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:46:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:46:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCE-0008LK-6L; Sat, 22 Mar 2014 14:46:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCD-0008LA-5n for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:49 +0000 Received: from [85.158.143.35:54339] by server-3.bemta-4.messagelabs.com id DD/9D-13602-852AD235; Sat, 22 Mar 2014 14:46:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1395499606!3991210!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13544 invoked from network); 22 Mar 2014 14:46:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:46:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCA-0002W6-Ku for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNCA-0005gq-J7 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:46 +0000 Date: Sat, 22 Mar 2014 14:46:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: fix --enable-xenapi typo error X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 41992839cd7ebc35f7106017e9685df890a3326a Author: Yixun Lan (dlan) AuthorDate: Fri Mar 21 06:44:16 2014 +0800 Commit: Ian Campbell CommitDate: Fri Mar 21 11:49:23 2014 +0000 tools: fix --enable-xenapi typo error typo in tools/configure.ac cause --enable-xenapi does not works lead to variables XML2_CONFIG, CURL_CONFIG not set Signed-off-by: Yixun Lan (dlan) Acked-by: Ian Campbell --- tools/configure | 2 +- tools/configure.ac | 2 +- tools/libxen/Makefile | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/configure b/tools/configure index e974c5d..5c2fa14 100755 --- a/tools/configure +++ b/tools/configure @@ -4702,7 +4702,7 @@ if test x"${PERL}" = x"no" then as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5 fi -if test "x$xapi" = "xy"; then : +if test "x$xenapi" = "xy"; then : # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 diff --git a/tools/configure.ac b/tools/configure.ac index 884d63d..a62faf8 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -151,7 +151,7 @@ AC_PROG_INSTALL AC_PATH_PROG([BISON], [bison]) AC_PATH_PROG([FLEX], [flex]) AX_PATH_PROG_OR_FAIL([PERL], [perl]) -AS_IF([test "x$xapi" = "xy"], [ +AS_IF([test "x$xenapi" = "xy"], [ AX_PATH_PROG_OR_FAIL([CURL], [curl-config]) AX_PATH_PROG_OR_FAIL([XML], [xml2-config]) ]) diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile index b66f0bc..262412d 100644 --- a/tools/libxen/Makefile +++ b/tools/libxen/Makefile @@ -22,12 +22,15 @@ MAJOR = 1.0 MINOR = 0 CFLAGS += -Iinclude \ - $(shell $(XML2_CONFIG) --cflags) \ - $(shell $(CURL_CONFIG) --cflags) \ -fPIC +ifeq ($(LIBXENAPI_BINDINGS),y) +CFLAGS += $(shell $(XML2_CONFIG) --cflags) \ + $(shell $(CURL_CONFIG) --cflags) + LDFLAGS += $(shell $(XML2_CONFIG) --libs) \ $(shell $(CURL_CONFIG) --libs) +endif LIBXENAPI_HDRS = $(wildcard include/xen/api/*.h) include/xen/api/xen_all.h LIBXENAPI_OBJS = $(patsubst %.c, %.o, $(wildcard src/*.c)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:47:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:47:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCO-0008MY-8y; Sat, 22 Mar 2014 14:47:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCN-0008MR-8A for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:59 +0000 Received: from [85.158.143.35:54674] by server-2.bemta-4.messagelabs.com id 09/B0-06539-262AD235; Sat, 22 Mar 2014 14:46:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1395499616!3285704!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3550 invoked from network); 22 Mar 2014 14:46:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:46:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCK-0002WF-PY for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNCK-0005hC-Oe for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:56 +0000 Date: Sat, 22 Mar 2014 14:46:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] PV-GRUB: fix blk access at end of disk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 51e18e41e39a682de5a2e60ad86048dc6344efec Author: Samuel Thibault AuthorDate: Fri Mar 21 02:56:56 2014 +0100 Commit: Ian Campbell CommitDate: Fri Mar 21 11:49:24 2014 +0000 PV-GRUB: fix blk access at end of disk GRUB usually always loads a whole disk track, even if that means going beyond the end of the disk. We thus have to gracefully return an error, instead of letting the blkfront go panic. Signed-off-by: Samuel Thibault Acked-by: Ian Campbell --- stubdom/grub/mini-os.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/stubdom/grub/mini-os.c b/stubdom/grub/mini-os.c index 8cecf90..64ab962 100644 --- a/stubdom/grub/mini-os.c +++ b/stubdom/grub/mini-os.c @@ -126,6 +126,9 @@ biosdisk (int read, int drive, struct geometry *geometry, if (i >= blk_nb) return -1; + if (sector + nsec > geometry->total_sectors) + return -1; + aiocb.aio_dev = blk_dev[i]; aiocb.aio_buf = addr; aiocb.aio_nbytes = (size_t)nsec * blk_info[i].sector_size; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:47:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:47:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCO-0008MY-8y; Sat, 22 Mar 2014 14:47:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCN-0008MR-8A for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:59 +0000 Received: from [85.158.143.35:54674] by server-2.bemta-4.messagelabs.com id 09/B0-06539-262AD235; Sat, 22 Mar 2014 14:46:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1395499616!3285704!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3550 invoked from network); 22 Mar 2014 14:46:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:46:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCK-0002WF-PY for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNCK-0005hC-Oe for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:46:56 +0000 Date: Sat, 22 Mar 2014 14:46:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] PV-GRUB: fix blk access at end of disk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 51e18e41e39a682de5a2e60ad86048dc6344efec Author: Samuel Thibault AuthorDate: Fri Mar 21 02:56:56 2014 +0100 Commit: Ian Campbell CommitDate: Fri Mar 21 11:49:24 2014 +0000 PV-GRUB: fix blk access at end of disk GRUB usually always loads a whole disk track, even if that means going beyond the end of the disk. We thus have to gracefully return an error, instead of letting the blkfront go panic. Signed-off-by: Samuel Thibault Acked-by: Ian Campbell --- stubdom/grub/mini-os.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/stubdom/grub/mini-os.c b/stubdom/grub/mini-os.c index 8cecf90..64ab962 100644 --- a/stubdom/grub/mini-os.c +++ b/stubdom/grub/mini-os.c @@ -126,6 +126,9 @@ biosdisk (int read, int drive, struct geometry *geometry, if (i >= blk_nb) return -1; + if (sector + nsec > geometry->total_sectors) + return -1; + aiocb.aio_dev = blk_dev[i]; aiocb.aio_buf = addr; aiocb.aio_nbytes = (size_t)nsec * blk_info[i].sector_size; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:47:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:47:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCZ-0008Nv-Cg; Sat, 22 Mar 2014 14:47:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCX-0008Nk-RV for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:10 +0000 Received: from [85.158.139.211:35005] by server-13.bemta-5.messagelabs.com id 1F/9F-16341-D62AD235; Sat, 22 Mar 2014 14:47:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1395499627!2707720!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29084 invoked from network); 22 Mar 2014 14:47:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:47:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCU-0002Wo-V8 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNCU-0005hi-UE for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:06 +0000 Date: Sat, 22 Mar 2014 14:47:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: remove needless error checking from calls to xl_fork X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7deaedc301dc160286fed8d2ffa298ba454ca79e Author: Ian Jackson AuthorDate: Mon Oct 14 16:01:49 2013 +0100 Commit: Ian Jackson CommitDate: Fri Mar 21 14:35:52 2014 +0000 xl: remove needless error checking from calls to xl_fork xl_fork cannot fail - it exits instead. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8990020..e19b1cf 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -230,10 +230,7 @@ static void autoconnect_vncviewer(uint32_t domid, int autopass) vncviewer_child_report(); pid_t pid = xl_fork(child_vncviewer); - if (pid < 0) { - perror("unable to fork vncviewer"); - return; - } else if (pid > 0) + if (pid) return; postfork(); @@ -2009,10 +2006,7 @@ static void autoconnect_console(libxl_ctx *ctx_ignored, console_child_report(); pid_t pid = xl_fork(child_console); - if (pid < 0) { - perror("unable to fork xenconsole"); - return; - } else if (pid > 0) + if (pid) return; postfork(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:47:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:47:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCZ-0008Nv-Cg; Sat, 22 Mar 2014 14:47:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCX-0008Nk-RV for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:10 +0000 Received: from [85.158.139.211:35005] by server-13.bemta-5.messagelabs.com id 1F/9F-16341-D62AD235; Sat, 22 Mar 2014 14:47:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1395499627!2707720!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29084 invoked from network); 22 Mar 2014 14:47:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:47:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCU-0002Wo-V8 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNCU-0005hi-UE for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:06 +0000 Date: Sat, 22 Mar 2014 14:47:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: remove needless error checking from calls to xl_fork X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7deaedc301dc160286fed8d2ffa298ba454ca79e Author: Ian Jackson AuthorDate: Mon Oct 14 16:01:49 2013 +0100 Commit: Ian Jackson CommitDate: Fri Mar 21 14:35:52 2014 +0000 xl: remove needless error checking from calls to xl_fork xl_fork cannot fail - it exits instead. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8990020..e19b1cf 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -230,10 +230,7 @@ static void autoconnect_vncviewer(uint32_t domid, int autopass) vncviewer_child_report(); pid_t pid = xl_fork(child_vncviewer); - if (pid < 0) { - perror("unable to fork vncviewer"); - return; - } else if (pid > 0) + if (pid) return; postfork(); @@ -2009,10 +2006,7 @@ static void autoconnect_console(libxl_ctx *ctx_ignored, console_child_report(); pid_t pid = xl_fork(child_console); - if (pid < 0) { - perror("unable to fork xenconsole"); - return; - } else if (pid > 0) + if (pid) return; postfork(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:47:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:47:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCj-0008PK-FH; Sat, 22 Mar 2014 14:47:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCi-0008PA-0b for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:20 +0000 Received: from [85.158.139.211:32562] by server-14.bemta-5.messagelabs.com id 63/F6-15696-772AD235; Sat, 22 Mar 2014 14:47:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1395499637!2694994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9959 invoked from network); 22 Mar 2014 14:47:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:47:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCf-0002Wu-4P for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNCf-0005ip-37 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:17 +0000 Date: Sat, 22 Mar 2014 14:47:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Introduce children[].description and xl_report_child_exitstatus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d2dfd4bd5817f89f24006adb90aeb340394370b7 Author: Ian Jackson AuthorDate: Mon Oct 14 16:13:19 2013 +0100 Commit: Ian Jackson CommitDate: Fri Mar 21 14:35:52 2014 +0000 xl: Introduce children[].description and xl_report_child_exitstatus We record the descriptive string for the child in the children[] array, and use it when reporting the exit status. The only functional change is that the message reported for the migration child is changed from "migration target process" to "migration transport process". Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/xl.c | 10 +++++++++- tools/libxl/xl.h | 8 +++++++- tools/libxl/xl_cmdimpl.c | 21 ++++++++++----------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index 1d157fe..527b4c5 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -189,12 +189,13 @@ void postfork(void) xl_ctx_alloc(); } -pid_t xl_fork(xlchildnum child) { +pid_t xl_fork(xlchildnum child, const char *description) { xlchild *ch = &children[child]; int i; assert(!ch->pid); ch->reaped = 0; + ch->description = description; ch->pid = fork(); if (ch->pid == -1) { @@ -238,6 +239,13 @@ int xl_child_pid(xlchildnum child) return ch->pid; } +void xl_report_child_exitstatus(xentoollog_level level, + xlchildnum child, pid_t pid, int status) +{ + libxl_report_child_exitstatus(ctx, level, children[child].description, + pid, status); +} + static int xl_reaped_callback(pid_t got, int status, void *user) { int i; diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 280d39c..40a42b3 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -130,6 +130,7 @@ typedef struct { pid_t pid; /* 0: not in use */ int reaped; /* valid iff pid!=0 */ int status; /* valid iff reaped */ + const char *description; /* valid iff pid!=0 */ } xlchild; typedef enum { @@ -139,7 +140,8 @@ typedef enum { extern xlchild children[child_max]; -pid_t xl_fork(xlchildnum); /* like fork, but prints and dies if it fails */ +pid_t xl_fork(xlchildnum, const char *description); + /* like fork, but prints and dies if it fails */ void postfork(void); /* needed only if we aren't going to exec right away */ /* Handles EINTR. Clears out the xlchild so it can be reused. */ @@ -147,6 +149,10 @@ pid_t xl_waitpid(xlchildnum, int *status, int flags); int xl_child_pid(xlchildnum); /* returns 0 if child struct is not in use */ +void xl_report_child_exitstatus(xentoollog_level level, + xlchildnum child, pid_t pid, int status); + /* like libxl_report_child_exitstatus, but uses children[].description */ + /* global options */ extern int autoballoon; extern int run_hotplug_scripts; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index e19b1cf..0c2eca3 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -220,8 +220,8 @@ static void vncviewer_child_report(void) if (got < 0) perror("xl: warning, failed to waitpid for vncviewer child"); else if (status) - libxl_report_child_exitstatus(ctx, XTL_ERROR, "vncviewer child", - xl_child_pid(child_vncviewer), status); + xl_report_child_exitstatus(XTL_ERROR, child_vncviewer, + got, status); } } @@ -229,7 +229,7 @@ static void autoconnect_vncviewer(uint32_t domid, int autopass) { vncviewer_child_report(); - pid_t pid = xl_fork(child_vncviewer); + pid_t pid = xl_fork(child_vncviewer, "vncviewer child"); if (pid) return; @@ -435,7 +435,7 @@ static int do_daemonize(char *name) int nullfd, ret = 0; int status = 0; - child1 = xl_fork(child_waitdaemon); + child1 = xl_fork(child_waitdaemon, "domain monitoring daemon"); if (child1) { got_child = xl_waitpid(child_waitdaemon, &status, 0); if (got_child != child1) { @@ -1991,8 +1991,8 @@ static void console_child_report(void) if (got < 0) perror("xl: warning, failed to waitpid for console child"); else if (status) - libxl_report_child_exitstatus(ctx, XTL_ERROR, "console child", - xl_child_pid(child_console), status); + xl_report_child_exitstatus(XTL_ERROR, child_console, + got, status); } } @@ -2005,7 +2005,7 @@ static void autoconnect_console(libxl_ctx *ctx_ignored, console_child_report(); - pid_t pid = xl_fork(child_console); + pid_t pid = xl_fork(child_console, "console child"); if (pid) return; @@ -3525,7 +3525,7 @@ static pid_t create_migration_child(const char *rune, int *send_fd, MUST( libxl_pipe(ctx, sendpipe) ); MUST( libxl_pipe(ctx, recvpipe) ); - child = xl_fork(child_migration); + child = xl_fork(child_migration, "migration transport process"); if (!child) { dup2(sendpipe[0], 0); @@ -3586,9 +3586,8 @@ static void migration_child_report(int recv_fd) { if (child == migration_child) { if (status) - libxl_report_child_exitstatus(ctx, XTL_INFO, - "migration target process", - migration_child, status); + xl_report_child_exitstatus(XTL_INFO, child_migration, + migration_child, status); break; } if (child == -1) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:47:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:47:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCj-0008PK-FH; Sat, 22 Mar 2014 14:47:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCi-0008PA-0b for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:20 +0000 Received: from [85.158.139.211:32562] by server-14.bemta-5.messagelabs.com id 63/F6-15696-772AD235; Sat, 22 Mar 2014 14:47:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1395499637!2694994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9959 invoked from network); 22 Mar 2014 14:47:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:47:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCf-0002Wu-4P for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNCf-0005ip-37 for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:17 +0000 Date: Sat, 22 Mar 2014 14:47:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Introduce children[].description and xl_report_child_exitstatus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d2dfd4bd5817f89f24006adb90aeb340394370b7 Author: Ian Jackson AuthorDate: Mon Oct 14 16:13:19 2013 +0100 Commit: Ian Jackson CommitDate: Fri Mar 21 14:35:52 2014 +0000 xl: Introduce children[].description and xl_report_child_exitstatus We record the descriptive string for the child in the children[] array, and use it when reporting the exit status. The only functional change is that the message reported for the migration child is changed from "migration target process" to "migration transport process". Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/xl.c | 10 +++++++++- tools/libxl/xl.h | 8 +++++++- tools/libxl/xl_cmdimpl.c | 21 ++++++++++----------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index 1d157fe..527b4c5 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -189,12 +189,13 @@ void postfork(void) xl_ctx_alloc(); } -pid_t xl_fork(xlchildnum child) { +pid_t xl_fork(xlchildnum child, const char *description) { xlchild *ch = &children[child]; int i; assert(!ch->pid); ch->reaped = 0; + ch->description = description; ch->pid = fork(); if (ch->pid == -1) { @@ -238,6 +239,13 @@ int xl_child_pid(xlchildnum child) return ch->pid; } +void xl_report_child_exitstatus(xentoollog_level level, + xlchildnum child, pid_t pid, int status) +{ + libxl_report_child_exitstatus(ctx, level, children[child].description, + pid, status); +} + static int xl_reaped_callback(pid_t got, int status, void *user) { int i; diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 280d39c..40a42b3 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -130,6 +130,7 @@ typedef struct { pid_t pid; /* 0: not in use */ int reaped; /* valid iff pid!=0 */ int status; /* valid iff reaped */ + const char *description; /* valid iff pid!=0 */ } xlchild; typedef enum { @@ -139,7 +140,8 @@ typedef enum { extern xlchild children[child_max]; -pid_t xl_fork(xlchildnum); /* like fork, but prints and dies if it fails */ +pid_t xl_fork(xlchildnum, const char *description); + /* like fork, but prints and dies if it fails */ void postfork(void); /* needed only if we aren't going to exec right away */ /* Handles EINTR. Clears out the xlchild so it can be reused. */ @@ -147,6 +149,10 @@ pid_t xl_waitpid(xlchildnum, int *status, int flags); int xl_child_pid(xlchildnum); /* returns 0 if child struct is not in use */ +void xl_report_child_exitstatus(xentoollog_level level, + xlchildnum child, pid_t pid, int status); + /* like libxl_report_child_exitstatus, but uses children[].description */ + /* global options */ extern int autoballoon; extern int run_hotplug_scripts; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index e19b1cf..0c2eca3 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -220,8 +220,8 @@ static void vncviewer_child_report(void) if (got < 0) perror("xl: warning, failed to waitpid for vncviewer child"); else if (status) - libxl_report_child_exitstatus(ctx, XTL_ERROR, "vncviewer child", - xl_child_pid(child_vncviewer), status); + xl_report_child_exitstatus(XTL_ERROR, child_vncviewer, + got, status); } } @@ -229,7 +229,7 @@ static void autoconnect_vncviewer(uint32_t domid, int autopass) { vncviewer_child_report(); - pid_t pid = xl_fork(child_vncviewer); + pid_t pid = xl_fork(child_vncviewer, "vncviewer child"); if (pid) return; @@ -435,7 +435,7 @@ static int do_daemonize(char *name) int nullfd, ret = 0; int status = 0; - child1 = xl_fork(child_waitdaemon); + child1 = xl_fork(child_waitdaemon, "domain monitoring daemon"); if (child1) { got_child = xl_waitpid(child_waitdaemon, &status, 0); if (got_child != child1) { @@ -1991,8 +1991,8 @@ static void console_child_report(void) if (got < 0) perror("xl: warning, failed to waitpid for console child"); else if (status) - libxl_report_child_exitstatus(ctx, XTL_ERROR, "console child", - xl_child_pid(child_console), status); + xl_report_child_exitstatus(XTL_ERROR, child_console, + got, status); } } @@ -2005,7 +2005,7 @@ static void autoconnect_console(libxl_ctx *ctx_ignored, console_child_report(); - pid_t pid = xl_fork(child_console); + pid_t pid = xl_fork(child_console, "console child"); if (pid) return; @@ -3525,7 +3525,7 @@ static pid_t create_migration_child(const char *rune, int *send_fd, MUST( libxl_pipe(ctx, sendpipe) ); MUST( libxl_pipe(ctx, recvpipe) ); - child = xl_fork(child_migration); + child = xl_fork(child_migration, "migration transport process"); if (!child) { dup2(sendpipe[0], 0); @@ -3586,9 +3586,8 @@ static void migration_child_report(int recv_fd) { if (child == migration_child) { if (status) - libxl_report_child_exitstatus(ctx, XTL_INFO, - "migration target process", - migration_child, status); + xl_report_child_exitstatus(XTL_INFO, child_migration, + migration_child, status); break; } if (child == -1) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:47:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:47:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCt-0008Rb-Jm; Sat, 22 Mar 2014 14:47:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCs-0008RG-6e for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:30 +0000 Received: from [85.158.139.211:32807] by server-17.bemta-5.messagelabs.com id 7A/70-09046-182AD235; Sat, 22 Mar 2014 14:47:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1395499647!920604!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23941 invoked from network); 22 Mar 2014 14:47:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:47:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCp-0002X0-9u for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNCp-0005jB-8T for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:27 +0000 Date: Sat, 22 Mar 2014 14:47:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Abolish vncviewer_child_report X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 242e0ee7922dbce4b9866fb2ec65254e174d717c Author: Ian Jackson AuthorDate: Mon Oct 14 16:20:20 2013 +0100 Commit: Ian Jackson CommitDate: Fri Mar 21 14:35:52 2014 +0000 xl: Abolish vncviewer_child_report vncviewer_child_report was very similar to console_child_report. We can abolish vncviewer_child_report by adding an xlchildnum parameter to console_child_report. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 45 ++++++++++++++++----------------------------- 1 files changed, 16 insertions(+), 29 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 0c2eca3..d61d301 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -205,29 +205,29 @@ static uint32_t find_domain(const char *p) return domid; } -static int vncviewer(uint32_t domid, int autopass) +static void console_child_report(xlchildnum child) { - libxl_vncviewer_exec(ctx, domid, autopass); - fprintf(stderr, "Unable to execute vncviewer\n"); - return 1; -} - -static void vncviewer_child_report(void) -{ - if (xl_child_pid(child_vncviewer)) { + if (xl_child_pid(child)) { int status; - pid_t got = xl_waitpid(child_vncviewer, &status, 0); + pid_t got = xl_waitpid(child, &status, 0); if (got < 0) - perror("xl: warning, failed to waitpid for vncviewer child"); + fprintf(stderr, "xl: warning, failed to waitpid for %s: %s\n", + children[child].description, strerror(errno)); else if (status) - xl_report_child_exitstatus(XTL_ERROR, child_vncviewer, - got, status); + xl_report_child_exitstatus(XTL_ERROR, child, got, status); } } +static int vncviewer(uint32_t domid, int autopass) +{ + libxl_vncviewer_exec(ctx, domid, autopass); + fprintf(stderr, "Unable to execute vncviewer\n"); + return 1; +} + static void autoconnect_vncviewer(uint32_t domid, int autopass) { - vncviewer_child_report(); + console_child_report(child_vncviewer); pid_t pid = xl_fork(child_vncviewer, "vncviewer child"); if (pid) @@ -1983,19 +1983,6 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info) return ERROR_NOMEM; } -static void console_child_report(void) -{ - if (xl_child_pid(child_console)) { - int status; - pid_t got = xl_waitpid(child_console, &status, 0); - if (got < 0) - perror("xl: warning, failed to waitpid for console child"); - else if (status) - xl_report_child_exitstatus(XTL_ERROR, child_console, - got, status); - } -} - static void autoconnect_console(libxl_ctx *ctx_ignored, libxl_event *ev, void *priv) { @@ -2003,7 +1990,7 @@ static void autoconnect_console(libxl_ctx *ctx_ignored, libxl_event_free(ctx, ev); - console_child_report(); + console_child_report(child_console); pid_t pid = xl_fork(child_console, "console child"); if (pid) @@ -2461,7 +2448,7 @@ out: free(config_data); - console_child_report(); + console_child_report(child_console); if (deathw) libxl_evdisable_domain_death(ctx, deathw); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:47:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:47:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCt-0008Rb-Jm; Sat, 22 Mar 2014 14:47:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCs-0008RG-6e for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:30 +0000 Received: from [85.158.139.211:32807] by server-17.bemta-5.messagelabs.com id 7A/70-09046-182AD235; Sat, 22 Mar 2014 14:47:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1395499647!920604!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23941 invoked from network); 22 Mar 2014 14:47:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:47:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCp-0002X0-9u for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNCp-0005jB-8T for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:27 +0000 Date: Sat, 22 Mar 2014 14:47:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Abolish vncviewer_child_report X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 242e0ee7922dbce4b9866fb2ec65254e174d717c Author: Ian Jackson AuthorDate: Mon Oct 14 16:20:20 2013 +0100 Commit: Ian Jackson CommitDate: Fri Mar 21 14:35:52 2014 +0000 xl: Abolish vncviewer_child_report vncviewer_child_report was very similar to console_child_report. We can abolish vncviewer_child_report by adding an xlchildnum parameter to console_child_report. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 45 ++++++++++++++++----------------------------- 1 files changed, 16 insertions(+), 29 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 0c2eca3..d61d301 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -205,29 +205,29 @@ static uint32_t find_domain(const char *p) return domid; } -static int vncviewer(uint32_t domid, int autopass) +static void console_child_report(xlchildnum child) { - libxl_vncviewer_exec(ctx, domid, autopass); - fprintf(stderr, "Unable to execute vncviewer\n"); - return 1; -} - -static void vncviewer_child_report(void) -{ - if (xl_child_pid(child_vncviewer)) { + if (xl_child_pid(child)) { int status; - pid_t got = xl_waitpid(child_vncviewer, &status, 0); + pid_t got = xl_waitpid(child, &status, 0); if (got < 0) - perror("xl: warning, failed to waitpid for vncviewer child"); + fprintf(stderr, "xl: warning, failed to waitpid for %s: %s\n", + children[child].description, strerror(errno)); else if (status) - xl_report_child_exitstatus(XTL_ERROR, child_vncviewer, - got, status); + xl_report_child_exitstatus(XTL_ERROR, child, got, status); } } +static int vncviewer(uint32_t domid, int autopass) +{ + libxl_vncviewer_exec(ctx, domid, autopass); + fprintf(stderr, "Unable to execute vncviewer\n"); + return 1; +} + static void autoconnect_vncviewer(uint32_t domid, int autopass) { - vncviewer_child_report(); + console_child_report(child_vncviewer); pid_t pid = xl_fork(child_vncviewer, "vncviewer child"); if (pid) @@ -1983,19 +1983,6 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info) return ERROR_NOMEM; } -static void console_child_report(void) -{ - if (xl_child_pid(child_console)) { - int status; - pid_t got = xl_waitpid(child_console, &status, 0); - if (got < 0) - perror("xl: warning, failed to waitpid for console child"); - else if (status) - xl_report_child_exitstatus(XTL_ERROR, child_console, - got, status); - } -} - static void autoconnect_console(libxl_ctx *ctx_ignored, libxl_event *ev, void *priv) { @@ -2003,7 +1990,7 @@ static void autoconnect_console(libxl_ctx *ctx_ignored, libxl_event_free(ctx, ev); - console_child_report(); + console_child_report(child_console); pid_t pid = xl_fork(child_console, "console child"); if (pid) @@ -2461,7 +2448,7 @@ out: free(config_data); - console_child_report(); + console_child_report(child_console); if (deathw) libxl_evdisable_domain_death(ctx, deathw); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:47:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:47:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRND3-0008TJ-MX; Sat, 22 Mar 2014 14:47:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRND2-0008T5-2I for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:40 +0000 Received: from [85.158.143.35:25872] by server-3.bemta-4.messagelabs.com id EC/DD-13602-B82AD235; Sat, 22 Mar 2014 14:47:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1395499657!3968948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2826 invoked from network); 22 Mar 2014 14:47:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:47:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCz-0002X6-FH for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNCz-0005jb-Dx for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:37 +0000 Date: Sat, 22 Mar 2014 14:47:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Remove clone-and-hack in do_daemonize X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ac8aae00121ca8648b1bb5e5d087aee673ad3b1 Author: Ian Jackson AuthorDate: Wed Mar 19 14:07:05 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 21 14:35:52 2014 +0000 xl: Remove clone-and-hack in do_daemonize do_daemonize had open-coded handling of the results from xl_waitpid. Instead, break out the meat of console_child_report into a new function child_report (which returns an error code), and use it. No functional change other than a change to the message printed if forking the daemonic child fails. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/xl.h | 4 +++ tools/libxl/xl_cmdimpl.c | 48 +++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 40a42b3..10a2e66 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -153,6 +153,10 @@ void xl_report_child_exitstatus(xentoollog_level level, xlchildnum child, pid_t pid, int status); /* like libxl_report_child_exitstatus, but uses children[].description */ +int child_report(xlchildnum child); + /* waits and expects child to exit status 0. + * otherwise, logs and returns ERROR_FAIL */ + /* global options */ extern int autoballoon; extern int run_hotplug_scripts; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index d61d301..27b6f40 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -205,19 +205,28 @@ static uint32_t find_domain(const char *p) return domid; } -static void console_child_report(xlchildnum child) +int child_report(xlchildnum child) { - if (xl_child_pid(child)) { - int status; - pid_t got = xl_waitpid(child, &status, 0); - if (got < 0) - fprintf(stderr, "xl: warning, failed to waitpid for %s: %s\n", - children[child].description, strerror(errno)); - else if (status) - xl_report_child_exitstatus(XTL_ERROR, child, got, status); + int status; + pid_t got = xl_waitpid(child, &status, 0); + if (got < 0) { + fprintf(stderr, "xl: warning, failed to waitpid for %s: %s\n", + children[child].description, strerror(errno)); + return ERROR_FAIL; + } else if (status) { + xl_report_child_exitstatus(XTL_ERROR, child, got, status); + return ERROR_FAIL; + } else { + return 0; } } +static void console_child_report(xlchildnum child) +{ + if (xl_child_pid(child)) + child_report(child); +} + static int vncviewer(uint32_t domid, int autopass) { libxl_vncviewer_exec(ctx, domid, autopass); @@ -431,26 +440,13 @@ out: static int do_daemonize(char *name) { char *fullname; - pid_t child1, got_child; + pid_t child1; int nullfd, ret = 0; - int status = 0; - child1 = xl_fork(child_waitdaemon, "domain monitoring daemon"); + child1 = xl_fork(child_waitdaemon, "domain monitoring daemonizing child"); if (child1) { - got_child = xl_waitpid(child_waitdaemon, &status, 0); - if (got_child != child1) { - assert(got_child == -1); - LOG("failed to wait for daemonizing child: %s", strerror(errno)); - ret = ERROR_FAIL; - goto out; - } - - if (status) { - libxl_report_child_exitstatus(ctx, XTL_ERROR, - "daemonizing child", child1, status); - ret = ERROR_FAIL; - goto out; - } + ret = child_report(child_waitdaemon); + if (ret) goto out; ret = 1; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:47:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:47:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRND3-0008TJ-MX; Sat, 22 Mar 2014 14:47:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRND2-0008T5-2I for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:40 +0000 Received: from [85.158.143.35:25872] by server-3.bemta-4.messagelabs.com id EC/DD-13602-B82AD235; Sat, 22 Mar 2014 14:47:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1395499657!3968948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2826 invoked from network); 22 Mar 2014 14:47:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:47:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNCz-0002X6-FH for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRNCz-0005jb-Dx for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:37 +0000 Date: Sat, 22 Mar 2014 14:47:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Remove clone-and-hack in do_daemonize X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ac8aae00121ca8648b1bb5e5d087aee673ad3b1 Author: Ian Jackson AuthorDate: Wed Mar 19 14:07:05 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 21 14:35:52 2014 +0000 xl: Remove clone-and-hack in do_daemonize do_daemonize had open-coded handling of the results from xl_waitpid. Instead, break out the meat of console_child_report into a new function child_report (which returns an error code), and use it. No functional change other than a change to the message printed if forking the daemonic child fails. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/xl.h | 4 +++ tools/libxl/xl_cmdimpl.c | 48 +++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 40a42b3..10a2e66 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -153,6 +153,10 @@ void xl_report_child_exitstatus(xentoollog_level level, xlchildnum child, pid_t pid, int status); /* like libxl_report_child_exitstatus, but uses children[].description */ +int child_report(xlchildnum child); + /* waits and expects child to exit status 0. + * otherwise, logs and returns ERROR_FAIL */ + /* global options */ extern int autoballoon; extern int run_hotplug_scripts; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index d61d301..27b6f40 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -205,19 +205,28 @@ static uint32_t find_domain(const char *p) return domid; } -static void console_child_report(xlchildnum child) +int child_report(xlchildnum child) { - if (xl_child_pid(child)) { - int status; - pid_t got = xl_waitpid(child, &status, 0); - if (got < 0) - fprintf(stderr, "xl: warning, failed to waitpid for %s: %s\n", - children[child].description, strerror(errno)); - else if (status) - xl_report_child_exitstatus(XTL_ERROR, child, got, status); + int status; + pid_t got = xl_waitpid(child, &status, 0); + if (got < 0) { + fprintf(stderr, "xl: warning, failed to waitpid for %s: %s\n", + children[child].description, strerror(errno)); + return ERROR_FAIL; + } else if (status) { + xl_report_child_exitstatus(XTL_ERROR, child, got, status); + return ERROR_FAIL; + } else { + return 0; } } +static void console_child_report(xlchildnum child) +{ + if (xl_child_pid(child)) + child_report(child); +} + static int vncviewer(uint32_t domid, int autopass) { libxl_vncviewer_exec(ctx, domid, autopass); @@ -431,26 +440,13 @@ out: static int do_daemonize(char *name) { char *fullname; - pid_t child1, got_child; + pid_t child1; int nullfd, ret = 0; - int status = 0; - child1 = xl_fork(child_waitdaemon, "domain monitoring daemon"); + child1 = xl_fork(child_waitdaemon, "domain monitoring daemonizing child"); if (child1) { - got_child = xl_waitpid(child_waitdaemon, &status, 0); - if (got_child != child1) { - assert(got_child == -1); - LOG("failed to wait for daemonizing child: %s", strerror(errno)); - ret = ERROR_FAIL; - goto out; - } - - if (status) { - libxl_report_child_exitstatus(ctx, XTL_ERROR, - "daemonizing child", child1, status); - ret = ERROR_FAIL; - goto out; - } + ret = child_report(child_waitdaemon); + if (ret) goto out; ret = 1; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:47:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:47:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNDC-0008V1-P4; Sat, 22 Mar 2014 14:47:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNDC-0008Ur-5N for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:50 +0000 Received: from [193.109.254.147:48295] by server-13.bemta-14.messagelabs.com id 06/87-23211-592AD235; Sat, 22 Mar 2014 14:47:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1395499667!3479467!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15069 invoked from network); 22 Mar 2014 14:47:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:47:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRND9-0002XC-KR for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRND9-0005jx-Jc for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:47 +0000 Date: Sat, 22 Mar 2014 14:47:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: console connection: Print errno value from exec X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4787f667bcee205c56a27da59b766a53e1e929eb Author: Ian Jackson AuthorDate: Wed Mar 19 14:24:22 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 21 14:35:52 2014 +0000 xl: console connection: Print errno value from exec Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 27b6f40..8389468 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1997,7 +1997,7 @@ static void autoconnect_console(libxl_ctx *ctx_ignored, sleep(1); libxl_primary_console_exec(ctx, bldomid); /* Do not return. xl continued in child process */ - fprintf(stderr, "Unable to attach console\n"); + perror("xl: unable to exec console client"); _exit(1); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 22 14:47:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Mar 2014 14:47:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNDC-0008V1-P4; Sat, 22 Mar 2014 14:47:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRNDC-0008Ur-5N for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:50 +0000 Received: from [193.109.254.147:48295] by server-13.bemta-14.messagelabs.com id 06/87-23211-592AD235; Sat, 22 Mar 2014 14:47:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1395499667!3479467!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15069 invoked from network); 22 Mar 2014 14:47:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Mar 2014 14:47:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WRND9-0002XC-KR for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WRND9-0005jx-Jc for xen-changelog@lists.xensource.com; Sat, 22 Mar 2014 14:47:47 +0000 Date: Sat, 22 Mar 2014 14:47:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: console connection: Print errno value from exec X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4787f667bcee205c56a27da59b766a53e1e929eb Author: Ian Jackson AuthorDate: Wed Mar 19 14:24:22 2014 +0000 Commit: Ian Jackson CommitDate: Fri Mar 21 14:35:52 2014 +0000 xl: console connection: Print errno value from exec Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 27b6f40..8389468 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1997,7 +1997,7 @@ static void autoconnect_console(libxl_ctx *ctx_ignored, sleep(1); libxl_primary_console_exec(ctx, bldomid); /* Do not return. xl continued in child process */ - fprintf(stderr, "Unable to attach console\n"); + perror("xl: unable to exec console client"); _exit(1); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 24 18:33:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Mar 2014 18:33:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9gK-0006bq-2d; Mon, 24 Mar 2014 18:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9gI-0006be-8A for xen-changelog@lists.xensource.com; Mon, 24 Mar 2014 18:33:06 +0000 Received: from [85.158.137.68:51037] by server-17.bemta-3.messagelabs.com id FD/F1-22741-16A70335; Mon, 24 Mar 2014 18:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1395685983!1143074!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10558 invoked from network); 24 Mar 2014 18:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2014 18:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9gF-0006QK-G0 for xen-changelog@lists.xensource.com; Mon, 24 Mar 2014 18:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WS9gF-0002u5-AS for xen-changelog@lists.xensource.com; Mon, 24 Mar 2014 18:33:03 +0000 Date: Mon, 24 Mar 2014 18:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: drop unused Transmeta definitions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9c907c63d60a4bacb83c8e01b6e368c20609bde0 Author: Jan Beulich AuthorDate: Mon Mar 24 09:00:56 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 24 09:00:56 2014 +0100 x86: drop unused Transmeta definitions Signed-off-by: Jan Beulich --- xen/include/asm-x86/cpufeature.h | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 4bb5c69..0c4d6c1 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -57,10 +57,7 @@ #define X86_FEATURE_3DNOWEXT (1*32+30) /* AMD 3DNow! extensions */ #define X86_FEATURE_3DNOW (1*32+31) /* 3DNow! */ -/* Transmeta-defined CPU features, CPUID level 0x80860001, word 2 */ -#define X86_FEATURE_RECOVERY (2*32+ 0) /* CPU in recovery mode */ -#define X86_FEATURE_LONGRUN (2*32+ 1) /* Longrun power control */ -#define X86_FEATURE_LRTI (2*32+ 3) /* LongRun table interface */ +/* *** Available for re-use ***, word 2 */ /* Other features, Linux-defined mapping, word 3 */ /* This range is used for feature bits which conflict or are synthesized */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 24 18:33:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Mar 2014 18:33:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9gK-0006bq-2d; Mon, 24 Mar 2014 18:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9gI-0006be-8A for xen-changelog@lists.xensource.com; Mon, 24 Mar 2014 18:33:06 +0000 Received: from [85.158.137.68:51037] by server-17.bemta-3.messagelabs.com id FD/F1-22741-16A70335; Mon, 24 Mar 2014 18:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1395685983!1143074!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10558 invoked from network); 24 Mar 2014 18:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2014 18:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9gF-0006QK-G0 for xen-changelog@lists.xensource.com; Mon, 24 Mar 2014 18:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WS9gF-0002u5-AS for xen-changelog@lists.xensource.com; Mon, 24 Mar 2014 18:33:03 +0000 Date: Mon, 24 Mar 2014 18:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: drop unused Transmeta definitions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9c907c63d60a4bacb83c8e01b6e368c20609bde0 Author: Jan Beulich AuthorDate: Mon Mar 24 09:00:56 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 24 09:00:56 2014 +0100 x86: drop unused Transmeta definitions Signed-off-by: Jan Beulich --- xen/include/asm-x86/cpufeature.h | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 4bb5c69..0c4d6c1 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -57,10 +57,7 @@ #define X86_FEATURE_3DNOWEXT (1*32+30) /* AMD 3DNow! extensions */ #define X86_FEATURE_3DNOW (1*32+31) /* 3DNow! */ -/* Transmeta-defined CPU features, CPUID level 0x80860001, word 2 */ -#define X86_FEATURE_RECOVERY (2*32+ 0) /* CPU in recovery mode */ -#define X86_FEATURE_LONGRUN (2*32+ 1) /* Longrun power control */ -#define X86_FEATURE_LRTI (2*32+ 3) /* LongRun table interface */ +/* *** Available for re-use ***, word 2 */ /* Other features, Linux-defined mapping, word 3 */ /* This range is used for feature bits which conflict or are synthesized */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 24 18:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Mar 2014 18:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9gU-0006d2-5E; Mon, 24 Mar 2014 18:33:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9gS-0006cm-KO for xen-changelog@lists.xensource.com; Mon, 24 Mar 2014 18:33:16 +0000 Received: from [85.158.137.68:51457] by server-7.bemta-3.messagelabs.com id B0/69-04151-B6A70335; Mon, 24 Mar 2014 18:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1395685994!2667038!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25526 invoked from network); 24 Mar 2014 18:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2014 18:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9gP-0006QN-Pt for xen-changelog@lists.xensource.com; Mon, 24 Mar 2014 18:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WS9gP-0002uT-Ia for xen-changelog@lists.xensource.com; Mon, 24 Mar 2014 18:33:13 +0000 Date: Mon, 24 Mar 2014 18:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: disallow PHYSDEVOP_pirq_eoi_gmfn_v2/v1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7ca5c402e8cf61c5e8dd6e6797a627863f5a243 Author: Mukesh Rathor AuthorDate: Mon Mar 24 09:47:59 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 24 09:47:59 2014 +0100 x86/pvh: disallow PHYSDEVOP_pirq_eoi_gmfn_v2/v1 A call to do_physdev_op with PHYSDEVOP_pirq_eoi_gmfn_v2/v1 will corrupt struct hvm_domain when it writes to domain->arch.pv_domain.pirq_eoi_map. Disallow that. Currently, such a path exists for linux dom0 pvh. Signed-off-by: Mukesh Rathor --- xen/arch/x86/hvm/hvm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 9dd56f7..08ab9cb 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3427,6 +3427,12 @@ static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_irq_status_query: case PHYSDEVOP_get_free_pirq: return do_physdev_op(cmd, arg); + + /* pvh fixme: coming soon */ + case PHYSDEVOP_pirq_eoi_gmfn_v1: + case PHYSDEVOP_pirq_eoi_gmfn_v2: + return -ENOSYS; + } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 24 18:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Mar 2014 18:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9gU-0006d2-5E; Mon, 24 Mar 2014 18:33:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9gS-0006cm-KO for xen-changelog@lists.xensource.com; Mon, 24 Mar 2014 18:33:16 +0000 Received: from [85.158.137.68:51457] by server-7.bemta-3.messagelabs.com id B0/69-04151-B6A70335; Mon, 24 Mar 2014 18:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1395685994!2667038!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25526 invoked from network); 24 Mar 2014 18:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2014 18:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9gP-0006QN-Pt for xen-changelog@lists.xensource.com; Mon, 24 Mar 2014 18:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WS9gP-0002uT-Ia for xen-changelog@lists.xensource.com; Mon, 24 Mar 2014 18:33:13 +0000 Date: Mon, 24 Mar 2014 18:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: disallow PHYSDEVOP_pirq_eoi_gmfn_v2/v1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7ca5c402e8cf61c5e8dd6e6797a627863f5a243 Author: Mukesh Rathor AuthorDate: Mon Mar 24 09:47:59 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 24 09:47:59 2014 +0100 x86/pvh: disallow PHYSDEVOP_pirq_eoi_gmfn_v2/v1 A call to do_physdev_op with PHYSDEVOP_pirq_eoi_gmfn_v2/v1 will corrupt struct hvm_domain when it writes to domain->arch.pv_domain.pirq_eoi_map. Disallow that. Currently, such a path exists for linux dom0 pvh. Signed-off-by: Mukesh Rathor --- xen/arch/x86/hvm/hvm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 9dd56f7..08ab9cb 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3427,6 +3427,12 @@ static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_irq_status_query: case PHYSDEVOP_get_free_pirq: return do_physdev_op(cmd, arg); + + /* pvh fixme: coming soon */ + case PHYSDEVOP_pirq_eoi_gmfn_v1: + case PHYSDEVOP_pirq_eoi_gmfn_v2: + return -ENOSYS; + } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 04:00:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 04:00:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSf0a-0002Ln-PF; Wed, 26 Mar 2014 04:00:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSf0Y-0002I4-MM for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 04:00:07 +0000 Received: from [85.158.137.68:63374] by server-15.bemta-3.messagelabs.com id E3/3A-13757-5C052335; Wed, 26 Mar 2014 04:00:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1395806404!2903807!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5242 invoked from network); 26 Mar 2014 04:00:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 04:00:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSf0V-0007H7-LI for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 04:00:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSf0V-000375-6W for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 04:00:03 +0000 Date: Wed, 26 Mar 2014 04:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cfe54268832a964fd873ef1364bc9556ea9d6591 Author: Jan Beulich AuthorDate: Tue Mar 25 17:27:40 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 25 17:27:40 2014 +0100 x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() Processing up to 4G PFNs may take almost arbitrarily long, so preemption is needed here. This is CVE-2014-2599 / XSA-89. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 9469499..bf0ad26 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3755,7 +3755,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) ((a.first_pfn + a.nr - 1) > domain_get_maximum_gpfn(d)) ) goto param_fail5; - for ( pfn = a.first_pfn; pfn < a.first_pfn + a.nr; pfn++ ) + for ( pfn = a.first_pfn; a.nr; ++pfn ) { p2m_type_t t; mfn_t mfn; @@ -3768,6 +3768,17 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) p2m_unlock(p2m); if ( !success ) goto param_fail5; + + /* Check for continuation if it's not the last interation. */ + if ( --a.nr && hypercall_preempt_check() ) + { + a.first_pfn = pfn + 1; + if ( copy_to_guest(arg, &a, 1) ) + rc = -EFAULT; + else + rc = -EAGAIN; + goto param_fail5; + } } rc = 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 04:00:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 04:00:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSf0a-0002Ln-PF; Wed, 26 Mar 2014 04:00:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSf0Y-0002I4-MM for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 04:00:07 +0000 Received: from [85.158.137.68:63374] by server-15.bemta-3.messagelabs.com id E3/3A-13757-5C052335; Wed, 26 Mar 2014 04:00:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1395806404!2903807!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5242 invoked from network); 26 Mar 2014 04:00:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 04:00:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSf0V-0007H7-LI for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 04:00:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSf0V-000375-6W for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 04:00:03 +0000 Date: Wed, 26 Mar 2014 04:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cfe54268832a964fd873ef1364bc9556ea9d6591 Author: Jan Beulich AuthorDate: Tue Mar 25 17:27:40 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 25 17:27:40 2014 +0100 x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() Processing up to 4G PFNs may take almost arbitrarily long, so preemption is needed here. This is CVE-2014-2599 / XSA-89. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 9469499..bf0ad26 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3755,7 +3755,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) ((a.first_pfn + a.nr - 1) > domain_get_maximum_gpfn(d)) ) goto param_fail5; - for ( pfn = a.first_pfn; pfn < a.first_pfn + a.nr; pfn++ ) + for ( pfn = a.first_pfn; a.nr; ++pfn ) { p2m_type_t t; mfn_t mfn; @@ -3768,6 +3768,17 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) p2m_unlock(p2m); if ( !success ) goto param_fail5; + + /* Check for continuation if it's not the last interation. */ + if ( --a.nr && hypercall_preempt_check() ) + { + a.first_pfn = pfn + 1; + if ( copy_to_guest(arg, &a, 1) ) + rc = -EFAULT; + else + rc = -EAGAIN; + goto param_fail5; + } } rc = 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 07:11:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 07:11:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WShzQ-0002UO-TA; Wed, 26 Mar 2014 07:11:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WShzP-0002U5-FP for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 07:11:07 +0000 Received: from [85.158.137.68:40651] by server-1.bemta-3.messagelabs.com id A9/8D-11134-A8D72335; Wed, 26 Mar 2014 07:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1395817863!3008451!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29024 invoked from network); 26 Mar 2014 07:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 07:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WShzL-0000kW-2i for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 07:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WShzK-0000oL-Ps for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 07:11:02 +0000 Date: Wed, 26 Mar 2014 07:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit babcef372ae2ca9c4f4212398803015eb250f764 Author: Jan Beulich AuthorDate: Tue Mar 25 17:20:47 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 25 17:20:47 2014 +0100 x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() Processing up to 4G PFNs may take almost arbitrarily long, so preemption is needed here. This is CVE-2014-2599 / XSA-89. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 0fe53c4f279e1a8ef913e71ed000236d21ce96de master date: 2014-03-25 15:23:57 +0100 --- xen/arch/x86/hvm/hvm.c | 9 +++++++++ xen/arch/x86/mm/p2m.c | 21 +++++++++++++++------ xen/include/asm-x86/p2m.h | 4 ++-- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 69f7e74..6150899 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4465,6 +4465,15 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) goto param_fail5; rc = p2m_set_mem_access(d, a.first_pfn, a.nr, a.hvmmem_access); + if ( rc > 0 ) + { + a.first_pfn += a.nr - rc; + a.nr = rc; + if ( __copy_to_guest(arg, &a, 1) ) + rc = -EFAULT; + else + rc = -EAGAIN; + } param_fail5: rcu_unlock_domain(d); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 8f380ed..e0e5840 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1366,15 +1366,14 @@ void p2m_mem_access_resume(struct domain *d) /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access) +long p2m_set_mem_access(struct domain *d, unsigned long pfn, uint32_t nr, + hvmmem_access_t access) { struct p2m_domain *p2m = p2m_get_hostp2m(d); - unsigned long pfn; p2m_access_t a, _a; p2m_type_t t; mfn_t mfn; - int rc = 0; + long rc; /* N.B. _not_ static: initializer depends on p2m->default_access */ p2m_access_t memaccess[] = { @@ -1397,14 +1396,17 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, a = memaccess[access]; /* If request to set default access */ - if ( start_pfn == ~0ull ) + if ( pfn == ~0ul ) { p2m->default_access = a; return 0; } + if ( !nr ) + return 0; + p2m_lock(p2m); - for ( pfn = start_pfn; pfn < start_pfn + nr; pfn++ ) + for ( ; ; ++pfn ) { mfn = p2m->get_entry(p2m, pfn, &t, &_a, 0, NULL); if ( p2m->set_entry(p2m, pfn, mfn, PAGE_ORDER_4K, t, a) == 0 ) @@ -1412,6 +1414,13 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, rc = -ENOMEM; break; } + + /* Check for continuation if it's not the last interation. */ + if ( !--nr || hypercall_preempt_check() ) + { + rc = nr; + break; + } } p2m_unlock(p2m); return rc; diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index f4e7253..a2cb1b7 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -576,8 +576,8 @@ void p2m_mem_access_resume(struct domain *d); /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access); +long p2m_set_mem_access(struct domain *d, unsigned long start_pfn, + uint32_t nr, hvmmem_access_t access); /* Get access type for a pfn * If pfn == -1ul, gets the default access type */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 07:11:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 07:11:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WShzQ-0002UO-TA; Wed, 26 Mar 2014 07:11:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WShzP-0002U5-FP for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 07:11:07 +0000 Received: from [85.158.137.68:40651] by server-1.bemta-3.messagelabs.com id A9/8D-11134-A8D72335; Wed, 26 Mar 2014 07:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1395817863!3008451!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29024 invoked from network); 26 Mar 2014 07:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 07:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WShzL-0000kW-2i for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 07:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WShzK-0000oL-Ps for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 07:11:02 +0000 Date: Wed, 26 Mar 2014 07:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit babcef372ae2ca9c4f4212398803015eb250f764 Author: Jan Beulich AuthorDate: Tue Mar 25 17:20:47 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 25 17:20:47 2014 +0100 x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() Processing up to 4G PFNs may take almost arbitrarily long, so preemption is needed here. This is CVE-2014-2599 / XSA-89. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 0fe53c4f279e1a8ef913e71ed000236d21ce96de master date: 2014-03-25 15:23:57 +0100 --- xen/arch/x86/hvm/hvm.c | 9 +++++++++ xen/arch/x86/mm/p2m.c | 21 +++++++++++++++------ xen/include/asm-x86/p2m.h | 4 ++-- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 69f7e74..6150899 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4465,6 +4465,15 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) goto param_fail5; rc = p2m_set_mem_access(d, a.first_pfn, a.nr, a.hvmmem_access); + if ( rc > 0 ) + { + a.first_pfn += a.nr - rc; + a.nr = rc; + if ( __copy_to_guest(arg, &a, 1) ) + rc = -EFAULT; + else + rc = -EAGAIN; + } param_fail5: rcu_unlock_domain(d); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 8f380ed..e0e5840 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1366,15 +1366,14 @@ void p2m_mem_access_resume(struct domain *d) /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access) +long p2m_set_mem_access(struct domain *d, unsigned long pfn, uint32_t nr, + hvmmem_access_t access) { struct p2m_domain *p2m = p2m_get_hostp2m(d); - unsigned long pfn; p2m_access_t a, _a; p2m_type_t t; mfn_t mfn; - int rc = 0; + long rc; /* N.B. _not_ static: initializer depends on p2m->default_access */ p2m_access_t memaccess[] = { @@ -1397,14 +1396,17 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, a = memaccess[access]; /* If request to set default access */ - if ( start_pfn == ~0ull ) + if ( pfn == ~0ul ) { p2m->default_access = a; return 0; } + if ( !nr ) + return 0; + p2m_lock(p2m); - for ( pfn = start_pfn; pfn < start_pfn + nr; pfn++ ) + for ( ; ; ++pfn ) { mfn = p2m->get_entry(p2m, pfn, &t, &_a, 0, NULL); if ( p2m->set_entry(p2m, pfn, mfn, PAGE_ORDER_4K, t, a) == 0 ) @@ -1412,6 +1414,13 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, rc = -ENOMEM; break; } + + /* Check for continuation if it's not the last interation. */ + if ( !--nr || hypercall_preempt_check() ) + { + rc = nr; + break; + } } p2m_unlock(p2m); return rc; diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index f4e7253..a2cb1b7 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -576,8 +576,8 @@ void p2m_mem_access_resume(struct domain *d); /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access); +long p2m_set_mem_access(struct domain *d, unsigned long start_pfn, + uint32_t nr, hvmmem_access_t access); /* Get access type for a pfn * If pfn == -1ul, gets the default access type */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 16:55:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 16:55:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6a-0003wf-4Z; Wed, 26 Mar 2014 16:55:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6Y-0003wM-8r for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:06 +0000 Received: from [85.158.143.35:51564] by server-1.bemta-4.messagelabs.com id 0E/EC-09853-96603335; Wed, 26 Mar 2014 16:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1395852904!4921405!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8135 invoked from network); 26 Mar 2014 16:55:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 16:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6V-0007Ap-J8 for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSr6U-0000rw-VR for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:03 +0000 Date: Wed, 26 Mar 2014 16:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix determination of bit count for struct domain allocations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b3d2f8b2cba9fce5bc8995612d0d13fcefec7769 Author: Jan Beulich AuthorDate: Mon Mar 24 10:48:03 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 24 10:48:03 2014 +0100 x86: fix determination of bit count for struct domain allocations We can't just add in the hole shift value, as the hole may be at or above the 44-bit boundary. Instead we need to determine the total bit count until reaching 32 significant (not squashed out) bits in PFN representations. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 0d563de..b48f2dc 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -180,6 +180,28 @@ void dump_pageframe_info(struct domain *d) spin_unlock(&d->page_alloc_lock); } +/* + * The hole may be at or above the 44-bit boundary, so we need to determine + * the total bit count until reaching 32 significant (not squashed out) bits + * in PFN representations. + * Note that the way "bits" gets initialized/updated/bounds-checked guarantees + * that the function will never return zero, and hence will never be called + * more than once (which is important due to it being deliberately placed in + * .init.text). + */ +static unsigned int __init noinline _domain_struct_bits(void) +{ + unsigned int bits = 32 + PAGE_SHIFT; + unsigned int sig = hweight32(~pfn_hole_mask); + unsigned int mask = pfn_hole_mask >> 32; + + for ( ; bits < BITS_PER_LONG && sig < 32; ++bits, mask >>= 1 ) + if ( !(mask & 1) ) + ++sig; + + return bits; +} + struct domain *alloc_domain_struct(void) { struct domain *d; @@ -187,7 +209,10 @@ struct domain *alloc_domain_struct(void) * We pack the PDX of the domain structure into a 32-bit field within * the page_info structure. Hence the MEMF_bits() restriction. */ - unsigned int bits = 32 + PAGE_SHIFT + pfn_pdx_hole_shift; + static unsigned int __read_mostly bits; + + if ( unlikely(!bits) ) + bits = _domain_struct_bits(); BUILD_BUG_ON(sizeof(*d) > PAGE_SIZE); d = alloc_xenheap_pages(0, MEMF_bits(bits)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 16:55:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 16:55:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6a-0003wf-4Z; Wed, 26 Mar 2014 16:55:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6Y-0003wM-8r for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:06 +0000 Received: from [85.158.143.35:51564] by server-1.bemta-4.messagelabs.com id 0E/EC-09853-96603335; Wed, 26 Mar 2014 16:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1395852904!4921405!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8135 invoked from network); 26 Mar 2014 16:55:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 16:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6V-0007Ap-J8 for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSr6U-0000rw-VR for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:03 +0000 Date: Wed, 26 Mar 2014 16:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix determination of bit count for struct domain allocations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b3d2f8b2cba9fce5bc8995612d0d13fcefec7769 Author: Jan Beulich AuthorDate: Mon Mar 24 10:48:03 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 24 10:48:03 2014 +0100 x86: fix determination of bit count for struct domain allocations We can't just add in the hole shift value, as the hole may be at or above the 44-bit boundary. Instead we need to determine the total bit count until reaching 32 significant (not squashed out) bits in PFN representations. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 0d563de..b48f2dc 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -180,6 +180,28 @@ void dump_pageframe_info(struct domain *d) spin_unlock(&d->page_alloc_lock); } +/* + * The hole may be at or above the 44-bit boundary, so we need to determine + * the total bit count until reaching 32 significant (not squashed out) bits + * in PFN representations. + * Note that the way "bits" gets initialized/updated/bounds-checked guarantees + * that the function will never return zero, and hence will never be called + * more than once (which is important due to it being deliberately placed in + * .init.text). + */ +static unsigned int __init noinline _domain_struct_bits(void) +{ + unsigned int bits = 32 + PAGE_SHIFT; + unsigned int sig = hweight32(~pfn_hole_mask); + unsigned int mask = pfn_hole_mask >> 32; + + for ( ; bits < BITS_PER_LONG && sig < 32; ++bits, mask >>= 1 ) + if ( !(mask & 1) ) + ++sig; + + return bits; +} + struct domain *alloc_domain_struct(void) { struct domain *d; @@ -187,7 +209,10 @@ struct domain *alloc_domain_struct(void) * We pack the PDX of the domain structure into a 32-bit field within * the page_info structure. Hence the MEMF_bits() restriction. */ - unsigned int bits = 32 + PAGE_SHIFT + pfn_pdx_hole_shift; + static unsigned int __read_mostly bits; + + if ( unlikely(!bits) ) + bits = _domain_struct_bits(); BUILD_BUG_ON(sizeof(*d) > PAGE_SIZE); d = alloc_xenheap_pages(0, MEMF_bits(bits)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 16:55:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 16:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6j-0003z7-SL; Wed, 26 Mar 2014 16:55:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6i-0003yD-Ke for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:16 +0000 Received: from [85.158.139.211:7644] by server-5.bemta-5.messagelabs.com id 56/81-06049-37603335; Wed, 26 Mar 2014 16:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1395852914!3565457!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5639 invoked from network); 26 Mar 2014 16:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 16:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6f-0007At-OJ for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSr6f-0000sL-MJ for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:13 +0000 Date: Wed, 26 Mar 2014 16:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sysctl: annotate struct pm_cx_stat's pc[]/cc[] X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2788cd4e327f3b6e63da52e6a59bf8927abfe4bb Author: Jan Beulich AuthorDate: Mon Mar 24 10:49:19 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 24 10:49:19 2014 +0100 sysctl: annotate struct pm_cx_stat's pc[]/cc[] Suggested-by: Ian Jackson Signed-off-by: Jan Beulich Acked-by: Ian Campbell Acked-by: Keir Fraser --- xen/include/public/sysctl.h | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 8ae6870..3588698 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -228,8 +228,15 @@ struct pm_cx_stat { XEN_GUEST_HANDLE_64(uint64) residencies; /* Cx residencies */ uint32_t nr_pc; /* entry nr in pc[] */ uint32_t nr_cc; /* entry nr in cc[] */ - XEN_GUEST_HANDLE_64(uint64) pc; /* 1-biased indexing */ - XEN_GUEST_HANDLE_64(uint64) cc; /* 1-biased indexing */ + /* + * These two arrays may (and generally will) have unused slots; slots not + * having a corresponding hardware register will not be written by the + * hypervisor. It is therefore up to the caller to put a suitable sentinel + * into all slots before invoking the function. + * Indexing is 1-biased (PC1/CC1 being at index 0). + */ + XEN_GUEST_HANDLE_64(uint64) pc; + XEN_GUEST_HANDLE_64(uint64) cc; }; struct xen_sysctl_get_pmstat { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 16:55:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 16:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6j-0003z7-SL; Wed, 26 Mar 2014 16:55:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6i-0003yD-Ke for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:16 +0000 Received: from [85.158.139.211:7644] by server-5.bemta-5.messagelabs.com id 56/81-06049-37603335; Wed, 26 Mar 2014 16:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1395852914!3565457!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5639 invoked from network); 26 Mar 2014 16:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 16:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6f-0007At-OJ for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSr6f-0000sL-MJ for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:13 +0000 Date: Wed, 26 Mar 2014 16:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sysctl: annotate struct pm_cx_stat's pc[]/cc[] X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2788cd4e327f3b6e63da52e6a59bf8927abfe4bb Author: Jan Beulich AuthorDate: Mon Mar 24 10:49:19 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 24 10:49:19 2014 +0100 sysctl: annotate struct pm_cx_stat's pc[]/cc[] Suggested-by: Ian Jackson Signed-off-by: Jan Beulich Acked-by: Ian Campbell Acked-by: Keir Fraser --- xen/include/public/sysctl.h | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 8ae6870..3588698 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -228,8 +228,15 @@ struct pm_cx_stat { XEN_GUEST_HANDLE_64(uint64) residencies; /* Cx residencies */ uint32_t nr_pc; /* entry nr in pc[] */ uint32_t nr_cc; /* entry nr in cc[] */ - XEN_GUEST_HANDLE_64(uint64) pc; /* 1-biased indexing */ - XEN_GUEST_HANDLE_64(uint64) cc; /* 1-biased indexing */ + /* + * These two arrays may (and generally will) have unused slots; slots not + * having a corresponding hardware register will not be written by the + * hypervisor. It is therefore up to the caller to put a suitable sentinel + * into all slots before invoking the function. + * Indexing is 1-biased (PC1/CC1 being at index 0). + */ + XEN_GUEST_HANDLE_64(uint64) pc; + XEN_GUEST_HANDLE_64(uint64) cc; }; struct xen_sysctl_get_pmstat { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 16:55:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 16:55:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6u-000432-0c; Wed, 26 Mar 2014 16:55:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6s-000423-9z for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:26 +0000 Received: from [85.158.143.35:22991] by server-2.bemta-4.messagelabs.com id 41/95-06539-D7603335; Wed, 26 Mar 2014 16:55:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1395852924!4916819!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20009 invoked from network); 26 Mar 2014 16:55:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 16:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6p-0007B1-Ux for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSr6p-0000tD-SJ for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:23 +0000 Date: Wed, 26 Mar 2014 16:55:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: Reduce compiler command line clutter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98bef9974d9b39fbb7d052c50db950435f0b2513 Author: Daniel De Graaf AuthorDate: Mon Mar 24 10:54:27 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 24 10:54:27 2014 +0100 xsm: Reduce compiler command line clutter Move the preprocessor definitions for all FLASK parameters other than the enable flag off the compiler command line and into config.h, which is the preferred location for such definitions. Signed-off-by: Daniel De Graaf Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/Rules.mk | 3 +-- xen/include/xen/config.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 3a6cec5..42c713f 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -47,8 +47,7 @@ CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h CFLAGS += -nostdinc CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE -CFLAGS-$(FLASK_ENABLE) += -DFLASK_ENABLE -DXSM_MAGIC=0xf97cff8c -CFLAGS-$(FLASK_ENABLE) += -DFLASK_DEVELOP -DFLASK_BOOTPARAM -DFLASK_AVC_STATS +CFLAGS-$(FLASK_ENABLE) += -DFLASK_ENABLE CFLAGS-$(verbose) += -DVERBOSE CFLAGS-$(crash_debug) += -DCRASH_DEBUG CFLAGS-$(perfc) += -DPERF_COUNTERS diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 8bae6e6..7bef8a6 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -98,4 +98,14 @@ #define __cpuinitdata #define __cpuinit +#ifdef FLASK_ENABLE +#define XSM_MAGIC 0xf97cff8c +/* Enable permissive mode (xl setenforce or flask_enforcing parameter) */ +#define FLASK_DEVELOP 1 +/* Allow runtime disabling of FLASK via the flask_enable parameter */ +#define FLASK_BOOTPARAM 1 +/* Maintain statistics on the access vector cache */ +#define FLASK_AVC_STATS 1 +#endif + #endif /* __XEN_CONFIG_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 16:55:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 16:55:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6u-000432-0c; Wed, 26 Mar 2014 16:55:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6s-000423-9z for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:26 +0000 Received: from [85.158.143.35:22991] by server-2.bemta-4.messagelabs.com id 41/95-06539-D7603335; Wed, 26 Mar 2014 16:55:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1395852924!4916819!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20009 invoked from network); 26 Mar 2014 16:55:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 16:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr6p-0007B1-Ux for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSr6p-0000tD-SJ for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:23 +0000 Date: Wed, 26 Mar 2014 16:55:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: Reduce compiler command line clutter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98bef9974d9b39fbb7d052c50db950435f0b2513 Author: Daniel De Graaf AuthorDate: Mon Mar 24 10:54:27 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 24 10:54:27 2014 +0100 xsm: Reduce compiler command line clutter Move the preprocessor definitions for all FLASK parameters other than the enable flag off the compiler command line and into config.h, which is the preferred location for such definitions. Signed-off-by: Daniel De Graaf Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/Rules.mk | 3 +-- xen/include/xen/config.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 3a6cec5..42c713f 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -47,8 +47,7 @@ CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h CFLAGS += -nostdinc CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE -CFLAGS-$(FLASK_ENABLE) += -DFLASK_ENABLE -DXSM_MAGIC=0xf97cff8c -CFLAGS-$(FLASK_ENABLE) += -DFLASK_DEVELOP -DFLASK_BOOTPARAM -DFLASK_AVC_STATS +CFLAGS-$(FLASK_ENABLE) += -DFLASK_ENABLE CFLAGS-$(verbose) += -DVERBOSE CFLAGS-$(crash_debug) += -DCRASH_DEBUG CFLAGS-$(perfc) += -DPERF_COUNTERS diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 8bae6e6..7bef8a6 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -98,4 +98,14 @@ #define __cpuinitdata #define __cpuinit +#ifdef FLASK_ENABLE +#define XSM_MAGIC 0xf97cff8c +/* Enable permissive mode (xl setenforce or flask_enforcing parameter) */ +#define FLASK_DEVELOP 1 +/* Allow runtime disabling of FLASK via the flask_enable parameter */ +#define FLASK_BOOTPARAM 1 +/* Maintain statistics on the access vector cache */ +#define FLASK_AVC_STATS 1 +#endif + #endif /* __XEN_CONFIG_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 16:55:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 16:55:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr75-00047I-3Y; Wed, 26 Mar 2014 16:55:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr73-00046D-7f for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:37 +0000 Received: from [85.158.137.68:35393] by server-16.bemta-3.messagelabs.com id 62/20-13481-88603335; Wed, 26 Mar 2014 16:55:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1395852934!3160835!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24521 invoked from network); 26 Mar 2014 16:55:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 16:55:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr70-0007BA-4E for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSr70-0000td-29 for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:34 +0000 Date: Wed, 26 Mar 2014 16:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: optimize XSM ssid field X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3e12a091147a0804b55c73064beb7e11785ab04 Author: Daniel De Graaf AuthorDate: Mon Mar 24 10:55:26 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 24 10:55:26 2014 +0100 evtchn: optimize XSM ssid field When FLASK is the only enabled implementation of the XSM hooks in Xen, some of the abstractions required to handle multiple XSM providers are redundant and only produce unneeded overhead. This patch reduces the memory overhead of enabling XSM on event channels by replacing the untyped ssid pointer from struct evtchn with a union containing the contents of the structure. This avoids an additional heap allocation for every event channel, and on 64-bit systems, reduces the size of struct evtchn by 4 bytes. If an out-of-tree XSM module needs the full flexibility of the generic evtcnn ssid pointer, defining the symbol XSM_NEED_GENERIC_EVTCHN_SSID will include a suitable pointer field. This also cleans up the unused selinux_checkreqprot declaration left from the Linux port. Signed-off-by: Daniel De Graaf Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/include/xen/sched.h | 18 +++++++++++++++++- xen/xsm/flask/hooks.c | 37 ++++++------------------------------- xen/xsm/flask/include/objsec.h | 6 ------ 3 files changed, 23 insertions(+), 38 deletions(-) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 00f0eba..b9ba379 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -100,8 +100,24 @@ struct evtchn u8 pending:1; u16 last_vcpu_id; u8 last_priority; +#ifdef XSM_ENABLE + union { +#ifdef XSM_NEED_GENERIC_EVTCHN_SSID + /* + * If an XSM module needs more space for its event channel context, + * this pointer stores the necessary data for the security server. + */ + void *generic; +#endif #ifdef FLASK_ENABLE - void *ssid; + /* + * Inlining the contents of the structure for FLASK avoids unneeded + * allocations, and on 64-bit platforms with only FLASK enabled, + * reduces the size of struct evtchn. + */ + u32 flask_sid; +#endif + } ssid; #endif }; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index ba719de..4ce31c9 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -55,8 +55,7 @@ static u32 domain_target_sid(struct domain *src, struct domain *dst) static u32 evtchn_sid(const struct evtchn *chn) { - struct evtchn_security_struct *esec = chn->ssid; - return esec->sid; + return chn->ssid.flask_sid; } static int domain_has_perm(struct domain *dom1, struct domain *dom2, @@ -182,7 +181,6 @@ static int flask_evtchn_unbound(struct domain *d1, struct evtchn *chn, u32 sid1, sid2, newsid; int rc; struct domain *d2; - struct evtchn_security_struct *esec; d2 = rcu_lock_domain_by_any_id(id2); if ( d2 == NULL ) @@ -190,7 +188,6 @@ static int flask_evtchn_unbound(struct domain *d1, struct evtchn *chn, sid1 = domain_sid(d1); sid2 = domain_target_sid(d1, d2); - esec = chn->ssid; rc = security_transition_sid(sid1, sid2, SECCLASS_EVENT, &newsid); if ( rc ) @@ -204,7 +201,7 @@ static int flask_evtchn_unbound(struct domain *d1, struct evtchn *chn, if ( rc ) goto out; - esec->sid = newsid; + chn->ssid.flask_sid = newsid; out: rcu_unlock_domain(d2); @@ -216,7 +213,6 @@ static int flask_evtchn_interdomain(struct domain *d1, struct evtchn *chn1, { u32 sid1, sid2, newsid, reverse_sid; int rc; - struct evtchn_security_struct *esec1; struct avc_audit_data ad; AVC_AUDIT_DATA_INIT(&ad, NONE); ad.sdom = d1; @@ -225,8 +221,6 @@ static int flask_evtchn_interdomain(struct domain *d1, struct evtchn *chn1, sid1 = domain_sid(d1); sid2 = domain_target_sid(d1, d2); - esec1 = chn1->ssid; - rc = security_transition_sid(sid1, sid2, SECCLASS_EVENT, &newsid); if ( rc ) { @@ -252,17 +246,14 @@ static int flask_evtchn_interdomain(struct domain *d1, struct evtchn *chn1, if ( rc ) return rc; - esec1->sid = newsid; + chn1->ssid.flask_sid = newsid; return rc; } static void flask_evtchn_close_post(struct evtchn *chn) { - struct evtchn_security_struct *esec; - esec = chn->ssid; - - esec->sid = SECINITSID_UNLABELED; + chn->ssid.flask_sid = SECINITSID_UNLABELED; } static int flask_evtchn_send(struct domain *d, struct evtchn *chn) @@ -297,33 +288,17 @@ static int flask_evtchn_reset(struct domain *d1, struct domain *d2) static int flask_alloc_security_evtchn(struct evtchn *chn) { - struct evtchn_security_struct *esec; - - esec = xzalloc(struct evtchn_security_struct); - if ( !esec ) - return -ENOMEM; - - esec->sid = SECINITSID_UNLABELED; - - chn->ssid = esec; + chn->ssid.flask_sid = SECINITSID_UNLABELED; return 0; } static void flask_free_security_evtchn(struct evtchn *chn) { - struct evtchn_security_struct *esec; - if ( !chn ) return; - esec = chn->ssid; - - if ( !esec ) - return; - - chn->ssid = NULL; - xfree(esec); + chn->ssid.flask_sid = SECINITSID_UNLABELED; } static char *flask_show_security_evtchn(struct domain *d, const struct evtchn *chn) diff --git a/xen/xsm/flask/include/objsec.h b/xen/xsm/flask/include/objsec.h index 6595dc3..b576a5d 100644 --- a/xen/xsm/flask/include/objsec.h +++ b/xen/xsm/flask/include/objsec.h @@ -23,10 +23,4 @@ struct domain_security_struct { u32 target_sid; /* SID for device model target domain */ }; -struct evtchn_security_struct { - u32 sid; /* current SID */ -}; - -extern unsigned int selinux_checkreqprot; - #endif /* _FLASK_OBJSEC_H_ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 16:55:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 16:55:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr75-00047I-3Y; Wed, 26 Mar 2014 16:55:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr73-00046D-7f for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:37 +0000 Received: from [85.158.137.68:35393] by server-16.bemta-3.messagelabs.com id 62/20-13481-88603335; Wed, 26 Mar 2014 16:55:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1395852934!3160835!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24521 invoked from network); 26 Mar 2014 16:55:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 16:55:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr70-0007BA-4E for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSr70-0000td-29 for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:34 +0000 Date: Wed, 26 Mar 2014 16:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: optimize XSM ssid field X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3e12a091147a0804b55c73064beb7e11785ab04 Author: Daniel De Graaf AuthorDate: Mon Mar 24 10:55:26 2014 +0100 Commit: Jan Beulich CommitDate: Mon Mar 24 10:55:26 2014 +0100 evtchn: optimize XSM ssid field When FLASK is the only enabled implementation of the XSM hooks in Xen, some of the abstractions required to handle multiple XSM providers are redundant and only produce unneeded overhead. This patch reduces the memory overhead of enabling XSM on event channels by replacing the untyped ssid pointer from struct evtchn with a union containing the contents of the structure. This avoids an additional heap allocation for every event channel, and on 64-bit systems, reduces the size of struct evtchn by 4 bytes. If an out-of-tree XSM module needs the full flexibility of the generic evtcnn ssid pointer, defining the symbol XSM_NEED_GENERIC_EVTCHN_SSID will include a suitable pointer field. This also cleans up the unused selinux_checkreqprot declaration left from the Linux port. Signed-off-by: Daniel De Graaf Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/include/xen/sched.h | 18 +++++++++++++++++- xen/xsm/flask/hooks.c | 37 ++++++------------------------------- xen/xsm/flask/include/objsec.h | 6 ------ 3 files changed, 23 insertions(+), 38 deletions(-) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 00f0eba..b9ba379 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -100,8 +100,24 @@ struct evtchn u8 pending:1; u16 last_vcpu_id; u8 last_priority; +#ifdef XSM_ENABLE + union { +#ifdef XSM_NEED_GENERIC_EVTCHN_SSID + /* + * If an XSM module needs more space for its event channel context, + * this pointer stores the necessary data for the security server. + */ + void *generic; +#endif #ifdef FLASK_ENABLE - void *ssid; + /* + * Inlining the contents of the structure for FLASK avoids unneeded + * allocations, and on 64-bit platforms with only FLASK enabled, + * reduces the size of struct evtchn. + */ + u32 flask_sid; +#endif + } ssid; #endif }; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index ba719de..4ce31c9 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -55,8 +55,7 @@ static u32 domain_target_sid(struct domain *src, struct domain *dst) static u32 evtchn_sid(const struct evtchn *chn) { - struct evtchn_security_struct *esec = chn->ssid; - return esec->sid; + return chn->ssid.flask_sid; } static int domain_has_perm(struct domain *dom1, struct domain *dom2, @@ -182,7 +181,6 @@ static int flask_evtchn_unbound(struct domain *d1, struct evtchn *chn, u32 sid1, sid2, newsid; int rc; struct domain *d2; - struct evtchn_security_struct *esec; d2 = rcu_lock_domain_by_any_id(id2); if ( d2 == NULL ) @@ -190,7 +188,6 @@ static int flask_evtchn_unbound(struct domain *d1, struct evtchn *chn, sid1 = domain_sid(d1); sid2 = domain_target_sid(d1, d2); - esec = chn->ssid; rc = security_transition_sid(sid1, sid2, SECCLASS_EVENT, &newsid); if ( rc ) @@ -204,7 +201,7 @@ static int flask_evtchn_unbound(struct domain *d1, struct evtchn *chn, if ( rc ) goto out; - esec->sid = newsid; + chn->ssid.flask_sid = newsid; out: rcu_unlock_domain(d2); @@ -216,7 +213,6 @@ static int flask_evtchn_interdomain(struct domain *d1, struct evtchn *chn1, { u32 sid1, sid2, newsid, reverse_sid; int rc; - struct evtchn_security_struct *esec1; struct avc_audit_data ad; AVC_AUDIT_DATA_INIT(&ad, NONE); ad.sdom = d1; @@ -225,8 +221,6 @@ static int flask_evtchn_interdomain(struct domain *d1, struct evtchn *chn1, sid1 = domain_sid(d1); sid2 = domain_target_sid(d1, d2); - esec1 = chn1->ssid; - rc = security_transition_sid(sid1, sid2, SECCLASS_EVENT, &newsid); if ( rc ) { @@ -252,17 +246,14 @@ static int flask_evtchn_interdomain(struct domain *d1, struct evtchn *chn1, if ( rc ) return rc; - esec1->sid = newsid; + chn1->ssid.flask_sid = newsid; return rc; } static void flask_evtchn_close_post(struct evtchn *chn) { - struct evtchn_security_struct *esec; - esec = chn->ssid; - - esec->sid = SECINITSID_UNLABELED; + chn->ssid.flask_sid = SECINITSID_UNLABELED; } static int flask_evtchn_send(struct domain *d, struct evtchn *chn) @@ -297,33 +288,17 @@ static int flask_evtchn_reset(struct domain *d1, struct domain *d2) static int flask_alloc_security_evtchn(struct evtchn *chn) { - struct evtchn_security_struct *esec; - - esec = xzalloc(struct evtchn_security_struct); - if ( !esec ) - return -ENOMEM; - - esec->sid = SECINITSID_UNLABELED; - - chn->ssid = esec; + chn->ssid.flask_sid = SECINITSID_UNLABELED; return 0; } static void flask_free_security_evtchn(struct evtchn *chn) { - struct evtchn_security_struct *esec; - if ( !chn ) return; - esec = chn->ssid; - - if ( !esec ) - return; - - chn->ssid = NULL; - xfree(esec); + chn->ssid.flask_sid = SECINITSID_UNLABELED; } static char *flask_show_security_evtchn(struct domain *d, const struct evtchn *chn) diff --git a/xen/xsm/flask/include/objsec.h b/xen/xsm/flask/include/objsec.h index 6595dc3..b576a5d 100644 --- a/xen/xsm/flask/include/objsec.h +++ b/xen/xsm/flask/include/objsec.h @@ -23,10 +23,4 @@ struct domain_security_struct { u32 target_sid; /* SID for device model target domain */ }; -struct evtchn_security_struct { - u32 sid; /* current SID */ -}; - -extern unsigned int selinux_checkreqprot; - #endif /* _FLASK_OBJSEC_H_ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 16:55:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 16:55:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr7E-0004BE-6m; Wed, 26 Mar 2014 16:55:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr7C-0004AB-PR for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:46 +0000 Received: from [193.109.254.147:57941] by server-15.bemta-14.messagelabs.com id C7/BE-15813-29603335; Wed, 26 Mar 2014 16:55:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1395852944!4331304!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15450 invoked from network); 26 Mar 2014 16:55:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 16:55:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr7A-0007BJ-9i for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSr7A-0000tz-8b for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:44 +0000 Date: Wed, 26 Mar 2014 16:55:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0fe53c4f279e1a8ef913e71ed000236d21ce96de Author: Jan Beulich AuthorDate: Tue Mar 25 15:23:57 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 25 15:23:57 2014 +0100 x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() Processing up to 4G PFNs may take almost arbitrarily long, so preemption is needed here. This is XSA-89. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 9 +++++++++ xen/arch/x86/mm/p2m.c | 21 +++++++++++++++------ xen/include/asm-x86/p2m.h | 4 ++-- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 08ab9cb..b0da8e7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4604,6 +4604,15 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) goto param_fail5; rc = p2m_set_mem_access(d, a.first_pfn, a.nr, a.hvmmem_access); + if ( rc > 0 ) + { + a.first_pfn += a.nr - rc; + a.nr = rc; + if ( __copy_to_guest(arg, &a, 1) ) + rc = -EFAULT; + else + rc = -EAGAIN; + } param_fail5: rcu_unlock_domain(d); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index c0ddef0..ee527da 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1333,15 +1333,14 @@ void p2m_mem_access_resume(struct domain *d) /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access) +long p2m_set_mem_access(struct domain *d, unsigned long pfn, uint32_t nr, + hvmmem_access_t access) { struct p2m_domain *p2m = p2m_get_hostp2m(d); - unsigned long pfn; p2m_access_t a, _a; p2m_type_t t; mfn_t mfn; - int rc = 0; + long rc; /* N.B. _not_ static: initializer depends on p2m->default_access */ p2m_access_t memaccess[] = { @@ -1364,14 +1363,17 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, a = memaccess[access]; /* If request to set default access */ - if ( start_pfn == ~0ull ) + if ( pfn == ~0ul ) { p2m->default_access = a; return 0; } + if ( !nr ) + return 0; + p2m_lock(p2m); - for ( pfn = start_pfn; pfn < start_pfn + nr; pfn++ ) + for ( ; ; ++pfn ) { mfn = p2m->get_entry(p2m, pfn, &t, &_a, 0, NULL); if ( p2m->set_entry(p2m, pfn, mfn, PAGE_ORDER_4K, t, a) == 0 ) @@ -1379,6 +1381,13 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, rc = -ENOMEM; break; } + + /* Check for continuation if it's not the last interation. */ + if ( !--nr || hypercall_preempt_check() ) + { + rc = nr; + break; + } } p2m_unlock(p2m); return rc; diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index f4e7253..a2cb1b7 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -576,8 +576,8 @@ void p2m_mem_access_resume(struct domain *d); /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access); +long p2m_set_mem_access(struct domain *d, unsigned long start_pfn, + uint32_t nr, hvmmem_access_t access); /* Get access type for a pfn * If pfn == -1ul, gets the default access type */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 16:55:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 16:55:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr7E-0004BE-6m; Wed, 26 Mar 2014 16:55:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr7C-0004AB-PR for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:46 +0000 Received: from [193.109.254.147:57941] by server-15.bemta-14.messagelabs.com id C7/BE-15813-29603335; Wed, 26 Mar 2014 16:55:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1395852944!4331304!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15450 invoked from network); 26 Mar 2014 16:55:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 16:55:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSr7A-0007BJ-9i for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSr7A-0000tz-8b for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 16:55:44 +0000 Date: Wed, 26 Mar 2014 16:55:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0fe53c4f279e1a8ef913e71ed000236d21ce96de Author: Jan Beulich AuthorDate: Tue Mar 25 15:23:57 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 25 15:23:57 2014 +0100 x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() Processing up to 4G PFNs may take almost arbitrarily long, so preemption is needed here. This is XSA-89. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 9 +++++++++ xen/arch/x86/mm/p2m.c | 21 +++++++++++++++------ xen/include/asm-x86/p2m.h | 4 ++-- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 08ab9cb..b0da8e7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4604,6 +4604,15 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) goto param_fail5; rc = p2m_set_mem_access(d, a.first_pfn, a.nr, a.hvmmem_access); + if ( rc > 0 ) + { + a.first_pfn += a.nr - rc; + a.nr = rc; + if ( __copy_to_guest(arg, &a, 1) ) + rc = -EFAULT; + else + rc = -EAGAIN; + } param_fail5: rcu_unlock_domain(d); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index c0ddef0..ee527da 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1333,15 +1333,14 @@ void p2m_mem_access_resume(struct domain *d) /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access) +long p2m_set_mem_access(struct domain *d, unsigned long pfn, uint32_t nr, + hvmmem_access_t access) { struct p2m_domain *p2m = p2m_get_hostp2m(d); - unsigned long pfn; p2m_access_t a, _a; p2m_type_t t; mfn_t mfn; - int rc = 0; + long rc; /* N.B. _not_ static: initializer depends on p2m->default_access */ p2m_access_t memaccess[] = { @@ -1364,14 +1363,17 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, a = memaccess[access]; /* If request to set default access */ - if ( start_pfn == ~0ull ) + if ( pfn == ~0ul ) { p2m->default_access = a; return 0; } + if ( !nr ) + return 0; + p2m_lock(p2m); - for ( pfn = start_pfn; pfn < start_pfn + nr; pfn++ ) + for ( ; ; ++pfn ) { mfn = p2m->get_entry(p2m, pfn, &t, &_a, 0, NULL); if ( p2m->set_entry(p2m, pfn, mfn, PAGE_ORDER_4K, t, a) == 0 ) @@ -1379,6 +1381,13 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, rc = -ENOMEM; break; } + + /* Check for continuation if it's not the last interation. */ + if ( !--nr || hypercall_preempt_check() ) + { + rc = nr; + break; + } } p2m_unlock(p2m); return rc; diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index f4e7253..a2cb1b7 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -576,8 +576,8 @@ void p2m_mem_access_resume(struct domain *d); /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access); +long p2m_set_mem_access(struct domain *d, unsigned long start_pfn, + uint32_t nr, hvmmem_access_t access); /* Get access type for a pfn * If pfn == -1ul, gets the default access type */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 17:44:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 17:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSrry-0000wg-WA; Wed, 26 Mar 2014 17:44:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSrrx-0000wS-Jn for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 17:44:05 +0000 Received: from [85.158.143.35:7214] by server-3.bemta-4.messagelabs.com id 15/3B-13602-4E113335; Wed, 26 Mar 2014 17:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1395855843!4914124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29417 invoked from network); 26 Mar 2014 17:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 17:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSrrv-0007eI-44 for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 17:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSrrv-0002Sl-0Q for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 17:44:03 +0000 Date: Wed, 26 Mar 2014 17:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ce89055575860c4100370133ab488979a83ad49a Author: Jan Beulich AuthorDate: Tue Mar 25 17:22:58 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 25 17:22:58 2014 +0100 x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() Processing up to 4G PFNs may take almost arbitrarily long, so preemption is needed here. This is CVE-2014-2599 / XSA-89. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 0fe53c4f279e1a8ef913e71ed000236d21ce96de master date: 2014-03-25 15:23:57 +0100 --- xen/arch/x86/hvm/hvm.c | 9 +++++++++ xen/arch/x86/mm/p2m.c | 21 +++++++++++++++------ xen/include/asm-x86/p2m.h | 4 ++-- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7efa274..a3a2c32 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4352,6 +4352,15 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) goto param_fail5; rc = p2m_set_mem_access(d, a.first_pfn, a.nr, a.hvmmem_access); + if ( rc > 0 ) + { + a.first_pfn += a.nr - rc; + a.nr = rc; + if ( __copy_to_guest(arg, &a, 1) ) + rc = -EFAULT; + else + rc = -EAGAIN; + } param_fail5: rcu_unlock_domain(d); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index f5ddd20..e661525 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1364,15 +1364,14 @@ void p2m_mem_access_resume(struct domain *d) /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access) +long p2m_set_mem_access(struct domain *d, unsigned long pfn, uint32_t nr, + hvmmem_access_t access) { struct p2m_domain *p2m = p2m_get_hostp2m(d); - unsigned long pfn; p2m_access_t a, _a; p2m_type_t t; mfn_t mfn; - int rc = 0; + long rc; /* N.B. _not_ static: initializer depends on p2m->default_access */ p2m_access_t memaccess[] = { @@ -1395,14 +1394,17 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, a = memaccess[access]; /* If request to set default access */ - if ( start_pfn == ~0ull ) + if ( pfn == ~0ul ) { p2m->default_access = a; return 0; } + if ( !nr ) + return 0; + p2m_lock(p2m); - for ( pfn = start_pfn; pfn < start_pfn + nr; pfn++ ) + for ( ; ; ++pfn ) { mfn = p2m->get_entry(p2m, pfn, &t, &_a, 0, NULL); if ( p2m->set_entry(p2m, pfn, mfn, PAGE_ORDER_4K, t, a) == 0 ) @@ -1410,6 +1412,13 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, rc = -ENOMEM; break; } + + /* Check for continuation if it's not the last interation. */ + if ( !--nr || hypercall_preempt_check() ) + { + rc = nr; + break; + } } p2m_unlock(p2m); return rc; diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index f4e7253..a2cb1b7 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -576,8 +576,8 @@ void p2m_mem_access_resume(struct domain *d); /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access); +long p2m_set_mem_access(struct domain *d, unsigned long start_pfn, + uint32_t nr, hvmmem_access_t access); /* Get access type for a pfn * If pfn == -1ul, gets the default access type */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 17:44:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 17:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSrry-0000wg-WA; Wed, 26 Mar 2014 17:44:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSrrx-0000wS-Jn for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 17:44:05 +0000 Received: from [85.158.143.35:7214] by server-3.bemta-4.messagelabs.com id 15/3B-13602-4E113335; Wed, 26 Mar 2014 17:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1395855843!4914124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29417 invoked from network); 26 Mar 2014 17:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 17:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSrrv-0007eI-44 for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 17:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSrrv-0002Sl-0Q for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 17:44:03 +0000 Date: Wed, 26 Mar 2014 17:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ce89055575860c4100370133ab488979a83ad49a Author: Jan Beulich AuthorDate: Tue Mar 25 17:22:58 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 25 17:22:58 2014 +0100 x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() Processing up to 4G PFNs may take almost arbitrarily long, so preemption is needed here. This is CVE-2014-2599 / XSA-89. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 0fe53c4f279e1a8ef913e71ed000236d21ce96de master date: 2014-03-25 15:23:57 +0100 --- xen/arch/x86/hvm/hvm.c | 9 +++++++++ xen/arch/x86/mm/p2m.c | 21 +++++++++++++++------ xen/include/asm-x86/p2m.h | 4 ++-- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7efa274..a3a2c32 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4352,6 +4352,15 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) goto param_fail5; rc = p2m_set_mem_access(d, a.first_pfn, a.nr, a.hvmmem_access); + if ( rc > 0 ) + { + a.first_pfn += a.nr - rc; + a.nr = rc; + if ( __copy_to_guest(arg, &a, 1) ) + rc = -EFAULT; + else + rc = -EAGAIN; + } param_fail5: rcu_unlock_domain(d); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index f5ddd20..e661525 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1364,15 +1364,14 @@ void p2m_mem_access_resume(struct domain *d) /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access) +long p2m_set_mem_access(struct domain *d, unsigned long pfn, uint32_t nr, + hvmmem_access_t access) { struct p2m_domain *p2m = p2m_get_hostp2m(d); - unsigned long pfn; p2m_access_t a, _a; p2m_type_t t; mfn_t mfn; - int rc = 0; + long rc; /* N.B. _not_ static: initializer depends on p2m->default_access */ p2m_access_t memaccess[] = { @@ -1395,14 +1394,17 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, a = memaccess[access]; /* If request to set default access */ - if ( start_pfn == ~0ull ) + if ( pfn == ~0ul ) { p2m->default_access = a; return 0; } + if ( !nr ) + return 0; + p2m_lock(p2m); - for ( pfn = start_pfn; pfn < start_pfn + nr; pfn++ ) + for ( ; ; ++pfn ) { mfn = p2m->get_entry(p2m, pfn, &t, &_a, 0, NULL); if ( p2m->set_entry(p2m, pfn, mfn, PAGE_ORDER_4K, t, a) == 0 ) @@ -1410,6 +1412,13 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, rc = -ENOMEM; break; } + + /* Check for continuation if it's not the last interation. */ + if ( !--nr || hypercall_preempt_check() ) + { + rc = nr; + break; + } } p2m_unlock(p2m); return rc; diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index f4e7253..a2cb1b7 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -576,8 +576,8 @@ void p2m_mem_access_resume(struct domain *d); /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access); +long p2m_set_mem_access(struct domain *d, unsigned long start_pfn, + uint32_t nr, hvmmem_access_t access); /* Get access type for a pfn * If pfn == -1ul, gets the default access type */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 22:55:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 22:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSwj4-0006If-Bw; Wed, 26 Mar 2014 22:55:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSwj2-0006IN-AE for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 22:55:12 +0000 Received: from [85.158.137.68:46639] by server-9.bemta-3.messagelabs.com id 22/C3-30063-FCA53335; Wed, 26 Mar 2014 22:55:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1395874509!3195768!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28222 invoked from network); 26 Mar 2014 22:55:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 22:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSwit-0002Fk-Uy for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 22:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSwit-0003HR-J6 for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 22:55:03 +0000 Date: Wed, 26 Mar 2014 22:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f7e1fc377a9b44d68c557df5e761794fba88f55e Author: Jan Beulich AuthorDate: Tue Mar 25 17:25:14 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 25 17:25:14 2014 +0100 x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() Processing up to 4G PFNs may take almost arbitrarily long, so preemption is needed here. This is CVE-2014-2599 / XSA-89. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 0fe53c4f279e1a8ef913e71ed000236d21ce96de master date: 2014-03-25 15:23:57 +0100 --- xen/arch/x86/hvm/hvm.c | 9 +++++++++ xen/arch/x86/mm/p2m.c | 21 +++++++++++++++------ xen/include/asm-x86/p2m.h | 4 ++-- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 1bcc40d..d2f8015 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4300,6 +4300,15 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) goto param_fail5; rc = p2m_set_mem_access(d, a.first_pfn, a.nr, a.hvmmem_access); + if ( rc > 0 ) + { + a.first_pfn += a.nr - rc; + a.nr = rc; + if ( __copy_to_guest(arg, &a, 1) ) + rc = -EFAULT; + else + rc = -EAGAIN; + } param_fail5: rcu_unlock_domain(d); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e111d64..afc6319 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1338,15 +1338,14 @@ void p2m_mem_access_resume(struct domain *d) /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access) +long p2m_set_mem_access(struct domain *d, unsigned long pfn, uint32_t nr, + hvmmem_access_t access) { struct p2m_domain *p2m = p2m_get_hostp2m(d); - unsigned long pfn; p2m_access_t a, _a; p2m_type_t t; mfn_t mfn; - int rc = 0; + long rc; /* N.B. _not_ static: initializer depends on p2m->default_access */ p2m_access_t memaccess[] = { @@ -1369,14 +1368,17 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, a = memaccess[access]; /* If request to set default access */ - if ( start_pfn == ~0ull ) + if ( pfn == ~0ul ) { p2m->default_access = a; return 0; } + if ( !nr ) + return 0; + p2m_lock(p2m); - for ( pfn = start_pfn; pfn < start_pfn + nr; pfn++ ) + for ( ; ; ++pfn ) { mfn = p2m->get_entry(p2m, pfn, &t, &_a, 0, NULL); if ( p2m->set_entry(p2m, pfn, mfn, PAGE_ORDER_4K, t, a) == 0 ) @@ -1384,6 +1386,13 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, rc = -ENOMEM; break; } + + /* Check for continuation if it's not the last interation. */ + if ( !--nr || hypercall_preempt_check() ) + { + rc = nr; + break; + } } p2m_unlock(p2m); return rc; diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index af1359b..43dd1f0 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -597,8 +597,8 @@ void p2m_mem_access_resume(struct domain *d); /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access); +long p2m_set_mem_access(struct domain *d, unsigned long start_pfn, + uint32_t nr, hvmmem_access_t access); /* Get access type for a pfn * If pfn == -1ul, gets the default access type */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 26 22:55:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Mar 2014 22:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSwj4-0006If-Bw; Wed, 26 Mar 2014 22:55:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSwj2-0006IN-AE for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 22:55:12 +0000 Received: from [85.158.137.68:46639] by server-9.bemta-3.messagelabs.com id 22/C3-30063-FCA53335; Wed, 26 Mar 2014 22:55:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1395874509!3195768!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28222 invoked from network); 26 Mar 2014 22:55:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Mar 2014 22:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSwit-0002Fk-Uy for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 22:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WSwit-0003HR-J6 for xen-changelog@lists.xensource.com; Wed, 26 Mar 2014 22:55:03 +0000 Date: Wed, 26 Mar 2014 22:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f7e1fc377a9b44d68c557df5e761794fba88f55e Author: Jan Beulich AuthorDate: Tue Mar 25 17:25:14 2014 +0100 Commit: Jan Beulich CommitDate: Tue Mar 25 17:25:14 2014 +0100 x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() Processing up to 4G PFNs may take almost arbitrarily long, so preemption is needed here. This is CVE-2014-2599 / XSA-89. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 0fe53c4f279e1a8ef913e71ed000236d21ce96de master date: 2014-03-25 15:23:57 +0100 --- xen/arch/x86/hvm/hvm.c | 9 +++++++++ xen/arch/x86/mm/p2m.c | 21 +++++++++++++++------ xen/include/asm-x86/p2m.h | 4 ++-- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 1bcc40d..d2f8015 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4300,6 +4300,15 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) goto param_fail5; rc = p2m_set_mem_access(d, a.first_pfn, a.nr, a.hvmmem_access); + if ( rc > 0 ) + { + a.first_pfn += a.nr - rc; + a.nr = rc; + if ( __copy_to_guest(arg, &a, 1) ) + rc = -EFAULT; + else + rc = -EAGAIN; + } param_fail5: rcu_unlock_domain(d); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e111d64..afc6319 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1338,15 +1338,14 @@ void p2m_mem_access_resume(struct domain *d) /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access) +long p2m_set_mem_access(struct domain *d, unsigned long pfn, uint32_t nr, + hvmmem_access_t access) { struct p2m_domain *p2m = p2m_get_hostp2m(d); - unsigned long pfn; p2m_access_t a, _a; p2m_type_t t; mfn_t mfn; - int rc = 0; + long rc; /* N.B. _not_ static: initializer depends on p2m->default_access */ p2m_access_t memaccess[] = { @@ -1369,14 +1368,17 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, a = memaccess[access]; /* If request to set default access */ - if ( start_pfn == ~0ull ) + if ( pfn == ~0ul ) { p2m->default_access = a; return 0; } + if ( !nr ) + return 0; + p2m_lock(p2m); - for ( pfn = start_pfn; pfn < start_pfn + nr; pfn++ ) + for ( ; ; ++pfn ) { mfn = p2m->get_entry(p2m, pfn, &t, &_a, 0, NULL); if ( p2m->set_entry(p2m, pfn, mfn, PAGE_ORDER_4K, t, a) == 0 ) @@ -1384,6 +1386,13 @@ int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, rc = -ENOMEM; break; } + + /* Check for continuation if it's not the last interation. */ + if ( !--nr || hypercall_preempt_check() ) + { + rc = nr; + break; + } } p2m_unlock(p2m); return rc; diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index af1359b..43dd1f0 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -597,8 +597,8 @@ void p2m_mem_access_resume(struct domain *d); /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access); +long p2m_set_mem_access(struct domain *d, unsigned long start_pfn, + uint32_t nr, hvmmem_access_t access); /* Get access type for a pfn * If pfn == -1ul, gets the default access type */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 27 23:00:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Mar 2014 23:00:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHN-0007Cn-R1; Thu, 27 Mar 2014 23:00:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHM-0007CR-2v for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:08 +0000 Received: from [85.158.137.68:33163] by server-11.bemta-3.messagelabs.com id 72/30-19438-67DA4335; Thu, 27 Mar 2014 23:00:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1395961204!3419460!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30145 invoked from network); 27 Mar 2014 23:00:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Mar 2014 23:00:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHI-0007Ra-10 for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTJHH-0005oS-Qe for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:03 +0000 Date: Thu, 27 Mar 2014 23:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: flask: Remove unused function avc_sidcmp X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62b57be3cb1c30c375777c384e2ecd1e3ab62edd Author: Julien Grall AuthorDate: Wed Mar 26 15:29:34 2014 +0100 Commit: Jan Beulich CommitDate: Wed Mar 26 15:29:34 2014 +0100 xsm: flask: Remove unused function avc_sidcmp Fix compilation with Clang 3.5: avc.c:657:19: error: unused function 'avc_sidcmp' [-Werror,-Wunused-function] static inline int avc_sidcmp(u32 x, u32 y) ^ Signed-off-by: Julien Grall Acked-by: Daniel De Graaf --- xen/xsm/flask/avc.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c index a26b34a..fc6580e 100644 --- a/xen/xsm/flask/avc.c +++ b/xen/xsm/flask/avc.c @@ -654,11 +654,6 @@ int avc_add_callback(int (*callback)(u32 event, u32 ssid, u32 tsid, u16 tclass, return rc; } -static inline int avc_sidcmp(u32 x, u32 y) -{ - return (x == y || x == SECSID_WILD || y == SECSID_WILD); -} - /** * avc_update_node Update an AVC entry * @event : Updating event -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 27 23:00:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Mar 2014 23:00:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHN-0007Cn-R1; Thu, 27 Mar 2014 23:00:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHM-0007CR-2v for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:08 +0000 Received: from [85.158.137.68:33163] by server-11.bemta-3.messagelabs.com id 72/30-19438-67DA4335; Thu, 27 Mar 2014 23:00:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1395961204!3419460!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30145 invoked from network); 27 Mar 2014 23:00:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Mar 2014 23:00:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHI-0007Ra-10 for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTJHH-0005oS-Qe for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:03 +0000 Date: Thu, 27 Mar 2014 23:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: flask: Remove unused function avc_sidcmp X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62b57be3cb1c30c375777c384e2ecd1e3ab62edd Author: Julien Grall AuthorDate: Wed Mar 26 15:29:34 2014 +0100 Commit: Jan Beulich CommitDate: Wed Mar 26 15:29:34 2014 +0100 xsm: flask: Remove unused function avc_sidcmp Fix compilation with Clang 3.5: avc.c:657:19: error: unused function 'avc_sidcmp' [-Werror,-Wunused-function] static inline int avc_sidcmp(u32 x, u32 y) ^ Signed-off-by: Julien Grall Acked-by: Daniel De Graaf --- xen/xsm/flask/avc.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c index a26b34a..fc6580e 100644 --- a/xen/xsm/flask/avc.c +++ b/xen/xsm/flask/avc.c @@ -654,11 +654,6 @@ int avc_add_callback(int (*callback)(u32 event, u32 ssid, u32 tsid, u16 tclass, return rc; } -static inline int avc_sidcmp(u32 x, u32 y) -{ - return (x == y || x == SECSID_WILD || y == SECSID_WILD); -} - /** * avc_update_node Update an AVC entry * @event : Updating event -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 27 23:00:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Mar 2014 23:00:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHX-0007De-1i; Thu, 27 Mar 2014 23:00:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHV-0007DT-9y for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:17 +0000 Received: from [85.158.137.68:33706] by server-15.bemta-3.messagelabs.com id 28/A7-13757-08DA4335; Thu, 27 Mar 2014 23:00:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1395961214!3429978!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10426 invoked from network); 27 Mar 2014 23:00:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Mar 2014 23:00:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHS-0007Rd-Js for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTJHS-0005ow-6s for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:14 +0000 Date: Thu, 27 Mar 2014 23:00:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: flask: ss: remove unused function determine_oocontext X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0cae8fc40dc7550ff2c6e95b5271c4243e7714b2 Author: Julien Grall AuthorDate: Wed Mar 26 15:32:49 2014 +0100 Commit: Jan Beulich CommitDate: Wed Mar 26 15:32:49 2014 +0100 xsm: flask: ss: remove unused function determine_oocontext This function is not used neither exported. Signed-off-by: Julien Grall Acked-by: Daniel De Graaf --- xen/xsm/flask/ss/services.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 59234ff..f0e459a 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -2035,20 +2035,6 @@ out: return rc; } -int determine_ocontext( char *ocontext ) -{ - if ( strcmp(ocontext, "pirq") == 0 ) - return OCON_PIRQ; - else if ( strcmp(ocontext, "ioport") == 0 ) - return OCON_IOPORT; - else if ( strcmp(ocontext, "iomem") == 0 ) - return OCON_IOMEM; - else if ( strcmp(ocontext, "pcidevice") == 0 ) - return OCON_DEVICE; - else - return -1; -} - int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high ,u32 sid ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 27 23:00:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Mar 2014 23:00:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHX-0007De-1i; Thu, 27 Mar 2014 23:00:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHV-0007DT-9y for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:17 +0000 Received: from [85.158.137.68:33706] by server-15.bemta-3.messagelabs.com id 28/A7-13757-08DA4335; Thu, 27 Mar 2014 23:00:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1395961214!3429978!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10426 invoked from network); 27 Mar 2014 23:00:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Mar 2014 23:00:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHS-0007Rd-Js for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTJHS-0005ow-6s for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:14 +0000 Date: Thu, 27 Mar 2014 23:00:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: flask: ss: remove unused function determine_oocontext X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0cae8fc40dc7550ff2c6e95b5271c4243e7714b2 Author: Julien Grall AuthorDate: Wed Mar 26 15:32:49 2014 +0100 Commit: Jan Beulich CommitDate: Wed Mar 26 15:32:49 2014 +0100 xsm: flask: ss: remove unused function determine_oocontext This function is not used neither exported. Signed-off-by: Julien Grall Acked-by: Daniel De Graaf --- xen/xsm/flask/ss/services.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 59234ff..f0e459a 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -2035,20 +2035,6 @@ out: return rc; } -int determine_ocontext( char *ocontext ) -{ - if ( strcmp(ocontext, "pirq") == 0 ) - return OCON_PIRQ; - else if ( strcmp(ocontext, "ioport") == 0 ) - return OCON_IOPORT; - else if ( strcmp(ocontext, "iomem") == 0 ) - return OCON_IOMEM; - else if ( strcmp(ocontext, "pcidevice") == 0 ) - return OCON_DEVICE; - else - return -1; -} - int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high ,u32 sid ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 27 23:00:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Mar 2014 23:00:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHg-0007FC-Dt; Thu, 27 Mar 2014 23:00:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHf-0007Eu-DW for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:27 +0000 Received: from [193.109.254.147:56446] by server-12.bemta-14.messagelabs.com id B6/45-27473-A8DA4335; Thu, 27 Mar 2014 23:00:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1395961225!4652367!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10366 invoked from network); 27 Mar 2014 23:00:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Mar 2014 23:00:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHc-0007Rg-Sy for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTJHc-0005pI-Nf for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:24 +0000 Date: Thu, 27 Mar 2014 23:00:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: flask: flask_disable is only used internally X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e2f150c16e1ab954eb7c384e2d905f1d62209af Author: Julien Grall AuthorDate: Wed Mar 26 15:33:01 2014 +0100 Commit: Jan Beulich CommitDate: Wed Mar 26 15:33:01 2014 +0100 xsm: flask: flask_disable is only used internally Signed-off-by: Julien Grall Acked-by: Daniel De Graaf --- xen/xsm/flask/flask_op.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 85a615b..7743aac 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -272,7 +272,7 @@ static int flask_security_sid(struct xen_flask_sid_context *arg) #ifndef COMPAT -int flask_disable(void) +static int flask_disable(void) { static int flask_disabled = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 27 23:00:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Mar 2014 23:00:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHg-0007FC-Dt; Thu, 27 Mar 2014 23:00:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHf-0007Eu-DW for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:27 +0000 Received: from [193.109.254.147:56446] by server-12.bemta-14.messagelabs.com id B6/45-27473-A8DA4335; Thu, 27 Mar 2014 23:00:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1395961225!4652367!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10366 invoked from network); 27 Mar 2014 23:00:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Mar 2014 23:00:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHc-0007Rg-Sy for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTJHc-0005pI-Nf for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:24 +0000 Date: Thu, 27 Mar 2014 23:00:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: flask: flask_disable is only used internally X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e2f150c16e1ab954eb7c384e2d905f1d62209af Author: Julien Grall AuthorDate: Wed Mar 26 15:33:01 2014 +0100 Commit: Jan Beulich CommitDate: Wed Mar 26 15:33:01 2014 +0100 xsm: flask: flask_disable is only used internally Signed-off-by: Julien Grall Acked-by: Daniel De Graaf --- xen/xsm/flask/flask_op.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 85a615b..7743aac 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -272,7 +272,7 @@ static int flask_security_sid(struct xen_flask_sid_context *arg) #ifndef COMPAT -int flask_disable(void) +static int flask_disable(void) { static int flask_disabled = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 27 23:00:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Mar 2014 23:00:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHr-0007IM-HY; Thu, 27 Mar 2014 23:00:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHq-0007Hq-FZ for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:38 +0000 Received: from [193.109.254.147:56999] by server-10.bemta-14.messagelabs.com id 69/79-04546-59DA4335; Thu, 27 Mar 2014 23:00:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1395961236!4659957!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16029 invoked from network); 27 Mar 2014 23:00:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Mar 2014 23:00:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHo-0007Rp-2t for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTJHn-0005pp-9c for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:36 +0000 Date: Thu, 27 Mar 2014 23:00:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common: sched_sedf: Remove unused functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 786d4b8bbb2390e23a547a0906c9449a3a45c0e8 Author: Julien Grall AuthorDate: Wed Mar 26 15:34:29 2014 +0100 Commit: Jan Beulich CommitDate: Wed Mar 26 15:34:29 2014 +0100 common: sched_sedf: Remove unused functions Clang 3.5 will fail to compile xen/common/sched_sedf.c because some function are not used: sched_sedf.c:141:20: error: unused function 'extraq_add_head' [-Werror,-Wunused-function] static inline void extraq_add_head(struct vcpu *d, int i) ^ sched_sedf.c:147:20: error: unused function 'extraq_add_tail' [-Werror,-Wunused-function] static inline void extraq_add_tail(struct vcpu *d, int i) Signed-off-by: Julien Grall Acked-by: George Dunlap --- xen/common/sched_sedf.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 7c24171..0c9011a 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -138,18 +138,6 @@ static inline int extraq_on(struct vcpu *d, int i) (EXTRALIST(d,i)->next != EXTRALIST(d,i))); } -static inline void extraq_add_head(struct vcpu *d, int i) -{ - list_add(EXTRALIST(d,i), EXTRAQ(d->processor,i)); - ASSERT(extraq_on(d, i)); -} - -static inline void extraq_add_tail(struct vcpu *d, int i) -{ - list_add_tail(EXTRALIST(d,i), EXTRAQ(d->processor,i)); - ASSERT(extraq_on(d, i)); -} - static inline void extraq_del(struct vcpu *d, int i) { struct list_head *list = EXTRALIST(d,i); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 27 23:00:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Mar 2014 23:00:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHr-0007IM-HY; Thu, 27 Mar 2014 23:00:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHq-0007Hq-FZ for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:38 +0000 Received: from [193.109.254.147:56999] by server-10.bemta-14.messagelabs.com id 69/79-04546-59DA4335; Thu, 27 Mar 2014 23:00:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1395961236!4659957!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16029 invoked from network); 27 Mar 2014 23:00:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Mar 2014 23:00:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHo-0007Rp-2t for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTJHn-0005pp-9c for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:36 +0000 Date: Thu, 27 Mar 2014 23:00:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common: sched_sedf: Remove unused functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 786d4b8bbb2390e23a547a0906c9449a3a45c0e8 Author: Julien Grall AuthorDate: Wed Mar 26 15:34:29 2014 +0100 Commit: Jan Beulich CommitDate: Wed Mar 26 15:34:29 2014 +0100 common: sched_sedf: Remove unused functions Clang 3.5 will fail to compile xen/common/sched_sedf.c because some function are not used: sched_sedf.c:141:20: error: unused function 'extraq_add_head' [-Werror,-Wunused-function] static inline void extraq_add_head(struct vcpu *d, int i) ^ sched_sedf.c:147:20: error: unused function 'extraq_add_tail' [-Werror,-Wunused-function] static inline void extraq_add_tail(struct vcpu *d, int i) Signed-off-by: Julien Grall Acked-by: George Dunlap --- xen/common/sched_sedf.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 7c24171..0c9011a 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -138,18 +138,6 @@ static inline int extraq_on(struct vcpu *d, int i) (EXTRALIST(d,i)->next != EXTRALIST(d,i))); } -static inline void extraq_add_head(struct vcpu *d, int i) -{ - list_add(EXTRALIST(d,i), EXTRAQ(d->processor,i)); - ASSERT(extraq_on(d, i)); -} - -static inline void extraq_add_tail(struct vcpu *d, int i) -{ - list_add_tail(EXTRALIST(d,i), EXTRAQ(d->processor,i)); - ASSERT(extraq_on(d, i)); -} - static inline void extraq_del(struct vcpu *d, int i) { struct list_head *list = EXTRALIST(d,i); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 27 23:00:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Mar 2014 23:00:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJI1-0007L2-LX; Thu, 27 Mar 2014 23:00:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJI0-0007Kj-Nu for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:48 +0000 Received: from [85.158.143.35:15696] by server-2.bemta-4.messagelabs.com id 1C/65-06539-0ADA4335; Thu, 27 Mar 2014 23:00:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1395961246!5276363!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16070 invoked from network); 27 Mar 2014 23:00:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Mar 2014 23:00:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHy-0007Ry-9p for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTJHy-0005rE-76 for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:46 +0000 Date: Thu, 27 Mar 2014 23:00:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: Some functions are only used internally X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 38457ed7fac563b47487d1885b212e4e1efd0350 Author: Julien Grall AuthorDate: Wed Mar 26 15:35:15 2014 +0100 Commit: Jan Beulich CommitDate: Wed Mar 26 15:35:15 2014 +0100 credit2: Some functions are only used internally The list of function above are only used internally in common/sched_credit2.c - migrate - update_max_weight Signed-off-by: Julien Grall Acked-by: George Dunlap --- xen/common/sched_credit2.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 6729564..97f4049 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -696,7 +696,8 @@ void burn_credits(struct csched_runqueue_data *rqd, struct csched_vcpu *svc, s_t } /* Find the domain with the highest weight. */ -void update_max_weight(struct csched_runqueue_data *rqd, int new_weight, int old_weight) +static void update_max_weight(struct csched_runqueue_data *rqd, int new_weight, + int old_weight) { /* Try to avoid brute-force search: * - If new_weight is larger, max_weigth <- new_weight @@ -1182,10 +1183,10 @@ static void consider(balance_state_t *st, } -void migrate(const struct scheduler *ops, - struct csched_vcpu *svc, - struct csched_runqueue_data *trqd, - s_time_t now) +static void migrate(const struct scheduler *ops, + struct csched_vcpu *svc, + struct csched_runqueue_data *trqd, + s_time_t now) { if ( test_bit(__CSFLAG_scheduled, &svc->flags) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 27 23:00:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Mar 2014 23:00:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJI1-0007L2-LX; Thu, 27 Mar 2014 23:00:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJI0-0007Kj-Nu for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:48 +0000 Received: from [85.158.143.35:15696] by server-2.bemta-4.messagelabs.com id 1C/65-06539-0ADA4335; Thu, 27 Mar 2014 23:00:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1395961246!5276363!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16070 invoked from network); 27 Mar 2014 23:00:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Mar 2014 23:00:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJHy-0007Ry-9p for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTJHy-0005rE-76 for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:46 +0000 Date: Thu, 27 Mar 2014 23:00:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: Some functions are only used internally X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 38457ed7fac563b47487d1885b212e4e1efd0350 Author: Julien Grall AuthorDate: Wed Mar 26 15:35:15 2014 +0100 Commit: Jan Beulich CommitDate: Wed Mar 26 15:35:15 2014 +0100 credit2: Some functions are only used internally The list of function above are only used internally in common/sched_credit2.c - migrate - update_max_weight Signed-off-by: Julien Grall Acked-by: George Dunlap --- xen/common/sched_credit2.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 6729564..97f4049 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -696,7 +696,8 @@ void burn_credits(struct csched_runqueue_data *rqd, struct csched_vcpu *svc, s_t } /* Find the domain with the highest weight. */ -void update_max_weight(struct csched_runqueue_data *rqd, int new_weight, int old_weight) +static void update_max_weight(struct csched_runqueue_data *rqd, int new_weight, + int old_weight) { /* Try to avoid brute-force search: * - If new_weight is larger, max_weigth <- new_weight @@ -1182,10 +1183,10 @@ static void consider(balance_state_t *st, } -void migrate(const struct scheduler *ops, - struct csched_vcpu *svc, - struct csched_runqueue_data *trqd, - s_time_t now) +static void migrate(const struct scheduler *ops, + struct csched_vcpu *svc, + struct csched_runqueue_data *trqd, + s_time_t now) { if ( test_bit(__CSFLAG_scheduled, &svc->flags) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 27 23:01:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Mar 2014 23:01:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJIC-0007Nr-P6; Thu, 27 Mar 2014 23:01:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJIB-0007N0-2W for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:59 +0000 Received: from [85.158.139.211:23512] by server-5.bemta-5.messagelabs.com id 2C/E3-06049-AADA4335; Thu, 27 Mar 2014 23:00:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1395961256!3862848!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32571 invoked from network); 27 Mar 2014 23:00:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Mar 2014 23:00:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJI8-0007S1-G7 for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTJI8-0005rd-DK for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:56 +0000 Date: Thu, 27 Mar 2014 23:00:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: identify which vcpu's CR4 is being badly modified X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 29f7ec2a9231352de05523e88619e9cef9ed695c Author: Andrew Cooper AuthorDate: Wed Mar 26 15:36:13 2014 +0100 Commit: Jan Beulich CommitDate: Wed Mar 26 15:36:13 2014 +0100 x86: identify which vcpu's CR4 is being badly modified When the toolstack is setting vcpu state on behalf of a migrating guest, the domain/vcpu reference from gdprintk() identifies the toolstack, not the affected domain. After this change, the error looks more like: (XEN) d0 attempted to change d6v0's CR4 flags 00002660 -> 01876000 Signed-off-by: Andrew Cooper --- xen/arch/x86/domain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index b48f2dc..796b775 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -651,9 +651,9 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *v, unsigned long guest_cr4) hv_cr4_mask &= ~X86_CR4_OSXSAVE; if ( (guest_cr4 & hv_cr4_mask) != (hv_cr4 & hv_cr4_mask) ) - gdprintk(XENLOG_WARNING, - "Attempt to change CR4 flags %08lx -> %08lx\n", - hv_cr4, guest_cr4); + printk(XENLOG_G_WARNING + "d%d attempted to change %pv's CR4 flags %08lx -> %08lx\n", + current->domain->domain_id, v, hv_cr4, guest_cr4); return (hv_cr4 & hv_cr4_mask) | (guest_cr4 & ~hv_cr4_mask); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 27 23:01:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 27 Mar 2014 23:01:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJIC-0007Nr-P6; Thu, 27 Mar 2014 23:01:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJIB-0007N0-2W for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:59 +0000 Received: from [85.158.139.211:23512] by server-5.bemta-5.messagelabs.com id 2C/E3-06049-AADA4335; Thu, 27 Mar 2014 23:00:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1395961256!3862848!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32571 invoked from network); 27 Mar 2014 23:00:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Mar 2014 23:00:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTJI8-0007S1-G7 for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTJI8-0005rd-DK for xen-changelog@lists.xensource.com; Thu, 27 Mar 2014 23:00:56 +0000 Date: Thu, 27 Mar 2014 23:00:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: identify which vcpu's CR4 is being badly modified X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 29f7ec2a9231352de05523e88619e9cef9ed695c Author: Andrew Cooper AuthorDate: Wed Mar 26 15:36:13 2014 +0100 Commit: Jan Beulich CommitDate: Wed Mar 26 15:36:13 2014 +0100 x86: identify which vcpu's CR4 is being badly modified When the toolstack is setting vcpu state on behalf of a migrating guest, the domain/vcpu reference from gdprintk() identifies the toolstack, not the affected domain. After this change, the error looks more like: (XEN) d0 attempted to change d6v0's CR4 flags 00002660 -> 01876000 Signed-off-by: Andrew Cooper --- xen/arch/x86/domain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index b48f2dc..796b775 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -651,9 +651,9 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *v, unsigned long guest_cr4) hv_cr4_mask &= ~X86_CR4_OSXSAVE; if ( (guest_cr4 & hv_cr4_mask) != (hv_cr4 & hv_cr4_mask) ) - gdprintk(XENLOG_WARNING, - "Attempt to change CR4 flags %08lx -> %08lx\n", - hv_cr4, guest_cr4); + printk(XENLOG_G_WARNING + "d%d attempted to change %pv's CR4 flags %08lx -> %08lx\n", + current->domain->domain_id, v, hv_cr4, guest_cr4); return (hv_cr4 & hv_cr4_mask) | (guest_cr4 & ~hv_cr4_mask); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:11:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:11:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0S-0001Zd-2n; Fri, 28 Mar 2014 06:11:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0Q-0001ZD-MC for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:06 +0000 Received: from [85.158.139.211:56854] by server-9.bemta-5.messagelabs.com id FE/D3-04350-97215335; Fri, 28 Mar 2014 06:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1395987063!3880665!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21871 invoked from network); 28 Mar 2014 06:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0N-0001vz-Mh for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ0N-0002M4-CA for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:03 +0000 Date: Fri, 28 Mar 2014 06:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: Don't use multiboot by default to initialize XSM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 55862a9383fdefa41db8790d5e1379dffc97387d Author: Julien Grall AuthorDate: Fri Mar 21 15:22:11 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 27 14:56:22 2014 +0000 xen/xsm: Don't use multiboot by default to initialize XSM Multiboot protocol is only used by x86. When XSM support for ARM will be introduced, another way will be used to retrieve the policy blob. Introduce CONFIG_MULTIBOOT to compile XSM specific multiboot code and rename xsm_init into xsm_multiboot_init to avoid confusion. Signed-off-by: Julien Grall Acked-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Ian Campbell Cc: Keir Fraser --- xen/arch/x86/setup.c | 2 +- xen/include/asm-x86/config.h | 2 ++ xen/include/xsm/xsm.h | 23 +++++++++++++++-------- xen/xsm/xsm_core.c | 9 ++++++--- xen/xsm/xsm_policy.c | 10 +++++++--- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 4dbf2b7..e9c2c51 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1251,7 +1251,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) bitmap_fill(module_map, mbi->mods_count); __clear_bit(0, module_map); /* Dom0 kernel is always first */ - xsm_init(module_map, mbi, bootstrap_map); + xsm_multiboot_init(module_map, mbi, bootstrap_map); microcode_grab_module(module_map, mbi, bootstrap_map); diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 99d0e2c..24f95a3 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -52,6 +52,8 @@ #define CONFIG_KEXEC 1 #define CONFIG_WATCHDOG 1 +#define CONFIG_MULTIBOOT 1 + #define HZ 100 #define OPT_CONSOLE_STR "vga" diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 15acb3b..4863e41 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -643,11 +643,15 @@ static inline int xsm_map_gmfn_foreign (xsm_default_t def, struct domain *d, str #endif /* XSM_NO_WRAPPERS */ -extern int xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)); -extern int xsm_policy_init(unsigned long *module_map, - const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)); +#ifdef CONFIG_MULTIBOOT +extern int xsm_multiboot_init(unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)); +extern int xsm_multiboot_policy_init(unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)); +#endif + extern int register_xsm(struct xsm_operations *ops); extern int unregister_xsm(struct xsm_operations *ops); @@ -658,12 +662,15 @@ extern void xsm_fixup_ops(struct xsm_operations *ops); #include -static inline int xsm_init (unsigned long *module_map, - const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)) +#ifdef CONFIG_MULTIBOOT +static inline int xsm_multiboot_init (unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)) { return 0; } +#endif + #endif /* XSM_ENABLE */ #endif /* __XSM_H */ diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index b16c071..11a9ca7 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -43,8 +43,10 @@ static void __init do_xsm_initcalls(void) } } -int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)) +#ifdef CONFIG_MULTIBOOT +int __init xsm_multiboot_init(unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)) { int ret = 0; @@ -52,7 +54,7 @@ int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, if ( XSM_MAGIC ) { - ret = xsm_policy_init(module_map, mbi, bootstrap_map); + ret = xsm_multiboot_policy_init(module_map, mbi, bootstrap_map); if ( ret ) { bootstrap_map(NULL); @@ -75,6 +77,7 @@ int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, return 0; } +#endif int register_xsm(struct xsm_operations *ops) { diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index 0186f30..3d5f66a 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -19,15 +19,18 @@ */ #include +#ifdef CONFIG_MULTIBOOT #include +#endif #include char *__initdata policy_buffer = NULL; u32 __initdata policy_size = 0; -int __init xsm_policy_init(unsigned long *module_map, - const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)) +#ifdef CONFIG_MULTIBOOT +int __init xsm_multiboot_policy_init(unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)) { int i; module_t *mod = (module_t *)__va(mbi->mods_addr); @@ -65,3 +68,4 @@ int __init xsm_policy_init(unsigned long *module_map, return rc; } +#endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:11:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:11:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0S-0001Zd-2n; Fri, 28 Mar 2014 06:11:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0Q-0001ZD-MC for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:06 +0000 Received: from [85.158.139.211:56854] by server-9.bemta-5.messagelabs.com id FE/D3-04350-97215335; Fri, 28 Mar 2014 06:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1395987063!3880665!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21871 invoked from network); 28 Mar 2014 06:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0N-0001vz-Mh for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ0N-0002M4-CA for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:03 +0000 Date: Fri, 28 Mar 2014 06:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: Don't use multiboot by default to initialize XSM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 55862a9383fdefa41db8790d5e1379dffc97387d Author: Julien Grall AuthorDate: Fri Mar 21 15:22:11 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 27 14:56:22 2014 +0000 xen/xsm: Don't use multiboot by default to initialize XSM Multiboot protocol is only used by x86. When XSM support for ARM will be introduced, another way will be used to retrieve the policy blob. Introduce CONFIG_MULTIBOOT to compile XSM specific multiboot code and rename xsm_init into xsm_multiboot_init to avoid confusion. Signed-off-by: Julien Grall Acked-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Ian Campbell Cc: Keir Fraser --- xen/arch/x86/setup.c | 2 +- xen/include/asm-x86/config.h | 2 ++ xen/include/xsm/xsm.h | 23 +++++++++++++++-------- xen/xsm/xsm_core.c | 9 ++++++--- xen/xsm/xsm_policy.c | 10 +++++++--- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 4dbf2b7..e9c2c51 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1251,7 +1251,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) bitmap_fill(module_map, mbi->mods_count); __clear_bit(0, module_map); /* Dom0 kernel is always first */ - xsm_init(module_map, mbi, bootstrap_map); + xsm_multiboot_init(module_map, mbi, bootstrap_map); microcode_grab_module(module_map, mbi, bootstrap_map); diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 99d0e2c..24f95a3 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -52,6 +52,8 @@ #define CONFIG_KEXEC 1 #define CONFIG_WATCHDOG 1 +#define CONFIG_MULTIBOOT 1 + #define HZ 100 #define OPT_CONSOLE_STR "vga" diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 15acb3b..4863e41 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -643,11 +643,15 @@ static inline int xsm_map_gmfn_foreign (xsm_default_t def, struct domain *d, str #endif /* XSM_NO_WRAPPERS */ -extern int xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)); -extern int xsm_policy_init(unsigned long *module_map, - const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)); +#ifdef CONFIG_MULTIBOOT +extern int xsm_multiboot_init(unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)); +extern int xsm_multiboot_policy_init(unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)); +#endif + extern int register_xsm(struct xsm_operations *ops); extern int unregister_xsm(struct xsm_operations *ops); @@ -658,12 +662,15 @@ extern void xsm_fixup_ops(struct xsm_operations *ops); #include -static inline int xsm_init (unsigned long *module_map, - const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)) +#ifdef CONFIG_MULTIBOOT +static inline int xsm_multiboot_init (unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)) { return 0; } +#endif + #endif /* XSM_ENABLE */ #endif /* __XSM_H */ diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index b16c071..11a9ca7 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -43,8 +43,10 @@ static void __init do_xsm_initcalls(void) } } -int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)) +#ifdef CONFIG_MULTIBOOT +int __init xsm_multiboot_init(unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)) { int ret = 0; @@ -52,7 +54,7 @@ int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, if ( XSM_MAGIC ) { - ret = xsm_policy_init(module_map, mbi, bootstrap_map); + ret = xsm_multiboot_policy_init(module_map, mbi, bootstrap_map); if ( ret ) { bootstrap_map(NULL); @@ -75,6 +77,7 @@ int __init xsm_init(unsigned long *module_map, const multiboot_info_t *mbi, return 0; } +#endif int register_xsm(struct xsm_operations *ops) { diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index 0186f30..3d5f66a 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -19,15 +19,18 @@ */ #include +#ifdef CONFIG_MULTIBOOT #include +#endif #include char *__initdata policy_buffer = NULL; u32 __initdata policy_size = 0; -int __init xsm_policy_init(unsigned long *module_map, - const multiboot_info_t *mbi, - void *(*bootstrap_map)(const module_t *)) +#ifdef CONFIG_MULTIBOOT +int __init xsm_multiboot_policy_init(unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootstrap_map)(const module_t *)) { int i; module_t *mod = (module_t *)__va(mbi->mods_addr); @@ -65,3 +68,4 @@ int __init xsm_policy_init(unsigned long *module_map, return rc; } +#endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0c-0001c4-5Y; Fri, 28 Mar 2014 06:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0a-0001bW-Kl for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:16 +0000 Received: from [85.158.137.68:4584] by server-3.bemta-3.messagelabs.com id F1/FA-05289-38215335; Fri, 28 Mar 2014 06:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1395987074!3490552!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28955 invoked from network); 28 Mar 2014 06:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0X-0001w2-SA for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ0X-0002NN-Ps for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:13 +0000 Date: Fri, 28 Mar 2014 06:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: Add xsm_core_init function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 804ad45c55fdaf88f7711a58045a2d3db0f54f20 Author: Julien Grall AuthorDate: Fri Mar 21 15:22:12 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 27 14:56:22 2014 +0000 xen/xsm: Add xsm_core_init function This function contains non-specific architecture code (mostly the tail of xsm_multiboot_init). It will be used later to avoid code duplication. Signed-off-by: Julien Grall Acked-by: Ian Campbell Acked-by: Daniel De Graaf --- xen/xsm/xsm_core.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 11a9ca7..24b0ff4 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -43,6 +43,21 @@ static void __init do_xsm_initcalls(void) } } +static int __init xsm_core_init(void) +{ + if ( verify(&dummy_xsm_ops) ) + { + printk("%s could not verify " + "dummy_xsm_ops structure.\n", __FUNCTION__); + return -EIO; + } + + xsm_ops = &dummy_xsm_ops; + do_xsm_initcalls(); + + return 0; +} + #ifdef CONFIG_MULTIBOOT int __init xsm_multiboot_init(unsigned long *module_map, const multiboot_info_t *mbi, @@ -63,16 +78,7 @@ int __init xsm_multiboot_init(unsigned long *module_map, } } - if ( verify(&dummy_xsm_ops) ) - { - bootstrap_map(NULL); - printk("%s could not verify " - "dummy_xsm_ops structure.\n", __FUNCTION__); - return -EIO; - } - - xsm_ops = &dummy_xsm_ops; - do_xsm_initcalls(); + ret = xsm_core_init(); bootstrap_map(NULL); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0c-0001c4-5Y; Fri, 28 Mar 2014 06:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0a-0001bW-Kl for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:16 +0000 Received: from [85.158.137.68:4584] by server-3.bemta-3.messagelabs.com id F1/FA-05289-38215335; Fri, 28 Mar 2014 06:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1395987074!3490552!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28955 invoked from network); 28 Mar 2014 06:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0X-0001w2-SA for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ0X-0002NN-Ps for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:13 +0000 Date: Fri, 28 Mar 2014 06:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: Add xsm_core_init function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 804ad45c55fdaf88f7711a58045a2d3db0f54f20 Author: Julien Grall AuthorDate: Fri Mar 21 15:22:12 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 27 14:56:22 2014 +0000 xen/xsm: Add xsm_core_init function This function contains non-specific architecture code (mostly the tail of xsm_multiboot_init). It will be used later to avoid code duplication. Signed-off-by: Julien Grall Acked-by: Ian Campbell Acked-by: Daniel De Graaf --- xen/xsm/xsm_core.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 11a9ca7..24b0ff4 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -43,6 +43,21 @@ static void __init do_xsm_initcalls(void) } } +static int __init xsm_core_init(void) +{ + if ( verify(&dummy_xsm_ops) ) + { + printk("%s could not verify " + "dummy_xsm_ops structure.\n", __FUNCTION__); + return -EIO; + } + + xsm_ops = &dummy_xsm_ops; + do_xsm_initcalls(); + + return 0; +} + #ifdef CONFIG_MULTIBOOT int __init xsm_multiboot_init(unsigned long *module_map, const multiboot_info_t *mbi, @@ -63,16 +78,7 @@ int __init xsm_multiboot_init(unsigned long *module_map, } } - if ( verify(&dummy_xsm_ops) ) - { - bootstrap_map(NULL); - printk("%s could not verify " - "dummy_xsm_ops structure.\n", __FUNCTION__); - return -EIO; - } - - xsm_ops = &dummy_xsm_ops; - do_xsm_initcalls(); + ret = xsm_core_init(); bootstrap_map(NULL); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:11:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0s-0001gs-A8; Fri, 28 Mar 2014 06:11:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0q-0001gT-66 for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:32 +0000 Received: from [85.158.143.35:20290] by server-3.bemta-4.messagelabs.com id 07/1F-13602-39215335; Fri, 28 Mar 2014 06:11:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1395987089!5288300!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20403 invoked from network); 28 Mar 2014 06:11:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:11:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0i-0001w6-40 for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ0h-0002Np-V2 for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:23 +0000 Date: Fri, 28 Mar 2014 06:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: Add support for device tree X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a8f2fb51c19eab086310ca21412f84a558b171a1 Author: Julien Grall AuthorDate: Fri Mar 21 15:22:13 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 27 14:56:38 2014 +0000 xen/xsm: Add support for device tree This patch adds a new module "xen,xsm-policy" to allow the user to load the XSM policy when Xen is booting. Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- docs/misc/arm/device-tree/booting.txt | 1 + xen/common/device_tree.c | 2 + xen/include/xen/device_tree.h | 3 +- xen/include/xsm/xsm.h | 12 ++++++++++ xen/xsm/xsm_core.c | 26 +++++++++++++++++++++++ xen/xsm/xsm_policy.c | 37 +++++++++++++++++++++++++++++++++ 6 files changed, 80 insertions(+), 1 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 07fde27..a7fb52b 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -16,6 +16,7 @@ Each node contains the following properties: - "linux-zimage" -- the dom0 kernel - "linux-initrd" -- the dom0 ramdisk + - "xsm-policy" -- XSM policy blob - reg diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 55716a8..e047d7f 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -354,6 +354,8 @@ static void __init process_multiboot_node(const void *fdt, int node, nr = MOD_KERNEL; else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0) nr = MOD_INITRD; + else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) + nr = MOD_XSM; else early_panic("%s not a known xen multiboot type\n", name); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 9a8c3de..76faf11 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -24,7 +24,8 @@ #define MOD_FDT 1 #define MOD_KERNEL 2 #define MOD_INITRD 3 -#define NR_MODULES 4 +#define MOD_XSM 4 +#define NR_MODULES 5 #define MOD_DISCARD_FIRST MOD_FDT diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 4863e41..2cd3a3b 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -652,6 +652,11 @@ extern int xsm_multiboot_policy_init(unsigned long *module_map, void *(*bootstrap_map)(const module_t *)); #endif +#ifdef HAS_DEVICE_TREE +extern int xsm_dt_init(void); +extern int xsm_dt_policy_init(void); +#endif + extern int register_xsm(struct xsm_operations *ops); extern int unregister_xsm(struct xsm_operations *ops); @@ -671,6 +676,13 @@ static inline int xsm_multiboot_init (unsigned long *module_map, } #endif +#ifdef HAS_DEVICE_TREE +static inline int xsm_dt_init(void) +{ + return 0; +} +#endif + #endif /* XSM_ENABLE */ #endif /* __XSM_H */ diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 24b0ff4..0ac6d03 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -85,6 +85,32 @@ int __init xsm_multiboot_init(unsigned long *module_map, } #endif +#ifdef HAS_DEVICE_TREE +int __init xsm_dt_init(void) +{ + int ret = 0; + + printk("XSM Framework v" XSM_FRAMEWORK_VERSION " initialized\n"); + + if ( XSM_MAGIC ) + { + ret = xsm_dt_policy_init(); + if ( ret ) + { + printk("%s: Error initializing policy (rc = %d).\n", + __FUNCTION__, ret); + return -EINVAL; + } + } + + ret = xsm_core_init(); + + xfree(policy_buffer); + + return ret; +} +#endif + int register_xsm(struct xsm_operations *ops) { if ( verify(ops) ) diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index 3d5f66a..a0dee09 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -23,6 +23,10 @@ #include #endif #include +#ifdef HAS_DEVICE_TREE +# include +# include +#endif char *__initdata policy_buffer = NULL; u32 __initdata policy_size = 0; @@ -69,3 +73,36 @@ int __init xsm_multiboot_policy_init(unsigned long *module_map, return rc; } #endif + +#ifdef HAS_DEVICE_TREE +int __init xsm_dt_policy_init(void) +{ + paddr_t paddr = early_info.modules.module[MOD_XSM].start; + paddr_t len = early_info.modules.module[MOD_XSM].size; + xsm_magic_t magic; + + if ( !len ) + return 0; + + copy_from_paddr(&magic, paddr, sizeof(magic)); + + if ( magic != XSM_MAGIC ) + { + printk(XENLOG_ERR "xsm: Invalid magic for XSM blob got 0x%x " + "expected 0x%x\n", magic, XSM_MAGIC); + return -EINVAL; + } + + printk("xsm: Policy len = 0x%"PRIpaddr" start at 0x%"PRIpaddr"\n", + len, paddr); + + policy_buffer = xmalloc_bytes(len); + if ( !policy_buffer ) + return -ENOMEM; + + copy_from_paddr(policy_buffer, paddr, len); + policy_size = len; + + return 0; +} +#endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:11:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0w-0001hh-CY; Fri, 28 Mar 2014 06:11:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0u-0001hJ-QC for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:37 +0000 Received: from [85.158.137.68:47306] by server-14.bemta-3.messagelabs.com id B9/85-30903-89215335; Fri, 28 Mar 2014 06:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1395987094!3457701!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20095 invoked from network); 28 Mar 2014 06:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0s-0001wE-9J for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ0s-0002OG-6e for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:34 +0000 Date: Fri, 28 Mar 2014 06:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add support for XSM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5b1743c58d45b0806b4034473dc160f2ac6944cc Author: Julien Grall AuthorDate: Fri Mar 21 15:22:14 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 27 14:56:44 2014 +0000 xen/arm: Add support for XSM Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/setup.c | 2 ++ xen/arch/arm/traps.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 215ec24..154b707 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -44,6 +44,7 @@ #include #include #include +#include struct cpuinfo_arm __read_mostly boot_cpu_data; @@ -721,6 +722,7 @@ void __init start_xen(unsigned long boot_phys_offset, gic_route_ppis(); gic_route_spis(); + xsm_dt_init(); init_maintenance_interrupt(); init_timer_interrupt(); diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index ec43e65..a7edc4e 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1006,6 +1006,7 @@ static arm_hypercall_t arm_hypercall_table[] = { HYPERCALL(sched_op, 2), HYPERCALL(console_io, 3), HYPERCALL(xen_version, 2), + HYPERCALL(xsm_op, 1), HYPERCALL(event_channel_op, 2), HYPERCALL(physdev_op, 2), HYPERCALL(sysctl, 2), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:11:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0s-0001gs-A8; Fri, 28 Mar 2014 06:11:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0q-0001gT-66 for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:32 +0000 Received: from [85.158.143.35:20290] by server-3.bemta-4.messagelabs.com id 07/1F-13602-39215335; Fri, 28 Mar 2014 06:11:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1395987089!5288300!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20403 invoked from network); 28 Mar 2014 06:11:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:11:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0i-0001w6-40 for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ0h-0002Np-V2 for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:23 +0000 Date: Fri, 28 Mar 2014 06:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: Add support for device tree X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a8f2fb51c19eab086310ca21412f84a558b171a1 Author: Julien Grall AuthorDate: Fri Mar 21 15:22:13 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 27 14:56:38 2014 +0000 xen/xsm: Add support for device tree This patch adds a new module "xen,xsm-policy" to allow the user to load the XSM policy when Xen is booting. Signed-off-by: Julien Grall Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- docs/misc/arm/device-tree/booting.txt | 1 + xen/common/device_tree.c | 2 + xen/include/xen/device_tree.h | 3 +- xen/include/xsm/xsm.h | 12 ++++++++++ xen/xsm/xsm_core.c | 26 +++++++++++++++++++++++ xen/xsm/xsm_policy.c | 37 +++++++++++++++++++++++++++++++++ 6 files changed, 80 insertions(+), 1 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 07fde27..a7fb52b 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -16,6 +16,7 @@ Each node contains the following properties: - "linux-zimage" -- the dom0 kernel - "linux-initrd" -- the dom0 ramdisk + - "xsm-policy" -- XSM policy blob - reg diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 55716a8..e047d7f 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -354,6 +354,8 @@ static void __init process_multiboot_node(const void *fdt, int node, nr = MOD_KERNEL; else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0) nr = MOD_INITRD; + else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) + nr = MOD_XSM; else early_panic("%s not a known xen multiboot type\n", name); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 9a8c3de..76faf11 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -24,7 +24,8 @@ #define MOD_FDT 1 #define MOD_KERNEL 2 #define MOD_INITRD 3 -#define NR_MODULES 4 +#define MOD_XSM 4 +#define NR_MODULES 5 #define MOD_DISCARD_FIRST MOD_FDT diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 4863e41..2cd3a3b 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -652,6 +652,11 @@ extern int xsm_multiboot_policy_init(unsigned long *module_map, void *(*bootstrap_map)(const module_t *)); #endif +#ifdef HAS_DEVICE_TREE +extern int xsm_dt_init(void); +extern int xsm_dt_policy_init(void); +#endif + extern int register_xsm(struct xsm_operations *ops); extern int unregister_xsm(struct xsm_operations *ops); @@ -671,6 +676,13 @@ static inline int xsm_multiboot_init (unsigned long *module_map, } #endif +#ifdef HAS_DEVICE_TREE +static inline int xsm_dt_init(void) +{ + return 0; +} +#endif + #endif /* XSM_ENABLE */ #endif /* __XSM_H */ diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 24b0ff4..0ac6d03 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -85,6 +85,32 @@ int __init xsm_multiboot_init(unsigned long *module_map, } #endif +#ifdef HAS_DEVICE_TREE +int __init xsm_dt_init(void) +{ + int ret = 0; + + printk("XSM Framework v" XSM_FRAMEWORK_VERSION " initialized\n"); + + if ( XSM_MAGIC ) + { + ret = xsm_dt_policy_init(); + if ( ret ) + { + printk("%s: Error initializing policy (rc = %d).\n", + __FUNCTION__, ret); + return -EINVAL; + } + } + + ret = xsm_core_init(); + + xfree(policy_buffer); + + return ret; +} +#endif + int register_xsm(struct xsm_operations *ops) { if ( verify(ops) ) diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index 3d5f66a..a0dee09 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -23,6 +23,10 @@ #include #endif #include +#ifdef HAS_DEVICE_TREE +# include +# include +#endif char *__initdata policy_buffer = NULL; u32 __initdata policy_size = 0; @@ -69,3 +73,36 @@ int __init xsm_multiboot_policy_init(unsigned long *module_map, return rc; } #endif + +#ifdef HAS_DEVICE_TREE +int __init xsm_dt_policy_init(void) +{ + paddr_t paddr = early_info.modules.module[MOD_XSM].start; + paddr_t len = early_info.modules.module[MOD_XSM].size; + xsm_magic_t magic; + + if ( !len ) + return 0; + + copy_from_paddr(&magic, paddr, sizeof(magic)); + + if ( magic != XSM_MAGIC ) + { + printk(XENLOG_ERR "xsm: Invalid magic for XSM blob got 0x%x " + "expected 0x%x\n", magic, XSM_MAGIC); + return -EINVAL; + } + + printk("xsm: Policy len = 0x%"PRIpaddr" start at 0x%"PRIpaddr"\n", + len, paddr); + + policy_buffer = xmalloc_bytes(len); + if ( !policy_buffer ) + return -ENOMEM; + + copy_from_paddr(policy_buffer, paddr, len); + policy_size = len; + + return 0; +} +#endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:11:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0w-0001hh-CY; Fri, 28 Mar 2014 06:11:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0u-0001hJ-QC for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:37 +0000 Received: from [85.158.137.68:47306] by server-14.bemta-3.messagelabs.com id B9/85-30903-89215335; Fri, 28 Mar 2014 06:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1395987094!3457701!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20095 invoked from network); 28 Mar 2014 06:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ0s-0001wE-9J for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ0s-0002OG-6e for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:34 +0000 Date: Fri, 28 Mar 2014 06:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add support for XSM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5b1743c58d45b0806b4034473dc160f2ac6944cc Author: Julien Grall AuthorDate: Fri Mar 21 15:22:14 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 27 14:56:44 2014 +0000 xen/arm: Add support for XSM Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/setup.c | 2 ++ xen/arch/arm/traps.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 215ec24..154b707 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -44,6 +44,7 @@ #include #include #include +#include struct cpuinfo_arm __read_mostly boot_cpu_data; @@ -721,6 +722,7 @@ void __init start_xen(unsigned long boot_phys_offset, gic_route_ppis(); gic_route_spis(); + xsm_dt_init(); init_maintenance_interrupt(); init_timer_interrupt(); diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index ec43e65..a7edc4e 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1006,6 +1006,7 @@ static arm_hypercall_t arm_hypercall_table[] = { HYPERCALL(sched_op, 2), HYPERCALL(console_io, 3), HYPERCALL(xen_version, 2), + HYPERCALL(xsm_op, 1), HYPERCALL(event_channel_op, 2), HYPERCALL(physdev_op, 2), HYPERCALL(sysctl, 2), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:11:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:11:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ17-0001ky-FZ; Fri, 28 Mar 2014 06:11:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ15-0001kU-Fk for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:47 +0000 Received: from [85.158.139.211:62686] by server-15.bemta-5.messagelabs.com id 8F/B2-11079-2A215335; Fri, 28 Mar 2014 06:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1395987104!3885151!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17669 invoked from network); 28 Mar 2014 06:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ12-0001wN-Eg for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ12-0002Oc-CG for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:44 +0000 Date: Fri, 28 Mar 2014 06:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: domain restore: fold redundant variables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed350ed594f39f8b800124478addd17e639dc807 Author: Jan Beulich AuthorDate: Mon Mar 24 12:14:05 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 27 15:00:47 2014 +0000 libxc: domain restore: fold redundant variables "vcpuextstate_size" being non-zero fully expresses "vcpuextstate" being true - drop the latter. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 1f6ce50..bcb0ae0 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -248,7 +248,7 @@ static int uncanonicalize_pagetable( static xen_pfn_t *load_p2m_frame_list( xc_interface *xch, struct restore_ctx *ctx, int io_fd, int *pae_extended_cr3, int *ext_vcpucontext, - int *vcpuextstate, uint32_t *vcpuextstate_size) + uint32_t *vcpuextstate_size) { xen_pfn_t *p2m_frame_list; vcpu_guest_context_any_t ctxt; @@ -326,7 +326,6 @@ static xen_pfn_t *load_p2m_frame_list( } else if ( !strncmp(chunk_sig, "xcnt", 4) ) { - *vcpuextstate = 1; if ( RDEXACT(io_fd, vcpuextstate_size, sizeof(*vcpuextstate_size)) ) { PERROR("read extended vcpu state size failed"); @@ -520,7 +519,7 @@ static int buffer_tail_hvm(xc_interface *xch, struct restore_ctx *ctx, struct tailbuf_hvm *buf, int fd, unsigned int max_vcpu_id, uint64_t *vcpumap, int ext_vcpucontext, - int vcpuextstate, uint32_t vcpuextstate_size) + uint32_t vcpuextstate_size) { uint8_t *tmp; unsigned char qemusig[21]; @@ -588,7 +587,6 @@ static int buffer_tail_pv(xc_interface *xch, struct restore_ctx *ctx, struct tailbuf_pv *buf, int fd, unsigned int max_vcpu_id, uint64_t *vcpumap, int ext_vcpucontext, - int vcpuextstate, uint32_t vcpuextstate_size) { unsigned int i; @@ -629,9 +627,7 @@ static int buffer_tail_pv(xc_interface *xch, struct restore_ctx *ctx, : sizeof(vcpu_guest_context_x86_32_t)) * buf->vcpucount; if ( ext_vcpucontext ) vcpulen += 128 * buf->vcpucount; - if ( vcpuextstate ) { - vcpulen += vcpuextstate_size * buf->vcpucount; - } + vcpulen += vcpuextstate_size * buf->vcpucount; if ( !(buf->vcpubuf) ) { if ( !(buf->vcpubuf = malloc(vcpulen)) ) { @@ -671,16 +667,14 @@ static int buffer_tail_pv(xc_interface *xch, struct restore_ctx *ctx, static int buffer_tail(xc_interface *xch, struct restore_ctx *ctx, tailbuf_t *buf, int fd, unsigned int max_vcpu_id, uint64_t *vcpumap, int ext_vcpucontext, - int vcpuextstate, uint32_t vcpuextstate_size) + uint32_t vcpuextstate_size) { if ( buf->ishvm ) return buffer_tail_hvm(xch, ctx, &buf->u.hvm, fd, max_vcpu_id, vcpumap, - ext_vcpucontext, vcpuextstate, - vcpuextstate_size); + ext_vcpucontext, vcpuextstate_size); else return buffer_tail_pv(xch, ctx, &buf->u.pv, fd, max_vcpu_id, vcpumap, - ext_vcpucontext, vcpuextstate, - vcpuextstate_size); + ext_vcpucontext, vcpuextstate_size); } static void tailbuf_free_hvm(struct tailbuf_hvm *buf) @@ -1421,7 +1415,6 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, DECLARE_DOMCTL; xc_dominfo_t info; int rc = 1, frc, i, j, n, m, pae_extended_cr3 = 0, ext_vcpucontext = 0; - int vcpuextstate = 0; uint32_t vcpuextstate_size = 0; unsigned long mfn, pfn; int nraces = 0; @@ -1527,7 +1520,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, /* Load the p2m frame list, plus potential extended info chunk */ p2m_frame_list = load_p2m_frame_list(xch, ctx, io_fd, &pae_extended_cr3, &ext_vcpucontext, - &vcpuextstate, &vcpuextstate_size); + &vcpuextstate_size); if ( !p2m_frame_list ) goto out; @@ -1730,7 +1723,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, if ( !ctx->completed ) { if ( buffer_tail(xch, ctx, &tailbuf, io_fd, max_vcpu_id, vcpumap, - ext_vcpucontext, vcpuextstate, vcpuextstate_size) < 0 ) { + ext_vcpucontext, vcpuextstate_size) < 0 ) { ERROR ("error buffering image tail"); goto out; } @@ -1783,7 +1776,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, memset(&tmptail, 0, sizeof(tmptail)); tmptail.ishvm = hvm; if ( buffer_tail(xch, ctx, &tmptail, io_fd, max_vcpu_id, vcpumap, - ext_vcpucontext, vcpuextstate, vcpuextstate_size) < 0 ) { + ext_vcpucontext, vcpuextstate_size) < 0 ) { ERROR ("error buffering image tail, finishing"); goto out; } @@ -2147,7 +2140,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } vcpu_ext_state_restore: - if ( !vcpuextstate ) + if ( !vcpuextstate_size ) continue; memcpy(&domctl.u.vcpuextstate.xfeature_mask, vcpup, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:11:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:11:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ17-0001ky-FZ; Fri, 28 Mar 2014 06:11:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ15-0001kU-Fk for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:47 +0000 Received: from [85.158.139.211:62686] by server-15.bemta-5.messagelabs.com id 8F/B2-11079-2A215335; Fri, 28 Mar 2014 06:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1395987104!3885151!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17669 invoked from network); 28 Mar 2014 06:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ12-0001wN-Eg for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ12-0002Oc-CG for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:44 +0000 Date: Fri, 28 Mar 2014 06:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: domain restore: fold redundant variables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed350ed594f39f8b800124478addd17e639dc807 Author: Jan Beulich AuthorDate: Mon Mar 24 12:14:05 2014 +0000 Commit: Ian Campbell CommitDate: Thu Mar 27 15:00:47 2014 +0000 libxc: domain restore: fold redundant variables "vcpuextstate_size" being non-zero fully expresses "vcpuextstate" being true - drop the latter. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 1f6ce50..bcb0ae0 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -248,7 +248,7 @@ static int uncanonicalize_pagetable( static xen_pfn_t *load_p2m_frame_list( xc_interface *xch, struct restore_ctx *ctx, int io_fd, int *pae_extended_cr3, int *ext_vcpucontext, - int *vcpuextstate, uint32_t *vcpuextstate_size) + uint32_t *vcpuextstate_size) { xen_pfn_t *p2m_frame_list; vcpu_guest_context_any_t ctxt; @@ -326,7 +326,6 @@ static xen_pfn_t *load_p2m_frame_list( } else if ( !strncmp(chunk_sig, "xcnt", 4) ) { - *vcpuextstate = 1; if ( RDEXACT(io_fd, vcpuextstate_size, sizeof(*vcpuextstate_size)) ) { PERROR("read extended vcpu state size failed"); @@ -520,7 +519,7 @@ static int buffer_tail_hvm(xc_interface *xch, struct restore_ctx *ctx, struct tailbuf_hvm *buf, int fd, unsigned int max_vcpu_id, uint64_t *vcpumap, int ext_vcpucontext, - int vcpuextstate, uint32_t vcpuextstate_size) + uint32_t vcpuextstate_size) { uint8_t *tmp; unsigned char qemusig[21]; @@ -588,7 +587,6 @@ static int buffer_tail_pv(xc_interface *xch, struct restore_ctx *ctx, struct tailbuf_pv *buf, int fd, unsigned int max_vcpu_id, uint64_t *vcpumap, int ext_vcpucontext, - int vcpuextstate, uint32_t vcpuextstate_size) { unsigned int i; @@ -629,9 +627,7 @@ static int buffer_tail_pv(xc_interface *xch, struct restore_ctx *ctx, : sizeof(vcpu_guest_context_x86_32_t)) * buf->vcpucount; if ( ext_vcpucontext ) vcpulen += 128 * buf->vcpucount; - if ( vcpuextstate ) { - vcpulen += vcpuextstate_size * buf->vcpucount; - } + vcpulen += vcpuextstate_size * buf->vcpucount; if ( !(buf->vcpubuf) ) { if ( !(buf->vcpubuf = malloc(vcpulen)) ) { @@ -671,16 +667,14 @@ static int buffer_tail_pv(xc_interface *xch, struct restore_ctx *ctx, static int buffer_tail(xc_interface *xch, struct restore_ctx *ctx, tailbuf_t *buf, int fd, unsigned int max_vcpu_id, uint64_t *vcpumap, int ext_vcpucontext, - int vcpuextstate, uint32_t vcpuextstate_size) + uint32_t vcpuextstate_size) { if ( buf->ishvm ) return buffer_tail_hvm(xch, ctx, &buf->u.hvm, fd, max_vcpu_id, vcpumap, - ext_vcpucontext, vcpuextstate, - vcpuextstate_size); + ext_vcpucontext, vcpuextstate_size); else return buffer_tail_pv(xch, ctx, &buf->u.pv, fd, max_vcpu_id, vcpumap, - ext_vcpucontext, vcpuextstate, - vcpuextstate_size); + ext_vcpucontext, vcpuextstate_size); } static void tailbuf_free_hvm(struct tailbuf_hvm *buf) @@ -1421,7 +1415,6 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, DECLARE_DOMCTL; xc_dominfo_t info; int rc = 1, frc, i, j, n, m, pae_extended_cr3 = 0, ext_vcpucontext = 0; - int vcpuextstate = 0; uint32_t vcpuextstate_size = 0; unsigned long mfn, pfn; int nraces = 0; @@ -1527,7 +1520,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, /* Load the p2m frame list, plus potential extended info chunk */ p2m_frame_list = load_p2m_frame_list(xch, ctx, io_fd, &pae_extended_cr3, &ext_vcpucontext, - &vcpuextstate, &vcpuextstate_size); + &vcpuextstate_size); if ( !p2m_frame_list ) goto out; @@ -1730,7 +1723,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, if ( !ctx->completed ) { if ( buffer_tail(xch, ctx, &tailbuf, io_fd, max_vcpu_id, vcpumap, - ext_vcpucontext, vcpuextstate, vcpuextstate_size) < 0 ) { + ext_vcpucontext, vcpuextstate_size) < 0 ) { ERROR ("error buffering image tail"); goto out; } @@ -1783,7 +1776,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, memset(&tmptail, 0, sizeof(tmptail)); tmptail.ishvm = hvm; if ( buffer_tail(xch, ctx, &tmptail, io_fd, max_vcpu_id, vcpumap, - ext_vcpucontext, vcpuextstate, vcpuextstate_size) < 0 ) { + ext_vcpucontext, vcpuextstate_size) < 0 ) { ERROR ("error buffering image tail, finishing"); goto out; } @@ -2147,7 +2140,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } vcpu_ext_state_restore: - if ( !vcpuextstate ) + if ( !vcpuextstate_size ) continue; memcpy(&domctl.u.vcpuextstate.xfeature_mask, vcpup, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:12:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:12:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1G-0001nV-IV; Fri, 28 Mar 2014 06:11:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1F-0001mx-6T for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:57 +0000 Received: from [85.158.137.68:6139] by server-12.bemta-3.messagelabs.com id 9C/85-14831-CA215335; Fri, 28 Mar 2014 06:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1395987114!3490605!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29843 invoked from network); 28 Mar 2014 06:11:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:11:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1C-0001wQ-JO for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ1C-0002Oy-HV for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:54 +0000 Date: Fri, 28 Mar 2014 06:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Avoid said the /dev/xvd* is already defined after X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1dcf1850e45c0069e7a9d6199f883aa9d88114da Author: Yi Li AuthorDate: Wed Mar 19 22:54:16 2014 +0800 Commit: Ian Campbell CommitDate: Thu Mar 27 15:03:15 2014 +0000 Avoid said the /dev/xvd* is already defined after open a vhd file failed For example: [root@dom0_134_103 ~]# xm block-attach 0 tap2:tapdisk:vhd:/root/liyi***.vhd /dev/xvdz w Error: ('create', '-avhd:/root/liyi***.vhd') failed (512 ) Usage: xm block-attach [BackDomain] Create a new virtual block device. [root@dom0_134_103 ~]# xm block-attach 0 tap2:tapdisk:vhd:/root/liyi.vhd /dev/xvdz w Error: The device "/dev/xvdz" is already defined Usage: xm block-attach [BackDomain] Create a new virtual block device. Signed-off-by: Yi Li Acked-by: Matt Wilson --- tools/python/xen/xend/XendDomainInfo.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 8d4ff5c..2270ab1 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -65,7 +65,7 @@ from xen.xend.XendConstants import * from xen.xend.XendAPIConstants import * from xen.xend.XendCPUPool import XendCPUPool from xen.xend.server.DevConstants import xenbusState -from xen.xend.server.BlktapController import TapdiskController +from xen.xend.server.BlktapController import TapdiskController, TapdiskException from xen.xend.XendVMMetrics import XendVMMetrics @@ -861,7 +861,7 @@ class XendDomainInfo: # blktap1 dev_type = self.getBlockDeviceClass(devid) self._waitForDevice(dev_type, devid) - except VmError, ex: + except (VmError, TapdiskException), ex: del self.info['devices'][dev_uuid] if dev_type == 'pci': for dev in dev_config_dict['devs']: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:12:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:12:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1G-0001nV-IV; Fri, 28 Mar 2014 06:11:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1F-0001mx-6T for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:57 +0000 Received: from [85.158.137.68:6139] by server-12.bemta-3.messagelabs.com id 9C/85-14831-CA215335; Fri, 28 Mar 2014 06:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1395987114!3490605!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29843 invoked from network); 28 Mar 2014 06:11:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:11:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1C-0001wQ-JO for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ1C-0002Oy-HV for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:11:54 +0000 Date: Fri, 28 Mar 2014 06:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Avoid said the /dev/xvd* is already defined after X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1dcf1850e45c0069e7a9d6199f883aa9d88114da Author: Yi Li AuthorDate: Wed Mar 19 22:54:16 2014 +0800 Commit: Ian Campbell CommitDate: Thu Mar 27 15:03:15 2014 +0000 Avoid said the /dev/xvd* is already defined after open a vhd file failed For example: [root@dom0_134_103 ~]# xm block-attach 0 tap2:tapdisk:vhd:/root/liyi***.vhd /dev/xvdz w Error: ('create', '-avhd:/root/liyi***.vhd') failed (512 ) Usage: xm block-attach [BackDomain] Create a new virtual block device. [root@dom0_134_103 ~]# xm block-attach 0 tap2:tapdisk:vhd:/root/liyi.vhd /dev/xvdz w Error: The device "/dev/xvdz" is already defined Usage: xm block-attach [BackDomain] Create a new virtual block device. Signed-off-by: Yi Li Acked-by: Matt Wilson --- tools/python/xen/xend/XendDomainInfo.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 8d4ff5c..2270ab1 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -65,7 +65,7 @@ from xen.xend.XendConstants import * from xen.xend.XendAPIConstants import * from xen.xend.XendCPUPool import XendCPUPool from xen.xend.server.DevConstants import xenbusState -from xen.xend.server.BlktapController import TapdiskController +from xen.xend.server.BlktapController import TapdiskController, TapdiskException from xen.xend.XendVMMetrics import XendVMMetrics @@ -861,7 +861,7 @@ class XendDomainInfo: # blktap1 dev_type = self.getBlockDeviceClass(devid) self._waitForDevice(dev_type, devid) - except VmError, ex: + except (VmError, TapdiskException), ex: del self.info['devices'][dev_uuid] if dev_type == 'pci': for dev in dev_config_dict['devs']: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:12:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:12:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1P-0001pp-LT; Fri, 28 Mar 2014 06:12:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1P-0001pY-2M for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:12:07 +0000 Received: from [193.109.254.147:19995] by server-6.bemta-14.messagelabs.com id F3/5F-13066-6B215335; Fri, 28 Mar 2014 06:12:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1395987124!4661173!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25226 invoked from network); 28 Mar 2014 06:12:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:12:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1M-0001wz-O9 for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:12:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ1M-0002PU-Ly for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:12:04 +0000 Date: Fri, 28 Mar 2014 06:12:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xend: move assert to exception block X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2256f09ee54136a399374c3d1b9a0c99df2fd66c Author: Olaf Hering AuthorDate: Mon Feb 10 08:57:34 2014 +0100 Commit: Ian Campbell CommitDate: Thu Mar 27 15:05:16 2014 +0000 tools/xend: move assert to exception block The two assert in restore trigger sometimes after hundreds of migrations. If they trigger the destination host will not destroy the newly created, yet empty guest. After a second migration attempt to this host there will be two guets with the same name and uuid. This situation is poorly handled by the xm tools. With this change the empty guest will be destroyed. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Acked-by: Matt Wilson --- tools/python/xen/xend/XendCheckpoint.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py index a433ffa..b8caf02 100644 --- a/tools/python/xen/xend/XendCheckpoint.py +++ b/tools/python/xen/xend/XendCheckpoint.py @@ -249,9 +249,6 @@ def restore(xd, fd, dominfo = None, paused = False, relocating = False): store_port = dominfo.getStorePort() console_port = dominfo.getConsolePort() - assert store_port - assert console_port - # if hvm, pass mem size to calculate the store_mfn if is_hvm: apic = int(dominfo.info['platform'].get('apic', 0)) @@ -263,6 +260,9 @@ def restore(xd, fd, dominfo = None, paused = False, relocating = False): pae = 0 try: + assert store_port + assert console_port + restore_image = image.create(dominfo, dominfo.info) memory = restore_image.getRequiredAvailableMemory( dominfo.info['memory_dynamic_max'] / 1024) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:12:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:12:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1P-0001pp-LT; Fri, 28 Mar 2014 06:12:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1P-0001pY-2M for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:12:07 +0000 Received: from [193.109.254.147:19995] by server-6.bemta-14.messagelabs.com id F3/5F-13066-6B215335; Fri, 28 Mar 2014 06:12:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1395987124!4661173!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25226 invoked from network); 28 Mar 2014 06:12:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:12:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1M-0001wz-O9 for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:12:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ1M-0002PU-Ly for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:12:04 +0000 Date: Fri, 28 Mar 2014 06:12:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xend: move assert to exception block X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2256f09ee54136a399374c3d1b9a0c99df2fd66c Author: Olaf Hering AuthorDate: Mon Feb 10 08:57:34 2014 +0100 Commit: Ian Campbell CommitDate: Thu Mar 27 15:05:16 2014 +0000 tools/xend: move assert to exception block The two assert in restore trigger sometimes after hundreds of migrations. If they trigger the destination host will not destroy the newly created, yet empty guest. After a second migration attempt to this host there will be two guets with the same name and uuid. This situation is poorly handled by the xm tools. With this change the empty guest will be destroyed. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Acked-by: Matt Wilson --- tools/python/xen/xend/XendCheckpoint.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py index a433ffa..b8caf02 100644 --- a/tools/python/xen/xend/XendCheckpoint.py +++ b/tools/python/xen/xend/XendCheckpoint.py @@ -249,9 +249,6 @@ def restore(xd, fd, dominfo = None, paused = False, relocating = False): store_port = dominfo.getStorePort() console_port = dominfo.getConsolePort() - assert store_port - assert console_port - # if hvm, pass mem size to calculate the store_mfn if is_hvm: apic = int(dominfo.info['platform'].get('apic', 0)) @@ -263,6 +260,9 @@ def restore(xd, fd, dominfo = None, paused = False, relocating = False): pae = 0 try: + assert store_port + assert console_port + restore_image = image.create(dominfo, dominfo.info) memory = restore_image.getRequiredAvailableMemory( dominfo.info['memory_dynamic_max'] / 1024) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:12:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:12:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1Z-0001sq-PE; Fri, 28 Mar 2014 06:12:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1Z-0001sW-61 for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:12:17 +0000 Received: from [85.158.143.35:26778] by server-3.bemta-4.messagelabs.com id CE/8F-13602-0C215335; Fri, 28 Mar 2014 06:12:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1395987135!5288425!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23426 invoked from network); 28 Mar 2014 06:12:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:12:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1W-0001x5-SS for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:12:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ1W-0002R0-Qd for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:12:14 +0000 Date: Fri, 28 Mar 2014 06:12:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xend/pvscsi: recognize also SCSI CDROM devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9011c2615c18b92f10cda8d78622e0c2a9e1f846 Author: Olaf Hering AuthorDate: Tue Feb 11 15:27:24 2014 +0100 Commit: Ian Campbell CommitDate: Thu Mar 27 15:05:52 2014 +0000 xend/pvscsi: recognize also SCSI CDROM devices Attaching a CDROM device with 'xm scsi-attach domU /dev/sr0 0:0:0:0' fails because for some reason the sr driver was not handled at all in the match list. With the change the above command succeeds and the device is attached. Signed-off-by: Olaf Hering Acked-by: Matt Wilson --- tools/python/xen/util/vscsi_util.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/python/xen/util/vscsi_util.py b/tools/python/xen/util/vscsi_util.py index 5872e65..a4f5ad3 100644 --- a/tools/python/xen/util/vscsi_util.py +++ b/tools/python/xen/util/vscsi_util.py @@ -66,6 +66,9 @@ def _vscsi_get_hctl_by(phyname, scsi_devices): if re.match('/dev/sd[a-z]+([1-9]|1[0-5])?$', phyname): # sd driver name = re.sub('(^/dev/)|([1-9]|1[0-5])?$', '', phyname) + elif re.match('/dev/sr[0-9]+$', phyname): + # sr driver + name = re.sub('^/dev/', '', phyname) elif re.match('/dev/sg[0-9]+$', phyname): # sg driver name = re.sub('^/dev/', '', phyname) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 28 06:12:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Mar 2014 06:12:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1Z-0001sq-PE; Fri, 28 Mar 2014 06:12:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1Z-0001sW-61 for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:12:17 +0000 Received: from [85.158.143.35:26778] by server-3.bemta-4.messagelabs.com id CE/8F-13602-0C215335; Fri, 28 Mar 2014 06:12:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1395987135!5288425!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23426 invoked from network); 28 Mar 2014 06:12:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Mar 2014 06:12:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTQ1W-0001x5-SS for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:12:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WTQ1W-0002R0-Qd for xen-changelog@lists.xensource.com; Fri, 28 Mar 2014 06:12:14 +0000 Date: Fri, 28 Mar 2014 06:12:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xend/pvscsi: recognize also SCSI CDROM devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9011c2615c18b92f10cda8d78622e0c2a9e1f846 Author: Olaf Hering AuthorDate: Tue Feb 11 15:27:24 2014 +0100 Commit: Ian Campbell CommitDate: Thu Mar 27 15:05:52 2014 +0000 xend/pvscsi: recognize also SCSI CDROM devices Attaching a CDROM device with 'xm scsi-attach domU /dev/sr0 0:0:0:0' fails because for some reason the sr driver was not handled at all in the match list. With the change the above command succeeds and the device is attached. Signed-off-by: Olaf Hering Acked-by: Matt Wilson --- tools/python/xen/util/vscsi_util.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/python/xen/util/vscsi_util.py b/tools/python/xen/util/vscsi_util.py index 5872e65..a4f5ad3 100644 --- a/tools/python/xen/util/vscsi_util.py +++ b/tools/python/xen/util/vscsi_util.py @@ -66,6 +66,9 @@ def _vscsi_get_hctl_by(phyname, scsi_devices): if re.match('/dev/sd[a-z]+([1-9]|1[0-5])?$', phyname): # sd driver name = re.sub('(^/dev/)|([1-9]|1[0-5])?$', '', phyname) + elif re.match('/dev/sr[0-9]+$', phyname): + # sr driver + name = re.sub('^/dev/', '', phyname) elif re.match('/dev/sg[0-9]+$', phyname): # sg driver name = re.sub('^/dev/', '', phyname) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog